Changeset 8a4ceaa in mainline

Timestamp:

2023-08-08T07:33:40Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a77c722

Parents:

14cbf07

git-author:

Jiri Svoboda <jiri@…> (2023-08-07 17:32:47)

git-committer:

Jiri Svoboda <jiri@…> (2023-08-08 07:33:40)

Message:

Refuse to delete the last seat

Location:

uspace

Files:

• app/display-cfg/seats.c (modified) (2 diffs)
• srv/hid/display/cfgops.c (modified) (2 diffs)

uspace/app/display-cfg/seats.c

@@ -419 +419 @@
         errno_t rc;
 
-        printf("seats list populate\n");
         rc = dcfg_seats_list_populate(seats);
         if (rc != EOK)
@@ -924 +923 @@
         rc = dispcfg_seat_delete(seats->dcfg->dispcfg, entry->seat_id);
         if (rc != EOK) {
+                /*
+                 * EBUSY is returned when we attempt to delete the last
+                 * seat. No need to complain about it.
+                 */
+                if (rc == EBUSY)
+                        return;
+
                 printf("Error removing seat '%s'.\n", entry->name);
                 return;

uspace/srv/hid/display/cfgops.c

@@ -197 +197 @@
         ds_cfgclient_t *cfgclient = (ds_cfgclient_t *)arg;
         ds_seat_t *seat;
+        ds_seat_t *s;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dispcfg_seat_delete()");
@@ -205 +206 @@
                 ds_display_unlock(cfgclient->display);
                 return ENOENT;
+        }
+
+        /* Verify we are not deleting the last seat */
+        s = ds_display_first_seat(cfgclient->display);
+        if (s == seat && ds_display_next_seat(s) == NULL) {
+                ds_display_unlock(cfgclient->display);
+                return EBUSY;
         }