Re: [libvirt PATCH] Move default Input bus logic to PostParse handling

24 Apr 2023

On 4/24/23 12:15, Martin Kletzander wrote:
...
And I would squash this in before pushing if you're OK with that:

diff --git i/src/conf/domain_conf.c w/src/conf/domain_conf.c
index 0d8b128f9538..222dd989f54f 100644
--- i/src/conf/domain_conf.c
+++ w/src/conf/domain_conf.c
@@ -10733,15 +10733,12 @@ virDomainInputDefParseXML(virDomainXMLOption 
*xmlopt,
         goto error;
     }
-    if (bus) {
-        if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown input bus type '%1$s'"), bus);
-            goto error;
-        }
-
-    } else {
-        def->bus = VIR_DOMAIN_INPUT_BUS_DEFAULT;
+    if (bus &&
+        ((def->bus = virDomainInputBusTypeFromString(bus)) < 0 ||
+         def->bus == VIR_DOMAIN_INPUT_BUS_DEFAULT)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("unknown input bus type '%1$s'"), bus);
+        goto error;
     }
     if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &def->info, 
flags) < 0)
--
Martin
Greetings Mentor Martin,

I have understood your corrections.

Please proceed with the squash and the commit.

Thank You
K Shiva

    