From 3ab1c8abe9f08c363752b8aa6204038895a72a51 Mon Sep 17 00:00:00 2001

From: Eric Blake <eblake@redhat.com>

Date: Thu, 1 Jun 2017 16:58:20 +0200

Subject: [PATCH 04/17] shutdown: Add source information to SHUTDOWN and RESET

RH-Author: Eric Blake <eblake@redhat.com>

Message-id: <20170601165821.26810-5-eblake@redhat.com>

Patchwork-id: 75467

O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH v2 4/5] shutdown: Add source information to SHUTDOWN and RESET

Bugzilla: 1418927

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

Time to wire up all the call sites that request a shutdown or

reset to use the enum added in the previous patch.

It would have been less churn to keep the common case with no

arguments as meaning guest-triggered, and only modified the

host-triggered code paths, via a wrapper function, but then we'd

still have to audit that I didn't miss any host-triggered spots;

changing the signature forces us to double-check that I correctly

categorized all callers.

Since command line options can change whether a guest reset request

causes an actual reset vs. a shutdown, it's easy to also add the

information to reset requests.

Signed-off-by: Eric Blake <eblake@redhat.com>

Acked-by: David Gibson <david@gibson.dropbear.id.au> [ppc parts]

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> [SPARC part]

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> [s390x parts]

Message-Id: <20170515214114.15442-5-eblake@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

(cherry picked from commit cf83f140059f21d4629ae4b61d468c3baef2bb4c)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/acpi/core.c              |  4 ++--

 hw/arm/highbank.c           |  4 ++--

 hw/arm/integratorcp.c       |  2 +-

 hw/arm/musicpal.c           |  2 +-

 hw/arm/omap1.c              | 10 ++++++----

 hw/arm/omap2.c              |  2 +-

 hw/arm/spitz.c              |  2 +-

 hw/arm/stellaris.c          |  2 +-

 hw/arm/tosa.c               |  2 +-

 hw/i386/pc.c                |  2 +-

 hw/input/pckbd.c            |  4 ++--

 hw/ipmi/ipmi.c              |  4 ++--

 hw/isa/lpc_ich9.c           |  2 +-

 hw/mips/boston.c            |  2 +-

 hw/mips/mips_malta.c        |  2 +-

 hw/mips/mips_r4k.c          |  4 ++--

 hw/misc/arm_sysctl.c        |  8 ++++----

 hw/misc/cbus.c              |  2 +-

 hw/misc/macio/cuda.c        |  4 ++--

 hw/misc/slavio_misc.c       |  4 ++--

 hw/misc/zynq_slcr.c         |  2 +-

 hw/pci-host/apb.c           |  4 ++--

 hw/pci-host/bonito.c        |  2 +-

 hw/pci-host/piix.c          |  2 +-

 hw/ppc/e500.c               |  2 +-

 hw/ppc/mpc8544_guts.c       |  2 +-

 hw/ppc/ppc.c                |  2 +-

 hw/ppc/ppc405_uc.c          |  2 +-

 hw/ppc/spapr_hcall.c        |  2 +-

 hw/ppc/spapr_rtas.c         |  4 ++--

 hw/s390x/ipl.c              |  2 +-

 hw/sh4/r2d.c                |  2 +-

 hw/timer/etraxfs_timer.c    |  2 +-

 hw/timer/m48t59.c           |  4 ++--

 hw/timer/milkymist-sysctl.c |  4 ++--

 hw/timer/pxa2xx_timer.c     |  2 +-

 hw/watchdog/watchdog.c      |  2 +-

 hw/xenpv/xen_domainbuild.c  |  2 +-

 hw/xtensa/xtfpga.c          |  2 +-

 include/sysemu/sysemu.h     |  4 ++--

 kvm-all.c                   |  6 +++---

 os-win32.c                  |  2 +-

 qmp.c                       |  4 ++--

 replay/replay.c             |  4 ++--

 target/alpha/sys_helper.c   |  4 ++--

 target/arm/psci.c           |  4 ++--

 target/i386/excp_helper.c   |  2 +-

 target/i386/hax-all.c       |  6 +++---

 target/i386/helper.c        |  2 +-

 target/i386/kvm.c           |  2 +-

 target/s390x/helper.c       |  2 +-

 target/s390x/kvm.c          |  4 ++--

 target/s390x/misc_helper.c  |  4 ++--

 target/sparc/int32_helper.c |  2 +-

 trace-events                |  2 +-

 ui/cocoa.m                  |  2 +-

 ui/sdl.c                    |  2 +-

 ui/sdl2.c                   |  4 ++--

 vl.c                        | 18 ++++++++----------

 xen-hvm.c                   |  2 +-

 60 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/hw/acpi/core.c b/hw/acpi/core.c

index e890a5d..95fcac9 100644

--- a/hw/acpi/core.c

+++ b/hw/acpi/core.c

@@ -561,7 +561,7 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val)

         uint16_t sus_typ = (val >> 10) & 7;

         switch(sus_typ) {

         case 0: /* soft power off */

-            qemu_system_shutdown_request();

+            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

             break;

         case 1:

             qemu_system_suspend_request();

@@ -569,7 +569,7 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val)

         default:

             if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */

                 qapi_event_send_suspend_disk(&error_abort);

-                qemu_system_shutdown_request();

+                qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

             }

             break;

         }

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c

index 0a4508c..d209b97 100644

--- a/hw/arm/highbank.c

+++ b/hw/arm/highbank.c

@@ -108,9 +108,9 @@ static void hb_regs_write(void *opaque, hwaddr offset,

     if (offset == 0xf00) {

         if (value == 1 || value == 2) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         } else if (value == 3) {

-            qemu_system_shutdown_request();

+            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

         }

     }

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c

index 5610ffc..ca3eca1 100644

--- a/hw/arm/integratorcp.c

+++ b/hw/arm/integratorcp.c

@@ -158,7 +158,7 @@ static void integratorcm_do_remap(IntegratorCMState *s)

 static void integratorcm_set_ctrl(IntegratorCMState *s, uint32_t value)

 {

     if (value & 8) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

     if ((s->cm_ctrl ^ value) & 1) {

         /* (value & 1) != 0 means the green "MISC LED" is lit.

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c

index cbbca4e..9c710f7 100644

--- a/hw/arm/musicpal.c

+++ b/hw/arm/musicpal.c

@@ -898,7 +898,7 @@ static void mv88w8618_pit_write(void *opaque, hwaddr offset,

     case MP_BOARD_RESET:

         if (value == MP_BOARD_RESET_MAGIC) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     }

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c

index b3cf0ec..54582bd 100644

--- a/hw/arm/omap1.c

+++ b/hw/arm/omap1.c

@@ -355,7 +355,7 @@ static void omap_wd_timer_write(void *opaque, hwaddr addr,

                 /* XXX: on T|E hardware somehow this has no effect,

                  * on Zire 71 it works as specified.  */

                 s->reset = 1;

-                qemu_system_reset_request();

+                qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             }

         }

         s->last_wr = value & 0xff;

@@ -1545,8 +1545,10 @@ static inline void omap_clkm_idlect1_update(struct omap_mpu_state_s *s,

     if (value & (1 << 11)) {                            /* SETARM_IDLE */

         cpu_interrupt(CPU(s->cpu), CPU_INTERRUPT_HALT);

     }

-    if (!(value & (1 << 10)))				/* WKUP_MODE */

-        qemu_system_shutdown_request();	/* XXX: disable wakeup from IRQ */

+    if (!(value & (1 << 10))) {                         /* WKUP_MODE */

+        /* XXX: disable wakeup from IRQ */

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

+    }

 #define SET_CANIDLE(clock, bit)				\

     if (diff & (1 << bit)) {				\

@@ -1693,7 +1695,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,

         diff = s->clkm.arm_rstct1 ^ value;

         s->clkm.arm_rstct1 = value & 0x0007;

         if (value & 9) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             s->clkm.cold_start = 0xa;

         }

         if (diff & ~value & 4) {				/* DSP_RST */

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c

index cf1b4ba..8afb854 100644

--- a/hw/arm/omap2.c

+++ b/hw/arm/omap2.c

@@ -1610,7 +1610,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr,

     case 0x450:	/* RM_RSTCTRL_WKUP */

         /* TODO: reset */

         if (value & 2)

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         break;

     case 0x454:	/* RM_RSTTIME_WKUP */

         s->rsttime_wkup = value & 0x1fff;

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c

index fe2d5a7..7e9f579 100644

--- a/hw/arm/spitz.c

+++ b/hw/arm/spitz.c

@@ -848,7 +848,7 @@ static void spitz_lcd_hsync_handler(void *opaque, int line, int level)

 static void spitz_reset(void *opaque, int line, int level)

 {

     if (level) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

 }

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c

index 9edcd49..c35f684 100644

--- a/hw/arm/stellaris.c

+++ b/hw/arm/stellaris.c

@@ -1183,7 +1183,7 @@ static

 void do_sys_reset(void *opaque, int n, int level)

 {

     if (level) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

 }

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c

index 9f58a23..2421b81 100644

--- a/hw/arm/tosa.c

+++ b/hw/arm/tosa.c

@@ -90,7 +90,7 @@ static void tosa_out_switch(void *opaque, int line, int level)

 static void tosa_reset(void *opaque, int line, int level)

 {

     if (level) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

 }

diff --git a/hw/i386/pc.c b/hw/i386/pc.c

index 3596de0..f0d09d9 100644

--- a/hw/i386/pc.c

+++ b/hw/i386/pc.c

@@ -520,7 +520,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val,

     s->outport = val;

     qemu_set_irq(s->a20_out, (val >> 1) & 1);

     if ((val & 1) && !(oldval & 1)) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

 }

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c

index f475f33..a7676bc 100644

--- a/hw/input/pckbd.c

+++ b/hw/input/pckbd.c

@@ -227,7 +227,7 @@ static void outport_write(KBDState *s, uint32_t val)

     s->outport = val;

     qemu_set_irq(s->a20_out, (val >> 1) & 1);

     if (!(val & 1)) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     }

 }

@@ -302,7 +302,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,

         s->outport &= ~KBD_OUT_A20;

         break;

     case KBD_CCMD_RESET:

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         break;

     case KBD_CCMD_NO_OP:

         /* ignore that */

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c

index 5cf1caa..afafe14 100644

--- a/hw/ipmi/ipmi.c

+++ b/hw/ipmi/ipmi.c

@@ -44,14 +44,14 @@ static int ipmi_do_hw_op(IPMIInterface *s, enum ipmi_op op, int checkonly)

         if (checkonly) {

             return 0;

         }

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         return 0;

     case IPMI_POWEROFF_CHASSIS:

         if (checkonly) {

             return 0;

         }

-        qemu_system_shutdown_request();

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

         return 0;

     case IPMI_SEND_NMI:

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c

index a0866c3..2b09354 100644

--- a/hw/isa/lpc_ich9.c

+++ b/hw/isa/lpc_ich9.c

@@ -606,7 +606,7 @@ static void ich9_rst_cnt_write(void *opaque, hwaddr addr, uint64_t val,

     ICH9LPCState *lpc = opaque;

     if (val & 4) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         return;

     }

     lpc->rst_cnt = val & 0xA; /* keep FULL_RST (bit 3) and SYS_RST (bit 1) */

diff --git a/hw/mips/boston.c b/hw/mips/boston.c

index 83f7b82..53d1e0c 100644

--- a/hw/mips/boston.c

+++ b/hw/mips/boston.c

@@ -232,7 +232,7 @@ static void boston_platreg_write(void *opaque, hwaddr addr,

         break;

     case PLAT_SOFTRST_CTL:

         if (val & PLAT_SOFTRST_CTL_SYSRESET) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     default:

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c

index 5dd177e..7814c39 100644

--- a/hw/mips/mips_malta.c

+++ b/hw/mips/mips_malta.c

@@ -470,7 +470,7 @@ static void malta_fpga_write(void *opaque, hwaddr addr,

     /* SOFTRES Register */

     case 0x00500:

         if (val == 0x42)

-            qemu_system_reset_request ();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         break;

     /* BRKRES Register */

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c

index 748586e..f4de9fc 100644

--- a/hw/mips/mips_r4k.c

+++ b/hw/mips/mips_r4k.c

@@ -53,9 +53,9 @@ static void mips_qemu_write (void *opaque, hwaddr addr,

                              uint64_t val, unsigned size)

 {

     if ((addr & 0xffff) == 0 && val == 42)

-        qemu_system_reset_request ();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     else if ((addr & 0xffff) == 4 && val == 42)

-        qemu_system_shutdown_request ();

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

 }

 static uint64_t mips_qemu_read (void *opaque, hwaddr addr,

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c

index 8524008..b20b44e 100644

--- a/hw/misc/arm_sysctl.c

+++ b/hw/misc/arm_sysctl.c

@@ -351,13 +351,13 @@ static bool vexpress_cfgctrl_write(arm_sysctl_state *s, unsigned int dcc,

         break;

     case SYS_CFG_SHUTDOWN:

         if (site == SYS_CFG_SITE_MB && device == 0) {

-            qemu_system_shutdown_request();

+            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

             return true;

         }

         break;

     case SYS_CFG_REBOOT:

         if (site == SYS_CFG_SITE_MB && device == 0) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             return true;

         }

         break;

@@ -429,7 +429,7 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,

             if (s->lockval == LOCK_VALUE) {

                 s->resetlevel = val;

                 if (val & 0x100) {

-                    qemu_system_reset_request();

+                    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

                 }

             }

             break;

@@ -438,7 +438,7 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,

             if (s->lockval == LOCK_VALUE) {

                 s->resetlevel = val;

                 if (val & 0x04) {

-                    qemu_system_reset_request();

+                    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

                 }

             }

             break;

diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c

index 0c207e3..677274c 100644

--- a/hw/misc/cbus.c

+++ b/hw/misc/cbus.c

@@ -356,7 +356,7 @@ static inline void retu_write(CBusRetu *s, int reg, uint16_t val)

     case RETU_REG_WATCHDOG:

         if (val == 0 && (s->cc[0] & 2))

-            qemu_system_shutdown_request();

+            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

         break;

     case RETU_REG_TXCR:

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c

index 05c02fb..008d8bd 100644

--- a/hw/misc/macio/cuda.c

+++ b/hw/misc/macio/cuda.c

@@ -612,7 +612,7 @@ static bool cuda_cmd_powerdown(CUDAState *s,

         return false;

     }

-    qemu_system_shutdown_request();

+    qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

     return true;

 }

@@ -624,7 +624,7 @@ static bool cuda_cmd_reset_system(CUDAState *s,

         return false;

     }

-    qemu_system_reset_request();

+    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     return true;

 }

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c

index edd5de0..18ff677 100644

--- a/hw/misc/slavio_misc.c

+++ b/hw/misc/slavio_misc.c

@@ -258,7 +258,7 @@ static void slavio_aux2_mem_writeb(void *opaque, hwaddr addr,

         val &= AUX2_PWROFF;

     s->aux2 = val;

     if (val & AUX2_PWROFF)

-        qemu_system_shutdown_request();

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

     slavio_misc_update_irq(s);

 }

@@ -338,7 +338,7 @@ static void slavio_sysctrl_mem_writel(void *opaque, hwaddr addr,

     case 0:

         if (val & SYS_RESET) {

             s->sysctrl = SYS_RESETSTAT;

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     default:

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c

index 7891219..44304d4 100644

--- a/hw/misc/zynq_slcr.c

+++ b/hw/misc/zynq_slcr.c

@@ -405,7 +405,7 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,

     switch (offset) {

     case PSS_RST_CTRL:

         if (val & R_PSS_RST_CTRL_SOFT_RST) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     }

diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c

index 653e711..83fc6a9 100644

--- a/hw/pci-host/apb.c

+++ b/hw/pci-host/apb.c

@@ -482,9 +482,9 @@ static void apb_config_writel (void *opaque, hwaddr addr,

             s->reset_control |= val & RESET_WMASK;

             if (val & SOFT_POR) {

                 s->nr_resets = 0;

-                qemu_system_reset_request();

+                qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             } else if (val & SOFT_XIR) {

-                qemu_system_reset_request();

+                qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             }

         }

         break;

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c

index 1999ece..b1d41d0 100644

--- a/hw/pci-host/bonito.c

+++ b/hw/pci-host/bonito.c

@@ -269,7 +269,7 @@ static void bonito_writel(void *opaque, hwaddr addr,

         }

         s->regs[saddr] = val;

         if (reset) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     case BONITO_INTENSET:

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c

index 7c3b7c1..f6d1ebc 100644

--- a/hw/pci-host/piix.c

+++ b/hw/pci-host/piix.c

@@ -638,7 +638,7 @@ static void rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned len)

     PIIX3State *d = opaque;

     if (val & 4) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         return;

     }

     d->rcr = val & 2; /* keep System Reset type only */

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c

index f7df238..62f1857 100644

--- a/hw/ppc/e500.c

+++ b/hw/ppc/e500.c

@@ -774,7 +774,7 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params,

 static void ppce500_power_off(void *opaque, int line, int on)

 {

     if (on) {

-        qemu_system_shutdown_request();

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

     }

 }

diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c

index ba69178..ce1254b 100644

--- a/hw/ppc/mpc8544_guts.c

+++ b/hw/ppc/mpc8544_guts.c

@@ -98,7 +98,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr,

     switch (addr) {

     case MPC8544_GUTS_ADDR_RSTCR:

         if (value & MPC8544_GUTS_RSTCR_RESET) {

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

         break;

     default:

diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c

index 5f93083..224184d 100644

--- a/hw/ppc/ppc.c

+++ b/hw/ppc/ppc.c

@@ -412,7 +412,7 @@ static void ppce500_set_irq(void *opaque, int pin, int level)

             if (level) {

                 LOG_IRQ("%s: reset the PowerPC system\n",

                             __func__);

-                qemu_system_reset_request();

+                qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

             }

             break;

         case PPCE500_INPUT_RESET_CORE:

diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c

index d5df94a..fc32e96 100644

--- a/hw/ppc/ppc405_uc.c

+++ b/hw/ppc/ppc405_uc.c

@@ -1807,7 +1807,7 @@ void ppc40x_chip_reset(PowerPCCPU *cpu)

 void ppc40x_system_reset(PowerPCCPU *cpu)

 {

     printf("Reset PowerPC system\n");

-    qemu_system_reset_request();

+    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

 }

 void store_40x_dbcr0 (CPUPPCState *env, uint32_t val)

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c

index 9f18f75..2735fe9 100644

--- a/hw/ppc/spapr_hcall.c

+++ b/hw/ppc/spapr_hcall.c

@@ -1166,7 +1166,7 @@ static target_ulong h_client_architecture_support(PowerPCCPU *cpu,

     spapr_ovec_cleanup(ov5_updates);

     if (spapr->cas_reboot) {

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     } else {

         /* If ppc_spapr_reset() did not set up a HPT but one is necessary

          * (because the guest isn't going to use radix) then set it up here. */

diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c

index 619f32c..128d993 100644

--- a/hw/ppc/spapr_rtas.c

+++ b/hw/ppc/spapr_rtas.c

@@ -110,7 +110,7 @@ static void rtas_power_off(PowerPCCPU *cpu, sPAPRMachineState *spapr,

         rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

         return;

     }

-    qemu_system_shutdown_request();

+    qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

     cpu_stop_current();

     rtas_st(rets, 0, RTAS_OUT_SUCCESS);

 }

@@ -124,7 +124,7 @@ static void rtas_system_reboot(PowerPCCPU *cpu, sPAPRMachineState *spapr,

         rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

         return;

     }

-    qemu_system_reset_request();

+    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     rtas_st(rets, 0, RTAS_OUT_SUCCESS);

 }

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c

index 7978c7d..e5ab0ad 100644

--- a/hw/s390x/ipl.c

+++ b/hw/s390x/ipl.c

@@ -363,7 +363,7 @@ void s390_reipl_request(void)

     S390IPLState *ipl = get_ipl_device();

     ipl->reipl_requested = true;

-    qemu_system_reset_request();

+    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

 }

 void s390_ipl_prepare_cpu(S390CPU *cpu)

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c

index 6d06968..117ba9f 100644

--- a/hw/sh4/r2d.c

+++ b/hw/sh4/r2d.c

@@ -164,7 +164,7 @@ r2d_fpga_write(void *opaque, hwaddr addr, uint64_t value, unsigned int size)

 	break;

     case PA_POWOFF:

         if (value & 1) {

-            qemu_system_shutdown_request();

+            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

         }

         break;

     case PA_VERREG:

diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c

index 8e18236..d13bc30 100644

--- a/hw/timer/etraxfs_timer.c

+++ b/hw/timer/etraxfs_timer.c

@@ -207,7 +207,7 @@ static void watchdog_hit(void *opaque)

         qemu_irq_raise(t->nmi);

     }

     else

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     t->wd_hits++;

 }

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c

index 474981a..4a064fb 100644

--- a/hw/timer/m48t59.c

+++ b/hw/timer/m48t59.c

@@ -1,7 +1,7 @@

 /*

  * QEMU M48T59 and M48T08 NVRAM emulation for PPC PREP and Sparc platforms

  *

- * Copyright (c) 2003-2005, 2007 Jocelyn Mayer

+ * Copyright (c) 2003-2005, 2007, 2017 Jocelyn Mayer

  * Copyright (c) 2013 Hervé Poussineau

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy

@@ -159,7 +159,7 @@ static void watchdog_cb (void *opaque)

 	NVRAM->buffer[0x1FF7] = 0x00;

 	NVRAM->buffer[0x1FFC] &= ~0x40;

         /* May it be a hw CPU Reset instead ? */

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

     } else {

 	qemu_set_irq(NVRAM->IRQ, 1);

 	qemu_set_irq(NVRAM->IRQ, 0);

diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c

index 4488590..93bc6e17 100644

--- a/hw/timer/milkymist-sysctl.c

+++ b/hw/timer/milkymist-sysctl.c

@@ -90,7 +90,7 @@ static void sysctl_icap_write(MilkymistSysctlState *s, uint32_t value)

     trace_milkymist_sysctl_icap_write(value);

     switch (value & 0xffff) {

     case 0x000e:

-        qemu_system_shutdown_request();

+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

         break;

     }

 }

@@ -195,7 +195,7 @@ static void sysctl_write(void *opaque, hwaddr addr, uint64_t value,

         s->regs[addr] = 1;

         break;

     case R_SYSTEM_ID:

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         break;

     case R_GPIO_IN:

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c

index 59002b4..68ba5a7 100644

--- a/hw/timer/pxa2xx_timer.c

+++ b/hw/timer/pxa2xx_timer.c

@@ -401,7 +401,7 @@ static void pxa2xx_timer_tick(void *opaque)

     if (t->num == 3)

         if (i->reset3 & 1) {

             i->reset3 = 0;

-            qemu_system_reset_request();

+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }

 }

diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c

index 2aeaf1f..0c5c9cd 100644

--- a/hw/watchdog/watchdog.c

+++ b/hw/watchdog/watchdog.c

@@ -110,7 +110,7 @@ void watchdog_perform_action(void)

     switch (watchdog_action) {

     case WDT_RESET:             /* same as 'system_reset' in monitor */

         qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_RESET, &error_abort);

-        qemu_system_reset_request();

+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         break;

     case WDT_SHUTDOWN:          /* same as 'system_powerdown' in monitor */

diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c

index 457a897..c89ced2 100644

--- a/hw/xenpv/xen_domainbuild.c

+++ b/hw/xenpv/xen_domainbuild.c

@@ -148,7 +148,7 @@ static void xen_domain_poll(void *opaque)

     return;

 quit:

-    qemu_system_shutdown_request();

+    qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

 }