diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-25 16:25:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-25 16:25:47 +0000 |
| commit | a5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3 (patch) | |
| tree | febbb39911f8d17f86b8cb452911bf0677291523 /migration/savevm.c | |
| parent | 65e05c82bdc6d348155e301c9d87dba7a08a5701 (diff) | |
| parent | 4d0e59ace29277b2faa5b33c719be9baaa659093 (diff) | |
| download | focaccia-qemu-a5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3.tar.gz focaccia-qemu-a5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 25 Nov 2019 15:30:56 GMT # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: net/virtio: return error when device_opts arg is NULL net/virtio: fix re-plugging of primary device net/virtio: return early when failover primary alread added net/virtio: fix dev_unplug_pending Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 966a9c3bdb..a71b930b91 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1119,7 +1119,8 @@ int qemu_savevm_nr_failover_devices(void) int n = 0; QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { - if (se->vmsd && se->vmsd->dev_unplug_pending) { + if (se->vmsd && se->vmsd->dev_unplug_pending && + se->vmsd->dev_unplug_pending(se->opaque)) { n++; } } |