[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/3] i386: use machine class ->wakeup method
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/3] i386: use machine class ->wakeup method |
Date: |
Mon, 22 Jul 2019 18:38:55 +1000 |
User-agent: |
Mutt/1.12.0 (2019-05-25) |
On Mon, Jul 22, 2019 at 04:17:51PM +1000, Nicholas Piggin wrote:
> Move the i386 suspend_wakeup logic out of the fallback path, and into
> the new ->wakeup method.
>
> Signed-off-by: Nicholas Piggin <address@hidden>
Reviewed-by: David Gibson <address@hidden>
> ---
> hw/i386/pc.c | 8 ++++++++
> vl.c | 2 --
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 549c437050..78c03d7f9d 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -2828,6 +2828,13 @@ static void pc_machine_reset(MachineState *machine)
> }
> }
>
> +static void pc_machine_wakeup(MachineState *machine)
> +{
> + cpu_synchronize_all_states();
> + pc_machine_reset(machine);
> + cpu_synchronize_all_post_reset();
> +}
> +
> static CpuInstanceProperties
> pc_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
> {
> @@ -2940,6 +2947,7 @@ static void pc_machine_class_init(ObjectClass *oc, void
> *data)
> mc->block_default_type = IF_IDE;
> mc->max_cpus = 255;
> mc->reset = pc_machine_reset;
> + mc->wakeup = pc_machine_wakeup;
> hc->pre_plug = pc_machine_device_pre_plug_cb;
> hc->plug = pc_machine_device_plug_cb;
> hc->unplug_request = pc_machine_device_unplug_request_cb;
> diff --git a/vl.c b/vl.c
> index 45ea034410..3f50dd685b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1567,8 +1567,6 @@ static void qemu_system_wakeup(void)
>
> if (mc && mc->wakeup) {
> mc->wakeup(current_machine);
> - } else {
> - qemu_system_reset(SHUTDOWN_CAUSE_NONE);
> }
> }
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature