From patchwork Thu Jan 14 13:17:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 42890 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 C2878B7CC2 for ; Fri, 15 Jan 2010 01:10:38 +1100 (EST) Received: from localhost ([127.0.0.1]:39600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVQOQ-0003XD-Nj for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 09:09:46 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVQ4Y-0002nl-Sc for qemu-devel@nongnu.org; Thu, 14 Jan 2010 08:49:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVQ4U-0002mA-2Z for qemu-devel@nongnu.org; Thu, 14 Jan 2010 08:49:14 -0500 Received: from [199.232.76.173] (port=59862 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVQ4T-0002lz-Su for qemu-devel@nongnu.org; Thu, 14 Jan 2010 08:49:09 -0500 Received: from mx20.gnu.org ([199.232.41.8]:15988) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NVQ4T-0001Uo-CP for qemu-devel@nongnu.org; Thu, 14 Jan 2010 08:49:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVQ4O-00058H-9p for qemu-devel@nongnu.org; Thu, 14 Jan 2010 08:49:04 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0EDIrbZ004160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jan 2010 08:18:54 -0500 Received: from localhost (vpn-246-68.phx2.redhat.com [10.3.246.68]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0EDIqoX024011; Thu, 14 Jan 2010 08:18:53 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2010 18:47:36 +0530 Message-Id: <1263475063-15238-2-git-send-email-amit.shah@redhat.com> In-Reply-To: <1263475063-15238-1-git-send-email-amit.shah@redhat.com> References: <1263475063-15238-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah Subject: [Qemu-devel] [PATCH 1/8] 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 64. 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 fa7184a..7c020a3 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 3994cc9..7b2b327 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