[libvirt] [PATCH v2.1 03/11] qemu: Introduce nbd-server-start command
This will be used with new migration scheme.
This patch creates basically just monitor stub
functions. Wiring them into something useful
is done in later patches.
---
src/qemu/qemu_monitor.c | 22 ++++++++++++++++++++
src/qemu/qemu_monitor.h | 3 +++
src/qemu/qemu_monitor_json.c | 49 ++++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_monitor_json.h | 3 +++
4 files changed, 77 insertions(+)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 131e8df..eab833f 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3320,3 +3320,25 @@ char *qemuMonitorGetTargetArch(qemuMonitorPtr mon)
return qemuMonitorJSONGetTargetArch(mon);
}
+
+int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
+ const char *host,
+ unsigned int port)
+{
+ VIR_DEBUG("mon=%p host=%s port=%u",
+ mon, host, port);
+
+ if (!mon) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("monitor must not be NULL"));
+ return -1;
+ }
+
+ if (!mon->json) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("JSON monitor is required"));
+ return -1;
+ }
+
+ return qemuMonitorJSONNBDServerStart(mon, host, port);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index dbfab88..eb069ed 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -631,6 +631,9 @@ int qemuMonitorGetObjectProps(qemuMonitorPtr mon,
char ***props);
char *qemuMonitorGetTargetArch(qemuMonitorPtr mon);
+int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
+ const char *host,
+ unsigned int port);
/**
* When running two dd process and using <> redirection, we need a
* shell that will not truncate files. These two strings serve that
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0cd66b6..545285d 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4273,3 +4273,52 @@ cleanup:
virJSONValueFree(reply);
return ret;
}
+
+int
+qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
+ const char *host,
+ unsigned int port)
+{
+ int ret = -1;
+ virJSONValuePtr cmd = NULL;
+ virJSONValuePtr reply = NULL;
+ virJSONValuePtr data = NULL;
+ virJSONValuePtr addr = NULL;
+ char *port_str = NULL;
+
+ if (!(data = virJSONValueNewObject()) ||
+ !(addr = virJSONValueNewObject()) ||
+ virAsprintf(&port_str, "%d", port) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (virJSONValueObjectAppendString(data, "host", host) < 0 ||
+ virJSONValueObjectAppendString(data, "port", port_str) < 0 ||
+ virJSONValueObjectAppendString(addr, "type", "inet") < 0
||
+ virJSONValueObjectAppend(addr, "data", data) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-start",
+ "a:addr", addr,
+ NULL)))
+ goto cleanup;
+
+ if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+ goto cleanup;
+
+ if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+ goto cleanup;
+
+ ret = 0;
+
+cleanup:
+ VIR_FREE(port_str);
+ virJSONValueFree(reply);
+ virJSONValueFree(cmd);
+ virJSONValueFree(addr);
+ virJSONValueFree(data);
+ return ret;
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index acca4ec..0e43e39 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -324,4 +324,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
+int qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
+ const char *host,
+ unsigned int port);
#endif /* QEMU_MONITOR_JSON_H */
--
1.8.0.2