From: Boris Fiuczynski Date: Fri, 20 Mar 2015 15:01:10 +0000 (+0100) Subject: qemu: Set default SCSI controller model for S390 arch X-Git-Tag: v1.2.14-rc1~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c35b277671efd95c3142e01246990044b7aca9e2;p=thirdparty%2Flibvirt.git qemu: Set default SCSI controller model for S390 arch When no model is specified in the domain definition for a scsi controller and the architectur is s390 than virtio-scsi is set as default model. Signed-off-by: Boris Fiuczynski Reviewed-by: Daniel Hansel Reviewed-by: Stefan Zimmermann Reviewed-by: Jens Freimann Reviewed-by: Michal Privoznik --- diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 41d1263f4c..949bf8b052 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1148,6 +1148,13 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; + /* set the default SCSI controller model for S390 arches */ + if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && + dev->data.controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + dev->data.controller->model == -1 && + ARCH_IS_S390(def->os.arch)) + dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; + /* auto generate unix socket path */ if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&