diff options
| author | Steve Sistare <steven.sistare@oracle.com> | 2024-01-03 12:05:32 -0800 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-01-04 09:52:42 +0800 |
| commit | 0f1db069b6c5e7f7ddcdcc9c64fd4b6dbe4afcdf (patch) | |
| tree | 4d3d938503ae964c4551e2a8b57f2b7e84427826 | |
| parent | b9ae473d80302519a7b89f98795a80abfea1deea (diff) | |
| download | qemu-0f1db069b6c5e7f7ddcdcc9c64fd4b6dbe4afcdf.zip qemu-0f1db069b6c5e7f7ddcdcc9c64fd4b6dbe4afcdf.tar.gz qemu-0f1db069b6c5e7f7ddcdcc9c64fd4b6dbe4afcdf.tar.bz2 | |
cpus: check running not RUN_STATE_RUNNING
When a vm transitions from running to suspended, runstate notifiers are
not called, so the notifiers still think the vm is running. Hence, when
we call vm_start to restore the suspended state, we call vm_state_notify
with running=1. However, some notifiers check for RUN_STATE_RUNNING.
They must check the running boolean instead.
No functional change.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/1704312341-66640-4-git-send-email-steven.sistare@oracle.com
Signed-off-by: Peter Xu <peterx@redhat.com>
| -rw-r--r-- | backends/tpm/tpm_emulator.c | 2 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 2 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 2 | ||||
| -rw-r--r-- | hw/xen/xen-hvm-common.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index f7f1b4a..254fce7 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -904,7 +904,7 @@ static void tpm_emulator_vm_state_change(void *opaque, bool running, trace_tpm_emulator_vm_state_change(running, state); - if (!running || state != RUN_STATE_RUNNING || !tpm_emu->relock_storage) { + if (!running || !tpm_emu->relock_storage) { return; } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 19b4534..10c82ce 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2451,7 +2451,7 @@ static void usb_ehci_vm_state_change(void *opaque, bool running, RunState state) * USB-devices which have async handled packages have a packet in the * ep queue to match the completion with. */ - if (state == RUN_STATE_RUNNING) { + if (running) { ehci_advance_async_state(ehci); } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index c9893df..3785bb0 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1403,7 +1403,7 @@ static void usbredir_vm_state_change(void *priv, bool running, RunState state) { USBRedirDevice *dev = priv; - if (state == RUN_STATE_RUNNING && dev->parser != NULL) { + if (running && dev->parser != NULL) { usbredirparser_do_write(dev->parser); /* Flush any pending writes */ } } diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 565dc39..47e6cb1 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -623,7 +623,7 @@ void xen_hvm_change_state_handler(void *opaque, bool running, xen_set_ioreq_server_state(xen_domid, state->ioservid, - (rstate == RUN_STATE_RUNNING)); + running); } void xen_exit_notifier(Notifier *n, void *data) |