| Message ID | 1455111073-5600-3-git-send-email-marcel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/02/2016 14:31, Marcel Apfelbaum wrote: > Minimizes the possibility to assign > the same bit to different features. > > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
On 02/10/2016 09:31 PM, Marcel Apfelbaum wrote: > Minimizes the possibility to assign > the same bit to different features. > > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> > --- > 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) > Acked-by: Jason Wang <jasowang@redhat.com>
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)
Minimizes the possibility to assign the same bit to different features. Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> --- hw/virtio/virtio-pci.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)