From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1df-0002QF-Er for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK1de-0001vR-6m for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1de-0001v6-1Z for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:34 -0400 Date: Tue, 28 Jul 2015 12:57:31 +0300 From: "Michael S. Tsirkin" Message-ID: <1438077261-16651-2-git-send-email-mst@redhat.com> References: <1438077261-16651-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438077261-16651-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 01/10] virtio: hide legacy features from modern guests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell 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 --- 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