| Message ID | 146919625979.27594.12550531078657174236.stgit@bahia.lan |
|---|---|
| State | New |
| Headers | show |
Michael, I realize this patch fell through the cracks while I was away... the various reviews seemed to indicate there was a consensus to have this in 2.7 though. Do you have an opinion whether QEMU needs this or not ? Cc'ing Peter in case it is acceptable to apply the patch this late. Cheers. -- Greg On Fri, 22 Jul 2016 16:05:29 +0200 Greg Kurz <groug@kaod.org> wrote: > From: Greg Kurz <gkurz@linux.vnet.ibm.com> > > 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 <gkurz@linux.vnet.ibm.com> > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> > Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> > Signed-off-by: Greg Kurz <groug@kaod.org> > --- > v5: - changed wording as suggested by Connie > - added Connies R-b tag > --- > 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..8714123d61fd 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 as neither modern nor legacy mode" > + " is enabled"); > + 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; > >
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 755f9218b77d..8714123d61fd 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 as neither modern nor legacy mode" + " is enabled"); + 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;