From patchwork Tue Dec 22 17:49:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 41636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05A88B7BA5 for ; Wed, 23 Dec 2009 05:24:12 +1100 (EST) Received: from localhost ([127.0.0.1]:33017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NN9Ow-0004ZB-NK for incoming@patchwork.ozlabs.org; Tue, 22 Dec 2009 13:24:06 -0500 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 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBMHoEUb030172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Dec 2009 12:50:14 -0500 Received: from localhost (vpn-231-27.phx2.redhat.com [10.3.231.27]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBMHoD8M003548; Tue, 22 Dec 2009 12:50:14 -0500 From: Amit Shah To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , armbru@redhat.com, agraf@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 1/3] virtio: Remove duplicate macro definition for max. virtqueues, bump up the max X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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