We can finally introduce a specific target model for the pl011 device
used by mach-virt guests, which means isa-serial will no longer show
up to confuse users.
We make sure migration works in both directions by interpreting the
isa-serial target type, or the lack of target type, appropriately
when parsing the guest XML, and skipping the newly-introduced type
when formatting if for migration. We also verify that pl011 is not
used for non-mach-virt guests and add a bunch of test cases.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=151292
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
docs/formatdomain.html.in | 2 +-
docs/schemas/domaincommon.rng | 2 +
src/conf/domain_conf.c | 4 ++
src/conf/domain_conf.h | 2 +
src/qemu/qemu_command.c | 8 +++-
src/qemu/qemu_domain.c | 37 ++++++++++++++++++
src/qemu/qemu_domain_address.c | 1 +
.../qemuxml2argv-mach-virt-console-native.args | 1 +
.../qemuxml2argv-mach-virt-console-native.xml | 17 +++++++++
.../qemuxml2argv-mach-virt-console-virtio.args | 24 ++++++++++++
.../qemuxml2argv-mach-virt-console-virtio.xml | 19 ++++++++++
...muxml2argv-mach-virt-serial+console-native.args | 1 +
...emuxml2argv-mach-virt-serial+console-native.xml | 18 +++++++++
.../qemuxml2argv-mach-virt-serial-compat.args | 1 +
.../qemuxml2argv-mach-virt-serial-compat.xml | 19 ++++++++++
...muxml2argv-mach-virt-serial-invalid-machine.xml | 21 +++++++++++
.../qemuxml2argv-mach-virt-serial-native.args | 23 +++++++++++
.../qemuxml2argv-mach-virt-serial-native.xml | 16 ++++++++
.../qemuxml2argv-mach-virt-serial-pci.args | 26 +++++++++++++
.../qemuxml2argv-mach-virt-serial-pci.xml | 18 +++++++++
.../qemuxml2argv-mach-virt-serial-usb.args | 27 +++++++++++++
.../qemuxml2argv-mach-virt-serial-usb.xml | 21 +++++++++++
tests/qemuxml2argvtest.c | 27 +++++++++++++
.../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 4 +-
.../qemuxml2xmlout-mach-virt-console-native.xml | 1 +
.../qemuxml2xmlout-mach-virt-console-virtio.xml | 27 +++++++++++++
...uxml2xmlout-mach-virt-serial+console-native.xml | 1 +
.../qemuxml2xmlout-mach-virt-serial-compat.xml | 31 +++++++++++++++
.../qemuxml2xmlout-mach-virt-serial-native.xml | 1 +
.../qemuxml2xmlout-mach-virt-serial-pci.xml | 44 ++++++++++++++++++++++
.../qemuxml2xmlout-mach-virt-serial-usb.xml | 41 ++++++++++++++++++++
tests/qemuxml2xmltest.c | 26 +++++++++++++
32 files changed, 507 insertions(+), 4 deletions(-)
create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml
create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml
create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml
create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml
create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml
create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 92622d031..1efded6be 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -6532,7 +6532,7 @@ qemu-kvm -net nic,model=? /dev/null
<code>type</code> attribute <span class="since">since 1.0.2</span>
which can be used to pick between <code>isa</code>, <code>usb</code>,
<code>pci</code> and, <span class="since">since 3.10.0</span>,
- <code>spapr-vio</code>.
+ <code>spapr-vio</code> and <code>system</code>.
Some values are not compatible with all architecture and machine types;
if the value is missing altogether, libvirt will try to pick an
appropriate default.
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index b7a13660d..949ad38ac 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3586,6 +3586,7 @@
<value>usb</value>
<value>pci</value>
<value>spapr-vio</value>
+ <value>system</value>
<!-- Legacy values, for backwards compatibility -->
<value>isa-serial</value>
<value>usb-serial</value>
@@ -3602,6 +3603,7 @@
<value>usb-serial</value>
<value>pci-serial</value>
<value>spapr-vty</value>
+ <value>pl011</value>
</choice>
</attribute>
</element>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d90acd31e..7b35fbd3d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -453,6 +453,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTarget,
"usb",
"pci",
"spapr-vio",
+ "system",
);
VIR_ENUM_IMPL(virDomainChrChannelTarget,
@@ -481,6 +482,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,
"usb-serial",
"pci-serial",
"spapr-vty",
+ "pl011",
);
VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
@@ -4054,6 +4056,7 @@ virDomainDefAddConsoleCompat(virDomainDefPtr def)
switch ((virDomainChrSerialTargetType) def->serials[0]->targetType) {
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: {
/* Create a stub console to match the serial port.
@@ -24095,6 +24098,7 @@ virDomainChrTargetDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "-serial");
break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
/* No conversion necessary */
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index dc376de49..59e292c9c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1086,6 +1086,7 @@ typedef enum {
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB,
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI,
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO,
+ VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM,
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST
} virDomainChrSerialTargetType;
@@ -1119,6 +1120,7 @@ typedef enum {
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL,
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL,
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY,
+ VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011,
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST
} virDomainChrSerialTargetModel;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 96ff082d3..e6961d7ec 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9151,10 +9151,13 @@ qemuChrIsPlatformDevice(const virDomainDef *def,
virDomainChrDefPtr chr)
{
if (def->os.arch == VIR_ARCH_ARMV7L || def->os.arch == VIR_ARCH_AARCH64) {
- /* TARGET_TYPE_ISA here really means 'the default platform device' */
+
+ /* pl011 (used on mach-virt) is a platform device */
if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
- chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA)
+ chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM &&
+ chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011) {
return true;
+ }
}
/* If we got all the way here and we're still stuck with the default
@@ -10288,6 +10291,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
}
break;
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
/* Except from _LAST, which is just a guard value and will never
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 785a93207..2b7a7dfc9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3538,6 +3538,16 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)
}
break;
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
+ if (chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target type '%s' cannot have an "
+ "associated address"),
+ virDomainChrSerialTargetTypeToString(chr->targetType));
+ return -1;
+ }
+ break;
+
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
break;
@@ -3585,6 +3595,16 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)
}
break;
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
+ if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target model '%s' requires "
+ "target type 'system'"),
+ virDomainChrSerialTargetModelTypeToString(chr->targetModel));
+ return -1;
+ }
+ break;
+
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
break;
@@ -3631,6 +3651,17 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev,
return -1;
}
+ if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+ (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM ||
+ dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011) &&
+ !qemuDomainIsVirt(def)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("Serial devices with target type 'system' and "
+ "target model 'pl011' are only supported on "
+ "mach-virt guests"));
+ return -1;
+ }
+
return 0;
}
@@ -4191,6 +4222,8 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA;
} else if (qemuDomainIsPSeries(def)) {
chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO;
+ } else if (qemuDomainIsVirt(def)) {
+ chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM;
}
}
@@ -4210,6 +4243,9 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY;
break;
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
+ chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011;
+ break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
/* Nothing to do */
@@ -5126,6 +5162,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
if (flags & VIR_DOMAIN_XML_MIGRATABLE) {
switch ((virDomainChrSerialTargetType) serial->targetType) {
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
serial->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE;
serial->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE;
break;
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index f62bb2f97..db9656a3a 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -784,6 +784,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
return 0;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
new file mode 120000
index 000000000..1a90484d3
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
@@ -0,0 +1 @@
+qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml
new file mode 100644
index 000000000..6aba864d0
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml
@@ -0,0 +1,17 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- The <console> element being present should result in a matching
+ <serial> element being created -->
+ <console type='pty'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args
new file mode 100644
index 000000000..2a862bff1
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args
@@ -0,0 +1,24 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-M virt \
+-m 512 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-no-acpi \
+-boot c \
+-device virtio-serial,id=virtio-serial0 \
+-chardev pty,id=charconsole0 \
+-device virtconsole,chardev=charconsole0,id=console0
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml
new file mode 100644
index 000000000..92704504c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml
@@ -0,0 +1,19 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- The <console> element being present should *not* result in a
+ matching <serial> element being created -->
+ <console type='pty'>
+ <target type='virtio'/>
+ </console>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
new file mode 120000
index 000000000..1a90484d3
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
@@ -0,0 +1 @@
+qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml
new file mode 100644
index 000000000..549b764e9
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml
@@ -0,0 +1,18 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- When both the <serial> and <console> elements are present, they will
+ be matched and end up representing the same native serial console -->
+ <serial type='pty'/>
+ <console type='pty'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
new file mode 120000
index 000000000..1a90484d3
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
@@ -0,0 +1 @@
+qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml
new file mode 100644
index 000000000..9e6be3ffe
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml
@@ -0,0 +1,19 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- isa-serial has to be accepted for backwards compatibility reasons,
+ but should get converted to the proper type (pl011) -->
+ <serial type='pty'>
+ <target type='isa-serial'/>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml
new file mode 100644
index 000000000..0b9acc45a
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml
@@ -0,0 +1,21 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- The pl011 serial console can only be used for mach-virt guests,
+ so this should be rejected -->
+ <serial type='pty'>
+ <target type='system'>
+ <model name='pl011'/>
+ </target>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args
new file mode 100644
index 000000000..f4bfce376
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args
@@ -0,0 +1,23 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-M virt \
+-m 512 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-no-acpi \
+-boot c \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml
new file mode 100644
index 000000000..817f606ee
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml
@@ -0,0 +1,16 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- This will use the pl011 target type -->
+ <serial type='pty'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args
new file mode 100644
index 000000000..334194efe
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args
@@ -0,0 +1,26 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-M virt \
+-m 512 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-no-acpi \
+-boot c \
+-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
+-device pcie-root-port,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-chardev pty,id=charserial0 \
+-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml
new file mode 100644
index 000000000..29aa7664b
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml
@@ -0,0 +1,18 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <!-- This will be assigned a PCI address -->
+ <serial type='pty'>
+ <target type='pci-serial'/>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args
new file mode 100644
index 000000000..44c4027ac
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-M virt \
+-m 512 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-no-acpi \
+-boot c \
+-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
+addr=0x1 \
+-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
+-chardev pty,id=charserial0 \
+-device usb-serial,chardev=charserial0,id=serial0,bus=usb.0,port=1
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml
new file mode 100644
index 000000000..35f192a3e
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml
@@ -0,0 +1,21 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='qemu-xhci'/>
+ <!-- This should be assigned a USB address. You'll not be able to find it
+ in the file generated by qemuxml2xmltest due to limitations in the
+ test suite, but it will be there when actually running libvirt;
+ moreover, the USB address will be present in the .args file -->
+ <serial type='pty'>
+ <target type='usb-serial'/>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bec7036b7..258ca72d4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1895,6 +1895,33 @@ mymain(void)
QEMU_CAPS_NODEFCONFIG);
DO_TEST_PARSE_ERROR("pseries-serial-invalid-machine", NONE);
+ DO_TEST("mach-virt-serial-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial+console-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial-compat",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial-pci",
+ QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_OBJECT_GPEX,
+ QEMU_CAPS_PCI_MULTIFUNCTION,
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_PCI_SERIAL);
+ DO_TEST("mach-virt-serial-usb",
+ QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_OBJECT_GPEX,
+ QEMU_CAPS_PCI_MULTIFUNCTION,
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+ QEMU_CAPS_DEVICE_QEMU_XHCI,
+ QEMU_CAPS_DEVICE_USB_SERIAL);
+ DO_TEST("mach-virt-console-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-console-virtio",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE);
+
DO_TEST("disk-ide-drive-split",
QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_IDE_CD);
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml
index e5496424b..112a72e56 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml
@@ -71,7 +71,9 @@
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</interface>
<serial type='pty'>
- <target port='0'/>
+ <target type='system' port='0'>
+ <model name='pl011'/>
+ </target>
</serial>
<console type='pty'>
<target type='serial' port='0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
new file mode 120000
index 000000000..a4768fcf8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
@@ -0,0 +1 @@
+qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml
new file mode 100644
index 000000000..3e46cd201
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml
@@ -0,0 +1,27 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <currentMemory unit='KiB'>524288</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <gic version='2'/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' index='0' model='none'/>
+ <controller type='virtio-serial' index='0'/>
+ <console type='pty'>
+ <target type='virtio' port='0'/>
+ </console>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
new file mode 120000
index 000000000..a4768fcf8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
@@ -0,0 +1 @@
+qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml
new file mode 100644
index 000000000..7b9bef7a0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml
@@ -0,0 +1,31 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <currentMemory unit='KiB'>524288</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <gic version='2'/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' index='0' model='none'/>
+ <serial type='pty'>
+ <target type='system' port='0'>
+ <model name='pl011'/>
+ </target>
+ </serial>
+ <console type='pty'>
+ <target type='serial' port='0'/>
+ </console>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
new file mode 120000
index 000000000..a4768fcf8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
@@ -0,0 +1 @@
+qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml
new file mode 100644
index 000000000..e73e3b105
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml
@@ -0,0 +1,44 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <currentMemory unit='KiB'>524288</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <gic version='2'/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' index='0' model='none'/>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1' model='dmi-to-pci-bridge'>
+ <model name='i82801b11-bridge'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+ </controller>
+ <controller type='pci' index='2' model='pci-bridge'>
+ <model name='pci-bridge'/>
+ <target chassisNr='2'/>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='pci' index='3' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='3' port='0x10'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+ </controller>
+ <serial type='pty'>
+ <target type='pci' port='0'>
+ <model name='pci-serial'/>
+ </target>
+ <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml
new file mode 100644
index 000000000..a33c39cca
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml
@@ -0,0 +1,41 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+ <memory unit='KiB'>524288</memory>
+ <currentMemory unit='KiB'>524288</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <gic version='2'/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <serial type='pty'>
+ <target type='usb' port='0'>
+ <model name='usb-serial'/>
+ </target>
+ </serial>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index ba10cbe64..f2b540f63 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -788,6 +788,32 @@ mymain(void)
DO_TEST("pseries-console-virtio",
QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial+console-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial-compat",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-serial-pci",
+ QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_OBJECT_GPEX,
+ QEMU_CAPS_PCI_MULTIFUNCTION,
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_PCI_SERIAL);
+ DO_TEST("mach-virt-serial-usb",
+ QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_OBJECT_GPEX,
+ QEMU_CAPS_PCI_MULTIFUNCTION,
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+ QEMU_CAPS_DEVICE_QEMU_XHCI,
+ QEMU_CAPS_DEVICE_USB_SERIAL);
+ DO_TEST("mach-virt-console-native",
+ QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("mach-virt-console-virtio",
+ QEMU_CAPS_NODEFCONFIG);
+
DO_TEST("balloon-device-auto", NONE);
DO_TEST("balloon-device-period", NONE);
DO_TEST("channel-virtio-auto", NONE);
--
2.14.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Tue, Nov 21, 2017 at 05:42:27PM +0100, Andrea Bolognani wrote: > We can finally introduce a specific target model for the pl011 device > used by mach-virt guests, which means isa-serial will no longer show > up to confuse users. > > We make sure migration works in both directions by interpreting the > isa-serial target type, or the lack of target type, appropriately > when parsing the guest XML, and skipping the newly-introduced type > when formatting if for migration. We also verify that pl011 is not > used for non-mach-virt guests and add a bunch of test cases. > > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=151292 I'm not sure that 'system' is a good name for serial type for mach-virt, it kind of feels like too generic name. Can we use the "apb-serial" for mach-virt? I understand that the "apb" name might not be well known but at least people that work closely with ARM machines have a chance to understand it better than "system" name. Either way, we should document it better than just listing it as a valid value for type, at least mention that it's valid for ARM/mach-virt machine and that it's a system bus or something like that. The standalone "system" doesn't make it clear what it actually is. Otherwise the patch looks good. Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Thu, 2017-11-23 at 17:43 +0100, Pavel Hrdina wrote: > On Tue, Nov 21, 2017 at 05:42:27PM +0100, Andrea Bolognani wrote: > > We can finally introduce a specific target model for the pl011 device > > used by mach-virt guests, which means isa-serial will no longer show > > up to confuse users. > > > > We make sure migration works in both directions by interpreting the > > isa-serial target type, or the lack of target type, appropriately > > when parsing the guest XML, and skipping the newly-introduced type > > when formatting if for migration. We also verify that pl011 is not > > used for non-mach-virt guests and add a bunch of test cases. > > > > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=151292 > > I'm not sure that 'system' is a good name for serial type for mach-virt, > it kind of feels like too generic name. Can we use the "apb-serial" for > mach-virt? I understand that the "apb" name might not be well known but > at least people that work closely with ARM machines have a chance to > understand it better than "system" name. I was discussing the naming issue with a QEMU developer focusing on aarch64 and he admitted never hearing about "APB" at all ;) Apparently that's a really low-level implementation detail, which is several layer down from a serial device. I know "system" is extremely generic and I don't like it either because of that, but it's what the bus is commonly called among people working on mach-virt, so it's probably the only reasonable option :( > Either way, we should document > it better than just listing it as a valid value for type, at least > mention that it's valid for ARM/mach-virt machine and that it's a system > bus or something like that. The standalone "system" doesn't make it > clear what it actually is. Do you mean in the code (in which case, where exactly?) or in the documentation? Usually we just list the available values without much of an explanation, and I kinda like that because it means we don't need to duplicate in writing the kind of checks that we have already implemented in code, but in this case the options should change infrequently enough and be specific enough that mentioning at least some of the constraints in the documentation as well. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Nov 24, 2017 at 11:26:32AM +0100, Andrea Bolognani wrote: > On Thu, 2017-11-23 at 17:43 +0100, Pavel Hrdina wrote: > > On Tue, Nov 21, 2017 at 05:42:27PM +0100, Andrea Bolognani wrote: > > > We can finally introduce a specific target model for the pl011 device > > > used by mach-virt guests, which means isa-serial will no longer show > > > up to confuse users. > > > > > > We make sure migration works in both directions by interpreting the > > > isa-serial target type, or the lack of target type, appropriately > > > when parsing the guest XML, and skipping the newly-introduced type > > > when formatting if for migration. We also verify that pl011 is not > > > used for non-mach-virt guests and add a bunch of test cases. > > > > > > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=151292 > > > > I'm not sure that 'system' is a good name for serial type for mach-virt, > > it kind of feels like too generic name. Can we use the "apb-serial" for > > mach-virt? I understand that the "apb" name might not be well known but > > at least people that work closely with ARM machines have a chance to > > understand it better than "system" name. > > I was discussing the naming issue with a QEMU developer focusing on > aarch64 and he admitted never hearing about "APB" at all ;) > > Apparently that's a really low-level implementation detail, which is > several layer down from a serial device. > > I know "system" is extremely generic and I don't like it either > because of that, but it's what the bus is commonly called among > people working on mach-virt, so it's probably the only reasonable > option :( > > > Either way, we should document > > it better than just listing it as a valid value for type, at least > > mention that it's valid for ARM/mach-virt machine and that it's a system > > bus or something like that. The standalone "system" doesn't make it > > clear what it actually is. > > Do you mean in the code (in which case, where exactly?) or in the > documentation? Usually we just list the available values without > much of an explanation, and I kinda like that because it means we > don't need to duplicate in writing the kind of checks that we have > already implemented in code, but in this case the options should > change infrequently enough and be specific enough that mentioning > at least some of the constraints in the documentation as well. In documentation, the "system" name is meaningless without mentioning that it is a system bus for mach-virt. It might be clear to mach-virt people but for majority users it will be confusing. The implementation is useless to users as well :). Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2025 Red Hat, Inc.