[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag |
Date: |
Tue, 15 Mar 2016 17:00:29 +0200 |
From: Marcel Apfelbaum <address@hidden>
Commits 1811e64c and a6df8adf use the same virtio feature bit 4
for different features.
Fix it by using different bits.
Reported-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Jason Wang <address@hidden>
---
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)
--
MST
- [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset., Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo, Michael S. Tsirkin, 2016/03/15