From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTUrZ-00018y-Uq for qemu-devel@nongnu.org; Wed, 10 Feb 2016 08:31:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTUrX-0007Z1-Rb for qemu-devel@nongnu.org; Wed, 10 Feb 2016 08:31:21 -0500 From: Marcel Apfelbaum Date: Wed, 10 Feb 2016 15:31:12 +0200 Message-Id: <1455111073-5600-2-git-send-email-marcel@redhat.com> In-Reply-To: <1455111073-5600-1-git-send-email-marcel@redhat.com> References: <1455111073-5600-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V2 1/2] hw/virtio: fix double use of a virtio flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, lvivier@redhat.com, jasowang@redhat.com, qemu-stable@nongnu.org, mst@redhat.com Commits 1811e64c and a6df8adf use the same virtio feature bit 4 for different features. Fix it by using different bits. Reported-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Marcel Apfelbaum --- hw/virtio/virtio-pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index e096e98..6686b10 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -71,7 +71,7 @@ typedef struct VirtioBusClass VirtioPCIBusClass; /* virtio version flags */ #define VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT 2 #define VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT 3 -#define VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT 4 +#define VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT 6 #define VIRTIO_PCI_FLAG_DISABLE_LEGACY (1 << VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT) #define VIRTIO_PCI_FLAG_DISABLE_MODERN (1 << VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT) #define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT) -- 2.4.3