External/libvirt
1
0
Fork 0
Code

qemuBlockGetBackingStoreString: Add 'pretty' argument

Browse Source 
Add support for pretty-printing of the JSON variant of the output for
consumption in tests. All current callers pass 'false'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-23 11:48:10 +01:00
parent fed97cb435
commit a83c1dc70e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_block.c
View File

@ -2027,13 +2027,15 @@ qemuBlockStorageGetCopyOnReadProps(virDomainDiskDefPtr disk)
/** /**
* qemuBlockGetBackingStoreString: * qemuBlockGetBackingStoreString:
* @src: storage source to get the string for * @src: storage source to get the string for
* @pretty: pretty-print the JSON (if applicable, used by tests)
* *
* Formats a string used in the backing store field of a disk image which * Formats a string used in the backing store field of a disk image which
* supports backing store. Non-local storage may result in use of the json: * supports backing store. Non-local storage may result in use of the json:
* pseudo protocol for any complex configuration. * pseudo protocol for any complex configuration.
*/ */
char * char *
qemuBlockGetBackingStoreString(virStorageSourcePtr src) qemuBlockGetBackingStoreString(virStorageSourcePtr src,
bool pretty)
{ {
int actualType = virStorageSourceGetActualType(src); int actualType = virStorageSourceGetActualType(src);
g_autoptr(virJSONValue) backingProps = NULL; g_autoptr(virJSONValue) backingProps = NULL;
@ -2100,7 +2102,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src)
props = sliceProps; props = sliceProps;
} }
if (!(backingJSON = virJSONValueToString(props, false))) if (!(backingJSON = virJSONValueToString(props, pretty)))
return NULL; return NULL;
ret = g_strdup_printf("json:%s", backingJSON); ret = g_strdup_printf("json:%s", backingJSON);
@ -2128,7 +2130,7 @@ qemuBlockStorageSourceCreateAddBacking(virStorageSourcePtr backing,
backingFormatStr = virStorageFileFormatTypeToString(backing->format); backingFormatStr = virStorageFileFormatTypeToString(backing->format);
} }
if (!(backingFileStr = qemuBlockGetBackingStoreString(backing))) if (!(backingFileStr = qemuBlockGetBackingStoreString(backing, false)))
return -1; return -1;
if (virJSONValueObjectAdd(props, if (virJSONValueObjectAdd(props,

3
src/qemu/qemu_block.h
View File

@ -178,7 +178,8 @@ qemuBlockSnapshotAddBlockdev(virJSONValuePtr actions,
virStorageSourcePtr newsrc); virStorageSourcePtr newsrc);
char * char *
qemuBlockGetBackingStoreString(virStorageSourcePtr src) qemuBlockGetBackingStoreString(virStorageSourcePtr src,
bool pretty)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
int int

4
src/qemu/qemu_driver.c
View File

@ -17499,7 +17499,7 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm,
if (baseSource) { if (baseSource) {
nodebase = baseSource->nodeformat; nodebase = baseSource->nodeformat;
if (!backingPath && if (!backingPath &&
!(backingPath = qemuBlockGetBackingStoreString(baseSource))) !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
goto endjob; goto endjob;
} }
device = disk->src->nodeformat; device = disk->src->nodeformat;
@ -18667,7 +18667,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
nodebase = baseSource->nodeformat; nodebase = baseSource->nodeformat;
device = qemuDomainDiskGetTopNodename(disk); device = qemuDomainDiskGetTopNodename(disk);
if (!backingPath && top_parent && if (!backingPath && top_parent &&
!(backingPath = qemuBlockGetBackingStoreString(baseSource))) !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
goto endjob; goto endjob;
if (bitmapDisableActions) { if (bitmapDisableActions) {