[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] qemu:rename qemuCheckScsiControllerModel function



>From qemuCheckScsiControllerModel
To   qemuSetScsiControllerModel
---
 src/qemu/qemu_command.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 56943d5..eb3ef26 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -469,7 +469,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
 }
 
 static int
-qemuCheckScsiControllerModel(virDomainDefPtr def,
+qemuSetScsiControllerModel(virDomainDefPtr def,
                              virBitmapPtr qemuCaps,
                              int *model)
 {
@@ -531,7 +531,7 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
                 virDomainDiskFindControllerModel(def, disk,
                                                  VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
 
-            if ((qemuCheckScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
+            if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
                 return -1;
         }
 
@@ -919,7 +919,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
     for (i = 0 ; i < def->ncontrollers; i++) {
         model = def->controllers[i]->model;
         if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
-            rc = qemuCheckScsiControllerModel(def, qemuCaps, &model);
+            rc = qemuSetScsiControllerModel(def, qemuCaps, &model);
             if (rc)
                 goto cleanup;
         }
@@ -2489,7 +2489,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
         controllerModel =
             virDomainDiskFindControllerModel(def, disk,
                                              VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
-        if ((qemuCheckScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
+        if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
             goto error;
 
         if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
@@ -2819,7 +2819,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
     switch (def->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
         model = def->model;
-        if ((qemuCheckScsiControllerModel(domainDef, qemuCaps, &model)) < 0)
+        if ((qemuSetScsiControllerModel(domainDef, qemuCaps, &model)) < 0)
             return NULL;
 
         switch (model) {
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]