From c11631e8bc91a1d1be2b89196e886a1385820dfb Mon Sep 17 00:00:00 2001

From: Amit Shah <amit.shah@redhat.com>

Date: Wed, 20 Jan 2010 00:36:51 +0530

Subject: [PATCH 1/9] virtio: Remove duplicate macro definition for max. virtqueues, bump up the max

VIRTIO_PCI_QUEUE_MAX is redefined in hw/virtio.c. Let's just keep it in

hw/virtio.h.

Also, bump up the value of the maximum allowed virtqueues to 64. This is

in preparation to allow multiple ports per virtio-console device.

Signed-off-by: Amit Shah <amit.shah@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

---

 hw/virtio.c |    2 --

 hw/virtio.h |    2 +-

 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/hw/virtio.c b/hw/virtio.c

index cecd0dc..88f4e78 100644

--- a/hw/virtio.c

+++ b/hw/virtio.c

@@ -75,8 +75,6 @@ struct VirtQueue

     void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq);

 };

-#define VIRTIO_PCI_QUEUE_MAX        16

-

 /* virt queue functions */

 static void virtqueue_init(VirtQueue *vq)

 {

diff --git a/hw/virtio.h b/hw/virtio.h

index 35532a6..051910a 100644

--- a/hw/virtio.h

+++ b/hw/virtio.h

@@ -90,7 +90,7 @@ typedef struct {

     unsigned (*get_features)(void * opaque);

 } VirtIOBindings;

-#define VIRTIO_PCI_QUEUE_MAX 16

+#define VIRTIO_PCI_QUEUE_MAX 64

 #define VIRTIO_NO_VECTOR 0xffff

-- 

1.6.2.5