conf: change virDomainDefMaybeAddInput() to return void

It can't fail.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b7fdf47d6aa8f41605893e5934640b6ec16a9bd6..5edf326574deaa5551c7eb5a1c693b79571889a5 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16561,7 +16561,7 @@ virDomainDefMaybeAddController(virDomainDef *def,
 }
 
 
-int
+void
 virDomainDefMaybeAddInput(virDomainDef *def,
                           int type,
                           int bus)
@@ -16572,7 +16572,7 @@ virDomainDefMaybeAddInput(virDomainDef *def,
     for (i = 0; i < def->ninputs; i++) {
         if (def->inputs[i]->type == type &&
             def->inputs[i]->bus == bus)
-            return 0;
+            return;
     }
 
     input = g_new0(virDomainInputDef, 1);
@@ -16581,8 +16581,6 @@ virDomainDefMaybeAddInput(virDomainDef *def,
     input->bus = bus;
 
     VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input);
-
-    return 0;
 }
 
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 42408841bfd443bab85000ef7ad7d76f77c8a410..2e28b0474abc7986da336f9b729e5bcc665ecb47 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4377,7 +4377,7 @@ virDomainDefMaybeAddController(virDomainDef *def,
                                virDomainControllerType type,
                                int idx,
                                int model);
-int
+void
 virDomainDefMaybeAddInput(virDomainDef *def,
                           int type,
                           int bus);

diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
index cbcdbf5a003748dfae3c0e009403452038e7fa1e..2e02c2f790ebef9356c88c8cea10dcd54a3e61e7 100644 (file)
--- a/src/libxl/xen_common.c
+++ b/src/libxl/xen_common.c
@@ -2396,15 +2396,8 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def)
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
         implicitInputBus = VIR_DOMAIN_INPUT_BUS_PS2;
 
-    if (virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                                  implicitInputBus) < 0)
-        return -1;
-
-    if (virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_KBD,
-                                  implicitInputBus) < 0)
-        return -1;
+    virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitInputBus);
+    virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInputBus);
 
     return 0;
 }

diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
index 49009ae2e4d61c31f75a558c6965c8cf5e09d64b..e48802191e85161ed6fd49d4d2dc788bbda2729a 100644 (file)
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1096,15 +1096,8 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *def,
 {
     if (virQEMUCapsSupportsI8042(qemuCaps, def) &&
         def->features[VIR_DOMAIN_FEATURE_PS2] != VIR_TRISTATE_SWITCH_OFF) {
-        if (virDomainDefMaybeAddInput(def,
-                                      VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                                      VIR_DOMAIN_INPUT_BUS_PS2) < 0)
-            return -1;
-
-        if (virDomainDefMaybeAddInput(def,
-                                      VIR_DOMAIN_INPUT_TYPE_KBD,
-                                      VIR_DOMAIN_INPUT_BUS_PS2) < 0)
-            return -1;
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_BUS_PS2);
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_BUS_PS2);
     }
 
     return 0;
@@ -1420,19 +1413,11 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
             addDefaultUSBMouse = false;
     }
 
-    if (addDefaultUSBKBD &&
-        def->ngraphics > 0 &&
-        virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_KBD,
-                                  VIR_DOMAIN_INPUT_BUS_USB) < 0)
-        return -1;
+    if (addDefaultUSBKBD && def->ngraphics > 0)
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_BUS_USB);
 
-    if (addDefaultUSBMouse &&
-        def->ngraphics > 0 &&
-        virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                                  VIR_DOMAIN_INPUT_BUS_USB) < 0)
-        return -1;
+    if (addDefaultUSBMouse && def->ngraphics > 0)
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_BUS_USB);
 
     if (addPanicDevice) {
         virDomainPanicModel defaultModel = qemuDomainDefaultPanicModel(def);

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 4edea4bf1837cd9a81fd0487b0de536d85cc8348..571735f940546080d82d5b0518188e7299dda6fc 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -219,15 +219,8 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def)
     if (def->ngraphics == 0)
         return 0;
 
-    if (virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                                  bus) < 0)
-        return -1;
-
-    if (virDomainDefMaybeAddInput(def,
-                                  VIR_DOMAIN_INPUT_TYPE_KBD,
-                                  bus) < 0)
-        return -1;
+    virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus);
+    virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus);
 
     return 0;
 }

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index cd99b4524b8dbfc9e11dd39a2faa665769a903e5..c2226c409dee62352e8f28fbc1a279d1a60aa303 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1848,15 +1848,8 @@ prlsdkLoadDomain(struct _vzDriver *driver,
         int bus = IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS :
                                VIR_DOMAIN_INPUT_BUS_PS2;
 
-        if (virDomainDefMaybeAddInput(def,
-                                      VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                                      bus) < 0)
-            return NULL;
-
-        if (virDomainDefMaybeAddInput(def,
-                                      VIR_DOMAIN_INPUT_TYPE_KBD,
-                                      bus) < 0)
-            return NULL;
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus);
+        virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus);
     }
 
     if (!dom) {