[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] virtio: hide legacy features from modern guest
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 01/10] virtio: hide legacy features from modern guests |
Date: |
Tue, 28 Jul 2015 12:57:31 +0300 |
NOTIFY_ON_EMPTY, ANY_LAYOUT and BAD are only valid on the legacy
interface.
Hide them from modern guests.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/virtio.h | 4 ++++
hw/virtio/virtio-pci.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 473fb75..0634c15 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -25,6 +25,10 @@
/* A guest should never accept this. It implies negotiation is broken. */
#define VIRTIO_F_BAD_FEATURE 30
+#define VIRTIO_LEGACY_FEATURES ((0x1ULL << VIRTIO_F_BAD_FEATURE) | \
+ (0x1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \
+ (0x1ULL << VIRTIO_F_ANY_LAYOUT))
+
struct VirtQueue;
static inline hwaddr vring_align(hwaddr addr,
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 283401a..db8f27c 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1095,7 +1095,8 @@ static uint64_t virtio_pci_common_read(void *opaque,
hwaddr addr,
break;
case VIRTIO_PCI_COMMON_DF:
if (proxy->dfselect <= 1) {
- val = vdev->host_features >> (32 * proxy->dfselect);
+ val = (vdev->host_features & ~VIRTIO_LEGACY_FEATURES) >>
+ (32 * proxy->dfselect);
}
break;
case VIRTIO_PCI_COMMON_GFSELECT:
--
MST
- [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 02/10] virtio-serial: fix ANY_LAYOUT, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 01/10] virtio: hide legacy features from modern guests,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 03/10] virtio-9p: fix any_layout, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 05/10] virtio-pci: fix memory MR cleanup for modern, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 04/10] virtio: set any_layout in virtio core, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 07/10] virtio-blk: fail get_features when both scsi and 1.0 were set, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 06/10] virtio: get_features() can fail, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 08/10] virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 09/10] acpi: fix pvpanic device is not shown in ui, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 10/10] virtio: minor cleanup, Michael S. Tsirkin, 2015/07/28
- Re: [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Cornelia Huck, 2015/07/28
- Re: [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Peter Maydell, 2015/07/28