* [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
@ 2016-07-21 15:52 Greg Kurz
2016-07-21 16:52 ` Marcel Apfelbaum
2016-07-21 20:00 ` Eric Blake
0 siblings, 2 replies; 6+ messages in thread
From: Greg Kurz @ 2016-07-21 15:52 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Cornelia Huck, qemu-devel
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>
Signed-off-by: Greg Kurz <groug@kaod.org>
---
v2: - error out at realize time as suggested by Connie
- updated title and changelog
---
hw/virtio/virtio-pci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index f0677b73d860..8d707aac0c21 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1838,6 +1838,12 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)
VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
PCIDevice *pci_dev = &proxy->pci_dev;
+ if (proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY &&
+ proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) {
+ error_setg(errp, "device is unserviceable when both legacy and modern modes are disabled. At least one of the disable-modern or disable-legacy properties should be set to false.");
+ return;
+ }
+
if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) &&
!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)) {
pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
2016-07-21 15:52 [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled Greg Kurz
@ 2016-07-21 16:52 ` Marcel Apfelbaum
2016-07-21 17:02 ` Greg Kurz
2016-07-21 20:00 ` Eric Blake
1 sibling, 1 reply; 6+ messages in thread
From: Marcel Apfelbaum @ 2016-07-21 16:52 UTC (permalink / raw)
To: Greg Kurz, Michael S. Tsirkin; +Cc: Cornelia Huck, qemu-devel
On 07/21/2016 06:52 PM, Greg Kurz 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>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> v2: - error out at realize time as suggested by Connie
> - updated title and changelog
> ---
> hw/virtio/virtio-pci.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index f0677b73d860..8d707aac0c21 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1838,6 +1838,12 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)
> VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
> PCIDevice *pci_dev = &proxy->pci_dev;
>
> + if (proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY &&
> + proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) {
> + error_setg(errp, "device is unserviceable when both legacy and modern modes are disabled. At least one of the disable-modern or disable-legacy properties should be set to false.");
> + return;
> + }
> +
Hi Greg,
I agree with the patch, but other patch in the mailing list
replaces the flags with standalone fields:
https://lists.gnu.org/archive/html/qemu-devel/2016-07/msg04744.html
Also the error line may be too long and need to be truncated.
Thanks,
Marcel
> if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) &&
> !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)) {
> pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
2016-07-21 16:52 ` Marcel Apfelbaum
@ 2016-07-21 17:02 ` Greg Kurz
2016-07-21 17:06 ` Greg Kurz
0 siblings, 1 reply; 6+ messages in thread
From: Greg Kurz @ 2016-07-21 17:02 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: Michael S. Tsirkin, Cornelia Huck, qemu-devel
On Thu, 21 Jul 2016 19:52:28 +0300
Marcel Apfelbaum <marcel.apfelbaum@gmail.com> wrote:
> On 07/21/2016 06:52 PM, Greg Kurz 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>
> > Signed-off-by: Greg Kurz <groug@kaod.org>
> > ---
> > v2: - error out at realize time as suggested by Connie
> > - updated title and changelog
> > ---
> > hw/virtio/virtio-pci.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> > index f0677b73d860..8d707aac0c21 100644
> > --- a/hw/virtio/virtio-pci.c
> > +++ b/hw/virtio/virtio-pci.c
> > @@ -1838,6 +1838,12 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)
> > VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
> > PCIDevice *pci_dev = &proxy->pci_dev;
> >
> > + if (proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY &&
> > + proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) {
> > + error_setg(errp, "device is unserviceable when both legacy and modern modes are disabled. At least one of the disable-modern or disable-legacy properties should be set to false.");
> > + return;
> > + }
> > +
>
> Hi Greg,
>
> I agree with the patch, but other patch in the mailing list
> replaces the flags with standalone fields:
>
> https://lists.gnu.org/archive/html/qemu-devel/2016-07/msg04744.html
>
v3 will be using virtio_pci_legacy() and virtio_pci_modern().
> Also the error line may be too long and need to be truncated.
>
I'll rephrase the message. BTW is there a formal limit for the length
of error lines ? 80 chars ?
> Thanks,
> Marcel
>
> > if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) &&
> > !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)) {
> > pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
> >
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
2016-07-21 17:02 ` Greg Kurz
@ 2016-07-21 17:06 ` Greg Kurz
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kurz @ 2016-07-21 17:06 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: Michael S. Tsirkin, Cornelia Huck, qemu-devel
On Thu, 21 Jul 2016 19:02:39 +0200
Greg Kurz <groug@kaod.org> wrote:
> On Thu, 21 Jul 2016 19:52:28 +0300
> Marcel Apfelbaum <marcel.apfelbaum@gmail.com> wrote:
>
> > On 07/21/2016 06:52 PM, Greg Kurz 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>
> > > Signed-off-by: Greg Kurz <groug@kaod.org>
> > > ---
> > > v2: - error out at realize time as suggested by Connie
> > > - updated title and changelog
> > > ---
> > > hw/virtio/virtio-pci.c | 6 ++++++
> > > 1 file changed, 6 insertions(+)
> > >
> > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> > > index f0677b73d860..8d707aac0c21 100644
> > > --- a/hw/virtio/virtio-pci.c
> > > +++ b/hw/virtio/virtio-pci.c
> > > @@ -1838,6 +1838,12 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)
> > > VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
> > > PCIDevice *pci_dev = &proxy->pci_dev;
> > >
> > > + if (proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY &&
> > > + proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) {
> > > + error_setg(errp, "device is unserviceable when both legacy and modern modes are disabled. At least one of the disable-modern or disable-legacy properties should be set to false.");
> > > + return;
> > > + }
> > > +
> >
> > Hi Greg,
> >
> > I agree with the patch, but other patch in the mailing list
> > replaces the flags with standalone fields:
> >
> > https://lists.gnu.org/archive/html/qemu-devel/2016-07/msg04744.html
> >
>
> v3 will be using virtio_pci_legacy() and virtio_pci_modern().
>
> > Also the error line may be too long and need to be truncated.
> >
>
> I'll rephrase the message. BTW is there a formal limit for the length
> of error lines ? 80 chars ?
>
Not even sure it makes sense since the final error message contains the
full -device command line option which can be of arbitrary length...
> > Thanks,
> > Marcel
> >
> > > if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) &&
> > > !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)) {
> > > pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
> > >
> > >
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
2016-07-21 15:52 [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled Greg Kurz
2016-07-21 16:52 ` Marcel Apfelbaum
@ 2016-07-21 20:00 ` Eric Blake
1 sibling, 0 replies; 6+ messages in thread
From: Eric Blake @ 2016-07-21 20:00 UTC (permalink / raw)
To: Greg Kurz, Michael S. Tsirkin; +Cc: Cornelia Huck, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
On 07/21/2016 09:52 AM, Greg Kurz 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>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> v2: - error out at realize time as suggested by Connie
> - updated title and changelog
> ---
> hw/virtio/virtio-pci.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index f0677b73d860..8d707aac0c21 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1838,6 +1838,12 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)
> VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
> PCIDevice *pci_dev = &proxy->pci_dev;
>
> + if (proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY &&
> + proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) {
> + error_setg(errp, "device is unserviceable when both legacy and modern modes are disabled. At least one of the disable-modern or disable-legacy properties should be set to false.");
Too long. error_setg() should be a single phrase, with no trailing '.'.
If you need to add additional information, error_append_hint() is how
you add the second sentence.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled
@ 2016-09-09 9:00 Greg Kurz
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kurz @ 2016-09-09 9:00 UTC (permalink / raw)
To: qemu-devel
Cc: Cornelia Huck, Markus Armbruster, Marcel Apfelbaum, Michael S. Tsirkin
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>
---
v2: - moved the check to virtio_pci_realize() to ensure disable_legacy is
either ON or OFF, but not AUTO (this would cause the check to fail
before we have a chance to know if the device can actually work).
I've kept the R-b tags, please raise a flag if this is inapropriate.
I've dropped the other patch about virtio-9p: the issue will be addressed
in a separate series.
---
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 268fd8ebb219..551c4346bf4b 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1770,6 +1770,14 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
proxy->disable_legacy = pcie_port ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
+ 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 (pcie_port && pci_is_express(pci_dev)) {
int pos;
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-09 9:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-21 15:52 [Qemu-devel] [PATCH v2] virtio-pci: error out when both legacy and modern modes are disabled Greg Kurz
2016-07-21 16:52 ` Marcel Apfelbaum
2016-07-21 17:02 ` Greg Kurz
2016-07-21 17:06 ` Greg Kurz
2016-07-21 20:00 ` Eric Blake
2016-09-09 9:00 Greg Kurz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.