提交 ad8da38e 编写于 作者: P Peter Krempa

qemu: command: Rename qemuBuildDriveDevStr to qemuBuildDiskDeviceStr

It builds the string for '-device' from a virDomainDiskDef.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 192cf8ce
...@@ -1809,10 +1809,10 @@ qemuBuildDriveDevCacheStr(virDomainDiskDefPtr disk, ...@@ -1809,10 +1809,10 @@ qemuBuildDriveDevCacheStr(virDomainDiskDefPtr disk,
char * char *
qemuBuildDriveDevStr(const virDomainDef *def, qemuBuildDiskDeviceStr(const virDomainDef *def,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
unsigned int bootindex, unsigned int bootindex,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; virBuffer opt = VIR_BUFFER_INITIALIZER;
const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus);
...@@ -2283,8 +2283,8 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, ...@@ -2283,8 +2283,8 @@ qemuBuildDiskCommandLine(virCommandPtr cmd,
} else { } else {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildDriveDevStr(def, disk, bootindex, if (!(optstr = qemuBuildDiskDeviceStr(def, disk, bootindex,
qemuCaps))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
VIR_FREE(optstr); VIR_FREE(optstr);
......
...@@ -110,11 +110,11 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, ...@@ -110,11 +110,11 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src,
qemuBlockStorageSourceAttachDataPtr data, qemuBlockStorageSourceAttachDataPtr data,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ char
char *qemuBuildDriveDevStr(const virDomainDef *def, *qemuBuildDiskDeviceStr(const virDomainDef *def,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
unsigned int bootindex, unsigned int bootindex,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
int qemuBuildControllerDevStr(const virDomainDef *domainDef, int qemuBuildControllerDevStr(const virDomainDef *domainDef,
......
...@@ -388,7 +388,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, ...@@ -388,7 +388,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data, priv->qemuCaps) < 0) if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data, priv->qemuCaps) < 0)
goto error; goto error;
if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) if (!(devstr = qemuBuildDiskDeviceStr(vm->def, disk, 0, priv->qemuCaps)))
goto error; goto error;
if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册