Commit cf83f140 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

shutdown: Add source information to SHUTDOWN and RESET 



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: default avatarEric 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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 802f045a

hw/acpi/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }

hw/arm/highbank.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }

hw/arm/integratorcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

hw/arm/musicpal.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

hw/arm/omap1.c

+6 −4
Original line number Diff line number Diff line
@@ -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 */