Now that everything was replaced by the new code we can remove this function. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- src/libvirt_private.syms | 1 - src/util/virqemu.c | 30 ------------------------------ src/util/virqemu.h | 4 ---- 3 files changed, 35 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a58f2e4552..cffd3d638c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3120,7 +3120,6 @@ virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildCommandLineJSONArrayObjectsStr; virQEMUBuildDriveCommandlineFromJSON; -virQEMUBuildNetdevCommandlineFromJSON; # util/virrandom.h diff --git a/src/util/virqemu.c b/src/util/virqemu.c index ff6e13b963..8119643431 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -283,36 +283,6 @@ virQEMUBuildCommandLineJSON(virJSONValue *value, } -/** - * virQEMUBuildNetdevCommandlineFromJSON: - * @props: JSON properties describing a netdev - * @rawjson: don't transform to commandline args, but just stringify json - * - * Converts @props into arguments for -netdev including all the quirks and - * differences between the monitor and command line syntax. - * - * @rawjson is meant for testing of the schema in the xml2argvtest - */ -char * -virQEMUBuildNetdevCommandlineFromJSON(virJSONValue *props, - bool rawjson) -{ - const char *type = virJSONValueObjectGetString(props, "type"); - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - - if (rawjson) - return virJSONValueToString(props, false); - - virBufferAsprintf(&buf, "%s,", type); - - if (virQEMUBuildCommandLineJSON(props, &buf, "type", - virQEMUBuildCommandLineJSONArrayObjectsStr) < 0) - return NULL; - - return virBufferContentAndReset(&buf); -} - - char * virQEMUBuildDriveCommandlineFromJSON(virJSONValue *srcdef) { diff --git a/src/util/virqemu.h b/src/util/virqemu.h index b1fc3c8323..5098ed7653 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -48,10 +48,6 @@ int virQEMUBuildCommandLineJSON(virJSONValue *value, const char *skipKey, virQEMUBuildCommandLineJSONArrayFormatFunc array); -char * -virQEMUBuildNetdevCommandlineFromJSON(virJSONValue *props, - bool rawjson); - char *virQEMUBuildDriveCommandlineFromJSON(virJSONValue *src); void virQEMUBuildBufferEscapeComma(virBuffer *buf, const char *str); -- 2.31.1