[libvirt] [PATCH v2 12/21] qemu: Validate target model for serial devices
Target model and target type must agree for the configuration
to make sense, so check that's actually the case and error out
otherwise.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/libvirt_private.syms | 2 ++
src/qemu/qemu_domain.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d3ca6b2ec..0fb7d0e81 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -209,6 +209,8 @@ virDomainChrGetDomainPtrs;
virDomainChrInsertPreAlloced;
virDomainChrPreAlloc;
virDomainChrRemove;
+virDomainChrSerialTargetModelTypeFromString;
+virDomainChrSerialTargetModelTypeToString;
virDomainChrSerialTargetTypeFromString;
virDomainChrSerialTargetTypeToString;
virDomainChrSourceDefClear;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 32cb62fb9..06ce382fa 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3538,6 +3538,43 @@ qemuDomainChrTargetDefValidate(const virDomainDef *def,
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
break;
}
+
+ /* Validate target model */
+ switch ((virDomainChrSerialTargetModel) chr->targetModel) {
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
+ if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target model '%s' requires "
+ "target type 'isa'"),
+
virDomainChrSerialTargetModelTypeToString(chr->targetModel));
+ return -1;
+ }
+ break;
+
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:
+ if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target model '%s' requires "
+ "target type 'usb'"),
+
virDomainChrSerialTargetModelTypeToString(chr->targetModel));
+ return -1;
+ }
+ break;
+
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:
+ if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target model '%s' requires "
+ "target type 'pci'"),
+
virDomainChrSerialTargetModelTypeToString(chr->targetModel));
+ return -1;
+ }
+ break;
+
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
+ break;
+ }
break;
case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
--
2.14.3