[libvirt] [PATCH 0/2] qemu: Assume presence of 'set_password' and 'expire_password'
Remove some dead code. Peter Krempa (2): qemu: Assume that 'set_password' and 'expire_password' are supported qemu: monitor: Remove unused qemuMonitor(JSON)SetVNCPassword src/qemu/qemu_hotplug.c | 20 ------------------- src/qemu/qemu_monitor.c | 16 ---------------- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 37 ------------------------------------ src/qemu/qemu_monitor_json.h | 2 -- tests/qemumonitorjsontest.c | 2 -- 6 files changed, 79 deletions(-) -- 2.20.1
They were added in qemu commit 7572150c189c6553c2448334116ab717680de66d released in v0.14.0. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_hotplug.c | 20 -------------------- src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 12 ------------ 3 files changed, 33 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c1d2d00016..c7c9a584f2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4227,15 +4227,6 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, goto cleanup; ret = qemuMonitorSetPassword(priv->mon, type, password, connected); - if (ret == -2) { - if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Graphics password only supported for VNC")); - ret = -1; - } else { - ret = qemuMonitorSetVNCPassword(priv->mon, password); - } - } if (ret != 0) goto end_job; @@ -4252,17 +4243,6 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, ret = qemuMonitorExpirePassword(priv->mon, type, expire); - if (ret == -2) { - /* XXX we could fake this with a timer */ - if (auth->expires) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expiry of passwords is not supported")); - ret = -1; - } else { - ret = 0; - } - } - end_job: if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0eb7f60e38..d406ecfab3 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2395,7 +2395,6 @@ qemuMonitorTypeToProtocol(int type) } -/* Returns -2 if not supported with this monitor connection */ int qemuMonitorSetPassword(qemuMonitorPtr mon, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5c16e1f3a1..77c1eaa335 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2781,7 +2781,6 @@ int qemuMonitorJSONSetVNCPassword(qemuMonitorPtr mon, return ret; } -/* Returns -1 on error, -2 if not supported */ int qemuMonitorJSONSetPassword(qemuMonitorPtr mon, const char *protocol, const char *password, @@ -2800,11 +2799,6 @@ int qemuMonitorJSONSetPassword(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { - ret = -2; - goto cleanup; - } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; @@ -2815,7 +2809,6 @@ int qemuMonitorJSONSetPassword(qemuMonitorPtr mon, return ret; } -/* Returns -1 on error, -2 if not supported */ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, const char *protocol, const char *expire_time) @@ -2832,11 +2825,6 @@ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { - ret = -2; - goto cleanup; - } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; -- 2.20.1
On Tue, Mar 26, 2019 at 01:03:03PM +0100, Peter Krempa wrote:
They were added in qemu commit 7572150c189c6553c2448334116ab717680de66d released in v0.14.0.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_hotplug.c | 20 -------------------- src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 12 ------------ 3 files changed, 33 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c1d2d00016..c7c9a584f2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4227,15 +4227,6 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, goto cleanup; ret = qemuMonitorSetPassword(priv->mon, type, password, connected);
- if (ret == -2) { - if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Graphics password only supported for VNC")); - ret = -1; - } else { - ret = qemuMonitorSetVNCPassword(priv->mon, password); - } - } if (ret != 0) goto end_job;
@@ -4252,17 +4243,6 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
ret = qemuMonitorExpirePassword(priv->mon, type, expire);
- if (ret == -2) { - /* XXX we could fake this with a timer */
Thankfully we never did.
- if (auth->expires) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expiry of passwords is not supported")); - ret = -1; - } else { - ret = 0; - } - } - end_job: if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1;
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@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
On Tue, Mar 26, 2019 at 01:03:04PM +0100, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@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(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Tue, 2019-03-26 at 13:03 +0100, Peter Krempa wrote:
Remove some dead code.
Peter Krempa (2): qemu: Assume that 'set_password' and 'expire_password' are supported qemu: monitor: Remove unused qemuMonitor(JSON)SetVNCPassword
src/qemu/qemu_hotplug.c | 20 ------------------- src/qemu/qemu_monitor.c | 16 ---------------- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 37 ------------------------------------ src/qemu/qemu_monitor_json.h | 2 -- tests/qemumonitorjsontest.c | 2 -- 6 files changed, 79 deletions(-)
For both patches, Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
participants (3)
-
Andrea Bolognani -
Ján Tomko -
Peter Krempa