From nobody Tue Nov 18 15:27:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611153882; cv=none; d=zohomail.com; s=zohoarc; b=Evi+MxEX3LlqRxIR4NBLXpuQR471QxsvBkmMPjR2Z4GSLclg9RP7iLhQp7PcBp7DbCxZi9GvrkaqGjbdalraQW/WBNIx05QlEL/l+nzUPab7z/YZQady/9+vZrkfp1qsyyejr5Nck7BhegxM1gkDgelVTO/jGNOXv5BsGZXoO10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611153882; h=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=Wootb/1eDmlPqGDLnEKTq4XqjiZhmmbPcYn7WSwlNhY=; b=VFmxayYUF+zH58jW2V79UYRQQLOODJ55TPYJxn4OzUMEpLcxbKL+LSliFlUy9Rn1ChcOF+c4IkOhy8u5hK6pRb18nrfVNwPsP/wNqkQolPy8aNhpyw93ISpqW2N3FReP890kPvV33zlQloBF0QwvmfjmQyHAS5vTzaMB0iopgeE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611153882307689.4261268114566; Wed, 20 Jan 2021 06:44:42 -0800 (PST) Received: from localhost ([::1]:51074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2Eiv-0005MQ-2y for importer@patchew.org; Wed, 20 Jan 2021 09:44:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2Egz-00040c-Cy for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:41 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:41046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2Egx-00047z-D5 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:41 -0500 Received: by mail-ej1-x62d.google.com with SMTP id g12so33861008ejf.8 for ; Wed, 20 Jan 2021 06:42:39 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id v9sm965078ejd.92.2021.01.20.06.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 06:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wootb/1eDmlPqGDLnEKTq4XqjiZhmmbPcYn7WSwlNhY=; b=GbOqRZU/cWZlej2cVbfYgEkB5DlZLDbpRlvcs8mmSxJ/1LQn+Dzp+sTyGrMX7KRXIx RAreaiVrCjTXRR/GYSGC8h0lxE7dVrlrU9V9d7Mp9Cqiua/176GDswXeEbAQd5k7qY66 jVxt7JkYuB5McxjfHB7zYOq5NJcOE1dkGBzzW8oQS7bYc35I29wkdyDIcs3pImeQElHx Hb4eEgqt+D5tq1qCffNNyGW5UVGoulWg9crc9TU+FpFRdZGLn4NvvCv7WIMVEMflEiib UsHnvLCYozupCLsvJ73/UBypWp8JvvMcHQFhxiYSkZ3ZVjU30PKAD4rbP5/GQUOs3LIm HBog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Wootb/1eDmlPqGDLnEKTq4XqjiZhmmbPcYn7WSwlNhY=; b=WMEchTU2lyRIhytVu7yjACrJN16P0fVBNg7qXJUkmbM+Y3z/8iTVsXQjZvP1qQNzA2 pOo5da67HkPE+bZSUgh96M+uMqckIx73KSzgxBjEuNnR7Jp/kpLFah0Zi7IoxHfj5uSi OJloPhBmqxAy4DXNqgMzWjsDYq3Ossk+WVwnCOsMBpRc+9e00o5yyKCjyw8AdJv0dMqf P5kqylBq4rVJDprOk6p0ClXs/7d45AVjy7I93nnL8OuatmJ0KDeIHZ/3zSJoKC6b7SLw oBxekshVR5uwRm7EKWt2VQikj3E9QyeGCH1Iky40mfPvGENWAL4u/wyQruQ4yDPchUu/ 1vDg== X-Gm-Message-State: AOAM530s9+7FO/TBMcocgNDIc1ET6TIX0gOD9at/DUu+SAGxwnxEhFYV HuMLZdrpZ4YZzcTyNtHpn5PXxAQgG6djQg== X-Google-Smtp-Source: ABdhPJxlH7yG1Uyj1udv2I2juAreN/UZ2kjIO5R3CQeOfifU4Wubkgv5YZPntFxNGrihmvn/zpXxcg== X-Received: by 2002:a17:906:3685:: with SMTP id a5mr6143085ejc.544.1611153758101; Wed, 20 Jan 2021 06:42:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hmp: remove "change vnc TARGET" command Date: Wed, 20 Jan 2021 15:42:33 +0100 Message-Id: <20210120144235.345983-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120144235.345983-1-pbonzini@redhat.com> References: <20210120144235.345983-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: armbru@redhat.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The HMP command \"change vnc TARGET\" is messy: - it takes an ugly shortcut to determine if the option has an "id", with incorrect results if "id=3D" is not preceded by an unescaped comma. - it deletes the existing QemuOpts and does not try to rollback if the parsing fails (which is not causing problems, but only due to how VNC options are parsed) - because it uses the same parsing function as "-vnc", it forces the latter to not support "-vnc help". On top of this, it uses a deprecated QMP command, thus getting in the way of removing the QMP command. Since the usecase for the command is not clear, just remove it and send "change vnc password" directly to the QMP "change-vnc-password" command. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Gerd Hoffmann --- docs/system/removed-features.rst | 6 ++++++ hmp-commands.hx | 6 ------ monitor/hmp-cmds.c | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 430fc33ca1..5b0ff6ab1f 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -68,6 +68,12 @@ The ``[hub_id name]`` parameter tuple of the 'hostfwd_ad= d' and Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See documentation of ``query-hotpluggable-cpus`` for additional details. =20 +``change vnc TARGET`` (removed in 6.0) +'''''''''''''''''''''''''''''''''''''' + +No replacement. The ``change vnc password`` and ``change DEVICE MEDIUM`` +commands are not affected. + Guest Emulator ISAs ------------------- =20 diff --git a/hmp-commands.hx b/hmp-commands.hx index 73e0832ea1..d4001f9c5d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -231,12 +231,6 @@ SRST read-write Makes the device writable. =20 - ``change vnc`` *display*,\ *options* - Change the configuration of the VNC server. The valid syntax for *disp= lay* - and *options* are described at :ref:`sec_005finvocation`. eg:: - - (qemu) change vnc localhost:1 - ``change vnc password`` [*password*] =20 Change the password associated with the VNC server. If the new password diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index fd4d77e246..499647a578 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1521,13 +1521,16 @@ void hmp_change(Monitor *mon, const QDict *qdict) } if (strcmp(target, "passwd") =3D=3D 0 || strcmp(target, "password") =3D=3D 0) { - if (!arg) { + if (arg) { MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, comm= on); monitor_read_password(hmp_mon, hmp_change_read_arg, NULL); return; + } else { + qmp_change_vnc_password(arg, &err); } + } else { + monitor_printf(mon, "Expected 'password' after 'vnc'\n"); } - qmp_change("vnc", target, !!arg, arg, &err); } else #endif { --=20 2.29.2 From nobody Tue Nov 18 15:27:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611154120; cv=none; d=zohomail.com; s=zohoarc; b=YxfCkTYG9cteATmur4vAdig3S1646lG4OBYlZYKpflJWv1zaOSQklQjHFutlb2ULeUojpW+/5ElM/gpoYW7hje+IV1ZR5OZJn/kAwWEX5pUY0jiZbEN/9u+HPp+jxekP3AnQaEGTTh7CXch+zFI0pIXPFmUaEAynJfguNQ/n/kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611154120; h=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=9cLcyWzjeqPDEQMswGpew8id28jh9kRkPo24Eqj/hq8=; b=f9dDeAaPS/xZXLXRqd5xxLN/8VpG6oLTMqG9apfI44tvhpY15aMpTQuQwuRCJkij+jvYY7NvAK0VjH41NRngMsHNT2bxcfwL0gIuNnIwDNicd3yA2LzDelVPVsIg3owGqtyEK4MsbpBN1XcRBE9PhNb6uK6JnmzCs/NbDpBl4wk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611154120755205.92314245688385; Wed, 20 Jan 2021 06:48:40 -0800 (PST) Received: from localhost ([::1]:33904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2Eml-0001kX-Lg for importer@patchew.org; Wed, 20 Jan 2021 09:48:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2Eh0-00041S-33 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:42 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:43089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2Egy-00048c-G1 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:41 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a10so17228818ejg.10 for ; Wed, 20 Jan 2021 06:42:40 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id v9sm965078ejd.92.2021.01.20.06.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 06:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9cLcyWzjeqPDEQMswGpew8id28jh9kRkPo24Eqj/hq8=; b=MdN5i3QTmbgAUdzDtDfbKDeSNvHHFpwtsA9XsAaysmzO/H9cjpRhOom3snFtrvXnTh fo3RSbCUeTVZIJRixRWbtkxtkkCXH8mKRmSm/wbgvCDgHznKPYQxKxui6YWkMTwCih0K 6RDj0z8qJY9zLXfitNRY0MVtFNAyA+mKRba7v1mXfVwlGxXOw7kORW4EfSYTUac3cLLa T99wFYrf9dhCm53JyEK/e14xfopZyl+mDX8LfHkCUHX1JyECSUFuNe73akRc1wChqpdl fis8vdPvLEOKL+2HA9enFP15cMzMLgNQAQ3H6egvbZeBmmjFoTS6tra5j6VTXLNFSCz2 4Rww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9cLcyWzjeqPDEQMswGpew8id28jh9kRkPo24Eqj/hq8=; b=rpnydj1phjVYKz/rLcLB52M5lYj30P/yTHoT1+lb0QgSgY1mIvf5h3rdGwsgviOTL/ LDVFBDfPzbKfYIpypR8ssDjxbzMW/3XQkHBtdTOxIt+aMoiV21fXjsMZLJRuUN+gF+W4 /RRiKsDEPes4e4Pvo9CsCcUrPGGFw8oeN/2S6FZfleSezeMADpq8N0gwVo+eIVIm1/zL rgzaw0faAJb0UVJWVAUKV9Kui8nkyLh+EzDd+0IheL74mpjMLjh+KUvNuIBa/f6Ykqft SORKQWrB1C1WhRptOmts/5vpwSSz4EhGN3v8E/WsbmOgde9vx8JvUoIfTB4/1twulrAl W1eQ== X-Gm-Message-State: AOAM532vzhyilB+/H30w5ynwVrH00nvNhekmrcyO/7wEiwRiziCddBAH awEIFC5co9R5XYTcyaCy32aRmczZD4RN4A== X-Google-Smtp-Source: ABdhPJy52Ykyk+/S60ZPoy1Z+qNe2f3N5mYyL7+ZQPOrYSF39J1ywGCSD5LrSbmnw1rmqBtGP5k+Ng== X-Received: by 2002:a17:906:f1cc:: with SMTP id gx12mr1853306ejb.489.1611153759165; Wed, 20 Jan 2021 06:42:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] qmp: remove deprecated "change" command Date: Wed, 20 Jan 2021 15:42:34 +0100 Message-Id: <20210120144235.345983-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120144235.345983-1-pbonzini@redhat.com> References: <20210120144235.345983-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: armbru@redhat.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/system/deprecated.rst | 5 ---- docs/system/removed-features.rst | 5 ++++ monitor/qmp-cmds.c | 51 -------------------------------- qapi/misc.json | 49 ------------------------------ 4 files changed, 5 insertions(+), 105 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e20bfcb17a..651182b2df 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -131,11 +131,6 @@ devices. It is possible to use drives the board doesn= 't pick up with QEMU Machine Protocol (QMP) commands ------------------------------------ =20 -``change`` (since 2.5.0) -'''''''''''''''''''''''' - -Use ``blockdev-change-medium`` or ``change-vnc-password`` instead. - ``blockdev-open-tray``, ``blockdev-close-tray`` argument ``device`` (since= 2.8.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''= ''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 5b0ff6ab1f..c48266724f 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -53,6 +53,11 @@ are automatically loaded from qcow2 images. Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See documentation of ``query-hotpluggable-cpus`` for additional details. =20 +``change`` (removed in 6.0) +''''''''''''''''''''''''''' + +Use ``blockdev-change-medium`` or ``change-vnc-password`` instead. + Human Monitor Protocol (HMP) commands ------------------------------------- =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 34f7e75b7b..990936136c 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -251,58 +251,7 @@ void qmp_change_vnc_password(const char *password, Err= or **errp) error_setg(errp, "Could not set password"); } } - -static void qmp_change_vnc_listen(const char *target, Error **errp) -{ - QemuOptsList *olist =3D qemu_find_opts("vnc"); - QemuOpts *opts; - - if (strstr(target, "id=3D")) { - error_setg(errp, "id not supported"); - return; - } - - opts =3D qemu_opts_find(olist, "default"); - if (opts) { - qemu_opts_del(opts); - } - opts =3D vnc_parse(target, errp); - if (!opts) { - return; - } - - vnc_display_open("default", errp); -} - -static void qmp_change_vnc(const char *target, bool has_arg, const char *a= rg, - Error **errp) -{ - if (strcmp(target, "passwd") =3D=3D 0 || strcmp(target, "password") = =3D=3D 0) { - if (!has_arg) { - error_setg(errp, QERR_MISSING_PARAMETER, "password"); - } else { - qmp_change_vnc_password(arg, errp); - } - } else { - qmp_change_vnc_listen(target, errp); - } -} -#endif /* !CONFIG_VNC */ - -void qmp_change(const char *device, const char *target, - bool has_arg, const char *arg, Error **errp) -{ - if (strcmp(device, "vnc") =3D=3D 0) { -#ifdef CONFIG_VNC - qmp_change_vnc(target, has_arg, arg, errp); -#else - error_setg(errp, QERR_FEATURE_DISABLED, "vnc"); #endif - } else { - qmp_blockdev_change_medium(true, device, false, NULL, target, - has_arg, arg, false, 0, errp); - } -} =20 void qmp_add_client(const char *protocol, const char *fdname, bool has_skipauth, bool skipauth, bool has_tls, bool t= ls, diff --git a/qapi/misc.json b/qapi/misc.json index 27ccd7385f..156f98203e 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -238,55 +238,6 @@ 'returns': 'str', 'features': [ 'savevm-monitor-nodes' ] } =20 -## -# @change: -# -# This command is multiple commands multiplexed together. -# -# @device: This is normally the name of a block device but it may also be = 'vnc'. -# when it's 'vnc', then sub command depends on @target -# -# @target: If @device is a block device, then this is the new filename. -# If @device is 'vnc', then if the value 'password' selects the v= nc -# change password command. Otherwise, this specifies a new serv= er URI -# address to listen to for VNC connections. -# -# @arg: If @device is a block device, then this is an optional format to o= pen -# the device with. -# If @device is 'vnc' and @target is 'password', this is the new VNC -# password to set. See change-vnc-password for additional notes. -# -# Features: -# @deprecated: This command is deprecated. For changing block -# devices, use 'blockdev-change-medium' instead; for changing= VNC -# parameters, use 'change-vnc-password' instead. -# -# Returns: - Nothing on success. -# - If @device is not a valid block device, DeviceNotFound -# -# Since: 0.14 -# -# Example: -# -# 1. Change a removable medium -# -# -> { "execute": "change", -# "arguments": { "device": "ide1-cd0", -# "target": "/srv/images/Fedora-12-x86_64-DVD.iso" } } -# <- { "return": {} } -# -# 2. Change VNC password -# -# -> { "execute": "change", -# "arguments": { "device": "vnc", "target": "password", -# "arg": "foobar1" } } -# <- { "return": {} } -# -## -{ 'command': 'change', - 'data': {'device': 'str', 'target': 'str', '*arg': 'str'}, - 'features': [ 'deprecated' ] } - ## # @getfd: # --=20 2.29.2 From nobody Tue Nov 18 15:27:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611153887; cv=none; d=zohomail.com; s=zohoarc; b=U2Z0ZCjjOdXMe6vk14s6FPUhx1z+Ke7wZFDZCFZrDbwgEhZCWv89eOoFLef+Ezvx6A/SbLaPm9zECUWKEKzMEjRgSgEOH91uxj7P/VRO3Q5FDnMhx68uShN2JAyah62pHITvJ2uDwbGnc7aX07n5IEUhlhO1xqV+kxJVhLU5Lr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611153887; h=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=tstkOXr/poGRTXnqb8orWZc0ENWiWlKSvgrhU06MUPQ=; b=Ze7Jv7N9G+IKdGob/gsX04EcshbdFJoluNlsyQtmjKMBTBQXEL/nof4joKL77QaaNAsZd2og6679TyrottLTinc43xW07QicvIzzMzIC/nTBVGAHoz03M4hKr6x0gqLiyV61pOf1pDZTuvNui0dm3ezL14NiHgOxzMO4qrrW8nA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611153887096479.6562992612121; Wed, 20 Jan 2021 06:44:47 -0800 (PST) Received: from localhost ([::1]:51274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2Eiz-0005RR-RR for importer@patchew.org; Wed, 20 Jan 2021 09:44:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2Eh1-00042s-3w for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:46 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:46813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2Egz-00049A-Ib for qemu-devel@nongnu.org; Wed, 20 Jan 2021 09:42:42 -0500 Received: by mail-ej1-x62e.google.com with SMTP id rv9so15081193ejb.13 for ; Wed, 20 Jan 2021 06:42:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id v9sm965078ejd.92.2021.01.20.06.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 06:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tstkOXr/poGRTXnqb8orWZc0ENWiWlKSvgrhU06MUPQ=; b=GcttzMe+D+AzKCiLztkWdsCFc38nkBVNUNXRfzM+rNuK3ll5MsuMXsdj3U8CGm5icq EsQagDek03lWyhWkc31LSUno2qfgHKs3/HprLIhOf7OpJG3d7cHPvWRF0k/ohMHmOWKd LnNAiEygBbT29kMhPHGA2qMzJg1t8HCnUFAADAgsY5dArm5CqSF46fx0oxpGv3/ImFo3 5i+NKdeuOyJku7yweBxRmXf05KN5m22ChDn+2m3ipC92pgc6pzbKLTlxBXKFY6HyTo8C wn3umg6KL7y6nzxKqyWdbdtsv4pcGEQP4aANqROKIEvPtLKRVG3KTnrB/nd9vlVKS9Ri 8riQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tstkOXr/poGRTXnqb8orWZc0ENWiWlKSvgrhU06MUPQ=; b=f0q1Rpj4+cYfQN75F4S3Q9O4x7OoxDhbQozofvKqKDYgYJRkYFcPIYqVc2l22REV/E MtgYkMKriS5wsbje0Y3U+zG68NU6eIe6mEhfH0/DjZMjqkVkNQMBZegJxgBzXADGOquD O3tbxZvB0+U0AyKMUN89i8bSgKK54p4mHPU9LIw980X3azIytN73oXbZv+aVO83hSmo4 +561dipnbU7LBUUjA+bdqX0dPu0EIV/GpCzjWIuTw5SlxZ2l8hv6KZTIzwqEB0H6Obrr UUK088AZuh+wfUViCptP6NE1g3PzOWbWdbu/flWG3/hXeypU0ALI09A5OjBJWBC9T1ef IWUQ== X-Gm-Message-State: AOAM532q0ZeegD6Jpyol+NViChvh4jOZpRdzSg6foJMYKieG4n+0VbYS kkyYxV72DA64DaaElGbJ/VnuwrwzyIps1w== X-Google-Smtp-Source: ABdhPJx7hHPDYbWvcwSckoHaDaP2wjC+dBiX7jD0r6ieH9+1Q6nrdqwWy6CsdW6cRY0iqVwg2/nk4A== X-Received: by 2002:a17:907:1b10:: with SMTP id mp16mr3487052ejc.482.1611153760194; Wed, 20 Jan 2021 06:42:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] vnc: support "-vnc help" Date: Wed, 20 Jan 2021 15:42:35 +0100 Message-Id: <20210120144235.345983-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120144235.345983-1-pbonzini@redhat.com> References: <20210120144235.345983-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: armbru@redhat.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use qemu_opts_parse_noisily now that HMP does not call vnc_parse anymore. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Gerd Hoffmann --- include/ui/console.h | 2 +- softmmu/vl.c | 6 +++--- ui/vnc-stubs.c | 7 +++---- ui/vnc.c | 8 ++++---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 5dd21976a3..7a3fc11abf 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -439,7 +439,7 @@ void vnc_display_open(const char *id, Error **errp); void vnc_display_add_client(const char *id, int csock, bool skipauth); 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); +void vnc_parse(const char *str); int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); =20 /* input.c */ diff --git a/softmmu/vl.c b/softmmu/vl.c index 59304261cf..a8876b8965 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1113,7 +1113,7 @@ static void parse_display(const char *p) * display access. */ if (*opts =3D=3D '=3D') { - vnc_parse(opts + 1, &error_fatal); + vnc_parse(opts + 1); } else { error_report("VNC requires a display argument vnc=3D"= ); exit(1); @@ -1402,7 +1402,7 @@ static void qemu_create_default_devices(void) if (!qemu_display_find_default(&dpy)) { dpy.type =3D DISPLAY_TYPE_NONE; #if defined(CONFIG_VNC) - vnc_parse("localhost:0,to=3D99,id=3Ddefault", &error_abort); + vnc_parse("localhost:0,to=3D99,id=3Ddefault"); #endif } } @@ -3186,7 +3186,7 @@ void qemu_init(int argc, char **argv, char **envp) } break; case QEMU_OPTION_vnc: - vnc_parse(optarg, &error_fatal); + vnc_parse(optarg); break; case QEMU_OPTION_no_acpi: olist =3D qemu_find_opts("machine"); diff --git a/ui/vnc-stubs.c b/ui/vnc-stubs.c index c6b737dcec..0fd4e0846a 100644 --- a/ui/vnc-stubs.c +++ b/ui/vnc-stubs.c @@ -10,13 +10,12 @@ int vnc_display_pw_expire(const char *id, time_t expire= s) { return -ENODEV; }; -QemuOpts *vnc_parse(const char *str, Error **errp) +void vnc_parse(const char *str) { if (strcmp(str, "none") =3D=3D 0) { - return NULL; + return; } - error_setg(errp, "VNC support is disabled"); - return NULL; + error_setg(&error_fatal, "VNC support is disabled"); } int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) { diff --git a/ui/vnc.c b/ui/vnc.c index d429bfee5a..66f7c1b936 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -50,6 +50,7 @@ #include "crypto/random.h" #include "qom/object_interfaces.h" #include "qemu/cutils.h" +#include "qemu/help_option.h" #include "io/dns-resolver.h" =20 #define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT @@ -4211,14 +4212,14 @@ static void vnc_auto_assign_id(QemuOptsList *olist,= QemuOpts *opts) qemu_opts_set_id(opts, id); } =20 -QemuOpts *vnc_parse(const char *str, Error **errp) +void vnc_parse(const char *str) { QemuOptsList *olist =3D qemu_find_opts("vnc"); - QemuOpts *opts =3D qemu_opts_parse(olist, str, true, errp); + QemuOpts *opts =3D qemu_opts_parse_noisily(olist, str, !is_help_option= (str)); const char *id; =20 if (!opts) { - return NULL; + exit(1); } =20 id =3D qemu_opts_id(opts); @@ -4226,7 +4227,6 @@ QemuOpts *vnc_parse(const char *str, Error **errp) /* auto-assign id if not present */ vnc_auto_assign_id(olist, opts); } - return opts; } =20 int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) --=20 2.29.2