OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio: rename VIRTIO_PCI_QUEUE_MAX to VIRTIO_QUEUE_MAX

Browse Source 
VIRTIO_PCI_QUEUE_MAX is not only used for pci, so rename it be generic.

Cc: Amit Shah <amit.shah@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2015-05-29 14:15:31 +08:00 committed by Michael S. Tsirkin
parent d820331a0b
commit 87b3bd1c85
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/char/virtio-serial-bus.c
View File

@ -973,7 +973,7 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
} }
/* Each port takes 2 queues, and one pair is for the control queue */ /* Each port takes 2 queues, and one pair is for the control queue */
max_supported_ports = VIRTIO_PCI_QUEUE_MAX / 2 - 1; max_supported_ports = VIRTIO_QUEUE_MAX / 2 - 1;
if (vser->serial.max_virtserial_ports > max_supported_ports) { if (vser->serial.max_virtserial_ports > max_supported_ports) {
error_setg(errp, "maximum ports supported: %u", max_supported_ports); error_setg(errp, "maximum ports supported: %u", max_supported_ports);

4
hw/net/virtio-net.c
View File

@ -1555,10 +1555,10 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size);
n->max_queues = MAX(n->nic_conf.peers.queues, 1); n->max_queues = MAX(n->nic_conf.peers.queues, 1);
if (n->max_queues * 2 + 1 > VIRTIO_PCI_QUEUE_MAX) { if (n->max_queues * 2 + 1 > VIRTIO_QUEUE_MAX) {
error_setg(errp, "Invalid number of queues (= %" PRIu32 "), " error_setg(errp, "Invalid number of queues (= %" PRIu32 "), "
"must be a positive integer less than %d.", "must be a positive integer less than %d.",
n->max_queues, (VIRTIO_PCI_QUEUE_MAX - 1) / 2); n->max_queues, (VIRTIO_QUEUE_MAX - 1) / 2);
virtio_cleanup(vdev); virtio_cleanup(vdev);
return; return;
} }

4
hw/scsi/virtio-scsi.c
View File

@ -830,10 +830,10 @@ void virtio_scsi_common_realize(DeviceState *dev, Error **errp,
sizeof(VirtIOSCSIConfig)); sizeof(VirtIOSCSIConfig));
if (s->conf.num_queues == 0 || if (s->conf.num_queues == 0 ||
s->conf.num_queues > VIRTIO_PCI_QUEUE_MAX - 2) { s->conf.num_queues > VIRTIO_QUEUE_MAX - 2) {
error_setg(errp, "Invalid number of queues (= %" PRIu32 "), " error_setg(errp, "Invalid number of queues (= %" PRIu32 "), "
"must be a positive integer less than %d.", "must be a positive integer less than %d.",
s->conf.num_queues, VIRTIO_PCI_QUEUE_MAX - 2); s->conf.num_queues, VIRTIO_QUEUE_MAX - 2);
virtio_cleanup(vdev); virtio_cleanup(vdev);
return; return;
} }

4
hw/virtio/virtio-mmio.c
View File

@ -236,7 +236,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value,
proxy->guest_page_shift); proxy->guest_page_shift);
break; break;
case VIRTIO_MMIO_QUEUESEL: case VIRTIO_MMIO_QUEUESEL:
if (value < VIRTIO_PCI_QUEUE_MAX) { if (value < VIRTIO_QUEUE_MAX) {
vdev->queue_sel = value; vdev->queue_sel = value;
} }
break; break;
@ -256,7 +256,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value,
} }
break; break;
case VIRTIO_MMIO_QUEUENOTIFY: case VIRTIO_MMIO_QUEUENOTIFY:
if (value < VIRTIO_PCI_QUEUE_MAX) { if (value < VIRTIO_QUEUE_MAX) {
virtio_queue_notify(vdev, value); virtio_queue_notify(vdev, value);
} }
break; break;

10
hw/virtio/virtio-pci.c
View File

@ -171,7 +171,7 @@ static void virtio_pci_start_ioeventfd(VirtIOPCIProxy *proxy)
return; return;
} }
for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { for (n = 0; n < VIRTIO_QUEUE_MAX; n++) {
if (!virtio_queue_get_num(vdev, n)) { if (!virtio_queue_get_num(vdev, n)) {
continue; continue;
} }
@ -207,7 +207,7 @@ static void virtio_pci_stop_ioeventfd(VirtIOPCIProxy *proxy)
return; return;
} }
for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { for (n = 0; n < VIRTIO_QUEUE_MAX; n++) {
if (!virtio_queue_get_num(vdev, n)) { if (!virtio_queue_get_num(vdev, n)) {
continue; continue;
} }
@ -243,11 +243,11 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
virtio_queue_set_addr(vdev, vdev->queue_sel, pa); virtio_queue_set_addr(vdev, vdev->queue_sel, pa);
break; break;
case VIRTIO_PCI_QUEUE_SEL: case VIRTIO_PCI_QUEUE_SEL:
if (val < VIRTIO_PCI_QUEUE_MAX) if (val < VIRTIO_QUEUE_MAX)
vdev->queue_sel = val; vdev->queue_sel = val;
break; break;
case VIRTIO_PCI_QUEUE_NOTIFY: case VIRTIO_PCI_QUEUE_NOTIFY:
if (val < VIRTIO_PCI_QUEUE_MAX) { if (val < VIRTIO_QUEUE_MAX) {
virtio_queue_notify(vdev, val); virtio_queue_notify(vdev, val);
} }
break; break;
@ -744,7 +744,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign)
bool with_irqfd = msix_enabled(&proxy->pci_dev) && bool with_irqfd = msix_enabled(&proxy->pci_dev) &&
kvm_msi_via_irqfd_enabled(); kvm_msi_via_irqfd_enabled();
nvqs = MIN(nvqs, VIRTIO_PCI_QUEUE_MAX); nvqs = MIN(nvqs, VIRTIO_QUEUE_MAX);
/* When deassigning, pass a consistent nvqs value /* When deassigning, pass a consistent nvqs value
* to avoid leaking notifiers. * to avoid leaking notifiers.

28
hw/virtio/virtio.c
View File

@ -600,7 +600,7 @@ void virtio_reset(void *opaque)
vdev->config_vector = VIRTIO_NO_VECTOR; vdev->config_vector = VIRTIO_NO_VECTOR;
virtio_notify_vector(vdev, vdev->config_vector); virtio_notify_vector(vdev, vdev->config_vector);
for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for(i = 0; i < VIRTIO_QUEUE_MAX; i++) {
vdev->vq[i].vring.desc = 0; vdev->vq[i].vring.desc = 0;
vdev->vq[i].vring.avail = 0; vdev->vq[i].vring.avail = 0;
vdev->vq[i].vring.used = 0; vdev->vq[i].vring.used = 0;
@ -750,7 +750,7 @@ int virtio_get_num_queues(VirtIODevice *vdev)
{ {
int i; int i;
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
if (!virtio_queue_get_num(vdev, i)) { if (!virtio_queue_get_num(vdev, i)) {
break; break;
} }
@ -762,7 +762,7 @@ int virtio_get_num_queues(VirtIODevice *vdev)
int virtio_queue_get_id(VirtQueue *vq) int virtio_queue_get_id(VirtQueue *vq)
{ {
VirtIODevice *vdev = vq->vdev; VirtIODevice *vdev = vq->vdev;
assert(vq >= &vdev->vq[0] && vq < &vdev->vq[VIRTIO_PCI_QUEUE_MAX]); assert(vq >= &vdev->vq[0] && vq < &vdev->vq[VIRTIO_QUEUE_MAX]);
return vq - &vdev->vq[0]; return vq - &vdev->vq[0];
} }
@ -798,7 +798,7 @@ void virtio_queue_notify(VirtIODevice *vdev, int n)
uint16_t virtio_queue_vector(VirtIODevice *vdev, int n) uint16_t virtio_queue_vector(VirtIODevice *vdev, int n)
{ {
return n < VIRTIO_PCI_QUEUE_MAX ? vdev->vq[n].vector : return n < VIRTIO_QUEUE_MAX ? vdev->vq[n].vector :
VIRTIO_NO_VECTOR; VIRTIO_NO_VECTOR;
} }
@ -806,7 +806,7 @@ void virtio_queue_set_vector(VirtIODevice *vdev, int n, uint16_t vector)
{ {
VirtQueue *vq = &vdev->vq[n]; VirtQueue *vq = &vdev->vq[n];
if (n < VIRTIO_PCI_QUEUE_MAX) { if (n < VIRTIO_QUEUE_MAX) {
if (vdev->vector_queues && if (vdev->vector_queues &&
vdev->vq[n].vector != VIRTIO_NO_VECTOR) { vdev->vq[n].vector != VIRTIO_NO_VECTOR) {
QLIST_REMOVE(vq, node); QLIST_REMOVE(vq, node);
@ -824,12 +824,12 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
{ {
int i; int i;
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
if (vdev->vq[i].vring.num == 0) if (vdev->vq[i].vring.num == 0)
break; break;
} }
if (i == VIRTIO_PCI_QUEUE_MAX || queue_size > VIRTQUEUE_MAX_SIZE) if (i == VIRTIO_QUEUE_MAX || queue_size > VIRTQUEUE_MAX_SIZE)
abort(); abort();
vdev->vq[i].vring.num = queue_size; vdev->vq[i].vring.num = queue_size;
@ -841,7 +841,7 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void virtio_del_queue(VirtIODevice *vdev, int n) void virtio_del_queue(VirtIODevice *vdev, int n)
{ {
if (n < 0 || n >= VIRTIO_PCI_QUEUE_MAX) { if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
abort(); abort();
} }
@ -951,14 +951,14 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
qemu_put_be32(f, vdev->config_len); qemu_put_be32(f, vdev->config_len);
qemu_put_buffer(f, vdev->config, vdev->config_len); qemu_put_buffer(f, vdev->config, vdev->config_len);
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
if (vdev->vq[i].vring.num == 0) if (vdev->vq[i].vring.num == 0)
break; break;
} }
qemu_put_be32(f, i); qemu_put_be32(f, i);
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
if (vdev->vq[i].vring.num == 0) if (vdev->vq[i].vring.num == 0)
break; break;
@ -1019,7 +1019,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
qemu_get_8s(f, &vdev->status); qemu_get_8s(f, &vdev->status);
qemu_get_8s(f, &vdev->isr); qemu_get_8s(f, &vdev->isr);
qemu_get_be16s(f, &vdev->queue_sel); qemu_get_be16s(f, &vdev->queue_sel);
if (vdev->queue_sel >= VIRTIO_PCI_QUEUE_MAX) { if (vdev->queue_sel >= VIRTIO_QUEUE_MAX) {
return -1; return -1;
} }
qemu_get_be32s(f, &features); qemu_get_be32s(f, &features);
@ -1045,7 +1045,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
num = qemu_get_be32(f); num = qemu_get_be32(f);
if (num > VIRTIO_PCI_QUEUE_MAX) { if (num > VIRTIO_QUEUE_MAX) {
error_report("Invalid number of PCI queues: 0x%x", num); error_report("Invalid number of PCI queues: 0x%x", num);
return -1; return -1;
} }
@ -1171,9 +1171,9 @@ void virtio_init(VirtIODevice *vdev, const char *name,
vdev->isr = 0; vdev->isr = 0;
vdev->queue_sel = 0; vdev->queue_sel = 0;
vdev->config_vector = VIRTIO_NO_VECTOR; vdev->config_vector = VIRTIO_NO_VECTOR;
vdev->vq = g_malloc0(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX); vdev->vq = g_malloc0(sizeof(VirtQueue) * VIRTIO_QUEUE_MAX);
vdev->vm_running = runstate_is_running(); vdev->vm_running = runstate_is_running();
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
vdev->vq[i].vector = VIRTIO_NO_VECTOR; vdev->vq[i].vector = VIRTIO_NO_VECTOR;
vdev->vq[i].vdev = vdev; vdev->vq[i].vdev = vdev;
vdev->vq[i].queue_index = i; vdev->vq[i].queue_index = i;

2
include/hw/virtio/virtio.h
View File

@ -48,7 +48,7 @@ typedef struct VirtQueueElement
struct iovec out_sg[VIRTQUEUE_MAX_SIZE]; struct iovec out_sg[VIRTQUEUE_MAX_SIZE];
} VirtQueueElement; } VirtQueueElement;
#define VIRTIO_PCI_QUEUE_MAX 64 #define VIRTIO_QUEUE_MAX 64
#define VIRTIO_NO_VECTOR 0xffff #define VIRTIO_NO_VECTOR 0xffff