[libvirt] [PATCH v3 RESEND 04/12] qemu: Introduce nbd-server-add 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 | 25 +++++++++++++++++++++++++
src/qemu/qemu_monitor_json.h | 3 +++
4 files changed, 53 insertions(+)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index c7aa6d0..5abd9d0 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3405,3 +3405,25 @@ int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
return qemuMonitorJSONNBDServerStart(mon, host, port);
}
+
+int qemuMonitorNBDServerAdd(qemuMonitorPtr mon,
+ const char *deviceID,
+ bool writable)
+{
+ VIR_DEBUG("mon=%p deviceID=%s",
+ mon, deviceID);
+
+ if (!mon) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("monitor must not be NULL"));
+ return -1;
+ }
+
+ if (!mon->json) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("JSON monitor is required"));
+ return -1;
+ }
+
+ return qemuMonitorJSONNBDServerAdd(mon, deviceID, writable);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 230f920..d54d16d 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -635,6 +635,9 @@ char *qemuMonitorGetTargetArch(qemuMonitorPtr mon);
int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
const char *host,
unsigned int port);
+int qemuMonitorNBDServerAdd(qemuMonitorPtr mon,
+ const char *deviceID,
+ bool writable);
/**
* 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 e03688d..f14b597 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4415,3 +4415,28 @@ cleanup:
virJSONValueFree(data);
return ret;
}
+
+int
+qemuMonitorJSONNBDServerAdd(qemuMonitorPtr mon,
+ const char *deviceID,
+ bool writable)
+{
+ int ret = -1;
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+
+ if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-add",
+ "s:device", deviceID,
+ "b:writable", writable,
+ NULL)))
+ return ret;
+
+ ret = qemuMonitorJSONCommand(mon, cmd, &reply);
+
+ if (ret == 0)
+ ret = qemuMonitorJSONCheckError(cmd, reply);
+
+ virJSONValueFree(cmd);
+ virJSONValueFree(reply);
+ return ret;
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index a6ab68b..c58aa7d 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -330,4 +330,7 @@ char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
int qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
const char *host,
unsigned int port);
+int qemuMonitorJSONNBDServerAdd(qemuMonitorPtr mon,
+ const char *deviceID,
+ bool writable);
#endif /* QEMU_MONITOR_JSON_H */
--
1.8.0.2