Commit adf02c44 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-18' into staging 



QAPI patches for 2018-12-18

# gpg: Signature made Tue 18 Dec 2018 07:20:11 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2018-12-18:
  qapi: fix flat union on uncovered branches conditionals
  qmp hmp: Make system_wakeup check wake-up support and run state
  qga: update guest-suspend-ram and guest-suspend-hybrid descriptions
  qmp: query-current-machine with wakeup-suspend-support
  qmp: Split ShutdownCause host-qmp into quit and system-reset
  qmp: Add reason to SHUTDOWN and RESET events
  qapi: Turn ShutdownCause into QAPI enum

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e85c5771 ce1a1aec

hmp.c

+4 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,10 @@ void hmp_cont(Monitor *mon, const QDict *qdict) 


void hmp_system_wakeup(Monitor *mon, const QDict *qdict)

{

    qmp_system_wakeup(NULL);

    Error *err = NULL;



    qmp_system_wakeup(&err);

    hmp_handle_error(mon, &err);

}



void hmp_nmi(Monitor *mon, const QDict *qdict)

hw/acpi/core.c

+8 −1
Original line number Diff line number Diff line
@@ -514,7 +514,8 @@ static uint32_t acpi_pm_tmr_get(ACPIREGS *ar) 
static void acpi_pm_tmr_timer(void *opaque)

{

    ACPIREGS *ar = opaque;

    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER);



    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER, NULL);

    ar->tmr.update_sci(ar);

}
@@ -617,6 +618,12 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, 
    ar->pm1.cnt.s4_val = s4_val;

    ar->wakeup.notify = acpi_notify_wakeup;

    qemu_register_wakeup_notifier(&ar->wakeup);



    /*

     * Register wake-up support in QMP query-current-machine API

     */

    qemu_register_wakeup_support();



    memory_region_init_io(&ar->pm1.cnt.io, memory_region_owner(parent),

                          &acpi_pm_cnt_ops, ar, "acpi-cnt", 2);

    memory_region_add_subregion(parent, 4, &ar->pm1.cnt.io);

hw/char/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size) 
    SerialState *s = opaque;



    if (s->wakeup) {

        qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);

        qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);

    }

    if(s->fcr & UART_FCR_FE) {

        int i;

hw/i386/xen/xen-hvm.c

+5 −0
Original line number Diff line number Diff line
@@ -1405,6 +1405,11 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) 
    state->wakeup.notify = xen_wakeup_notifier;

    qemu_register_wakeup_notifier(&state->wakeup);



    /*

     * Register wake-up support in QMP query-current-machine API

     */

    qemu_register_wakeup_support();



    rc = xen_map_ioreq_server(state);

    if (rc < 0) {

        goto err;

hw/input/ps2.c

+3 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void ps2_put_keycode(void *opaque, int keycode) 
    PS2KbdState *s = opaque;



    trace_ps2_put_keycode(opaque, keycode);

    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);

    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);



    if (s->translate) {

        if (keycode == 0xf0) {
@@ -285,7 +285,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 
        return;

    }



    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);

    qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);

    assert(evt->type == INPUT_EVENT_KIND_KEY);

    qcode = qemu_input_key_value_to_qcode(key->key);
@@ -748,7 +748,7 @@ static void ps2_mouse_sync(DeviceState *dev) 
    }



    if (s->mouse_buttons) {

        qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);

        qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);

    }

    if (!(s->mouse_status & MOUSE_STATUS_REMOTE)) {

        /* if not remote, send event. Multiple events are sent if