shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

conf: change virDomainDefMaybeAddInput() to return void

Browse Source 
It can't fail.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Laine Stump 2025-02-11 17:03:44 -05:00
parent 2f8fde6680
commit 8733ce0151
6 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -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;
}

2
src/conf/domain_conf.h
View File

@ -4377,7 +4377,7 @@ virDomainDefMaybeAddController(virDomainDef *def,
virDomainControllerType type,
int idx,
int model);
int
void
virDomainDefMaybeAddInput(virDomainDef *def,
int type,
int bus);

11
src/libxl/xen_common.c
View File

@ -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;
}

27
src/qemu/qemu_postparse.c
View File

@ -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);

11
src/vz/vz_driver.c
View File

@ -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;
}

11
src/vz/vz_sdk.c
View File

@ -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) {