49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From e1f733fcbc4eb39333ad9527865c1590d74092ed Mon Sep 17 00:00:00 2001
|
||
|
|
From: fangyi <eric.fangyi@huawei.com>
|
||
|
|
Date: Tue, 29 Oct 2024 19:53:27 +0800
|
||
|
|
Subject: [PATCH 4/6] Revert "vdpa: add vhost_vdpa->suspended parameter"
|
||
|
|
|
||
|
|
Use a new scheme instead for kernel vdpa, So revert it.
|
||
|
|
|
||
|
|
This reverts commit b6662cb7e5376659c7abb56efe27dcf3898d4fe6.
|
||
|
|
---
|
||
|
|
hw/virtio/vhost-vdpa.c | 8 --------
|
||
|
|
include/hw/virtio/vhost-vdpa.h | 2 --
|
||
|
|
2 files changed, 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
||
|
|
index 130afb06dc..bb3320946d 100644
|
||
|
|
--- a/hw/virtio/vhost-vdpa.c
|
||
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
||
|
|
@@ -1406,14 +1406,6 @@ static int vhost_vdpa_get_vring_base(struct vhost_dev *dev,
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!v->suspended) {
|
||
|
|
- /*
|
||
|
|
- * Cannot trust in value returned by device, let vhost recover used
|
||
|
|
- * idx from guest.
|
||
|
|
- */
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
ret = vhost_vdpa_call(dev, VHOST_GET_VRING_BASE, ring);
|
||
|
|
trace_vhost_vdpa_get_vring_base(dev, ring->index, ring->num);
|
||
|
|
return ret;
|
||
|
|
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
|
||
|
|
index 5407d54fd7..ee255bc1bd 100644
|
||
|
|
--- a/include/hw/virtio/vhost-vdpa.h
|
||
|
|
+++ b/include/hw/virtio/vhost-vdpa.h
|
||
|
|
@@ -42,8 +42,6 @@ typedef struct vhost_vdpa {
|
||
|
|
bool shadow_vqs_enabled;
|
||
|
|
/* Vdpa must send shadow addresses as IOTLB key for data queues, not GPA */
|
||
|
|
bool shadow_data;
|
||
|
|
- /* Device suspended successfully */
|
||
|
|
- bool suspended;
|
||
|
|
/* IOVA mapping used by the Shadow Virtqueue */
|
||
|
|
VhostIOVATree *iova_tree;
|
||
|
|
GPtrArray *shadow_vqs;
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|