[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 2/3] i386: use machine class ->wakeup method
From: |
Nicholas Piggin |
Subject: |
[Qemu-ppc] [PATCH v2 2/3] i386: use machine class ->wakeup method |
Date: |
Mon, 22 Jul 2019 16:17:51 +1000 |
Move the i386 suspend_wakeup logic out of the fallback path, and into
the new ->wakeup method.
Signed-off-by: Nicholas Piggin <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);
}
}
--
2.20.1
- [Qemu-ppc] [PATCH v2 2/3] i386: use machine class ->wakeup method,
Nicholas Piggin <=