From d01b7c785441cfcbf066cfccf37fe4c4073b0a70 Mon Sep 17 00:00:00 2001 From: Boris Fiuczynski Date: Tue, 7 Jul 2015 17:30:42 +0200 Subject: [PATCH] qemu: Make virtio-9p-ccw the default for s390-ccw-virtio machines For s390-ccw-virtio machines the default bus type is set to ccw. Specifing an address element allows to override the default. Signed-off-by: Boris Fiuczynski Reviewed-by: Jason J. Herne Reviewed-by: Stefan Zimmermann --- src/qemu/qemu_command.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d21375a62a..42906a898b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1273,6 +1273,7 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, declare address-less virtio devices to be of address type 'type' disks, networks, consoles, controllers, memballoon and rng in this order + if type is ccw filesystem devices are declared to be of address type ccw */ size_t i; @@ -1309,6 +1310,13 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, def->rngs[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) def->rngs[i]->info.type = type; } + + if (type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + for (i = 0; i < def->nfss; i++) { + if (def->fss[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->fss[i]->info.type = type; + } + } } -- GitLab