From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NN8sP-00027q-0p for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:50:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NN8sI-00025h-SJ for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:50:27 -0500 Received: from [199.232.76.173] (port=35940 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NN8sI-00025e-Mb for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:50:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22989) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NN8sH-0002hn-Qh for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:50:22 -0500 From: Amit Shah Date: Tue, 22 Dec 2009 23:19:04 +0530 Message-Id: <1261504146-26018-2-git-send-email-amit.shah@redhat.com> In-Reply-To: <1261504146-26018-1-git-send-email-amit.shah@redhat.com> References: <1261504146-26018-1-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] virtio: Remove duplicate macro definition for max. virtqueues, bump up the max List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , armbru@redhat.com, agraf@suse.de, kraxel@redhat.com 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 32. This is in preparation to allow multiple ports per virtio-console device. Signed-off-by: Amit Shah --- 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..769f540 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 32 #define VIRTIO_NO_VECTOR 0xffff -- 1.6.2.5