[PATCH v2 2/2] vnc: add qmp to support reload vnc tls certificates

[Zihao Chang]

QEMU loads vnc tls certificates only when vm is started. This patch
provides a new qmp to reload vnc tls certificates without restart
vnc-server/VM.
{"execute": "reload-vnc-cert"}

Signed-off-by: Zihao Chang <changzih...@huawei.com>
---
 include/ui/console.h |  1 +
 monitor/qmp-cmds.c   |  5 +++++
 qapi/ui.json         | 18 ++++++++++++++++++
 ui/vnc.c             | 24 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/include/ui/console.h b/include/ui/console.h
index 5dd21976a3..60a24a8bb5 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -441,6 +441,7 @@ int vnc_display_password(const char *id, const char 
*password);
 int vnc_display_pw_expire(const char *id, time_t expires);
 QemuOpts *vnc_parse(const char *str, Error **errp);
 int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);
+void vnc_display_reload_cert(const char *id,  Error **errp);
 
 /* input.c */
 int index_from_key(const char *key, size_t key_length);
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 34f7e75b7b..84f2b74ea8 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -287,6 +287,11 @@ static void qmp_change_vnc(const char *target, bool 
has_arg, const char *arg,
         qmp_change_vnc_listen(target, errp);
     }
 }
+
+void qmp_reload_vnc_cert(Error **errp)
+{
+    vnc_display_reload_cert(NULL, errp);
+}
 #endif /* !CONFIG_VNC */
 
 void qmp_change(const char *device, const char *target,
diff --git a/qapi/ui.json b/qapi/ui.json
index d08d72b439..855b1ac007 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1179,3 +1179,21 @@
 ##
 { 'command': 'query-display-options',
   'returns': 'DisplayOptions' }
+
+##
+# @reload-vnc-cert:
+#
+# Reload certificates for vnc.
+#
+# Returns: nothing
+#
+# Since: 5.2
+#
+# Example:
+#
+# -> { "execute": "reload-vnc-cert" }
+# <- { "return": {} }
+#
+##
+{ 'command': 'reload-vnc-cert',
+  'if': 'defined(CONFIG_VNC)' }
diff --git a/ui/vnc.c b/ui/vnc.c
index 7452ac7df2..2cc88c2421 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -582,6 +582,30 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp)
     return prev;
 }
 
+void vnc_display_reload_cert(const char *id, Error **errp)
+{
+    VncDisplay *vd = vnc_display_find(id);
+    QCryptoTLSCredsClass *creds = NULL;
+
+    if (!vd) {
+        error_setg(errp, "Can not find Vnc Display");
+        return;
+    }
+
+    if (!vd->tlscreds) {
+        error_setg(errp, "Vnc tls is not enable");
+        return;
+    }
+
+    creds = QCRYPTO_TLS_CREDS_GET_CLASS(OBJECT(vd->tlscreds));
+    if (creds->reload == NULL) {
+        error_setg(errp, "%s doesn't support to reload TLS credential",
+                   object_get_typename(OBJECT(vd->tlscreds)));
+        return;
+    }
+    creds->reload(vd->tlscreds, errp);
+}
+
 /* TODO
    1) Get the queue working for IO.
    2) there is some weirdness when using the -S option (the screen is grey
-- 
2.23.0