提交 9629fe25 编写于 作者: J John Ferlan

storage_util: Rename virQEMUBuildLuksOpts

Rename to storageBackendCreateQemuImgOpts - which is what it's doing.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 8fc9949c
...@@ -2596,8 +2596,8 @@ virQEMUBuildCommandLineJSON; ...@@ -2596,8 +2596,8 @@ virQEMUBuildCommandLineJSON;
virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayBitmap;
virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildCommandLineJSONArrayNumbered;
virQEMUBuildDriveCommandlineFromJSON; virQEMUBuildDriveCommandlineFromJSON;
virQEMUBuildLuksOpts;
virQEMUBuildObjectCommandlineFromJSON; virQEMUBuildObjectCommandlineFromJSON;
virQEMUBuildQemuImgKeySecretOpts;
# util/virrandom.h # util/virrandom.h
......
...@@ -823,7 +823,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDefPtr enc, ...@@ -823,7 +823,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDefPtr enc,
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
if (info.format == VIR_STORAGE_FILE_RAW && enc) { if (info.format == VIR_STORAGE_FILE_RAW && enc) {
virQEMUBuildLuksOpts(&buf, enc, info.secretAlias); virQEMUBuildQemuImgKeySecretOpts(&buf, enc, info.secretAlias);
} else { } else {
if (info.backingPath) if (info.backingPath)
virBufferAsprintf(&buf, "backing_fmt=%s,", virBufferAsprintf(&buf, "backing_fmt=%s,",
......
...@@ -303,7 +303,7 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str) ...@@ -303,7 +303,7 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str)
/** /**
* virQEMUBuildLuksOpts: * virQEMUBuildQemuImgKeySecretOpts:
* @buf: buffer to build the string into * @buf: buffer to build the string into
* @enc: pointer to encryption info * @enc: pointer to encryption info
* @alias: alias to use * @alias: alias to use
...@@ -323,7 +323,7 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str) ...@@ -323,7 +323,7 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str)
* *
*/ */
void void
virQEMUBuildLuksOpts(virBufferPtr buf, virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
virStorageEncryptionInfoDefPtr enc, virStorageEncryptionInfoDefPtr enc,
const char *alias) const char *alias)
{ {
......
...@@ -50,7 +50,7 @@ char *virQEMUBuildObjectCommandlineFromJSON(const char *type, ...@@ -50,7 +50,7 @@ char *virQEMUBuildObjectCommandlineFromJSON(const char *type,
char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src); char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src);
void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str); void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str);
void virQEMUBuildLuksOpts(virBufferPtr buf, void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
virStorageEncryptionInfoDefPtr enc, virStorageEncryptionInfoDefPtr enc,
const char *alias) const char *alias)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册