On Wed, Mar 23, 2016 at 02:56:03PM +0100, Boris Fiuczynski wrote: > If a panic device is being defined without a model in a domain > the default value is always overwritten with model ISA. An ISA > bus does not exist on S390 and therefore specifying a panic device > results in an unsupported configuration. > Since the s390 architecture inherently provides a crash detection > capability the panic device should be tolerated in the domain xml. > > This patch achieves the toleration by setting the model to the > default value in case the architecture is S390. > > Signed-off-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxxxxxxx> > Reviewed-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx> > --- > src/qemu/qemu_domain.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c > index 9f9fae3..96561c0 100644 > --- a/src/qemu/qemu_domain.c > +++ b/src/qemu/qemu_domain.c > @@ -1605,6 +1605,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, > if (ARCH_IS_PPC64(def->os.arch) && > STRPREFIX(def->os.machine, "pseries")) > dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES; > + else if (ARCH_IS_S390(def->os.arch)) > + /* since S390 does not support ISA use default for toleration */ > + dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_DEFAULT; > else > dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_ISA; > } I rather think we should define an explicit model for the s390 panic hardware, as we did for ppc64 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list