From: Li Zhang <zhlcindy@linux.vnet.ibm.com>
Date: Thu, 20 Dec 2012 06:02:25 +0000 (+0800)
Subject: Support all backend serial devices for pSeries guest
X-Git-Tag: v1.0.2-rc1~349
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da3d40c0eb8919a27ca606abb6e51d5e4b4bdcbe;p=thirdparty%2Flibvirt.git

Support all backend serial devices for pSeries guest

Currently, it only considers PTY backend serial devices for pseries.
It need to support all kinds of serial devices.

This patch is to fix the problem which is that it doesn't work
when specifying source type as file.

Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ef16d274a5..199eb6d1ea 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -923,7 +923,6 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
 
     for (i = 0 ; i < def->nserials; i++) {
         if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-            def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY &&
             (def->os.arch == VIR_ARCH_PPC64) &&
             STREQ(def->os.machine, "pseries"))
             def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
@@ -6970,7 +6969,6 @@ qemuBuildChrDeviceStr(virDomainChrDefPtr serial,
 
     if ((arch == VIR_ARCH_PPC64) && STREQ(machine, "pseries")) {
         if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-            serial->source.type == VIR_DOMAIN_CHR_TYPE_PTY &&
             serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
             virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
                               serial->info.alias);