diff options
| author | Juraj Marcin <jmarcin@redhat.com> | 2024-09-04 12:37:12 +0200 |
|---|---|---|
| committer | David Hildenbrand <david@redhat.com> | 2024-09-24 11:33:34 +0200 |
| commit | 1b063fe2df002052cc2d10799764979b8c583480 (patch) | |
| tree | 26b813cfbd486aa53344711d7c6deac950ffba56 /system/runstate.c | |
| parent | 8d018fe59a0beff580ac6b3399d642c4277d9dd0 (diff) | |
| download | focaccia-qemu-1b063fe2df002052cc2d10799764979b8c583480.tar.gz focaccia-qemu-1b063fe2df002052cc2d10799764979b8c583480.zip | |
reset: Use ResetType for qemu_devices_reset() and MachineClass::reset()
Currently, both qemu_devices_reset() and MachineClass::reset() use ShutdownCause for the reason of the reset. However, the Resettable interface uses ResetState, so ShutdownCause needs to be translated to ResetType somewhere. Translating it qemu_devices_reset() makes adding new reset types harder, as they cannot always be matched to a single ShutdownCause here, and devices may need to check the ResetType to determine what to reset and if to reset at all. This patch moves this translation up in the call stack to qemu_system_reset() and updates all MachineClass children to use the ResetType instead. Message-ID: <20240904103722.946194-2-jmarcin@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Juraj Marcin <jmarcin@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com>
Diffstat (limited to 'system/runstate.c')
| -rw-r--r-- | system/runstate.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/system/runstate.c b/system/runstate.c index a0e2a5fd22..c2c9afa905 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -32,6 +32,7 @@ #include "exec/cpu-common.h" #include "gdbstub/syscalls.h" #include "hw/boards.h" +#include "hw/resettable.h" #include "migration/misc.h" #include "migration/postcopy-ram.h" #include "monitor/monitor.h" @@ -507,15 +508,23 @@ static int qemu_debug_requested(void) void qemu_system_reset(ShutdownCause reason) { MachineClass *mc; + ResetType type; mc = current_machine ? MACHINE_GET_CLASS(current_machine) : NULL; cpu_synchronize_all_states(); + switch (reason) { + case SHUTDOWN_CAUSE_SNAPSHOT_LOAD: + type = RESET_TYPE_SNAPSHOT_LOAD; + break; + default: + type = RESET_TYPE_COLD; + } if (mc && mc->reset) { - mc->reset(current_machine, reason); + mc->reset(current_machine, type); } else { - qemu_devices_reset(reason); + qemu_devices_reset(type); } switch (reason) { case SHUTDOWN_CAUSE_NONE: |