diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 15602e30db..b9e57a6f4c 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -53,8 +53,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey G_GNUC_UNUSED) + virBuffer *buf) { ssize_t pos = -1; ssize_t end; @@ -90,8 +89,7 @@ virQEMUBuildCommandLineJSONArrayBitmap(const char *key, int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey) + virBuffer *buf) { virJSONValue *member; size_t i; @@ -102,7 +100,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member = virJSONValueArrayGet((virJSONValue *) array, i); prefix = g_strdup_printf("%s.%zu", key, i); - if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey, + if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, NULL, virQEMUBuildCommandLineJSONArrayNumbered, true) < 0) return 0; @@ -127,8 +125,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey G_GNUC_UNUSED) + virBuffer *buf) { g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER; size_t i; @@ -221,7 +218,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, 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 * for each member */ for (i = 0; i < virJSONValueArraySize(value); i++) { diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 472f24de53..be083d7545 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -28,20 +28,16 @@ typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey); + virBuffer *buf); int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey); + virBuffer *buf); int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey); + virBuffer *buf); int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, - virBuffer *buf, - const char *skipKey); + virBuffer *buf); int virQEMUBuildCommandLineJSON(virJSONValue *value, virBuffer *buf,