10:28 p.m.
It can't fail.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 6 ++----
src/conf/domain_conf.h | 2 +-
src/libxl/xen_common.c | 11 ++---------
src/qemu/qemu_postparse.c | 27 ++++++---------------------
src/vz/vz_driver.c | 11 ++---------
src/vz/vz_sdk.c | 11 ++---------
6 files changed, 15 insertions(+), 53 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2e74f75a13..b14712997b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16548,7 +16548,7 @@ virDomainDefMaybeAddController(virDomainDef *def,
}
-int
+void
virDomainDefMaybeAddInput(virDomainDef *def,
int type,
int bus)
@@ -16559,7 +16559,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);
@@ -16568,8 +16568,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 0dd2d6f1d2..1edc3679cd 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4370,7 +4370,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 3a64f565f7..c9c8ed2fde 100644
--- a/src/libxl/xen_common.c
+++ b/src/libxl/xen_common.c
@@ -2400,15 +2400,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 1f9077982a..53151eef75 100644
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1095,15 +1095,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;
@@ -1419,19 +1412,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 4edea4bf18..571735f940 100644
--- 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 688c9d1ebc..c64d0b73e5 100644
--- 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) {
--
2.47.1