Re: [libvirt] [PATCH] qemu: implement address for isa-serial
On 06/08/2015 09:42 AM, James Cowgill wrote:
I needed to specify the iobase address for certain exotic mips
configurations.
Signed-off-by: James Cowgill <james410(a)cowgill.org.uk>
---
src/qemu/qemu_command.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
Is there perhaps some sort of test case that could be added? The
qemuxml2argvtest.c will take an *.xml file and create an *.args output
so ensure it's done right.
Not the expert in this area, but what's here seems OK - just a test
would help complete the picture... If that's possible.
John
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 61faa57..e1d53c2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2693,6 +2693,10 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
info->addr.ccw.cssid,
info->addr.ccw.ssid,
info->addr.ccw.devno);
+ } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
+ virBufferAsprintf(buf, ",iobase=0x%x,irq=0x%x",
+ info->addr.isa.iobase,
+ info->addr.isa.irq);
}
ret = 0;
@@ -10950,11 +10954,15 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
- if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+ if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
+ serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("no addresses are supported for
isa-serial"));
+ _("isa-serial requires address of isa type"));
goto error;
}
+
+ if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps)
< 0)
+ goto error;
break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list