forked from rpms/libvirt
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
|
From ac3ea7982236832f5f2ae86b631aface267d035c Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <ac3ea7982236832f5f2ae86b631aface267d035c@dist-git>
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Tue, 21 Aug 2018 14:23:40 +0200
|
||
|
|
Subject: [PATCH] conf: Parse guestfwd channel device info again
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1610072
|
||
|
|
|
||
|
|
Due to historical reasons we were not parsing device info on
|
||
|
|
guestfwd channel. Sure, it doesn't make much sense to parse
|
||
|
|
<address/> but it surely makes sense to parse its alias (which
|
||
|
|
might be an user alias).
|
||
|
|
|
||
|
|
This reverts commit 47a3dd46ead20e6fdc30bcdc1b8e707e250d33da
|
||
|
|
which fixed https://bugzilla.redhat.com/show_bug.cgi?id=1172526.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
||
|
|
(cherry picked from commit cab1843914d9ce5d1ca28477d2b48e5304e9e6f2)
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/conf/domain_conf.c | 8 +-------
|
||
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
||
|
|
index 8a43e607e9..51a79ad8b1 100644
|
||
|
|
--- a/src/conf/domain_conf.c
|
||
|
|
+++ b/src/conf/domain_conf.c
|
||
|
|
@@ -12760,14 +12760,8 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
|
||
|
|
- def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD) {
|
||
|
|
- VIR_DEBUG("Ignoring device address for gustfwd channel");
|
||
|
|
- } else if (virDomainDeviceInfoParseXML(xmlopt, node,
|
||
|
|
- &def->info, flags) < 0) {
|
||
|
|
+ if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
|
||
|
|
goto error;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
|
||
|
|
if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
|
||
|
|
def->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB &&
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|