NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Drop qemuDomainSetSCSIControllerModel()

Browse Source 
It only has a single caller.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-19 16:04:39 +01:00
parent 7d6ec89243
commit 27cb524a9f
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_domain.c
View File

@ -5586,7 +5586,9 @@ qemuDomainControllerDefPostParse(virDomainControllerDef *cont,
switch (cont->type) { switch (cont->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
/* Set the default SCSI controller model if not already set */ /* Set the default SCSI controller model if not already set */
if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0) cont->model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps);
if (cont->model < 0)
return -1; return -1;
break; break;

25
src/qemu/qemu_domain_address.c
View File

@ -74,31 +74,6 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def,
} }
/**
* @def: Domain definition
* @cont: Domain controller def
* @qemuCaps: qemu capabilities
*
* Set the controller model based on the existing value and the
* capabilities if possible.
*
* Returns 0 on success, -1 on failure with error set.
*/
int
qemuDomainSetSCSIControllerModel(const virDomainDef *def,
virDomainControllerDef *cont,
virQEMUCaps *qemuCaps)
{
int model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps);
if (model < 0)
return -1;
cont->model = model;
return 0;
}
static int static int
qemuDomainAssignVirtioSerialAddresses(virDomainDef *def) qemuDomainAssignVirtioSerialAddresses(virDomainDef *def)
{ {

4
src/qemu/qemu_domain_address.h
View File

@ -28,10 +28,6 @@ int qemuDomainGetSCSIControllerModel(const virDomainDef *def,
const virDomainControllerDef *cont, const virDomainControllerDef *cont,
virQEMUCaps *qemuCaps); virQEMUCaps *qemuCaps);
int qemuDomainSetSCSIControllerModel(const virDomainDef *def,
virDomainControllerDef *cont,
virQEMUCaps *qemuCaps);
int qemuDomainAssignAddresses(virDomainDef *def, int qemuDomainAssignAddresses(virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
virQEMUDriver *driver, virQEMUDriver *driver,