From: Maxim Davydov <maxim.davydov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: den@openvz.org, mst@redhat.com, stefanha@redhat.com,
fam@euphon.net, amit@kernel.org, kraxel@redhat.com,
berrange@redhat.com, Maxim Davydov <maxim.davydov@virtuozzo.com>
Subject: [PATCH v1 6/8] scsi: Add tracking of the acknowledged feature bits
Date: Wed, 1 Sep 2021 12:08:02 +0300 [thread overview]
Message-ID: <20210901090804.7139-7-maxim.davydov@virtuozzo.com> (raw)
In-Reply-To: <20210901090804.7139-1-maxim.davydov@virtuozzo.com>
Add tracking of the VIRTIO_SCSI_F_HOTPLUG, VIRTIO_SCSI_F_CHANGE and
VIRTIO_SCSI_F_T10_PI bits acknowledged by the guest
Signed-off-by: Maxim Davydov <maxim.davydov@virtuozzo.com>
---
hw/scsi/vhost-scsi.c | 6 +++---
hw/scsi/vhost-user-scsi.c | 18 +++++++++---------
hw/scsi/virtio-scsi.c | 10 ++++++----
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 8c611bf..4530295 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -277,9 +277,9 @@ static Property vhost_scsi_properties[] = {
DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,
0xFFFF),
DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun, 128),
- DEFINE_PROP_BIT64("t10_pi", VHostSCSICommon, host_features,
- VIRTIO_SCSI_F_T10_PI,
- false),
+ DEFINE_VIRTIO_FEATURE_BIT64("t10_pi", VHostSCSICommon,
+ host_features, dev.acked_features,
+ VIRTIO_SCSI_F_T10_PI, false),
DEFINE_PROP_BOOL("migratable", VHostSCSICommon, migratable, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index 1b2f7ee..40f885d 100644
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -168,15 +168,15 @@ static Property vhost_user_scsi_properties[] = {
DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,
0xFFFF),
DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun, 128),
- DEFINE_PROP_BIT64("hotplug", VHostSCSICommon, host_features,
- VIRTIO_SCSI_F_HOTPLUG,
- true),
- DEFINE_PROP_BIT64("param_change", VHostSCSICommon, host_features,
- VIRTIO_SCSI_F_CHANGE,
- true),
- DEFINE_PROP_BIT64("t10_pi", VHostSCSICommon, host_features,
- VIRTIO_SCSI_F_T10_PI,
- false),
+ DEFINE_VIRTIO_FEATURE_BIT64("hotplug", VHostSCSICommon,
+ host_features, dev.acked_features,
+ VIRTIO_SCSI_F_HOTPLUG, true),
+ DEFINE_VIRTIO_FEATURE_BIT64("param_change", VHostSCSICommon,
+ host_features, dev.acked_features,
+ VIRTIO_SCSI_F_CHANGE, true),
+ DEFINE_VIRTIO_FEATURE_BIT64("t10_pi", VHostSCSICommon,
+ host_features, dev.acked_features,
+ VIRTIO_SCSI_F_T10_PI, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 6d80730..8f7dd14 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -1061,10 +1061,12 @@ static Property virtio_scsi_properties[] = {
0xFFFF),
DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSI, parent_obj.conf.cmd_per_lun,
128),
- DEFINE_PROP_BIT("hotplug", VirtIOSCSI, host_features,
- VIRTIO_SCSI_F_HOTPLUG, true),
- DEFINE_PROP_BIT("param_change", VirtIOSCSI, host_features,
- VIRTIO_SCSI_F_CHANGE, true),
+ DEFINE_VIRTIO_FEATURE_BIT("hotplug", VirtIOSCSI, host_features,
+ parent_obj.parent_obj.guest_features,
+ VIRTIO_SCSI_F_HOTPLUG, true),
+ DEFINE_VIRTIO_FEATURE_BIT("param_change", VirtIOSCSI, host_features,
+ parent_obj.parent_obj.guest_features,
+ VIRTIO_SCSI_F_CHANGE, true),
DEFINE_PROP_LINK("iothread", VirtIOSCSI, parent_obj.conf.iothread,
TYPE_IOTHREAD, IOThread *),
DEFINE_PROP_END_OF_LIST(),
--
1.8.3.1
next prev parent reply other threads:[~2021-09-01 14:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 9:07 [PATCH v1 0/8] Virtio features acknowledged by guest Maxim Davydov
2021-09-01 9:07 ` [PATCH v1 1/8] qdev-properties: Add read-only 64 bit property Maxim Davydov
2021-09-01 9:07 ` [PATCH v1 2/8] virtio: Add tracking of the common virtio guest features Maxim Davydov
2021-09-01 9:07 ` [PATCH v1 3/8] virtio-gpu: Add tracking of the virtio guest feature bits Maxim Davydov
2021-09-01 9:08 ` [PATCH v1 4/8] virtio-serial: " Maxim Davydov
2021-09-01 9:08 ` [PATCH v1 5/8] virtio-net: " Maxim Davydov
2021-09-01 9:08 ` Maxim Davydov [this message]
2021-09-01 9:08 ` [PATCH v1 7/8] virtio-blk: " Maxim Davydov
2021-09-01 9:08 ` [PATCH v1 8/8] virtio-balloon: " Maxim Davydov
2021-09-02 12:34 ` [PATCH v1 0/8] Virtio features acknowledged by guest Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210901090804.7139-7-maxim.davydov@virtuozzo.com \
--to=maxim.davydov@virtuozzo.com \
--cc=amit@kernel.org \
--cc=berrange@redhat.com \
--cc=den@openvz.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).