From nobody Sun May 19 17:22:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615460208; cv=none; d=zohomail.com; s=zohoarc; b=EuaRFz0O/OJi7NFbhwAqrBd6ar3JGsTLtcXBQ5kLoconiJPL6xUydulKMzTo3R4jjDU0Hz4sZnZOplKmdVRBM0Nz57ZtHQVUJFAs05vM0fNPZAwtW2gmlh+0hlC/vR+Djs6BwvDvd+I6syWi/YS6sg0yd7QYs7lDZLcLZb04P+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615460208; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ecgWIaPKkLwqNe29eY5dYdw/nnpZZYg2Si5Q2fH9qcE=; b=dBSHnY1hkz6+gZ1fOF865BU0MifX8Qm06kC6r8MbEhB+37WywkZpAILabmUcjcQT3AAi81oyZTbtQZIPA6/8GKuBRJ4lqsPbOKF9MSTgvlgYcyoQY22IfNbY+ibfDnKBMtqSYHgw46MG6NBRPX9RReX4GlaF3y6vU9IE69TAzzA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615460208780959.7684444472638; Thu, 11 Mar 2021 02:56:48 -0800 (PST) Received: from localhost ([::1]:59516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKIzn-0002IN-I8 for importer@patchew.org; Thu, 11 Mar 2021 05:56:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIy3-0000nR-Bo for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:54:59 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:4388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIxz-00028I-J3 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:54:59 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Dx5Q131SJz17Jfh; Thu, 11 Mar 2021 18:52:57 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.498.0; Thu, 11 Mar 2021 18:54:39 +0800 From: Zihao Chang To: Subject: [PATCH v5 1/3] crypto: add reload for QCryptoTLSCredsClass Date: Thu, 11 Mar 2021 18:54:22 +0800 Message-ID: <20210311105424.1370-2-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210311105424.1370-1-changzihao1@huawei.com> References: <20210311105424.1370-1-changzihao1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=changzihao1@huawei.com; helo=szxga04-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, yebiaoxiang@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch adds reload interface for QCryptoTLSCredsClass and implements the interface for QCryptoTLSCredsX509. Signed-off-by: Zihao Chang --- crypto/tlscredsx509.c | 117 ++++++++++++++++++++++++++++++++++++++ include/crypto/tlscreds.h | 8 ++- 2 files changed, 122 insertions(+), 3 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index dbadad4df28e..6b57f14f2df1 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -23,8 +23,10 @@ #include "tlscredspriv.h" #include "crypto/secret.h" #include "qapi/error.h" +#include "qapi/qmp/qstring.h" #include "qemu/module.h" #include "qom/object_interfaces.h" +#include "qom/qom-qobject.h" #include "trace.h" =20 =20 @@ -770,6 +772,118 @@ qcrypto_tls_creds_x509_prop_get_sanity(Object *obj, } =20 =20 +#ifdef CONFIG_GNUTLS + + +/* + * object_property_get_qobject() return "" for NULL QString, + * set NULL QString prop as "" is unsafe. + */ +static bool +qcrypto_tls_creds_x509_need_set_prop(QObject *qobj) +{ + QString *qstring =3D qobject_to(QString, qobj); + /* prop type is not QString. */ + if (!qstring) { + return true; + } + + return strlen(qstring_get_str(qstring)) > 0; +} + + +static bool +qcrypto_tls_creds_x509_copy_propertites(Object *new, + Object *old, + Error **errp) +{ + ObjectProperty *prop =3D NULL; + ObjectPropertyIterator iter; + Error *local_err =3D NULL; + + object_property_iter_init(&iter, old); + while ((prop =3D object_property_iter_next(&iter))) { + QObject *value =3D NULL; + /* "loaded" depends on other props, copy it finally. */ + if (g_strcmp0(prop->name, "loaded") =3D=3D 0) { + continue; + } + + /* prop do not support set. */ + if (!prop->set) { + continue; + } + + value =3D object_property_get_qobject(old, prop->name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return false; + } + + if (qcrypto_tls_creds_x509_need_set_prop(value)) { + object_property_set_qobject(new, prop->name, value, &local_err= ); + if (local_err) { + error_propagate(errp, local_err); + qobject_unref(value); + return false; + } + } + qobject_unref(value); + } + + return true; +} + + +static bool +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + Object *old =3D OBJECT(creds); + QCryptoTLSCredsX509 *old_x509 =3D QCRYPTO_TLS_CREDS_X509(creds); + Object *new =3D object_new(TYPE_QCRYPTO_TLS_CREDS_X509); + QCryptoTLSCredsX509 *new_x509 =3D QCRYPTO_TLS_CREDS_X509(new); + Error *local_err =3D NULL; + bool ret =3D false; + + if (!qcrypto_tls_creds_x509_copy_propertites(new, old, &local_err)) { + error_propagate(errp, local_err); + goto out; + } + + qcrypto_tls_creds_x509_load(new_x509, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + + /* load new cert successfully, release old data and update */ + qcrypto_tls_creds_x509_unload(old_x509); + old_x509->data =3D new_x509->data; + old_x509->parent_obj.dh_params =3D new_x509->parent_obj.dh_params; + new_x509->data =3D NULL; + new_x509->parent_obj.dh_params =3D NULL; + + ret =3D true; + + out: + object_unref(new); + return ret; +} + + +#else /* ! CONFIG_GNUTLS */ + + +static bool +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + return false; +} + + +#endif /* ! CONFIG_GNUTLS */ + + static void qcrypto_tls_creds_x509_complete(UserCreatable *uc, Error **errp) { @@ -800,6 +914,9 @@ static void qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + QCryptoTLSCredsClass *ctcc =3D QCRYPTO_TLS_CREDS_CLASS(oc); + + ctcc->reload =3D qcrypto_tls_creds_x509_reload; =20 ucc->complete =3D qcrypto_tls_creds_x509_complete; =20 diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index 079e37604784..d0808e391e91 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -30,14 +30,15 @@ =20 #define TYPE_QCRYPTO_TLS_CREDS "tls-creds" typedef struct QCryptoTLSCreds QCryptoTLSCreds; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCreds, QCRYPTO_TLS_CREDS, - TYPE_QCRYPTO_TLS_CREDS) - typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass; +DECLARE_OBJ_CHECKERS(QCryptoTLSCreds, QCryptoTLSCredsClass, QCRYPTO_TLS_CR= EDS, + TYPE_QCRYPTO_TLS_CREDS) + =20 #define QCRYPTO_TLS_CREDS_DH_PARAMS "dh-params.pem" =20 =20 +typedef bool (*CryptoTLSCredsReload)(QCryptoTLSCreds *, Error **); /** * QCryptoTLSCreds: * @@ -61,6 +62,7 @@ struct QCryptoTLSCreds { =20 struct QCryptoTLSCredsClass { ObjectClass parent_class; + CryptoTLSCredsReload reload; }; =20 =20 --=20 2.28.0 From nobody Sun May 19 17:22:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615460343; cv=none; d=zohomail.com; s=zohoarc; b=h9svWIIVPI98lCxvqb96FClpawTbj6LIQsIa9n5HgpcN1g/WVeDNbVCGjeHWsc6WUzOn84hv8qXIZXwAoR88aGtG/b+JrBPXbjouCqiAdUDIZeSxcApyo8XqM96CIGk940NeeVQD5/9sMWNzrFsYxDSJiPVreaXGiwp7uLXpkhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615460343; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MoEeb+ZhDTbsQq8tnvc6omLx7BcTX9koxUVnDvsBdaY=; b=i8HH5frbzpH70Qx/JnoqI+zR2tSk74ZPxa3uEG2dKd7a2Nc/apaZ1Yhs44wyExZY5OQcNI5NqMxRi3hYdFP26SBJGtMZOW0WlIKtuY7giIvmNeMFQHWMbdKZ8Zrw9jxdqCdpk4E+l2VeVHPmXbKmITGaSWu/a49dJUn3HPX5NQI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16154603434011004.8914022992109; Thu, 11 Mar 2021 02:59:03 -0800 (PST) Received: from localhost ([::1]:35948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKJ1y-0004KJ-9s for importer@patchew.org; Thu, 11 Mar 2021 05:59:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIy3-0000nK-3b for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:54:59 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIxz-0002AI-IG for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:54:58 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Dx5PY5yz2zNl8Q; Thu, 11 Mar 2021 18:52:33 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.498.0; Thu, 11 Mar 2021 18:54:40 +0800 From: Zihao Chang To: Subject: [PATCH v5 2/3] vnc: support reload x509 certificates for vnc Date: Thu, 11 Mar 2021 18:54:23 +0800 Message-ID: <20210311105424.1370-3-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210311105424.1370-1-changzihao1@huawei.com> References: <20210311105424.1370-1-changzihao1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=changzihao1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, yebiaoxiang@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch add vnc_display_reload_certs() to support update x509 certificates. Signed-off-by: Zihao Chang Reviewed-by: Daniel P. Berrang=C3=A9 --- include/ui/console.h | 1 + ui/vnc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index c960b7066ccd..2714038a0fae 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -476,6 +476,7 @@ int vnc_display_password(const char *id, const char *pa= ssword); int vnc_display_pw_expire(const char *id, time_t expires); void vnc_parse(const char *str); int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); +bool vnc_display_reload_certs(const char *id, Error **errp); =20 /* input.c */ int index_from_key(const char *key, size_t key_length); diff --git a/ui/vnc.c b/ui/vnc.c index 310abc937812..381e21a87563 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -584,6 +584,34 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) return prev; } =20 +bool vnc_display_reload_certs(const char *id, Error **errp) +{ + VncDisplay *vd =3D vnc_display_find(id); + QCryptoTLSCredsClass *creds =3D NULL; + + if (!vd) { + error_setg(errp, "Can not find vnc display"); + return false; + } + + if (!vd->tlscreds) { + error_setg(errp, "vnc tls is not enable"); + return false; + } + + creds =3D QCRYPTO_TLS_CREDS_GET_CLASS(OBJECT(vd->tlscreds)); + if (creds->reload =3D=3D NULL) { + error_setg(errp, "%s doesn't support to reload TLS credential", + object_get_typename(OBJECT(vd->tlscreds))); + return false; + } + if (!creds->reload(vd->tlscreds, errp)) { + return false; + } + + return true; +} + /* TODO 1) Get the queue working for IO. 2) there is some weirdness when using the -S option (the screen is grey --=20 2.28.0 From nobody Sun May 19 17:22:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615460209; cv=none; d=zohomail.com; s=zohoarc; b=O9312V83ZWJkHL8qBhlsod756yH08+HuwP0VxNHiEn62+S/tD3AprN7mup6u2IMtzfwxdHfpMBb2HH9uNytJmqXvmSWa/jACxokMqGznXMnOx4nvcwvLuOriiOp0n59h/xTfq7aicwrvFjzM2LD9w6kw9N5ysDXRUrdsggar6pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615460209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vQpnkehK19M2E8dbjm4/C3Q/BXvD/uIo030J7hITXEI=; b=IdlXS+qGA55JmKoIKomyHkZ0KrA3SffeLpKZgQE0NqXRYCejsf+KiXBCJpy9VYdFbQ9wV4pEgu2Msbx5QWdmJL7ru63rX+k/FTOAuOhdySAy1ixSomDjIOmFNvN/lQw7Ip2QHJmSM31PCXISRIebTAoP/g5KwYCeAyG4i/uDRrc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615460209363359.5722133657871; Thu, 11 Mar 2021 02:56:49 -0800 (PST) Received: from localhost ([::1]:59602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKIzo-0002KU-8z for importer@patchew.org; Thu, 11 Mar 2021 05:56:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIy4-0000nT-2j for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:55:00 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKIxz-0002AJ-Iz for qemu-devel@nongnu.org; Thu, 11 Mar 2021 05:54:59 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Dx5PY6HvmzNl8p; Thu, 11 Mar 2021 18:52:33 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.498.0; Thu, 11 Mar 2021 18:54:41 +0800 From: Zihao Chang To: Subject: [PATCH v5 3/3] qmp: add new qmp display-reload Date: Thu, 11 Mar 2021 18:54:24 +0800 Message-ID: <20210311105424.1370-4-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210311105424.1370-1-changzihao1@huawei.com> References: <20210311105424.1370-1-changzihao1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=changzihao1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, yebiaoxiang@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch provides a new qmp to reload display configuration without restart VM, but only reloading the vnc tls certificates is implemented. Example: {"execute": "display-reload", "arguments":{"vnc-tls-certs": true}} Signed-off-by: Zihao Chang --- monitor/qmp-cmds.c | 13 +++++++++++++ qapi/ui.json | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index c7df8c0ee268..0f791f974f30 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -334,3 +334,16 @@ MemoryInfo *qmp_query_memory_size_summary(Error **errp) =20 return mem_info; } + +void qmp_display_reload(bool has_vnc_tls_certs, bool vnc_tls_certs, + Error **errp) +{ + Error *local_err =3D NULL; + + if (has_vnc_tls_certs && vnc_tls_certs) { + if (!vnc_display_reload_certs(NULL, &local_err)) { + error_propagate(errp, local_err); + return; + } + } +} diff --git a/qapi/ui.json b/qapi/ui.json index d08d72b43923..97b38aa1666e 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1179,3 +1179,22 @@ ## { 'command': 'query-display-options', 'returns': 'DisplayOptions' } + +## +# @display-reload: +# +# Reload display configuration +# +# Returns: Nothing on success +# +# Since: 6.0 +# +# Example: +# +# -> { "execute": "display-reload", +# "arguments": { "vnc-tls-certs": true } } +# <- { "return": {} } +# +## +{ 'command': 'display-reload', + 'data': { '*vnc-tls-certs': 'bool' } } --=20 2.28.0