| Message ID | 1455831854-49013-4-git-send-email-silbe@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 18 Feb 2016 22:44:14 +0100 Sascha Silbe <silbe@linux.vnet.ibm.com> wrote: > 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 existing non-abstract virtio device classes. > > For virtio-balloon, only the CCW implementation was missing. There's also virtio-vga but that one looks quite hardcoded around pci. > > Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > --- > v1->v2: > - Completely wired up all (non-abstract) virtio device classes, even > those that still lack a CCW implementation. > > Markus, does your Reviewed-by apply to this version as well? (Wasn't > sure so I didn't include it) > --- > qdev-monitor.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Dear Conny, Cornelia Huck <cornelia.huck@de.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 existing non-abstract virtio device classes. [...] > There's also virtio-vga but that one looks quite hardcoded around pci. Yeah, it's not even called virtio-vga-pci but rather just virtio-vga, so we can't do any virtio-foo ? virtio-foo-{pci,ccw} alias magic for it. [...] > Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Thanks for the reviews! Sascha
diff --git a/qdev-monitor.c b/qdev-monitor.c index 4e3681c..be6a07e 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -45,14 +45,33 @@ 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-gpu-ccw", "virtio-gpu", QEMU_ARCH_S390X }, + { "virtio-gpu-pci", "virtio-gpu", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-input-host-ccw", "virtio-input-host", QEMU_ARCH_S390X }, + { "virtio-input-host-pci", "virtio-input-host", + QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-keyboard-ccw", "virtio-keyboard", QEMU_ARCH_S390X }, + { "virtio-keyboard-pci", "virtio-keyboard", + QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-mouse-ccw", "virtio-mouse", QEMU_ARCH_S390X }, + { "virtio-mouse-pci", "virtio-mouse", 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 }, + { "virtio-tablet-ccw", "virtio-tablet", QEMU_ARCH_S390X }, + { "virtio-tablet-pci", "virtio-tablet", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { } };
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 existing non-abstract virtio device classes. For virtio-balloon, only the CCW implementation was missing. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> --- v1->v2: - Completely wired up all (non-abstract) virtio device classes, even those that still lack a CCW implementation. Markus, does your Reviewed-by apply to this version as well? (Wasn't sure so I didn't include it) --- qdev-monitor.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)