Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi}

[Markus Armbruster]

Sascha Silbe <address@hidden> 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 <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>

> ---
>
> 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 
> },
>      { }