Changeset eebecdc in mainline for uspace/srv/system/system.c

Timestamp:

2025-03-13T18:30:36Z (4 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e3e53cc

Parents:

e494d7b (diff), da54714 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge upstream/master into helenraid

File:

• uspace/srv/system/system.c (modified) (6 diffs)

uspace/srv/system/system.c

@@ -35 +35 @@
  */
 
+#include <devman.h>
 #include <fibril.h>
 #include <futil.h>
@@ -48 +49 @@
 #include <str.h>
 #include <loc.h>
+#include <shutdown.h>
 #include <str_error.h>
 #include <config.h>
@@ -84 +86 @@
 
 static void system_srv_conn(ipc_call_t *, void *);
-static errno_t system_srv_shutdown(void *);
+static errno_t system_srv_poweroff(void *);
+static errno_t system_srv_restart(void *);
 
 system_ops_t system_srv_ops = {
-        .shutdown = system_srv_shutdown
+        .poweroff = system_srv_poweroff,
+        .restart = system_srv_restart
 };
 
@@ -520 +524 @@
         /* Eject all volumes. */
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Ejecting volumes.");
+
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -544 +550 @@
         free(part_ids);
         vol_destroy(vol);
+
         return EOK;
 error:
@@ -610 +617 @@
 }
 
-/** System shutdown request.
+/** System poweroff request.
  *
  * @param arg Argument (sys_srv_t *)
  */
-static errno_t system_srv_shutdown(void *arg)
+static errno_t system_srv_poweroff(void *arg)
 {
         sys_srv_t *syssrv = (sys_srv_t *)arg;
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff");
 
         rc = system_sys_shutdown();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff failed");
                 system_srv_shutdown_failed(&syssrv->srv);
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown complete");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff complete");
+        system_srv_shutdown_complete(&syssrv->srv);
+        return EOK;
+}
+
+/** System restart request.
+ *
+ * @param arg Argument (sys_srv_t *)
+ */
+static errno_t system_srv_restart(void *arg)
+{
+        sys_srv_t *syssrv = (sys_srv_t *)arg;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart");
+
+        rc = system_sys_shutdown();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart failed");
+                system_srv_shutdown_failed(&syssrv->srv);
+        }
+
+        /* Quiesce the device tree. */
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Quiescing devices.");
+
+        rc = devman_quiesce_devices("/hw");
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR,
+                    "Failed to quiesce device tree.");
+                return rc;
+        }
+
+        sys_reboot();
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_restart complete");
         system_srv_shutdown_complete(&syssrv->srv);
         return EOK;