External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: qemu: Remove 'skipKey' argument from virQEMUBuildCommandLineJSONArrayFormatFunc prototype

Browse Source 
Since we really only need to handle key skipping in the top level object
the caller doesn't at this point even pass it to the array formatting
helper function. Remove the unused argument.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-19 09:59:36 +01:00
parent 3bac06b278
commit ee394550df
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/virqemu.c
View File

@ -53,8 +53,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
int int
virQEMUBuildCommandLineJSONArrayBitmap(const char *key, virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf)
const char *skipKey G_GNUC_UNUSED)
{ {
ssize_t pos = -1; ssize_t pos = -1;
ssize_t end; ssize_t end;
@ -90,8 +89,7 @@ virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
int int
virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf)
const char *skipKey)
{ {
virJSONValue *member; virJSONValue *member;
size_t i; size_t i;
@ -102,7 +100,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
member = virJSONValueArrayGet((virJSONValue *) array, i); member = virJSONValueArrayGet((virJSONValue *) array, i);
prefix = g_strdup_printf("%s.%zu", key, i); prefix = g_strdup_printf("%s.%zu", key, i);
if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey, if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, NULL,
virQEMUBuildCommandLineJSONArrayNumbered, virQEMUBuildCommandLineJSONArrayNumbered,
true) < 0) true) < 0)
return 0; return 0;
@ -127,8 +125,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
int int
virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf)
const char *skipKey G_GNUC_UNUSED)
{ {
g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
@ -221,7 +218,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
return -1; return -1;
} }
if (arrayFunc(key, value, buf, NULL) < 0) { if (arrayFunc(key, value, buf) < 0) {
/* fallback, treat the array as a non-bitmap, adding the key /* fallback, treat the array as a non-bitmap, adding the key
* for each member */ * for each member */
for (i = 0; i < virJSONValueArraySize(value); i++) { for (i = 0; i < virJSONValueArraySize(value); i++) {

12
src/util/virqemu.h
View File

@ -28,20 +28,16 @@
typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key, typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf);
const char *skipKey);
int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf);
const char *skipKey);
int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, int virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf);
const char *skipKey);
int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, int virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
virJSONValue *array, virJSONValue *array,
virBuffer *buf, virBuffer *buf);
const char *skipKey);
int virQEMUBuildCommandLineJSON(virJSONValue *value, int virQEMUBuildCommandLineJSON(virJSONValue *value,
virBuffer *buf, virBuffer *buf,