[libvirt] [PATCH 2/2] qemu: monitor: Remove unused qemuMonitor(JSON)SetVNCPassword
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 15 ---------------
src/qemu/qemu_monitor.h | 2 --
src/qemu/qemu_monitor_json.c | 25 -------------------------
src/qemu/qemu_monitor_json.h | 2 --
tests/qemumonitorjsontest.c | 2 --
5 files changed, 46 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index d406ecfab3..babcbde878 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2363,21 +2363,6 @@ qemuMonitorBlockResize(qemuMonitorPtr mon,
}
-int
-qemuMonitorSetVNCPassword(qemuMonitorPtr mon,
- const char *password)
-{
- VIR_DEBUG("password=%p", password);
-
- QEMU_CHECK_MONITOR(mon);
-
- if (!password)
- password = "";
-
- return qemuMonitorJSONSetVNCPassword(mon, password);
-}
-
-
static const char *
qemuMonitorTypeToProtocol(int type)
{
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index fd7dcc9196..086195ff98 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -634,8 +634,6 @@ int qemuMonitorBlockResize(qemuMonitorPtr mon,
const char *device,
const char *nodename,
unsigned long long size);
-int qemuMonitorSetVNCPassword(qemuMonitorPtr mon,
- const char *password);
int qemuMonitorSetPassword(qemuMonitorPtr mon,
int type,
const char *password,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 77c1eaa335..743a88b914 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2755,31 +2755,6 @@ int qemuMonitorJSONBlockResize(qemuMonitorPtr mon,
return ret;
}
-int qemuMonitorJSONSetVNCPassword(qemuMonitorPtr mon,
- const char *password)
-{
- int ret = -1;
- virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("change",
- "s:device",
"vnc",
- "s:target",
"password",
- "s:arg", password,
- NULL);
- virJSONValuePtr reply = NULL;
- if (!cmd)
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- goto cleanup;
-
- if (qemuMonitorJSONCheckError(cmd, reply) < 0)
- goto cleanup;
-
- ret = 0;
- cleanup:
- virJSONValueFree(cmd);
- virJSONValueFree(reply);
- return ret;
-}
int qemuMonitorJSONSetPassword(qemuMonitorPtr mon,
const char *protocol,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 62772228fe..c10513da15 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -98,8 +98,6 @@ int qemuMonitorJSONBlockResize(qemuMonitorPtr mon,
const char *nodename,
unsigned long long size);
-int qemuMonitorJSONSetVNCPassword(qemuMonitorPtr mon,
- const char *password);
int qemuMonitorJSONSetPassword(qemuMonitorPtr mon,
const char *protocol,
const char *password,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 1a8a31717f..055e201611 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1322,7 +1322,6 @@ cleanup: \
GEN_TEST_FUNC(qemuMonitorJSONSetLink, "vnet0",
VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN)
GEN_TEST_FUNC(qemuMonitorJSONBlockResize, "vda", "asdf", 123456)
-GEN_TEST_FUNC(qemuMonitorJSONSetVNCPassword, "secret_password")
GEN_TEST_FUNC(qemuMonitorJSONSetPassword, "spice", "secret_password",
"disconnect")
GEN_TEST_FUNC(qemuMonitorJSONExpirePassword, "spice", "123456")
GEN_TEST_FUNC(qemuMonitorJSONSetBalloon, 1024)
@@ -2974,7 +2973,6 @@ mymain(void)
DO_TEST_SIMPLE("rtc-reset-reinjection",
qemuMonitorJSONRTCResetReinjection);
DO_TEST_GEN(qemuMonitorJSONSetLink);
DO_TEST_GEN(qemuMonitorJSONBlockResize);
- DO_TEST_GEN(qemuMonitorJSONSetVNCPassword);
DO_TEST_GEN(qemuMonitorJSONSetPassword);
DO_TEST_GEN(qemuMonitorJSONExpirePassword);
DO_TEST_GEN(qemuMonitorJSONSetBalloon);
--
2.20.1