[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V7 12/16] virtio-pci: switch to use bus specific que
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH V7 12/16] virtio-pci: switch to use bus specific queue limit |
Date: |
Thu, 23 Apr 2015 14:21:45 +0800 |
Instead of depending on a macro, switch to use a bus specific queue
limit.
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/virtio/virtio-pci.c | 12 +++++++-----
include/hw/virtio/virtio.h | 2 --
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 075b13b..e556919 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -42,6 +42,8 @@
* configuration space */
#define VIRTIO_PCI_CONFIG_SIZE(dev)
VIRTIO_PCI_CONFIG_OFF(msix_enabled(dev))
+#define VIRTIO_PCI_QUEUE_MAX 64
+
static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size,
VirtIOPCIProxy *dev);
@@ -171,7 +173,7 @@ static void virtio_pci_start_ioeventfd(VirtIOPCIProxy
*proxy)
return;
}
- for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) {
+ for (n = 0; n < virtio_get_queue_max(vdev); n++) {
if (!virtio_queue_get_num(vdev, n)) {
continue;
}
@@ -207,7 +209,7 @@ static void virtio_pci_stop_ioeventfd(VirtIOPCIProxy *proxy)
return;
}
- for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) {
+ for (n = 0; n < virtio_get_queue_max(vdev); n++) {
if (!virtio_queue_get_num(vdev, n)) {
continue;
}
@@ -243,11 +245,11 @@ static void virtio_ioport_write(void *opaque, uint32_t
addr, uint32_t val)
virtio_queue_set_addr(vdev, vdev->queue_sel, pa);
break;
case VIRTIO_PCI_QUEUE_SEL:
- if (val < VIRTIO_PCI_QUEUE_MAX)
+ if (val < virtio_get_queue_max(vdev))
vdev->queue_sel = val;
break;
case VIRTIO_PCI_QUEUE_NOTIFY:
- if (val < VIRTIO_PCI_QUEUE_MAX) {
+ if (val < virtio_get_queue_max(vdev)) {
virtio_queue_notify(vdev, val);
}
break;
@@ -748,7 +750,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d,
int nvqs, bool assign)
bool with_irqfd = msix_enabled(&proxy->pci_dev) &&
kvm_msi_via_irqfd_enabled();
- nvqs = MIN(nvqs, VIRTIO_PCI_QUEUE_MAX);
+ nvqs = MIN(nvqs, virtio_get_queue_max(vdev));
/* When deassigning, pass a consistent nvqs value
* to avoid leaking notifiers.
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 91fd673..7ff40ac 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -48,8 +48,6 @@ typedef struct VirtQueueElement
struct iovec out_sg[VIRTQUEUE_MAX_SIZE];
} VirtQueueElement;
-#define VIRTIO_PCI_QUEUE_MAX 64
-
#define VIRTIO_NO_VECTOR 0xffff
#define TYPE_VIRTIO_DEVICE "virtio-device"
--
2.1.0
- [Qemu-devel] [PATCH V7 08/16] virtio: introduce bus specific queue limit, (continued)
[Qemu-devel] [PATCH V7 09/16] virtio-ccw: introduce ccw specific queue limit, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 11/16] virtio-mmio: switch to bus specific queue limit, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 10/16] virtio-s390: switch to bus specific queue limit, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 12/16] virtio-pci: switch to use bus specific queue limit,
Jason Wang <=
[Qemu-devel] [PATCH V7 13/16] virtio: introduce vector to virtqueues mapping, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 14/16] virtio-pci: speedup MSI-X masking and unmasking, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 15/16] virtio-pci: increase the maximum number of virtqueues to 513, Jason Wang, 2015/04/23
[Qemu-devel] [PATCH V7 16/16] pci: remove hard-coded bar size in msix_init_exclusive_bar(), Jason Wang, 2015/04/23
Re: [Qemu-devel] [PATCH V7 00/16] Support more virtio queues, Cornelia Huck, 2015/04/23