From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nfvhr-0007I3-LH for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:37:15 -0500 Received: from [199.232.76.173] (port=38274 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nfvhr-0007Hr-BD for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:37:15 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nfvho-0006Di-VV for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:37:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28009) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nfvho-0006Dc-I0 for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:37:12 -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 o1CDbBgE013915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Feb 2010 08:37:11 -0500 Date: Fri, 12 Feb 2010 15:34:00 +0200 From: "Michael S. Tsirkin" Message-ID: <20100212133359.GA3945@redhat.com> References: <1265980958-28265-1-git-send-email-amit.shah@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1265980958-28265-1-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] Re: [PATCH] virtio-serial: pci: Allow MSI to be disabled List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: qemu-devel@nongnu.org On Fri, Feb 12, 2010 at 06:52:38PM +0530, Amit Shah wrote: > Michael noted we don't allow disabling of MSI for the virtio-serial-pci > device. Fix that. > > Signed-off-by: Amit Shah > CC: "Michael S. Tsirkin" How about using a symbolic constant for -1? We have NIC_NVECTORS_UNSPECIFIED in net.h, generalize it to DEV_NVECTORS_UNSPECIFIED? Acked-by: Michael S. Tsirkin As a side note, I think directly allocating a ton of vectors before some benchmark shows it's a measureable win for serial is a mistake. But that's a subject for another patch. > --- > hw/virtio-pci.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index f3373ae..bcd40f7 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -500,8 +500,8 @@ static int virtio_serial_init_pci(PCIDevice *pci_dev) > if (!vdev) { > return -1; > } > - vdev->nvectors = proxy->nvectors ? proxy->nvectors > - : proxy->max_virtserial_ports + 1; > + vdev->nvectors = proxy->nvectors == -1 ? proxy->max_virtserial_ports + 1 > + : proxy->nvectors; > virtio_init_pci(proxy, vdev, > PCI_VENDOR_ID_REDHAT_QUMRANET, > PCI_DEVICE_ID_VIRTIO_CONSOLE, > @@ -585,7 +585,7 @@ static PCIDeviceInfo virtio_info[] = { > .init = virtio_serial_init_pci, > .exit = virtio_exit_pci, > .qdev.props = (Property[]) { > - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 0), > + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, -1), > DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), > DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), > DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports, > -- > 1.6.2.5