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: stop checking for NULL return from virDomainControllerDefNew()

Browse Source 
It can't fail, so the caller doesn't need to check the return.

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 21:08:03 -05:00
parent 3d263290df
commit b62ce44a61
5 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -8581,8 +8581,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
VIR_XML_PROP_NONE, &type) < 0)
return NULL;
if (!(def = virDomainControllerDefNew(type)))
return NULL;
def = virDomainControllerDefNew(type);
if ((model = virXMLPropString(node, "model"))) {
if ((def->model = virDomainControllerModelTypeFromString(def, model)) < 0) {
@ -16472,10 +16471,7 @@ virDomainDefAddController(virDomainDef *def,
int idx,
int model)
{
virDomainControllerDef *cont;
if (!(cont = virDomainControllerDefNew(type)))
return NULL;
virDomainControllerDef *cont = virDomainControllerDefNew(type);
if (idx < 0)
idx = virDomainControllerFindUnusedIndex(def, type);

6
src/hyperv/hyperv_driver.c
View File

@ -1174,13 +1174,9 @@ hypervDomainDefAppendController(virDomainDef *def,
int idx,
virDomainControllerType controllerType)
{
virDomainControllerDef *controller = NULL;
if (!(controller = virDomainControllerDefNew(controllerType)))
return -1;
virDomainControllerDef *controller = virDomainControllerDefNew(controllerType);
controller->idx = idx;
VIR_APPEND_ELEMENT(def->controllers, def->ncontrollers, controller);
return 0;

4
src/libxl/libxl_conf.c
View File

@ -2102,9 +2102,7 @@ libxlMakeDefaultUSBControllers(virDomainDef *def,
x_controllers = g_new0(libxl_device_usbctrl, ncontrollers);
for (i = 0; i < ncontrollers; i++) {
if (!(l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
goto error;
l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
l_controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
l_controller->idx = i;
l_controller->opts.usbopts.ports = 8;

5
src/libxl/libxl_driver.c
View File

@ -3205,10 +3205,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *driver,
if (ports <= usbdevs) {
/* no free ports, we will create a new usb controller */
virDomainControllerDef *controller;
if (!(controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
goto cleanup;
virDomainControllerDef *controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
controller->idx = -1;

4
src/libxl/xen_xl.c
View File

@ -861,9 +861,7 @@ xenParseXLUSBController(virConf *conf, virDomainDef *def)
else
usbctrl_type = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
if (!(controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
return -1;
controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
controller->type = VIR_DOMAIN_CONTROLLER_TYPE_USB;
controller->model = usbctrl_type;
controller->opts.usbopts.ports = usbctrl_ports;