* [Qemu-devel] [PATCH 0/3] qemu-iotests: fix 140 on s390x
@ 2016-02-09 13:15 Sascha Silbe
2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Sascha Silbe @ 2016-02-09 13:15 UTC (permalink / raw)
To: qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo
Yet another IDE-using test crept in (commit 16dee418). Fix it by using
virtio-scsi. And to make this easier, provide cross-architecture
aliases for all virtio devices.
Sascha Silbe (3):
qdev-monitor: sort alias table by typename
qdev-monitor: add missing aliases for virtio-{9p,balloon,rng,scsi}
qemu-iotests: 140: use virtio-scsi instead of IDE
qdev-monitor.c | 21 ++++++++++++++-------
tests/qemu-iotests/140 | 4 ++--
2 files changed, 16 insertions(+), 9 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 15+ messages in thread* [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename 2016-02-09 13:15 [Qemu-devel] [PATCH 0/3] qemu-iotests: fix 140 on s390x Sascha Silbe @ 2016-02-09 13:15 ` Sascha Silbe 2016-02-10 10:20 ` Halil Pasic 2016-02-11 8:53 ` Markus Armbruster 2016-02-09 13:15 ` [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} Sascha Silbe 2016-02-09 13:15 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE Sascha Silbe 2 siblings, 2 replies; 15+ messages in thread From: Sascha Silbe @ 2016-02-09 13:15 UTC (permalink / raw) To: qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo Sort the alias table by typename so it's easier to see which aliases exist. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> --- qdev-monitor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 81e3ff3..0145deb 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -40,18 +40,18 @@ typedef struct QDevAlias } QDevAlias; static const QDevAlias qdev_alias_table[] = { - { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "e1000", "e1000-82540em" }, + { "ich9-ahci", "ahci" }, + { "kvm-pci-assign", "pci-assign" }, + { "lsi53c895a", "lsi" }, { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, + { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, + { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, - { "lsi53c895a", "lsi" }, - { "ich9-ahci", "ahci" }, - { "kvm-pci-assign", "pci-assign" }, - { "e1000", "e1000-82540em" }, + { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { } }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename 2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe @ 2016-02-10 10:20 ` Halil Pasic 2016-02-11 8:53 ` Markus Armbruster 1 sibling, 0 replies; 15+ messages in thread From: Halil Pasic @ 2016-02-10 10:20 UTC (permalink / raw) To: Sascha Silbe, qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo On 02/09/2016 02:15 PM, Sascha Silbe wrote: > Sort the alias table by typename so it's easier to see which aliases > exist. > > Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > --- > qdev-monitor.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/qdev-monitor.c b/qdev-monitor.c > index 81e3ff3..0145deb 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -40,18 +40,18 @@ typedef struct QDevAlias > } QDevAlias; > > static const QDevAlias qdev_alias_table[] = { > - { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > - { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > - { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > + { "e1000", "e1000-82540em" }, > + { "ich9-ahci", "ahci" }, > + { "kvm-pci-assign", "pci-assign" }, > + { "lsi53c895a", "lsi" }, > { "virtio-balloon-pci", "virtio-balloon", > QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, > + { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, > + { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, > - { "lsi53c895a", "lsi" }, > - { "ich9-ahci", "ahci" }, > - { "kvm-pci-assign", "pci-assign" }, > - { "e1000", "e1000-82540em" }, > + { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { } > }; > Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename 2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe 2016-02-10 10:20 ` Halil Pasic @ 2016-02-11 8:53 ` Markus Armbruster 2016-02-11 16:32 ` Sascha Silbe 1 sibling, 1 reply; 15+ messages in thread From: Markus Armbruster @ 2016-02-11 8:53 UTC (permalink / raw) To: Sascha Silbe; +Cc: Kevin Wolf, Tu Bo, qemu-devel, qemu-block, Alexander Graf Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > Sort the alias table by typename so it's easier to see which aliases > exist. > > Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > --- > qdev-monitor.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/qdev-monitor.c b/qdev-monitor.c > index 81e3ff3..0145deb 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -40,18 +40,18 @@ typedef struct QDevAlias > } QDevAlias; > > static const QDevAlias qdev_alias_table[] = { Suggest to add /* Please keep this table sorted */ > - { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > - { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > - { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > + { "e1000", "e1000-82540em" }, > + { "ich9-ahci", "ahci" }, > + { "kvm-pci-assign", "pci-assign" }, > + { "lsi53c895a", "lsi" }, > { "virtio-balloon-pci", "virtio-balloon", > QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, > + { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, > + { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, > - { "lsi53c895a", "lsi" }, > - { "ich9-ahci", "ahci" }, > - { "kvm-pci-assign", "pci-assign" }, > - { "e1000", "e1000-82540em" }, > + { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { } > }; Reviewed-by: Markus Armbruster <armbru@redhat.com> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename 2016-02-11 8:53 ` Markus Armbruster @ 2016-02-11 16:32 ` Sascha Silbe 0 siblings, 0 replies; 15+ messages in thread From: Sascha Silbe @ 2016-02-11 16:32 UTC (permalink / raw) To: Markus Armbruster Cc: Kevin Wolf, Tu Bo, qemu-devel, qemu-block, Alexander Graf Dear Markus, Markus Armbruster <armbru@redhat.com> writes: > Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > >> Sort the alias table by typename so it's easier to see which aliases >> exist. [...] [qdev-monitor.c] > > Suggest to add > > /* Please keep this table sorted */ Good idea. I've amended the following locally: /* Please keep this table sorted by typename. */ Holding onto this patch for a few more days to give virtio devs a chance to decide on whether to add the full set right away. > Reviewed-by: Markus Armbruster <armbru@redhat.com> Thanks for the reviews! Sascha -- Softwareentwicklung Sascha Silbe, Niederhofenstraße 5/1, 71229 Leonberg https://se-silbe.de/ USt-IdNr. DE281696641 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-09 13:15 [Qemu-devel] [PATCH 0/3] qemu-iotests: fix 140 on s390x Sascha Silbe 2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe @ 2016-02-09 13:15 ` Sascha Silbe 2016-02-11 9:01 ` Markus Armbruster 2016-02-09 13:15 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE Sascha Silbe 2 siblings, 1 reply; 15+ messages in thread From: Sascha Silbe @ 2016-02-09 13:15 UTC (permalink / raw) To: qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo virtio-{blk,balloon,net,serial} are aliases for their actual, architecture-dependent implementations (*-ccw on s390x, *-pci on other architectures supporting virtio). This makes it a lot easier to craft qemu invocations that work on all supported architectures. Complete the set to cover all virtio devices that are implemented on all architectures supporting virtio. For virtio-balloon, only the CCW implementation was missing. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> --- This leaves out virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because they're currently only implemented using PCI, so there's no immediate value in having them. It would nevertheless make sense to include them so they can get used already and will start to Just Work™ on s390x once a CCW implementation appears. I can post the corresponding patch if there's any interest. --- qdev-monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qdev-monitor.c b/qdev-monitor.c index 0145deb..9c4217c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -44,12 +44,19 @@ static const QDevAlias qdev_alias_table[] = { { "ich9-ahci", "ahci" }, { "kvm-pci-assign", "pci-assign" }, { "lsi53c895a", "lsi" }, + { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, + { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_S390X }, { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_S390X }, + { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_S390X }, + { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { } -- 2.1.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-09 13:15 ` [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} Sascha Silbe @ 2016-02-11 9:01 ` Markus Armbruster 2016-02-11 9:18 ` Cornelia Huck 0 siblings, 1 reply; 15+ messages in thread From: Markus Armbruster @ 2016-02-11 9:01 UTC (permalink / raw) To: Sascha Silbe Cc: Kevin Wolf, qemu-block, Michael S. Tsirkin, qemu-devel, Alexander Graf, Tu Bo, Cornelia Huck, Christian Borntraeger Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > virtio-{blk,balloon,net,serial} are aliases for their actual, > architecture-dependent implementations (*-ccw on s390x, *-pci on other > architectures supporting virtio). This makes it a lot easier to craft > qemu invocations that work on all supported architectures. Complete > the set to cover all virtio devices that are implemented on all > architectures supporting virtio. > > For virtio-balloon, only the CCW implementation was missing. > > Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> > --- > > This leaves out > virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because > they're currently only implemented using PCI, so there's no immediate > value in having them. It would nevertheless make sense to include them > so they can get used already and will start to Just Work™ on s390x > once a CCW implementation appears. I can post the corresponding patch > if there's any interest. I guess that's for the virtio people to decide. I'm cc'ing some. > --- > qdev-monitor.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/qdev-monitor.c b/qdev-monitor.c > index 0145deb..9c4217c 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -44,12 +44,19 @@ static const QDevAlias qdev_alias_table[] = { > { "ich9-ahci", "ahci" }, > { "kvm-pci-assign", "pci-assign" }, > { "lsi53c895a", "lsi" }, > + { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, > + { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > + { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_S390X }, > { "virtio-balloon-pci", "virtio-balloon", > QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, > { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, > { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > + { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_S390X }, > + { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > + { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_S390X }, > + { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, > { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, > { } ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-11 9:01 ` Markus Armbruster @ 2016-02-11 9:18 ` Cornelia Huck 2016-02-11 16:18 ` Sascha Silbe 0 siblings, 1 reply; 15+ messages in thread From: Cornelia Huck @ 2016-02-11 9:18 UTC (permalink / raw) To: Markus Armbruster Cc: Kevin Wolf, qemu-block, Michael S. Tsirkin, Alexander Graf, qemu-devel, Tu Bo, Christian Borntraeger, Sascha Silbe On Thu, 11 Feb 2016 10:01:35 +0100 Markus Armbruster <armbru@redhat.com> wrote: > Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > > This leaves out > > virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because > > they're currently only implemented using PCI, so there's no immediate > > value in having them. It would nevertheless make sense to include them > > so they can get used already and will start to Just Work™ on s390x > > once a CCW implementation appears. I can post the corresponding patch > > if there's any interest. > > I guess that's for the virtio people to decide. I'm cc'ing some. What would the error look like if one decided to use e.g. virtio-gpu on s390x? If the error is more specific (i.e. virtio-gpu-ccw does not exist vs. virtio-gpu does not exist), I think adding the aliases makes sense: the user sees what is actually missing. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-11 9:18 ` Cornelia Huck @ 2016-02-11 16:18 ` Sascha Silbe 2016-02-15 16:03 ` Cornelia Huck 0 siblings, 1 reply; 15+ messages in thread From: Sascha Silbe @ 2016-02-11 16:18 UTC (permalink / raw) To: Cornelia Huck, Markus Armbruster Cc: Kevin Wolf, qemu-block, Michael S. Tsirkin, qemu-devel, Alexander Graf, Tu Bo, Christian Borntraeger Dear Conny, Cornelia Huck <cornelia.huck@de.ibm.com> writes: > On Thu, 11 Feb 2016 10:01:35 +0100 > Markus Armbruster <armbru@redhat.com> wrote: > >> Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > >> > This leaves out >> > virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because >> > they're currently only implemented using PCI, so there's no immediate >> > value in having them. It would nevertheless make sense to include them >> > so they can get used already and will start to Just Work™ on s390x >> > once a CCW implementation appears. I can post the corresponding patch >> > if there's any interest. >> >> I guess that's for the virtio people to decide. I'm cc'ing some. > > What would the error look like if one decided to use e.g. virtio-gpu on > s390x? If the error is more specific (i.e. virtio-gpu-ccw does not > exist vs. virtio-gpu does not exist), I think adding the aliases makes > sense: the user sees what is actually missing. Interesting point. Indeed, if we already define the matching -ccw aliases, the error message may be slightly more useful: silbe@oc4731375738:~/recoverable/qemu$ s390x-softmmu/qemu-system-s390x -device virtio-gpu qemu-system-s390x: -device virtio-gpu: 'virtio-gpu-ccw' is not a valid device model name Though we should probably at least add a comment to the alias list mentioning that this is intentional. We might even want to adjust qdev_get_device_class() to print a more specific error message in this case. Sascha -- Softwareentwicklung Sascha Silbe, Niederhofenstraße 5/1, 71229 Leonberg https://se-silbe.de/ USt-IdNr. DE281696641 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-11 16:18 ` Sascha Silbe @ 2016-02-15 16:03 ` Cornelia Huck 2016-02-18 21:27 ` Sascha Silbe 0 siblings, 1 reply; 15+ messages in thread From: Cornelia Huck @ 2016-02-15 16:03 UTC (permalink / raw) To: Sascha Silbe Cc: Kevin Wolf, qemu-block, Michael S. Tsirkin, Markus Armbruster, Alexander Graf, qemu-devel, Tu Bo, Christian Borntraeger On Thu, 11 Feb 2016 17:18:32 +0100 Sascha Silbe <silbe@linux.vnet.ibm.com> wrote: > Cornelia Huck <cornelia.huck@de.ibm.com> writes: > > > On Thu, 11 Feb 2016 10:01:35 +0100 > > Markus Armbruster <armbru@redhat.com> wrote: > > > >> Sascha Silbe <silbe@linux.vnet.ibm.com> writes: > > > >> > This leaves out > >> > virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because > >> > they're currently only implemented using PCI, so there's no immediate > >> > value in having them. It would nevertheless make sense to include them > >> > so they can get used already and will start to Just Work™ on s390x > >> > once a CCW implementation appears. I can post the corresponding patch > >> > if there's any interest. [For laughs and giggles, I have wired up all of these devices for ccw. Excluding input-host (for which I did not have a suitable evdev), I can specify the various devices on the commandline and get some devices in the guest which do... nothing :) I won't pursue this further for now, as I currently don't have a convincing use case beyond "because we can".] > >> > >> I guess that's for the virtio people to decide. I'm cc'ing some. > > > > What would the error look like if one decided to use e.g. virtio-gpu on > > s390x? If the error is more specific (i.e. virtio-gpu-ccw does not > > exist vs. virtio-gpu does not exist), I think adding the aliases makes > > sense: the user sees what is actually missing. > > Interesting point. Indeed, if we already define the matching -ccw > aliases, the error message may be slightly more useful: > > silbe@oc4731375738:~/recoverable/qemu$ s390x-softmmu/qemu-system-s390x -device virtio-gpu > qemu-system-s390x: -device virtio-gpu: 'virtio-gpu-ccw' is not a valid device model name > > Though we should probably at least add a comment to the alias list > mentioning that this is intentional. We might even want to adjust > qdev_get_device_class() to print a more specific error message in this > case. qemu-system-s390x: -device virtio-gpu: 'virtio-gpu' (alias 'virtio-gpu-ccw') is not a valid device model name would make it obvious that some alias expansion had been going on. I think that would be useful. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} 2016-02-15 16:03 ` Cornelia Huck @ 2016-02-18 21:27 ` Sascha Silbe 0 siblings, 0 replies; 15+ messages in thread From: Sascha Silbe @ 2016-02-18 21:27 UTC (permalink / raw) To: Cornelia Huck Cc: Kevin Wolf, qemu-block, Michael S. Tsirkin, Markus Armbruster, Alexander Graf, qemu-devel, Tu Bo, Christian Borntraeger Dear Conny, Cornelia Huck <cornelia.huck@de.ibm.com> writes: [virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet}] > [For laughs and giggles, I have wired up all of these devices for ccw. > Excluding input-host (for which I did not have a suitable evdev), I can > specify the various devices on the commandline and get some devices in > the guest which do... nothing :) I won't pursue this further for now, > as I currently don't have a convincing use case beyond "because we > can".] Care to share the patch? > qemu-system-s390x: -device virtio-gpu: 'virtio-gpu' (alias 'virtio-gpu-ccw') is not a valid device model name > > would make it obvious that some alias expansion had been going on. I > think that would be useful. Good idea. Will include a patch for this in the next version. Sascha -- Softwareentwicklung Sascha Silbe, Niederhofenstraße 5/1, 71229 Leonberg https://se-silbe.de/ USt-IdNr. DE281696641 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE 2016-02-09 13:15 [Qemu-devel] [PATCH 0/3] qemu-iotests: fix 140 on s390x Sascha Silbe 2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe 2016-02-09 13:15 ` [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} Sascha Silbe @ 2016-02-09 13:15 ` Sascha Silbe 2016-02-10 16:15 ` Max Reitz 2 siblings, 1 reply; 15+ messages in thread From: Sascha Silbe @ 2016-02-09 13:15 UTC (permalink / raw) To: qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo IDE is only implemented by very few architectures (mostly PC). Use virtio-scsi instead so the test works on all architectures that support virtio. In particular, this fixes qemu-iotests on s390x. Fixes: 16dee418 ("iotests: Add test for eject under NBD server") Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> --- tests/qemu-iotests/140 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index f78c317..0c448e6 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -49,8 +49,8 @@ _make_test_img 64k $QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io keep_stderr=y \ -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ - 2> >(_filter_nbd) +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ + -device virtio-scsi -device scsi-cd,drive=drv 2> >(_filter_nbd) _send_qemu_cmd $QEMU_HANDLE \ "{ 'execute': 'qmp_capabilities' }" \ -- 2.1.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE 2016-02-09 13:15 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE Sascha Silbe @ 2016-02-10 16:15 ` Max Reitz 2016-02-10 19:26 ` Sascha Silbe 0 siblings, 1 reply; 15+ messages in thread From: Max Reitz @ 2016-02-10 16:15 UTC (permalink / raw) To: Sascha Silbe, qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo [-- Attachment #1: Type: text/plain, Size: 1558 bytes --] On 09.02.2016 14:15, Sascha Silbe wrote: > IDE is only implemented by very few architectures (mostly PC). Use > virtio-scsi instead so the test works on all architectures that > support virtio. In particular, this fixes qemu-iotests on s390x. > > Fixes: 16dee418 ("iotests: Add test for eject under NBD server") > Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > --- > tests/qemu-iotests/140 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 > index f78c317..0c448e6 100755 > --- a/tests/qemu-iotests/140 > +++ b/tests/qemu-iotests/140 > @@ -49,8 +49,8 @@ _make_test_img 64k > $QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io > > keep_stderr=y \ > -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ > - 2> >(_filter_nbd) > +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ > + -device virtio-scsi -device scsi-cd,drive=drv 2> >(_filter_nbd) Why not just omit the device (and the media=cdrom along with it, keeping if=none)? This will change the reference output because there is no longer any tray to be moved, but this will still test what it's supposed to. (This may sound hypocritical coming from me, because I wrote this test so I could have just done so in the first place; I guess I just didn't realize that 'eject' works on device-less drives, too.) Max > _send_qemu_cmd $QEMU_HANDLE \ > "{ 'execute': 'qmp_capabilities' }" \ > [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 473 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE 2016-02-10 16:15 ` Max Reitz @ 2016-02-10 19:26 ` Sascha Silbe 2016-02-15 19:18 ` Max Reitz 0 siblings, 1 reply; 15+ messages in thread From: Sascha Silbe @ 2016-02-10 19:26 UTC (permalink / raw) To: Max Reitz, qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo Dear Max, Max Reitz <mreitz@redhat.com> writes: [tests/qemu-iotests/140] >> -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ >> - 2> >(_filter_nbd) >> +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ >> + -device virtio-scsi -device scsi-cd,drive=drv 2> >(_filter_nbd) > > Why not just omit the device (and the media=cdrom along with it, keeping > if=none)? This will change the reference output because there is no > longer any tray to be moved, but this will still test what it's supposed to. > > (This may sound hypocritical coming from me, because I wrote this test > so I could have just done so in the first place; I guess I just didn't > realize that 'eject' works on device-less drives, too.) Is this supposed to work? I.e. can we rely on it? If so, that would certainly be the easier route for this particular test. Test coverage should be unaffected as 139 already tests ejection (using virtio, unlike 118 which is PC-only). The aliases patch has a value of its own, but that's a separate matter. Sascha -- Softwareentwicklung Sascha Silbe, Niederhofenstraße 5/1, 71229 Leonberg https://se-silbe.de/ USt-IdNr. DE281696641 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE 2016-02-10 19:26 ` Sascha Silbe @ 2016-02-15 19:18 ` Max Reitz 0 siblings, 0 replies; 15+ messages in thread From: Max Reitz @ 2016-02-15 19:18 UTC (permalink / raw) To: Sascha Silbe, qemu-devel, Alexander Graf, Kevin Wolf, qemu-block; +Cc: Tu Bo [-- Attachment #1: Type: text/plain, Size: 1811 bytes --] On 10.02.2016 20:26, Sascha Silbe wrote: > Dear Max, > > Max Reitz <mreitz@redhat.com> writes: > > [tests/qemu-iotests/140] >>> -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ >>> - 2> >(_filter_nbd) >>> +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ >>> + -device virtio-scsi -device scsi-cd,drive=drv 2> >(_filter_nbd) >> >> Why not just omit the device (and the media=cdrom along with it, keeping >> if=none)? This will change the reference output because there is no >> longer any tray to be moved, but this will still test what it's supposed to. >> >> (This may sound hypocritical coming from me, because I wrote this test >> so I could have just done so in the first place; I guess I just didn't >> realize that 'eject' works on device-less drives, too.) > > Is this supposed to work? I.e. can we rely on it? Let's say I would rely on it. :-) (which is why I proposed it) The test checks that ejecting a BlockDriverState tree from a BlockBackend (that is, a medium from a drive) works even if that BlockBackend is exposed via an NBD server. It doesn't really matter whether the drive has a device or not, the main thing is that the NBD server notices that the medium is ejected and automatically stops offering the drive. So I would think that we are supposed to be able to rely on it; if we cannot, something else is probably broken. > If so, that would > certainly be the easier route for this particular test. Test coverage > should be unaffected as 139 already tests ejection (using virtio, unlike > 118 which is PC-only). > > The aliases patch has a value of its own, but that's a separate > matter. Yes, certainly. Max [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 473 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2016-02-18 21:27 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-09 13:15 [Qemu-devel] [PATCH 0/3] qemu-iotests: fix 140 on s390x Sascha Silbe
2016-02-09 13:15 ` [Qemu-devel] [PATCH 1/3] qdev-monitor: sort alias table by typename Sascha Silbe
2016-02-10 10:20 ` Halil Pasic
2016-02-11 8:53 ` Markus Armbruster
2016-02-11 16:32 ` Sascha Silbe
2016-02-09 13:15 ` [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} Sascha Silbe
2016-02-11 9:01 ` Markus Armbruster
2016-02-11 9:18 ` Cornelia Huck
2016-02-11 16:18 ` Sascha Silbe
2016-02-15 16:03 ` Cornelia Huck
2016-02-18 21:27 ` Sascha Silbe
2016-02-09 13:15 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE Sascha Silbe
2016-02-10 16:15 ` Max Reitz
2016-02-10 19:26 ` Sascha Silbe
2016-02-15 19:18 ` Max Reitz
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.