0dd8f840c7
- vdpa: Fix bug where vdpa appliance migration does not resume after rollback - block: Parse filenames only when explicitly requested (CVE-2024-4467) - block: introduce bdrv_open_file_child() helper - iotests/270: Don't store data-file with json: prefix in image (CVE-2024-4467) - iotests/244: Don't store data-file with protocol in image (CVE-2024-4467) - qcow2: Don't open data_file with BDRV_O_NO_IO (CVE-2024-4467) - qcow2: Do not reopen data_file in invalidate_cache - hw/intc/arm_gic: Fix deactivation of SPI lines chery-pick from 7175a562f157d39725ab396e39c1e8e410d206b3 - vhost-user: Skip unnecessary duplicated VHOST_USER_SET_LOG_BASE requests - target/ppc: Split off common embedded TLB init cheery-pick from 581eea5d656b73c6532109f4ced4c73fd4e5fd47` - vdpa: fix vdpa device migrate rollback wrong when suspend device failed 1. - hw/virtio/virtio-pci:Support shadow device for virtio-net/blk/scsi devices Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit ad45062d44e901468eeb8c4ac0729587daaa1e1f)
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 2713ad857506ce338472e19706fbbab4ee4ba662 Mon Sep 17 00:00:00 2001
|
|
From: Adttil <2429917001@qq.com>
|
|
Date: Mon, 8 Jul 2024 14:45:18 +0800
|
|
Subject: [PATCH] vdpa: Fix bug where vdpa appliance migration does not resume
|
|
after rollback
|
|
|
|
using vdpa->started to judge device started instead of vdev->vhost_started
|
|
|
|
Signed-off-by: Adttil <2429917001@qq.com>
|
|
---
|
|
hw/virtio/vdpa-dev-mig.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/virtio/vdpa-dev-mig.c b/hw/virtio/vdpa-dev-mig.c
|
|
index 23238c9f19..c080f9d89b 100644
|
|
--- a/hw/virtio/vdpa-dev-mig.c
|
|
+++ b/hw/virtio/vdpa-dev-mig.c
|
|
@@ -137,7 +137,7 @@ static int vhost_vdpa_device_suspend(VhostVdpaDevice *vdpa)
|
|
{
|
|
VirtIODevice *vdev = VIRTIO_DEVICE(vdpa);
|
|
|
|
- if (!vdev->vhost_started || vdpa->suspended) {
|
|
+ if (!vdpa->started || vdpa->suspended) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -152,7 +152,7 @@ static int vhost_vdpa_device_resume(VhostVdpaDevice *vdpa)
|
|
MigrationIncomingState *mis = migration_incoming_get_current();
|
|
int ret;
|
|
|
|
- if (!vdev->vhost_started ||
|
|
+ if (!vdpa->started ||
|
|
(!vdpa->suspended && mis->state != RUN_STATE_RESTORE_VM)) {
|
|
return 0;
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|