Re: [libvirt] [PATCH v2 2/2] conf: Parse guestfwd channel device info again

[Andrea Bolognani]

On Tue, 2018-08-21 at 12:12 +0200, Michal Privoznik wrote:
[...]
>  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) {
> -goto error;
> -}
> -
> +def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD)
> +virDomainDeviceInfoClearAddress(&def->info);

Our style guidelines require curly braces around the if body in this
case - which is great, because it means your diff can be smaller and
more readable! :)

With that fixed

  Reviewed-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v2 2/2] conf: Parse guestfwd channel device info again

[Michal Privoznik]

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
 but it surely makes sense to parse its alias (which
might be an user alias).

This partially reverts commit
47a3dd46ead20e6fdc30bcdc1b8e707e250d33da which fixed
https://bugzilla.redhat.com/show_bug.cgi?id=1172526.

Signed-off-by: Michal Privoznik 
---
 src/conf/domain_conf.c | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3c254801cd..abbc6e8a85 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -12807,14 +12807,13 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
 }
 }
 
+if (virDomainDeviceInfoParseXML(xmlopt, node,
+&def->info, flags) < 0)
+goto error;
+
 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) {
-goto error;
-}
-
+def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD)
+virDomainDeviceInfoClearAddress(&def->info);
 
 if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
 def->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB &&
-- 
2.16.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list