Changes in uspace/srv/system/system.c [77a0119:4285f384] in mainline

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>
@@ -49 +48 @@
 #include <str.h>
 #include <loc.h>
-#include <shutdown.h>
 #include <str_error.h>
 #include <config.h>
@@ -86 +84 @@
 
 static void system_srv_conn(ipc_call_t *, void *);
-static errno_t system_srv_poweroff(void *);
-static errno_t system_srv_restart(void *);
+static errno_t system_srv_shutdown(void *);
 
 system_ops_t system_srv_ops = {
-        .poweroff = system_srv_poweroff,
-        .restart = system_srv_restart
+        .shutdown = system_srv_shutdown
 };
 
@@ -523 +519 @@
         /* Eject all volumes. */
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Ejecting volumes.");
-
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -549 +543 @@
         free(part_ids);
         vol_destroy(vol);
-
         return EOK;
 error:
@@ -616 +609 @@
 }
 
-/** System poweroff request.
+/** System shutdown request.
  *
  * @param arg Argument (sys_srv_t *)
  */
-static errno_t system_srv_poweroff(void *arg)
+static errno_t system_srv_shutdown(void *arg)
 {
         sys_srv_t *syssrv = (sys_srv_t *)arg;
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown");
 
         rc = system_sys_shutdown();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_poweroff failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown failed");
                 system_srv_shutdown_failed(&syssrv->srv);
         }
 
-        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");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "system_srv_shutdown complete");
         system_srv_shutdown_complete(&syssrv->srv);
         return EOK;