External/libvirt
1
0
Fork 0
Code

domain_conf: Make virDomainDeviceFindSCSIController accept virDomainDeviceDriveAddress struct

Browse Source 
So far, the virDomainDeviceFindSCSIController() takes
virDomainDeviceInfo structure which is an overkill. It assumes
that the passed structure is type of
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE which is not obvious.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2019-09-10 16:45:47 +02:00
parent 8e09cf1d5a
commit 9cddc6e8ee
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -8528,13 +8528,13 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
virDomainControllerDefPtr virDomainControllerDefPtr
virDomainDeviceFindSCSIController(const virDomainDef *def, virDomainDeviceFindSCSIController(const virDomainDef *def,
virDomainDeviceInfoPtr info) const virDomainDeviceDriveAddress *addr)
{ {
size_t i; size_t i;
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI &&
def->controllers[i]->idx == info->addr.drive.controller) def->controllers[i]->idx == addr->controller)
return def->controllers[i]; return def->controllers[i];
} }
@ -18560,7 +18560,7 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def)
* So let's grab the model from it and update the model we're * So let's grab the model from it and update the model we're
* going to add as long as this one isn't undefined. The premise * going to add as long as this one isn't undefined. The premise
* being keeping the same controller model for all SCSI hostdevs. */ * being keeping the same controller model for all SCSI hostdevs. */
cont = virDomainDeviceFindSCSIController(def, hostdev->info); cont = virDomainDeviceFindSCSIController(def, &hostdev->info->addr.drive);
if (cont && cont->model != -1) if (cont && cont->model != -1)
newModel = cont->model; newModel = cont->model;
} }

5
src/conf/domain_conf.h
View File

@ -2858,7 +2858,10 @@ int virDomainDiskGetFormat(virDomainDiskDefPtr def);
void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format); void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format);
virDomainControllerDefPtr virDomainControllerDefPtr
virDomainDeviceFindSCSIController(const virDomainDef *def, virDomainDeviceFindSCSIController(const virDomainDef *def,
virDomainDeviceInfoPtr info); const virDomainDeviceDriveAddress *addr);
virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
int bus,
char *dst);
virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type); virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type);
void virDomainControllerDefFree(virDomainControllerDefPtr def); void virDomainControllerDefFree(virDomainControllerDefPtr def);

2
src/qemu/qemu_domain_address.c
View File

@ -111,7 +111,7 @@ qemuDomainFindSCSIControllerModel(const virDomainDef *def,
{ {
virDomainControllerDefPtr cont; virDomainControllerDefPtr cont;
if (!(cont = virDomainDeviceFindSCSIController(def, info))) { if (!(cont = virDomainDeviceFindSCSIController(def, &info->addr.drive))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to find a SCSI controller for idx=%d"), _("unable to find a SCSI controller for idx=%d"),
info->addr.drive.controller); info->addr.drive.controller);

2
src/vbox/vbox_common.c
View File

@ -1110,7 +1110,7 @@ vboxAttachDrives(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
case VIR_DOMAIN_DISK_BUS_SCSI: case VIR_DOMAIN_DISK_BUS_SCSI:
VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SCSI_NAME, &storageCtlName); VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SCSI_NAME, &storageCtlName);
cont = virDomainDeviceFindSCSIController(def, &disk->info); cont = virDomainDeviceFindSCSIController(def, &disk->info.addr.drive);
if (cont && cont->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068) { if (cont && cont->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068) {
VBOX_UTF16_FREE(storageCtlName); VBOX_UTF16_FREE(storageCtlName);
VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SAS_NAME, &storageCtlName); VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SAS_NAME, &storageCtlName);