From nobody Tue Nov 18 09:17:00 2025 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=1609744451; cv=none; d=zohomail.com; s=zohoarc; b=FTKvWgtfrcZOwyvg3xqnSBSMWuUzSFobyxInJ/5vXOJ7H2o8qTUu2dFomJvgX+uxjxz5dzyTf4rrSRy9b4IcLw38QsGqVzG8qRbqz8TfQJ1Va1fzw0T12iXwdz+7fsXeCwVsdq5cwj4EskCf/D7VsYxzyGNttA1vgBFpLWZ9RNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609744451; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=37Pyel+l79Nr69yXFpPKW/obZok7bNLLbImk+CEuJM8=; b=arMtcBUGgyIdSzTDTPrd/qUe9BCt/ghC9Bi56roGBSgvPWNYms7OL15OUxrk2Pxt5ubfYx+gVgENzEw44v0Aw/XiYe/UwpAqH630tJP8k+/2rNtzL5E5Lpfc6srgvPhdMdvBfoqQfZJXPmqWqxjAj6X1m8hfb+piz7J3tBX8/5s= 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 1609744451065125.72512664014857; Sun, 3 Jan 2021 23:14:11 -0800 (PST) Received: from localhost ([::1]:59890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwK49-0004GN-Lu for importer@patchew.org; Mon, 04 Jan 2021 02:14:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwK27-0003NH-0w for qemu-devel@nongnu.org; Mon, 04 Jan 2021 02:12:03 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:2629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwK22-0001Qo-46 for qemu-devel@nongnu.org; Mon, 04 Jan 2021 02:12:02 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4D8Rc94XN6z7Q39; Mon, 4 Jan 2021 15:10:49 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.498.0; Mon, 4 Jan 2021 15:11:33 +0800 From: Zihao Chang To: Subject: [PATCH] vnc: add qmp to support reload vnc tls certificates Date: Mon, 4 Jan 2021 15:11:28 +0800 Message-ID: <20210104071128.754-1-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 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.35; envelope-from=changzihao1@huawei.com; helo=szxga07-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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@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" QEMU loads vnc tls certificates only when vm is started. This patch provides a new qmp command to reload vnc tls certificates without restart vnc-server/VM. Signed-off-by: Zihao Chang --- include/ui/console.h | 1 + monitor/qmp-cmds.c | 7 +++++++ qapi/ui.json | 17 +++++++++++++++++ ui/vnc.c | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index 5dd21976a3..f05140b662 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -441,6 +441,7 @@ int vnc_display_password(const char *id, const char *pa= ssword); 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); +int vnc_display_reload_cert(const char *id, Error **errp); =20 /* 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..90bd08c8ed 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -287,6 +287,13 @@ static void qmp_change_vnc(const char *target, bool ha= s_arg, const char *arg, qmp_change_vnc_listen(target, errp); } } + +void qmp_reload_vnc_cert(Error **errp) +{ + if (vnc_display_reload_cert(NULL, errp) < 0) { + error_setg(errp, "Reload vnc tls cert failed"); + } +} #endif /* !CONFIG_VNC */ =20 void qmp_change(const char *device, const char *target, diff --git a/qapi/ui.json b/qapi/ui.json index d08d72b439..bc3ffdb20f 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1179,3 +1179,20 @@ ## { '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' } diff --git a/ui/vnc.c b/ui/vnc.c index 7452ac7df2..b0cfbcf47c 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -582,6 +582,26 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) return prev; } =20 +int vnc_display_reload_cert(const char *id, Error **errp) +{ + VncDisplay *vd =3D vnc_display_find(id); + + if (!vd) { + return -EINVAL; + } + + if (!vd->tlscreds) { + error_printf_unless_qmp("If you want use vnc tls please enable " + "vnc tls using '-vnc tls-creds=3D${tls-obj= -id}'.\n"); + return -EPERM; + } + + object_property_set_bool(OBJECT(vd->tlscreds), "loaded", false, NULL); + object_property_set_bool(OBJECT(vd->tlscreds), "loaded", true, NULL); + + return 0; +} + /* TODO 1) Get the queue working for IO. 2) there is some weirdness when using the -S option (the screen is grey --=20 2.23.0