From fd981b46a6729b5d5dac4923b860f888b0c193b9 Mon Sep 17 00:00:00 2001

Message-Id: <fd981b46a6729b5d5dac4923b860f888b0c193b9@dist-git>

From: Andrea Bolognani <abologna@redhat.com>

Date: Wed, 29 Nov 2017 16:23:12 +0100

Subject: [PATCH] conf: Add target type and model for spapr-vty

We can finally introduce a specific target model for the spapr-vty

device used by pSeries 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 spapr-vty is

not used for non-pSeries guests and add a bunch of test cases.

This commit is best viewed with 'git show -w'.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1511421

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit c498a8921e447715189c8c6d22b7ca24cc810830)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 docs/formatdomain.html.in                          | 13 ++--

 docs/schemas/domaincommon.rng                      |  2 +

 src/conf/domain_conf.c                             |  6 +-

 src/conf/domain_conf.h                             |  2 +

 src/qemu/qemu_command.c                            | 67 +++++++++------------

 src/qemu/qemu_domain.c                             | 69 ++++++++++++++++++----

 src/qemu/qemu_domain_address.c                     |  1 +

 .../qemuxml2argv-pseries-basic.args                |  2 +-

 .../qemuxml2argv-pseries-console-native.args       |  1 +

 .../qemuxml2argv-pseries-console-native.xml        | 17 ++++++

 .../qemuxml2argv-pseries-console-virtio.args       | 23 ++++++++

 .../qemuxml2argv-pseries-console-virtio.xml        | 19 ++++++

 .../qemuxml2argv-pseries-cpu-compat-power9.args    |  2 +-

 .../qemuxml2argv-pseries-cpu-compat.args           |  2 +-

 .../qemuxml2argv-pseries-cpu-exact.args            |  2 +-

 .../qemuxml2argv-pseries-cpu-le.args               |  2 +-

 .../qemuxml2argv-pseries-panic-missing.args        |  2 +-

 .../qemuxml2argv-pseries-panic-no-address.args     |  2 +-

 ...qemuxml2argv-pseries-serial+console-native.args |  1 +

 .../qemuxml2argv-pseries-serial+console-native.xml | 18 ++++++

 .../qemuxml2argv-pseries-serial-compat.args        |  1 +

 .../qemuxml2argv-pseries-serial-compat.xml         | 19 ++++++

 ...qemuxml2argv-pseries-serial-invalid-machine.xml | 19 ++++++

 .../qemuxml2argv-pseries-serial-native.args        | 22 +++++++

 .../qemuxml2argv-pseries-serial-native.xml         | 16 +++++

 .../qemuxml2argv-pseries-usb-default.args          |  2 +-

 .../qemuxml2argv-pseries-usb-kbd.args              |  2 +-

 .../qemuxml2argv-pseries-usb-multi.args            |  2 +-

 .../qemuxml2argv-pseries-vio-user-assigned.args    |  4 +-

 .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args |  4 +-

 tests/qemuxml2argvtest.c                           | 16 +++++

 .../qemuxml2xmlout-panic-pseries.xml               |  4 +-

 .../qemuxml2xmlout-pseries-console-native.xml      |  1 +

 .../qemuxml2xmlout-pseries-console-virtio.xml      | 31 ++++++++++

 .../qemuxml2xmlout-pseries-cpu-compat-power9.xml   |  4 +-

 .../qemuxml2xmlout-pseries-cpu-compat.xml          |  4 +-

 .../qemuxml2xmlout-pseries-cpu-exact.xml           |  4 +-

 .../qemuxml2xmlout-pseries-panic-missing.xml       |  4 +-

 .../qemuxml2xmlout-pseries-panic-no-address.xml    |  4 +-

 ...emuxml2xmlout-pseries-serial+console-native.xml |  1 +

 .../qemuxml2xmlout-pseries-serial-compat.xml       |  1 +

 .../qemuxml2xmlout-pseries-serial-native.xml       | 35 +++++++++++

 tests/qemuxml2xmltest.c                            | 15 +++++

 43 files changed, 386 insertions(+), 82 deletions(-)

 create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml

 create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml

 create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml

 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml

 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-virtio.xml

 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml

 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml

 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-native.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in

index cf1167b9c6..0634f3396a 100644

--- a/docs/formatdomain.html.in

+++ b/docs/formatdomain.html.in

@@ -6462,7 +6462,9 @@ qemu-kvm -net nic,model=? /dev/null

       since 1.0.2, isa-serial (usable

       with x86 guests), usb-serial (usable whenever USB support

       is available) and pci-serial (usable whenever PCI support

-      is available).

+      is available); since 3.10.0,

+      spapr-vio-serial (usable with ppc64/pseries guests)

+      is available as well.

@@ -6472,7 +6474,9 @@ qemu-kvm -net nic,model=? /dev/null

       isa-serial (usable with the isa-serial target

       type); usb-serial (usable with the usb-serial

       target type); pci-serial

-      (usable with the pci-serial target type).

+      (usable with the pci-serial target type);

+      spapr-vty (usable with the spapr-vio-serial

+      target type).

@@ -6484,8 +6488,9 @@ qemu-kvm -net nic,model=? /dev/null

       All of the target types support configuring the guest-visible device

       address as documented above; more

       specifically, acceptable address types are isa (for

-      isa-serial), usb (for usb-serial)

-      and pci (for pci-serial).

+      isa-serial), usb (for usb-serial),

+      pci (for pci-serial) and spapr-vio

+      (for spapr-vio-serial).

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng

index 3630e539e6..027d9ae7a1 100644

--- a/docs/schemas/domaincommon.rng

+++ b/docs/schemas/domaincommon.rng

@@ -3571,6 +3571,7 @@

         <value>isa-serial</value>

         <value>usb-serial</value>

         <value>pci-serial</value>

+        <value>spapr-vio-serial</value>

       </choice>

     </attribute>

   </define>

@@ -3582,6 +3583,7 @@

           <value>isa-serial</value>

           <value>usb-serial</value>

           <value>pci-serial</value>

+          <value>spapr-vty</value>

         </choice>

       </attribute>

     </element>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c

index 692b9d9414..97c7a66b5b 100644

--- a/src/conf/domain_conf.c

+++ b/src/conf/domain_conf.c

@@ -444,7 +444,9 @@ VIR_ENUM_IMPL(virDomainChrSerialTarget,

               "none",

               "isa-serial",

               "usb-serial",

-              "pci-serial")

+              "pci-serial",

+              "spapr-vio-serial",

+);

 VIR_ENUM_IMPL(virDomainChrChannelTarget,

               VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST,

@@ -471,6 +473,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,

               "isa-serial",

               "usb-serial",

               "pci-serial",

+              "spapr-vty",

 );

 VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,

@@ -4059,6 +4062,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_NONE: {

             /* Create a stub console to match the serial port.

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h

index 9dfe9388cd..979e8cca00 100644

--- a/src/conf/domain_conf.h

+++ b/src/conf/domain_conf.h

@@ -1077,6 +1077,7 @@ typedef enum {

     VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA,

     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_LAST

 } virDomainChrSerialTargetType;

@@ -1109,6 +1110,7 @@ typedef enum {

     VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL,

     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_LAST

 } virDomainChrSerialTargetModel;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c

index f8d5d317cd..91083dc73d 100644

--- a/src/qemu/qemu_command.c

+++ b/src/qemu/qemu_command.c

@@ -9227,6 +9227,8 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel)

         return QEMU_CAPS_DEVICE_USB_SERIAL;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:

         return QEMU_CAPS_DEVICE_PCI_SERIAL;

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:

+        return QEMU_CAPS_DEVICE_SPAPR_VTY;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:

@@ -10354,52 +10356,39 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,

     virBuffer cmd = VIR_BUFFER_INITIALIZER;

     virQEMUCapsFlags caps;

-    if (qemuDomainIsPSeries(def)) {

-        if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&

-            serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {

-            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_VTY)) {

-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

-                               _("spapr-vty not supported in this QEMU binary"));

-                goto error;

-            }

+    switch ((virDomainChrSerialTargetModel) serial->targetModel) {

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:

-            virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",

-                              serial->info.alias);

-        }

-    } else {

-        switch ((virDomainChrSerialTargetModel) serial->targetModel) {

-        case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:

-        case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:

+        caps = qemuChrSerialTargetModelToCaps(serial->targetModel);

-            caps = qemuChrSerialTargetModelToCaps(serial->targetModel);

-

-            if (caps && !virQEMUCapsGet(qemuCaps, caps)) {

-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,

-                               _("'%s' is not supported in this QEMU binary"),

-                               virDomainChrSerialTargetModelTypeToString(serial->targetModel));

-                goto error;

-            }

-            break;

-

-        case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:

-            break;

-

-        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

-             * be used, all of the above are platform devices, which means

-             * qemuBuildSerialCommandLine() will have taken the appropriate

-             * branch and we will not have ended up here. */

-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

-                           _("Invalid target model for serial device"));

+        if (caps && !virQEMUCapsGet(qemuCaps, caps)) {

+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,

+                           _("'%s' is not supported in this QEMU binary"),

+                           virDomainChrSerialTargetModelTypeToString(serial->targetModel));

             goto error;

         }

+        break;

-        virBufferAsprintf(&cmd, "%s,chardev=char%s,id=%s",

-                          virDomainChrSerialTargetModelTypeToString(serial->targetModel),

-                          serial->info.alias, serial->info.alias);

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:

+        break;

+

+    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

+         * be used, all of the above are platform devices, which means

+         * qemuBuildSerialCommandLine() will have taken the appropriate

+         * branch and we will not have ended up here. */

+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

+                       _("Invalid target model for serial device"));

+        goto error;

     }

+    virBufferAsprintf(&cmd, "%s,chardev=char%s,id=%s",

+                      virDomainChrSerialTargetModelTypeToString(serial->targetModel),

+                      serial->info.alias, serial->info.alias);

+

     if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0)

         goto error;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c

index 7b5bc97de6..17c898896d 100644

--- a/src/qemu/qemu_domain.c

+++ b/src/qemu/qemu_domain.c

@@ -3466,6 +3466,8 @@ qemuDomainChrSerialTargetTypeToAddressType(int targetType)

         return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:

         return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:

+        return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:

     case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:

         break;

@@ -3485,6 +3487,8 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel)

         return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:

         return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI;

+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:

+        return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO;

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:

     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:

         break;

@@ -3495,8 +3499,7 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel)

 static int

-qemuDomainChrTargetDefValidate(const virDomainDef *def,

-                               const virDomainChrDef *chr)

+qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)

 {

     int expected;

@@ -3508,11 +3511,7 @@ qemuDomainChrTargetDefValidate(const virDomainDef *def,

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:

-

-            /* Hack required until we have a proper type for pSeries

-             * serial consoles */

-            if (qemuDomainIsPSeries(def))

-                return 0;

+        case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:

             expected = qemuDomainChrSerialTargetTypeToAddressType(chr->targetType);

@@ -3536,6 +3535,7 @@ qemuDomainChrTargetDefValidate(const virDomainDef *def,

         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:

+        case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:

             expected = qemuDomainChrSerialTargetModelToTargetType(chr->targetModel);

@@ -3573,7 +3573,7 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev,

     if (qemuDomainChrSourceDefValidate(dev->source) < 0)

         return -1;

-    if (qemuDomainChrTargetDefValidate(def, dev) < 0)

+    if (qemuDomainChrTargetDefValidate(dev) < 0)

         return -1;

     if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL &&

@@ -3583,6 +3583,26 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev,

             return -1;

     }

+    if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) {

+        bool isCompatible = true;

+

+        if (!qemuDomainIsPSeries(def) &&

+            (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO ||

+             dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY)) {

+            isCompatible = false;

+        }

+

+        if (!isCompatible) {

+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,

+                           _("Serial device with target type '%s' and "

+                             "target model '%s' not compatible with guest "

+                             "architecture or machine type"),

+                           virDomainChrSerialTargetTypeToString(dev->targetType),

+                           virDomainChrSerialTargetModelTypeToString(dev->targetModel));

+            return -1;

+        }

+    }

+

     return 0;

 }

@@ -4222,10 +4242,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,

         if (ARCH_IS_X86(def->os.arch)) {

             chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA;

         } else if (qemuDomainIsPSeries(def)) {

-            /* Setting TYPE_ISA here is just a temporary hack to reduce test

-             * suite churn. Later on we will have a proper serial type for

-             * pSeries and this line will be updated accordingly. */

-            chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA;

+            chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO;

         }

     }

@@ -4242,6 +4259,9 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:

             chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL;

             break;

+        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_NONE:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:

             /* Nothing to do */

@@ -5147,6 +5167,31 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,

                 goto cleanup;

         }

+        for (i = 0; i < def->nserials; i++) {

+            virDomainChrDefPtr serial = def->serials[i];

+

+            /* Historically, the native console type for some machine types

+             * was not set at all, which means it defaulted to ISA even

+             * though that was not even remotely accurate. To ensure migration

+             * towards older libvirt versions works for such guests, we switch

+             * it back to the default here */

+            if (flags & VIR_DOMAIN_XML_MIGRATABLE) {

+                switch ((virDomainChrSerialTargetType) serial->targetType) {

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:

+                    serial->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE;

+                    serial->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE;

+                    break;

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:

+                case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:

+                    /* Nothing to do */

+                    break;

+                }

+            }

+        }

+

         /* Replace the CPU definition updated according to QEMU with the one

          * used for starting the domain. The updated def will be sent

          * separately for backward compatibility.

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c

index 989c0e6c93..2319e503eb 100644

--- a/src/qemu/qemu_domain_address.c

+++ b/src/qemu/qemu_domain_address.c

@@ -782,6 +782,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_NONE:

         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:

             return 0;

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args

index 97a7057ba0..789d9f679e 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args

@@ -20,4 +20,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args

new file mode 120000

index 0000000000..d6c830ecdf

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args

@@ -0,0 +1 @@

+qemuxml2argv-pseries-serial-native.args

\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml

new file mode 100644

index 0000000000..9f37bf0dec

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-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='ppc64' machine='pseries'>hvm</type>

+  </os>

+  <devices>

+    <emulator>/usr/bin/qemu-system-ppc64</emulator>

+    <controller type='usb' model='none'/>

+    

+         <serial> element being created -->

+    <console type='pty'/>

+    <memballoon model='none'/>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.args

new file mode 100644

index 0000000000..343018fb3e

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.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-ppc64 \

+-name guest \

+-S \

+-M pseries \

+-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 \

+-boot c \

+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x1 \

+-chardev pty,id=charconsole0 \

+-device virtconsole,chardev=charconsole0,id=console0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml

new file mode 100644

index 0000000000..0190ab63ac

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-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='ppc64' machine='pseries'>hvm</type>

+  </os>

+  <devices>

+    <emulator>/usr/bin/qemu-system-ppc64</emulator>

+    <controller type='usb' model='none'/>

+    

+         matching <serial> element being created -->

+    <console type='pty'>

+      <target type='virtio'/>

+    </console>

+    <memballoon model='none'/>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args

index af93d63dc9..9bb375aeba 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args

@@ -21,4 +21,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args

index 7740e2f5a9..5174aa760e 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args

@@ -21,4 +21,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args

index d2c99a7fa3..3790deca8c 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args

@@ -21,4 +21,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args

index 97a7057ba0..789d9f679e 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args

@@ -20,4 +20,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args

index 97a7057ba0..789d9f679e 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args

@@ -20,4 +20,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args

index 97a7057ba0..789d9f679e 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args

@@ -20,4 +20,4 @@ server,nowait \

 -boot c \

 -usb \

 -chardev pty,id=charserial0 \

--device spapr-vty,chardev=charserial0,reg=0x30000000

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args

new file mode 120000

index 0000000000..d6c830ecdf

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args

@@ -0,0 +1 @@

+qemuxml2argv-pseries-serial-native.args

\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml

new file mode 100644

index 0000000000..2733baa980

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-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='ppc64' machine='pseries'>hvm</type>

+  </os>

+  <devices>

+    <emulator>/usr/bin/qemu-system-ppc64</emulator>

+    <controller type='usb' model='none'/>

+    

+         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-pseries-serial-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args

new file mode 120000

index 0000000000..d6c830ecdf

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args

@@ -0,0 +1 @@

+qemuxml2argv-pseries-serial-native.args

\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml

new file mode 100644

index 0000000000..2e182edbd0

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-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='ppc64' machine='pseries'>hvm</type>

+  </os>

+  <devices>

+    <emulator>/usr/bin/qemu-system-ppc64</emulator>

+    <controller type='usb' model='none'/>

+    

+         but should get converted to the proper type (spapr-vty-serial) -->

+    <serial type='pty'>

+      <target type='isa-serial'/>

+    </serial>

+    <memballoon model='none'/>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml

new file mode 100644

index 0000000000..5482146a57

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.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='x86_64' machine='pc'>hvm</type>

+  </os>

+  <devices>

+    <emulator>/usr/bin/qemu-system-x86_64</emulator>

+    <controller type='usb' model='none'/>

+    

+         guests, so this should be rejected -->

+    <serial type='pty'>

+      <target type='spapr-vio-serial'/>

+    </serial>

+    <memballoon model='none'/>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args

new file mode 100644

index 0000000000..f72b8b6259

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args

@@ -0,0 +1,22 @@

+LC_ALL=C \

+PATH=/bin \

+HOME=/home/test \

+USER=test \

+LOGNAME=test \

+QEMU_AUDIO_DRV=none \

+/usr/bin/qemu-system-ppc64 \

+-name guest \

+-S \

+-M pseries \

+-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 \

+-boot c \

+-chardev pty,id=charserial0 \

+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000