[Xen-devel] [PATCH v2] xen: use 'Hardware domain' instead of 'Domain 0' in hwdom_shutdown()

[Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>]

hwdom_shutdown() operates with hardware domains, use the proper wording.
Eliminate pointless braces from switch cases.

Use hardware_domain->domain_id instead of hardware_domid to print the actual
domain ID as in some cases it can differ (e.g. Dom0 dies before the actual HW
domain got created, kexec for the HW domain is being performed,...).

Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
---
 xen/common/shutdown.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index 94d4c53..923dffe 100644
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -37,46 +37,40 @@ void hwdom_shutdown(u8 reason)
     switch ( reason )
     {
     case SHUTDOWN_poweroff:
-    {
-        printk("Domain 0 halted: halting machine.\n");
+        printk("Hardware domain %u halted: halting machine.\n",
+               hardware_domain->domain_id);
         machine_halt();
         break; /* not reached */
-    }
 
     case SHUTDOWN_crash:
-    {
         debugger_trap_immediate();
-        printk("Domain 0 crashed: ");
+        printk("Hardware domain %u crashed: ", hardware_domain->domain_id);
 #ifdef CONFIG_KEXEC
         kexec_crash();
 #endif
         maybe_reboot();
         break; /* not reached */
-    }
 
     case SHUTDOWN_reboot:
-    {
-        printk("Domain 0 shutdown: rebooting machine.\n");
+        printk("Hardware domain %u shutdown: rebooting machine.\n",
+               hardware_domain->domain_id);
         machine_restart(0);
         break; /* not reached */
-    }
 
     case SHUTDOWN_watchdog:
-    {
-        printk("Domain 0 shutdown: watchdog rebooting machine.\n");
+        printk("Hardware domain %u shutdown: watchdog rebooting machine.\n",
+               hardware_domain->domain_id);
 #ifdef CONFIG_KEXEC
         kexec_crash();
 #endif
         machine_restart(0);
         break; /* not reached */
-    }
 
     default:
-    {
-        printk("Domain 0 shutdown (unknown reason %u): ", reason);
+        printk("Hardware domain %u shutdown (unknown reason %u): ",
+               hardware_domain->domain_id, reason);
         maybe_reboot();
         break; /* not reached */
     }
-    }
 }  
 
-- 
1.9.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel