mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 09:14:57 +00:00
qemu: panic device: check for invalid address type
qemu now checks for invalid address type for a panic device, which is currently implemented only to use ISA address type, thus rejecting any other options, except for leaving XML attributes blank, in that case, defaults are used (this behaviour remains the same from earlier verions). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1138125 Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
03890605dc
commit
afb4c6b663
@ -9418,12 +9418,18 @@ qemuBuildCommandLine(virConnectPtr conn,
|
||||
|
||||
if (def->panic) {
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PANIC)) {
|
||||
if (def->panic->info.addr.isa.iobase > 0) {
|
||||
if (def->panic->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
|
||||
virCommandAddArg(cmd, "-device");
|
||||
virCommandAddArgFormat(cmd, "pvpanic,ioport=%d",
|
||||
def->panic->info.addr.isa.iobase);
|
||||
} else {
|
||||
} else if (def->panic->info.type ==
|
||||
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
|
||||
virCommandAddArgList(cmd, "-device", "pvpanic", NULL);
|
||||
} else {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("panic is supported only "
|
||||
"with ISA address type"));
|
||||
goto error;
|
||||
}
|
||||
} else {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
|
Loading…
Reference in New Issue
Block a user