82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
From b9ff1a5a81df23f0a138a7f6d7d3ab0654f669e2 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Thu, 14 May 2020 10:10:16 +0200
|
|
Subject: [PATCH 03/18] util: virqemu: Introduce
|
|
virQEMUBuildNetdevCommandlineFromJSON
|
|
|
|
In preparation for converting the generator of -netdev to generate JSON
|
|
which will be used to do the command line rather than the other way
|
|
around we need to introduce a convertor which properly configures
|
|
virQEMUBuildCommandLineJSON for the quirks of -netdev.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
---
|
|
src/libvirt_private.syms | 1 +
|
|
src/util/virqemu.c | 22 ++++++++++++++++++++++
|
|
src/util/virqemu.h | 3 +++
|
|
3 files changed, 26 insertions(+)
|
|
|
|
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
index bac96e140e..84f3bd57ca 100644
|
|
--- a/src/libvirt_private.syms
|
|
+++ b/src/libvirt_private.syms
|
|
@@ -2902,6 +2902,7 @@ virQEMUBuildCommandLineJSON;
|
|
virQEMUBuildCommandLineJSONArrayBitmap;
|
|
virQEMUBuildCommandLineJSONArrayNumbered;
|
|
virQEMUBuildDriveCommandlineFromJSON;
|
|
+virQEMUBuildNetdevCommandlineFromJSON;
|
|
virQEMUBuildObjectCommandlineFromJSON;
|
|
virQEMUBuildQemuImgKeySecretOpts;
|
|
|
|
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
|
|
index 549f88fcd5..0f8cab29df 100644
|
|
--- a/src/util/virqemu.c
|
|
+++ b/src/util/virqemu.c
|
|
@@ -252,6 +252,28 @@ virQEMUBuildCommandLineJSON(virJSONValuePtr value,
|
|
}
|
|
|
|
|
|
+/**
|
|
+ * virQEMUBuildNetdevCommandlineFromJSON:
|
|
+ * @props: JSON properties describing a netdev
|
|
+ *
|
|
+ * Converts @props into arguments for -netdev including all the quirks and
|
|
+ * differences between the monitor and command line syntax.
|
|
+ */
|
|
+char *
|
|
+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props)
|
|
+{
|
|
+ const char *type = virJSONValueObjectGetString(props, "type");
|
|
+ g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
|
+
|
|
+ virBufferAsprintf(&buf, "%s,", type);
|
|
+
|
|
+ if (virQEMUBuildCommandLineJSON(props, &buf, "type", true, NULL) < 0)
|
|
+ return NULL;
|
|
+
|
|
+ return virBufferContentAndReset(&buf);
|
|
+}
|
|
+
|
|
+
|
|
static int
|
|
virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
|
|
const char *type,
|
|
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
|
|
index 67a5711613..22f47851df 100644
|
|
--- a/src/util/virqemu.h
|
|
+++ b/src/util/virqemu.h
|
|
@@ -49,6 +49,9 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
|
|
bool onOff,
|
|
virQEMUBuildCommandLineJSONArrayFormatFunc array);
|
|
|
|
+char *
|
|
+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props);
|
|
+
|
|
int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
|
|
virJSONValuePtr objprops);
|
|
|
|
--
|
|
2.23.0.windows.1
|
|
|