[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum |
Date: |
Tue, 15 Mar 2016 17:00:33 +0200 |
From: Marcel Apfelbaum <address@hidden>
Minimizes the possibility to assign
the same bit to different features.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Acked-by: Jason Wang <address@hidden>
---
hw/virtio/virtio-pci.h | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 6686b10..e4548c2 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -58,30 +58,33 @@ typedef struct VirtioBusClass VirtioPCIBusClass;
#define VIRTIO_PCI_BUS_CLASS(klass) \
OBJECT_CLASS_CHECK(VirtioPCIBusClass, klass, TYPE_VIRTIO_PCI_BUS)
+enum {
+ VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT,
+ VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT,
+ VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT,
+ VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT,
+ VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT,
+ VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT,
+ VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT,
+};
+
/* Need to activate work-arounds for buggy guests at vmstate load. */
-#define VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT 0
#define VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION \
(1 << VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT)
/* Performance improves when virtqueue kick processing is decoupled from the
* vcpu thread using ioeventfd for some devices. */
-#define VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT 1
#define VIRTIO_PCI_FLAG_USE_IOEVENTFD (1 <<
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT)
/* 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 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)
/* migrate extra state */
-#define VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT 4
#define VIRTIO_PCI_FLAG_MIGRATE_EXTRA (1 << VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT)
/* have pio notification for modern device ? */
-#define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT 5
#define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \
(1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_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 <=
- [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag, Michael S. Tsirkin, 2016/03/15
- [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