From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQVFa-0003Oo-TI for qemu-devel@nongnu.org; Fri, 22 Jul 2016 03:52:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQVFV-0004y5-QY for qemu-devel@nongnu.org; Fri, 22 Jul 2016 03:52:02 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQVFV-0004wj-0f for qemu-devel@nongnu.org; Fri, 22 Jul 2016 03:51:57 -0400 Received: by mail-lf0-x243.google.com with SMTP id l89so7023484lfi.2 for ; Fri, 22 Jul 2016 00:51:56 -0700 (PDT) Reply-To: marcel@redhat.com References: <146913602256.26732.547184422534259409.stgit@bahia.lan> <20160721235509.06d897cb@bahia.lan> From: Marcel Apfelbaum Message-ID: <5791D098.3030707@gmail.com> Date: Fri, 22 Jul 2016 10:51:52 +0300 MIME-Version: 1.0 In-Reply-To: <20160721235509.06d897cb@bahia.lan> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4] virtio-pci: error out when both legacy and modern modes are disabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: Cornelia Huck , qemu-devel@nongnu.org, "Michael S. Tsirkin" On 07/22/2016 12:55 AM, Greg Kurz wrote: > On Thu, 21 Jul 2016 23:21:16 +0200 > Greg Kurz wrote: > >> From: Greg Kurz >> >> Without presuming if we got there because of a user mistake or some >> more subtle bug in the tooling, it really does not make sense to >> implement a non-functional device. >> >> Signed-off-by: Greg Kurz >> Reviewed-by: Marcel Apfelbaum >> Signed-off-by: Greg Kurz >> --- >> v4: - rephrased error message and provide a hint to the user >> - split string literals to stay below 80 characters >> - added Marcel's R-b tag >> --- > > Marcel, > > I see that Michael has comments on your patch. If you feel this patch is valuable > for 2.7, please consider carrying and pushing it, as I'm about to take a 1-month > leave. > I'll be sure to take it form here, thanks for the help! Marcel > Thanks. > > -- > Greg > >> hw/virtio/virtio-pci.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c >> index 755f9218b77d..72c4b392ffda 100644 >> --- a/hw/virtio/virtio-pci.c >> +++ b/hw/virtio/virtio-pci.c >> @@ -1842,6 +1842,14 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp) >> VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); >> PCIDevice *pci_dev = &proxy->pci_dev; >> >> + if (!(virtio_pci_modern(proxy) || virtio_pci_legacy(proxy))) { >> + error_setg(errp, "device cannot work when both modern and legacy modes" >> + " are disabled"); >> + error_append_hint(errp, "Set either disable-modern or disable-legacy" >> + " to off\n"); >> + return; >> + } >> + >> if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && >> virtio_pci_modern(proxy)) { >> pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; >> >> >