From nobody Fri May 17 07:56:05 2024 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=1607624759; cv=none; d=zohomail.com; s=zohoarc; b=Ry/YwkJd7rHCDpEceOIqmb6/RIgs/hNeIyvxJeLsCJvk9/m0hMwzx4qzs4FeLgbSvAkgF2twiKozkAbUroFIq6SLsFUxbLsc3u6odXKBYKETYtFJDAF+7Koyt4Dej/h/KJqpMPjAbe2qhbCMdTTFSBKUM5ZaZGprNjayPMyMKPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607624759; 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=G2bGa2EOpf8UttQv+0DCCfEwjpR8f8U1SOsoCA0P5+E=; b=bMXJHtcT60N5jwXrzd2XajrkQ4JDhBHPhaJJbHirAaate5cy0i9RMhhCOpGbQtIru0YepQanc4l93HhRJnnw2RdL8dkziBn+ZSMMYjFunQzOMbRuRXO7wuodZRVIGP37qys8xMQRHz/GMxEEop8H3ZIFMqV89HZA8vGdfp2/gME= 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 1607624759553771.5888128799833; Thu, 10 Dec 2020 10:25:59 -0800 (PST) Received: from localhost ([::1]:47324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knOzR-0005u1-ST for importer@patchew.org; Thu, 10 Dec 2020 11:40:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrj-0008Mp-9k for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrV-0003TD-O0 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-yLP3tHSpPm2xjxAm3z1YMA-1; Thu, 10 Dec 2020 11:32:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C0E29195D581; Thu, 10 Dec 2020 16:31:41 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65EE06F976; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BCBE91132B52; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2bGa2EOpf8UttQv+0DCCfEwjpR8f8U1SOsoCA0P5+E=; b=MufhdToamLcI8rE7a7TD3YcY8nTT/hGuzyfDC2/usGmbGsdHhYtXPueqhCk11J4XzkigEo mI7znM1UZjk0S4f2J+NwFxM7OU4PdC2IzUVoG6UdtC6feCW+Z8rjfB9y5x11Vsb7ICK556 whs555ulN3IWo8aqIf702Eb9n06MEAo= X-MC-Unique: yLP3tHSpPm2xjxAm3z1YMA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 01/13] Clean up includes Date: Thu, 10 Dec 2020 17:31:20 +0100 Message-Id: <20201210163132.2919935-2-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Thomas Huth , "Michael S . Tsirkin" , Cornelia Huck , "Dr . David Alan Gilbert" , Alexander Bulekov , Stefan Hajnoczi , Paolo Bonzini 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" Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c contrib/plugins/, tests/plugin/, and tests/test-rcu-slist.c appear not to include osdep.h intentionally. The remaining reverts are the same as in commit bbfff19688d. Signed-off-by: Markus Armbruster Message-Id: <20201113061216.2483385-1-armbru@redhat.com> Acked-by: Paolo Bonzini Acked-by: Dr. David Alan Gilbert Tested-by: Thomas Huth Acked-by: Cornelia Huck Acked-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Acked-by: Alexander Bulekov --- contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-) diff --git a/contrib/vhost-user-gpu/vugbm.h b/contrib/vhost-user-gpu/vugbm.h index 07e698fcd7..66f1520764 100644 --- a/contrib/vhost-user-gpu/vugbm.h +++ b/contrib/vhost-user-gpu/vugbm.h @@ -10,10 +10,8 @@ #ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H =20 -#include "qemu/osdep.h" =20 #ifdef CONFIG_MEMFD -#include #include #endif =20 diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index bdf9a74b46..ad664c4df8 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -15,7 +15,6 @@ #ifndef VUGPU_H #define VUGPU_H =20 -#include "qemu/osdep.h" =20 #include "libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 5a49029543..c1bd5f6555 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -11,7 +11,6 @@ #ifndef SWIM_H #define SWIM_H =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index c133fa271e..80806b0306 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -13,7 +13,6 @@ #ifndef MACFB_H #define MACFB_H =20 -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" diff --git a/include/qemu/nvdimm-utils.h b/include/qemu/nvdimm-utils.h index 4b8b198ba7..5f45774c2c 100644 --- a/include/qemu/nvdimm-utils.h +++ b/include/qemu/nvdimm-utils.h @@ -1,7 +1,6 @@ #ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H =20 -#include "qemu/osdep.h" =20 GSList *nvdimm_get_device_list(void); #endif diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 08e9560a79..3a8570e84c 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -14,7 +14,6 @@ #ifndef FUZZER_H_ #define FUZZER_H_ =20 -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" =20 diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/gen= eric_fuzz_configs.h index c4d925f9e6..b4c5fefeca 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H =20 -#include "qemu/osdep.h" =20 typedef struct generic_fuzz_config { const char *name, *args, *objects; diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index 5aee5193eb..30b18b4966 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -18,8 +18,6 @@ =20 #include "fuse_log.h" #include "fuse_opt.h" -#include -#include =20 /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3 diff --git a/tools/virtiofsd/fuse_log.h b/tools/virtiofsd/fuse_log.h index bf6c11ff11..8d7091bd4d 100644 --- a/tools/virtiofsd/fuse_log.h +++ b/tools/virtiofsd/fuse_log.h @@ -14,7 +14,6 @@ * This file defines the logging interface of FUSE */ =20 -#include =20 /** * Log severity level diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowleve= l.h index 9c06240f9e..0e10a14bc9 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -25,10 +25,7 @@ =20 #include "fuse_common.h" =20 -#include -#include #include -#include #include #include =20 diff --git a/tools/virtiofsd/fuse_misc.h b/tools/virtiofsd/fuse_misc.h index 5c618ce21f..f252baa752 100644 --- a/tools/virtiofsd/fuse_misc.h +++ b/tools/virtiofsd/fuse_misc.h @@ -7,7 +7,6 @@ */ =20 #include -#include "config-host.h" =20 /* * Versioned symbols cannot be used in some cases because it diff --git a/tools/virtiofsd/passthrough_seccomp.h b/tools/virtiofsd/passth= rough_seccomp.h index d47c8eade6..a3ab073f08 100644 --- a/tools/virtiofsd/passthrough_seccomp.h +++ b/tools/virtiofsd/passthrough_seccomp.h @@ -9,7 +9,6 @@ #ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H =20 -#include =20 void setup_seccomp(bool enable_syslog); =20 diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index b0bc22c3c1..e647278052 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -12,6 +12,7 @@ * See the COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include #include "virgl.h" =20 diff --git a/contrib/vhost-user-gpu/vugbm.c b/contrib/vhost-user-gpu/vugbm.c index 9c357b6399..f5304ada2f 100644 --- a/contrib/vhost-user-gpu/vugbm.c +++ b/contrib/vhost-user-gpu/vugbm.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include "vugbm.h" =20 static bool diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/mai= n.c index d2de47cee7..c15d18c33f 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -6,7 +6,6 @@ =20 #include "qemu/osdep.h" =20 -#include #include =20 #include "qemu/iov.h" diff --git a/hw/display/artist.c b/hw/display/artist.c index ed0e637f25..aa7bd594aa 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 9296e1bb6e..ead4f222d5 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -9,11 +9,12 @@ * directory. */ =20 +#include "qemu/osdep.h" + #include #include #include =20 -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index bdc608c221..874f01c488 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/virtiofsd/buffer.c @@ -12,11 +12,6 @@ #include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include -#include -#include -#include -#include =20 size_t fuse_buf_size(const struct fuse_bufvec *bufv) { diff --git a/tools/virtiofsd/fuse_log.c b/tools/virtiofsd/fuse_log.c index c301ff6da1..745d88cd2a 100644 --- a/tools/virtiofsd/fuse_log.c +++ b/tools/virtiofsd/fuse_log.c @@ -11,8 +11,6 @@ #include "qemu/osdep.h" #include "fuse_log.h" =20 -#include -#include =20 static void default_log_func(__attribute__((unused)) enum fuse_log_level l= evel, const char *fmt, va_list ap) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index c70fb16a9a..d4119e92ab 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -16,17 +16,7 @@ #include "fuse_opt.h" #include "fuse_virtio.h" =20 -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include =20 #define THREAD_POOL_SIZE 64 =20 diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c index 28922361a2..f0ab8d22f4 100644 --- a/tools/virtiofsd/fuse_opt.c +++ b/tools/virtiofsd/fuse_opt.c @@ -14,10 +14,6 @@ #include "fuse_i.h" #include "fuse_misc.h" =20 -#include -#include -#include -#include =20 struct fuse_opt_context { void *data; diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c index f18625b6e2..1de46de1ce 100644 --- a/tools/virtiofsd/fuse_signals.c +++ b/tools/virtiofsd/fuse_signals.c @@ -12,11 +12,6 @@ #include "fuse_i.h" #include "fuse_lowlevel.h" =20 -#include -#include -#include -#include -#include =20 static struct fuse_session *fuse_instance; =20 diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 623812c432..b264dcbd18 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -20,20 +20,10 @@ #include "fuse_opt.h" #include "fuse_virtio.h" =20 -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include -#include #include -#include =20 #include "libvhost-user.h" =20 diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 75ac48dec2..28243b51b2 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -16,16 +16,8 @@ #include "fuse_misc.h" #include "fuse_opt.h" =20 -#include -#include -#include -#include -#include -#include #include -#include #include -#include =20 #define FUSE_HELPER_OPT(t, p) \ { \ diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 97485b22b4..12de321745 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -41,29 +41,17 @@ #include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include #include #include #include #include -#include #include #include #include -#include =20 #include "qemu/cutils.h" #include "passthrough_helpers.h" diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passth= rough_seccomp.c index 11623f56f2..a60d7da4b4 100644 --- a/tools/virtiofsd/passthrough_seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -10,10 +10,7 @@ #include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include -#include #include -#include =20 /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk) diff --git a/util/nvdimm-utils.c b/util/nvdimm-utils.c index 5cc768ca47..aa3d199f2d 100644 --- a/util/nvdimm-utils.c +++ b/util/nvdimm-utils.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h" =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607629321; cv=none; d=zohomail.com; s=zohoarc; b=CqM6feZjLCzrdDo6H6yuBHobkjqHKiGDTsHu14S++KLiWIC5i5t4AEDMAHAGmZ4Ah/EfhVFlYGojK+T0KWDlCgpRmQvvuZgYDB2OL10YznZVrG3bwY4N36yMabn6Pn89G8/GpXLimCKPsWUaXxZ6Y7YkN2zivSKo9PNHnLuP1Sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607629321; 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=qvSNPr5nX91x7bAYWO5n2Bq8U95y5FiZEGiuCY2ec6w=; b=ixGngL0oSXJTVCOD+cXqkUnPjIqDxxtv+2egMu0K0y7r1gHisntK0St+rU0k8khPPhDv6ZuWw+nUo194MYgcdOA8pFiMotn0dOuAPLD1tdLLNf8Hh7Kti5FTGRyjgnHbgELXtWVPuTcYlkr+dwJEiFi3fWqGh1BsBQY3C5mLGUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607629321381997.1239999861332; Thu, 10 Dec 2020 11:42:01 -0800 (PST) Received: from localhost ([::1]:54180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knP4M-0000eV-5n for importer@patchew.org; Thu, 10 Dec 2020 11:45:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrQ-0008HD-2A for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrK-0003S7-O5 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:07 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-XI7PPYgrNZSPo6cYtlFUqQ-1; Thu, 10 Dec 2020 11:31:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86C36801AAD; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54C755C6B8; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BFDAB11329A6; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qvSNPr5nX91x7bAYWO5n2Bq8U95y5FiZEGiuCY2ec6w=; b=M/9YutTDEyIJ3XvIle2xcCDPBzx+fSN39rmOaXqmTi8eThagx3GNBj1nIv2J7K/xntAzkU j5kbhXrGdfxJmyPz+CvoFWYQPeBHkgdlfOHY1B8QpMj+ReO9+bAeakZdzkyxXMoiEc48Qs ZSQ9fvw9/4YWnapjL2maMKtK61ERR9Q= X-MC-Unique: XI7PPYgrNZSPo6cYtlFUqQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 02/13] qerror: Drop unused QERR_ macros Date: Thu, 10 Dec 2020 17:31:21 +0100 Message-Id: <20201210163132.2919935-3-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) QERR_INVALID_BLOCK_FORMAT is dead since commit e6641719fe "block: Always pass NULL as drv for bdrv_open()", 2015-09-14. QERR_INVALID_PASSWORD is dead since commit c01c214b69 "block: remove all encryption handling APIs", 2017-07-11. Bury them. Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qapi/qmp/qerror.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 7c76e24aa7..3eabd451d8 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -43,9 +43,6 @@ #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 -#define QERR_INVALID_BLOCK_FORMAT \ - "Invalid block format '%s'" - #define QERR_INVALID_PARAMETER \ "Invalid parameter '%s'" =20 @@ -55,9 +52,6 @@ #define QERR_INVALID_PARAMETER_VALUE \ "Parameter '%s' expects %s" =20 -#define QERR_INVALID_PASSWORD \ - "Password incorrect" - #define QERR_IO_ERROR \ "An IO error has occurred" =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607619203; cv=none; d=zohomail.com; s=zohoarc; b=NXEbGbut90F1e0RO5vKynQnUEw2EBl5ZYHFjwojNECS30dpqboZx8qHhUdFSgkEiMTqs52q/VgbC9JiP2YOd1TBwrdvVtGcUbEWWMPtFkrW5J/5WhW0Zk8n5baSUfOAQrj/XUjCT5/0ilk/0HlaqyRIctQWcJK7jvs1A7IcDvJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607619203; 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=CTjlXH9+ni6jMSauDvvkugFLear1OvDjGp2TKIrmroo=; b=nt3tRYYhSw9C2E1JEl3OAckpnP6YWNlNp8UcTTIPpLaMe6tP7l75n2hwyxa8+C8XfrDOZ95hMLUDJpL6EG0t2R8dnMWVCpnwdUKpGOlVQBYfgdAImaw7x7jAvLFcRG2MBS8rGxOe+xUaFi6eAP+P9NRnpv+/J9csW+oqfFow8wU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607619203683803.4365971210827; Thu, 10 Dec 2020 08:53:23 -0800 (PST) Received: from localhost ([::1]:37408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPBy-0005zF-8q for importer@patchew.org; Thu, 10 Dec 2020 11:53:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrk-0008Q7-Oq for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrZ-0003TH-8d for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-431-sa3B_y4SP3auuciYFe4VPQ-1; Thu, 10 Dec 2020 11:32:07 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 892A3195D575; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 583CF5D6D3; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C336111328AA; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CTjlXH9+ni6jMSauDvvkugFLear1OvDjGp2TKIrmroo=; b=ClShIteZcvrBYWnjKbtok+GE7HfxfgKGYHwSLLVPdjVPkE3CZDk9xHxHf7BZc+6AXpSC7g 1Uk4NExO9/Qj+FbE4mtpw95/nJaVWkdGPFSufAzJQ7gtlrb3U1oJL4a/FAzw2zRHLeapVw WoIvlRCFYK1xus2P8aBXKqLr7/2+M1c= X-MC-Unique: sa3B_y4SP3auuciYFe4VPQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 03/13] qerror: Eliminate QERR_ macros used in just one place Date: Thu, 10 Dec 2020 17:31:22 +0100 Message-Id: <20201210163132.2919935-4-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-3-armbru@redhat.com> --- include/qapi/qmp/qerror.h | 9 --------- monitor/misc.c | 8 ++++---- net/net.c | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 3eabd451d8..c272e3fc29 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -25,21 +25,12 @@ #define QERR_DEVICE_HAS_NO_MEDIUM \ "Device '%s' has no medium" =20 -#define QERR_DEVICE_INIT_FAILED \ - "Device '%s' could not be initialized" - #define QERR_DEVICE_IN_USE \ "Device '%s' is in use" =20 #define QERR_DEVICE_NO_HOTPLUG \ "Device '%s' does not support hotplugging" =20 -#define QERR_FD_NOT_FOUND \ - "File descriptor named '%s' not found" - -#define QERR_FD_NOT_SUPPLIED \ - "No file descriptor supplied via SCM_RIGHTS" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 diff --git a/monitor/misc.c b/monitor/misc.c index 398211a034..c563e901c0 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1232,7 +1232,7 @@ void qmp_getfd(const char *fdname, Error **errp) =20 fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); if (fd =3D=3D -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); return; } =20 @@ -1286,7 +1286,7 @@ void qmp_closefd(const char *fdname, Error **errp) } =20 qemu_mutex_unlock(&cur_mon->mon_lock); - error_setg(errp, QERR_FD_NOT_FOUND, fdname); + error_setg(errp, "File descriptor named '%s' not found", fdname); } =20 int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) @@ -1357,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdse= t_id, bool has_opaque, =20 fd =3D qemu_chr_fe_get_msgfd(&mon->chr); if (fd =3D=3D -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); goto error; } =20 @@ -1410,7 +1410,7 @@ error: } else { snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id); } - error_setg(errp, QERR_FD_NOT_FOUND, fd_str); + error_setg(errp, "File descriptor named '%s' not found", fd_str); } =20 FdsetInfoList *qmp_query_fdsets(Error **errp) diff --git a/net/net.c b/net/net.c index 6a2c3d9567..e1035f21d1 100644 --- a/net/net.c +++ b/net/net.c @@ -1013,7 +1013,7 @@ static int net_client_init1(const Netdev *netdev, boo= l is_netdev, Error **errp) if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) = < 0) { /* FIXME drop when all init functions store an Error */ if (errp && !*errp) { - error_setg(errp, QERR_DEVICE_INIT_FAILED, + error_setg(errp, "Device '%s' could not be initialized", NetClientDriver_str(netdev->type)); } return -1; --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 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=1607626310; cv=none; d=zohomail.com; s=zohoarc; b=D9KEplrsjdZlCwgy4WJx/xK4I7JCdiuMriyYf1SVm2J4h/wYfKTTp3k5wn/oUFLFizaBG2j+c4sOOHbJOfJjAeWifVyNQb4cTYMQW75QiVOiYsKgrCKhBWucYwQYPuwzxAvnLBAbNF+Fdh4FAIBEV9xmLG5VLBkWegVtx97NfVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607626310; 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=Y2wwPuSl14SkVhCrD25fUmPdd4iak6LJGh/FStpFLRI=; b=TcgPhjRf0343U3t7QfPRj/wWOeSjFaExCw8KyO5ffUmy9JNarFrSvfmb358BN0Uf+1WN7gjLmkzvVgQa/MEdGYPG6d8WbXnK1jMai4mZ5WzajrinUHw12tXpKV3OmOs+c8YvGpWbX85+TaI6K/P0624tTyUMWffbyVEFOM/+R90= 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 1607626310522370.22676645300896; Thu, 10 Dec 2020 10:51:50 -0800 (PST) Received: from localhost ([::1]:39098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knOvi-0001uN-Fc for importer@patchew.org; Thu, 10 Dec 2020 11:36:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrO-0008Gk-Ut for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrL-0003SN-IT for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-LHgbaGYyM3Oe62h0zaEAKg-1; Thu, 10 Dec 2020 11:31:57 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6062801AB1; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A12B6F965; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C6ACD1129953; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y2wwPuSl14SkVhCrD25fUmPdd4iak6LJGh/FStpFLRI=; b=eVymfct8lqzlcfG5SOp5ZrxTQDQw6KZbaw8lri28dxSlUzYtuCptYOd66nUQRYGqSYyzJg jSFbzdxGjsaj0COX1Tzs5dscPkf31pXii8TK4QBNSI95C+XSBGFxPXuf5KKXHuIAAaoUtv 7ZWF9Eo+kDQeQItNpS8yBSoTzjBOyS8= X-MC-Unique: LHgbaGYyM3Oe62h0zaEAKg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 04/13] block: Improve some block-commit, block-stream error messages Date: Thu, 10 Dec 2020 17:31:23 +0100 Message-Id: <20201210163132.2919935-5-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Kevin Wolf , peter.maydell@linaro.org, qemu-block@nongnu.org, Max Reitz 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" block-commit defaults @base-node to the deepest backing image. When there is none, it fails with "Base 'NULL' not found". Improve to "There is no backing image". block-commit and block-stream reject a @base argument that doesn't resolve with "Base 'BASE' not found". Commit 6b33f3ae8b "qemu-img: Improve commit invalid base message" improved this message in qemu-img. Improve it here, too: "Can't find '%s' in the backing chain". QERR_BASE_NOT_FOUND is now unused. Drop. Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-4-armbru@redhat.com> Reviewed-by: Max Reitz --- include/qapi/qmp/qerror.h | 2 -- blockdev.c | 15 +++++++++------ tests/qemu-iotests/040 | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index c272e3fc29..5d7e69cc1f 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -16,8 +16,6 @@ * These macros will go away, please don't use in new code, and do not * add new ones! */ -#define QERR_BASE_NOT_FOUND \ - "Base '%s' not found" =20 #define QERR_BUS_NO_HOTPLUG \ "Bus '%s' does not support hotplugging" diff --git a/blockdev.c b/blockdev.c index fe6fb5dc1d..d05a8740f4 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2531,7 +2531,7 @@ void qmp_block_stream(bool has_job_id, const char *jo= b_id, const char *device, if (has_base) { base_bs =3D bdrv_find_backing_image(bs, base); if (base_bs =3D=3D NULL) { - error_setg(errp, QERR_BASE_NOT_FOUND, base); + error_setg(errp, "Can't find '%s' in the backing chain", base); goto out; } assert(bdrv_get_aio_context(base_bs) =3D=3D aio_context); @@ -2703,13 +2703,16 @@ void qmp_block_commit(bool has_job_id, const char *= job_id, const char *device, } } else if (has_base && base) { base_bs =3D bdrv_find_backing_image(top_bs, base); + if (base_bs =3D=3D NULL) { + error_setg(errp, "Can't find '%s' in the backing chain", base); + goto out; + } } else { base_bs =3D bdrv_find_base(top_bs); - } - - if (base_bs =3D=3D NULL) { - error_setg(errp, QERR_BASE_NOT_FOUND, base ? base : "NULL"); - goto out; + if (base_bs =3D=3D NULL) { + error_setg(errp, "There is no backimg image"); + goto out; + } } =20 assert(bdrv_get_aio_context(base_bs) =3D=3D aio_context); diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index caf286571a..dc6069edc0 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -156,7 +156,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % backing_img, base=3D'%s' % backing_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % ba= cking_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % backing_img) =20 def test_top_invalid(self): self.assert_no_active_block_jobs() @@ -168,7 +168,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % mid_img, base=3D'badfile') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'badfile\' not found') + self.assert_qmp(result, 'error/desc', "Can't find 'badfile' in the= backing chain") =20 def test_top_node_invalid(self): self.assert_no_active_block_jobs() @@ -208,7 +208,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % backing_img, base=3D'%s' % mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mi= d_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % mid_img) =20 def test_top_and_base_node_reversed(self): self.assert_no_active_block_jobs() @@ -349,7 +349,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.mid_img, base=3D'%s' % self.mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % se= lf.mid_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % self.mid_img) =20 def test_top_invalid(self): self.assert_no_active_block_jobs() @@ -361,7 +361,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.mid_img, base=3D'badfile') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'badfile\' not found') + self.assert_qmp(result, 'error/desc', "Can't find 'badfile' in the= backing chain") =20 def test_top_is_active(self): self.run_commit_test(self.test_img, self.backing_img) @@ -372,7 +372,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.backing_img, base=3D'%s' % self.mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % se= lf.mid_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % self.mid_img) =20 =20 class TestSetSpeed(ImageCommitTestCase): --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607626283; cv=none; d=zohomail.com; s=zohoarc; b=DEKZujbAEh6LWue//rL6CMqusnCrHyVMTwvyRg3RListX8793cO4KP85lGhKZSyqXdIRbXEeUqS9RRu2kcy08vEhUD8hecZj7Dm8smdK5WiU3gJtYBu57u9nOnYGBcjCTDndlBIJlUUmjFxAKB1g9psI7kIkCNr3IuOKLl/6+0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607626283; 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=Q9mYqMdY2wit4YRtgFZ9a0FsNrNzKz02wZhr+/VziCU=; b=A9JQzH9BehNb7ynVBwD8WVpZfk27ALfu8cNJm3HA157ZG05ORgoV+ByeuMMD17CaDgU5Uq8KE3vjQUW8891sCuGIIIjN/1J+t2smhDJE8TNvU+14dnCkdeRC8NaYSt/9ZwQLcOwCTguPA4om0icnh96e51VYiaW1W2OLTqa9iB8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607626283187271.98457469861785; Thu, 10 Dec 2020 10:51:23 -0800 (PST) Received: from localhost ([::1]:43934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPFg-0000cW-Cu for importer@patchew.org; Thu, 10 Dec 2020 11:57:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrm-0008SO-31 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOra-0003TV-3F for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-584-97_oz3hwNxC0rDbm7a1w2A-1; Thu, 10 Dec 2020 11:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BE2B100A8F4; Thu, 10 Dec 2020 16:31:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE3075D6D3; Thu, 10 Dec 2020 16:31:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C9E9E10FA0A7; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q9mYqMdY2wit4YRtgFZ9a0FsNrNzKz02wZhr+/VziCU=; b=PzVz6zXRaEcb12Hnoq+OCxbhDFjDH7b4FKuIG2YeOFu1leJlWdg2F+a+fwgj4S4Ifs0BlO oWe/OpSIJl4jh18OS0SQB7HghlzcGQpTYwYPg773i5nYk9TB/10RGl7TWFzzFDIH7Bwqci 1F+/SeJrRiH+p9gQ79+jesXZ3ZrjBZ8= X-MC-Unique: 97_oz3hwNxC0rDbm7a1w2A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 05/13] ui: Improve some set_passwd, expire_password error messages Date: Thu, 10 Dec 2020 17:31:24 +0100 Message-Id: <20201210163132.2919935-6-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" set_passwd and expire_password reject invalid "protocol" with "Invalid parameter 'protocol'". Misleading; the parameter is valid, its value isn't. Improve to "Parameter 'protocol' expects 'vnc' or 'spice'". expire_password fails with "Could not set password". Misleading; improve to "Could not set password expire time". QERR_SET_PASSWD_FAILED is now unused. Drop. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-5-armbru@redhat.com> --- include/qapi/qmp/qerror.h | 3 --- monitor/qmp-cmds.c | 38 +++++++++++++++----------------------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 5d7e69cc1f..d8267129bc 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -65,9 +65,6 @@ #define QERR_REPLAY_NOT_SUPPORTED \ "Record/replay feature is not supported for '%s'" =20 -#define QERR_SET_PASSWD_FAILED \ - "Could not set password" - #define QERR_UNDEFINED_ERROR \ "An undefined error has occurred" =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index a08143b323..ffbf948d55 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -199,13 +199,7 @@ void qmp_set_password(const char *protocol, const char= *password, } rc =3D qemu_spice.set_passwd(password, fail_if_connected, disconnect_if_connected); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } - return; - } - - if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (strcmp(protocol, "vnc") =3D=3D 0) { if (fail_if_connected || disconnect_if_connected) { /* vnc supports "connected=3Dkeep" only */ error_setg(errp, QERR_INVALID_PARAMETER, "connected"); @@ -214,13 +208,15 @@ void qmp_set_password(const char *protocol, const cha= r *password, /* Note that setting an empty password will not disable login thro= ugh * this interface. */ rc =3D vnc_display_password(NULL, password); - if (rc < 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } + } else { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", + "'vnc' or 'spice'"); return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER, "protocol"); + if (rc !=3D 0) { + error_setg(errp, "Could not set password"); + } } =20 void qmp_expire_password(const char *protocol, const char *whenstr, @@ -244,28 +240,24 @@ void qmp_expire_password(const char *protocol, const = char *whenstr, return; } rc =3D qemu_spice.set_pw_expire(when); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } - return; - } - - if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (strcmp(protocol, "vnc") =3D=3D 0) { rc =3D vnc_display_pw_expire(NULL, when); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } + } else { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", + "'vnc' or 'spice'"); return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER, "protocol"); + if (rc !=3D 0) { + error_setg(errp, "Could not set password expire time"); + } } =20 #ifdef CONFIG_VNC void qmp_change_vnc_password(const char *password, Error **errp) { if (vnc_display_password(NULL, password) < 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); + error_setg(errp, "Could not set password"); } } =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607618894; cv=none; d=zohomail.com; s=zohoarc; b=YBig6msCbpnWw1Vm4YUhFfm7KL0Uzp5X5Idf+g2JeEywyandrytnPqng4TSaJ4wNEB0tnZvZf8OU83+Dw6M233HLFas+PxC7YgDryN7AoZVbqeVQnXpLlRQXRbigFsJucCAYxC+eukyLiElaJb1wE3y8ygfjnIVLEmu1DE0U8tI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607618894; 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=ui5ZoOjNR7TGnKFeRY7gBJ6jmyr1OpeMdHskRzGsr0Q=; b=F5ignnVXJ6V4JNNvlyBT3r9en8APz+9/GY1RDPbxqlseI3l35gADKIOwyp9alzBgKVQw4kx4wXHDrSs4zVL+u/Wi+5PRCTrB+/8BGv+ewRNnjk88jXy52SGYiQKuwCCWYvsykwhUBGEyW1RBCQLTJqZ0BsaPC6h6o6jW8yItAE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607618894030275.7893930466885; Thu, 10 Dec 2020 08:48:14 -0800 (PST) Received: from localhost ([::1]:57354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knP6y-0002B2-6G for importer@patchew.org; Thu, 10 Dec 2020 11:48:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrj-0008Nt-Np for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrZ-0003Th-7f for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-VSya15mbN3KKUniuWX8A-A-1; Thu, 10 Dec 2020 11:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B051F107ACE3; Thu, 10 Dec 2020 16:31:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF6766E71D; Thu, 10 Dec 2020 16:31:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CD2A210FA0A8; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ui5ZoOjNR7TGnKFeRY7gBJ6jmyr1OpeMdHskRzGsr0Q=; b=hXhpd0baRSNKPMcFOHIZ7F9eY43VMJ4IwePQV+DQOQox4gjw2WoCYZHaLQ8bgT8Vs/5GM0 wzF80MP/fH0EsSD69Btwlp2FgI2v/u9JqKUWr1hDnddjZVtvhosXasI0miat5I70vI7cBX /8zggX1M5rVfBF/ZH/imHMJToQynz6o= X-MC-Unique: VSya15mbN3KKUniuWX8A-A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 06/13] ui: Improve a client_migrate_info error message Date: Thu, 10 Dec 2020 17:31:25 +0100 Message-Id: <20201210163132.2919935-7-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" client_migrate_info reports spice_server_migrate_connect() failure as "An undefined error has occurred". Improve to "Could not set up display for migration". QERR_UNDEFINED_ERROR is now unused. Drop. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-6-armbru@redhat.com> --- include/qapi/qmp/qerror.h | 3 --- monitor/misc.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index d8267129bc..596fce0c54 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -65,9 +65,6 @@ #define QERR_REPLAY_NOT_SUPPORTED \ "Record/replay feature is not supported for '%s'" =20 -#define QERR_UNDEFINED_ERROR \ - "An undefined error has occurred" - #define QERR_UNSUPPORTED \ "this feature or command is not currently supported" =20 diff --git a/monitor/misc.c b/monitor/misc.c index c563e901c0..bb102df823 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -441,7 +441,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, has_port ? port : -1, has_tls_port ? tls_port : -1, cert_subject)) { - error_setg(errp, QERR_UNDEFINED_ERROR); + error_setg(errp, "Could not set up display for migration"); return; } return; --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607626330; cv=none; d=zohomail.com; s=zohoarc; b=eufO9z6iq+sKd5GBd9gIHMCZknxgrTWnqPflOSN6OtWHsY/6unYN/DCrR+UdNNcyUi9k4x9NBUUuKlpJfeFk5VwxIC2IFi3C0bj4VWs6QGR+nsVt0qHpQ2xuQ2blEh3VjCW3XtUFHBt4CTXLiPdKtchBKcvj+FyrieubSrcaL7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607626330; 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=BWx54JLBdNpUQSWfOzrXU77D94vLd9uJoy+YnRD74FA=; b=LHW072SJ3U46qrTkthSf4ZUI9vLXy6LSKvkf6pwsUVoNjCAImzfnFolz9pnu2LLs0cvWwo+MyRiWSjft6HR5ny/bPQtlJizJWc0govJr+/jmumFns26jQbOZAhw/dbjC987DJ8pzX+4KbQQKDWSEGBA7wTwLnaaBOYntMNFGOGg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607626330365252.86012661288453; Thu, 10 Dec 2020 10:52:10 -0800 (PST) Received: from localhost ([::1]:35682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPAk-0005DT-Mm for importer@patchew.org; Thu, 10 Dec 2020 11:52:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrl-0008R7-8j for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrZ-0003Tf-83 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-P5xuXZoLMNOcRYnNXBPv2g-1; Thu, 10 Dec 2020 11:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A4C1100A957; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5B7D5C260; Thu, 10 Dec 2020 16:31:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D04EC10FA0A9; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BWx54JLBdNpUQSWfOzrXU77D94vLd9uJoy+YnRD74FA=; b=ZIK0XRItOBODC38GTG58xRn8mSj0jbnDlzE5Od2DL1KgqaXRoH3X2SS2lDMlGeBsPzcH2J wi6Z2eJpD68lEiRu1ISoC4f675USdFyaBgtIc/465a59p9rKBFITklWDmLi9SPcxjrBMt/ XZuLSS1uVaq1bXfy8L0HNYYT2BNK/cQ= X-MC-Unique: P5xuXZoLMNOcRYnNXBPv2g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 07/13] ui: Tweak a client_migrate_info error message Date: Thu, 10 Dec 2020 17:31:26 +0100 Message-Id: <20201210163132.2919935-8-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change Parameter 'protocol' expects spice to Parameter 'protocol' expects 'spice' for consistency with similar error messages elsewhere. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-7-armbru@redhat.com> --- monitor/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/misc.c b/monitor/misc.c index bb102df823..7ffe6f7a84 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -447,7 +447,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "spice"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'"); } =20 static void hmp_logfile(Monitor *mon, const QDict *qdict) --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607629190; cv=none; d=zohomail.com; s=zohoarc; b=DdecBj6+6dV40ad0eX7QlyfgdAKe2hsREnxDgnscELcCJXBot2A5sU5I2xYIE/PCUsh/74wDDOfn7uWJBpfWMjxpevp7v5lX1EgqIqFctVNYzzz0RKSKt0Z71QBi1bvN/a/TA33JLHgw99VlXlqlZRx7gcFUp30a8YxXFhhWge8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607629190; 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=+XZ27pivnTCpVjagT3xZv6YltdtK87FBiuGDMyDsOnQ=; b=i8MvHZtEv7XTnls498RIEh7APJHgEaVu2spY/BiNb4YKzy0RzB1rttimtGFjqXYbC3IuD3jt/IyGcY14sMsSth0rE9OhjItCpzATSWg27MMxYLozncumRlObXp+++xQQUmxprKByOhI5T6V7zSx3O0rN/VBu6I/x5uvkmIsuN4M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607629190639382.30507566332096; Thu, 10 Dec 2020 11:39:50 -0800 (PST) Received: from localhost ([::1]:55614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knP61-0001IF-7k for importer@patchew.org; Thu, 10 Dec 2020 11:47:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrk-0008QP-Uh for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrb-0003Tn-5U for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-FbYMJoAsOqSqoKlZIqbUUQ-1; Thu, 10 Dec 2020 11:32:12 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CA86C2A0; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA1A510013C0; Thu, 10 Dec 2020 16:31:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D37C310FA0AA; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+XZ27pivnTCpVjagT3xZv6YltdtK87FBiuGDMyDsOnQ=; b=MGyz2ZyC27pa5UP6MBk8xthQ0wCvlF80ysz0QGlFeEnpOjHOjGqSTt5HKnFX6VoCpbj4NM o7MBHNJrSO7DT30UcKWvVBhpu2s5A7aY1Cpv8g4eTkspaYWFzn9UXmdfgyCUPf3xKLTWJk 9fD/BXjt+Je/M06EnwMP7Biphn51KVw= X-MC-Unique: FbYMJoAsOqSqoKlZIqbUUQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 08/13] qga: Replace an unreachable error by abort() Date: Thu, 10 Dec 2020 17:31:27 +0100 Message-Id: <20201210163132.2919935-9-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" check_suspend_mode()'s error message Parameter 'mode' expects GuestSuspendMode makes no sense to users: GuestSuspendMode is a C enum. Fortunately, it is unreachable. Replace it by abort(). Cc: Michael Roth Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-8-armbru@redhat.com> --- qga/commands-win32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 300b87c859..87dc43e837 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1441,8 +1441,7 @@ static void check_suspend_mode(GuestSuspendMode mode,= Error **errp) } break; default: - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "mode", - "GuestSuspendMode"); + abort(); } } =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607627305; cv=none; d=zohomail.com; s=zohoarc; b=DuzkiuthMUg47LlG2AUXxNPJKfOUj7Q2VBL5a1n+ufSN2ZC8WM4iVgrL/xX1ZgT4gZGKSxTDtxAboPzF+r2/Sprz9n87cEg/BoUJc0VtOmz56xMmVip+pHQ1bwiCPuWkgIyrYJo/3S4I8AUOPI04cgbaT9aPUNUrgXRI72SlHYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607627305; 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=whLHOsBRY9uTzZBcWpVaxSpApfI2gzRbAk+ZaPehyaY=; b=OIZd7Nb1SM00+luHusSBoeev9kOkWdBo8YhK8AiE16v9oCQy8Doxr98Xsq8CBOtusCHdywuVBiRgY9W8V3pNb5QJPfuJ9rj6Y3S7x/4lAEV5sfEy9kqGDLtzu/dPCdECn01HoyoRwPxGiONXDj6vMI82PC+oKRbSDs82kyNCa+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607627305163396.62595123429423; Thu, 10 Dec 2020 11:08:25 -0800 (PST) Received: from localhost ([::1]:45604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPGY-0001M2-WA for importer@patchew.org; Thu, 10 Dec 2020 11:58:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrm-0008TW-NA for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37209) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrd-0003VU-0u for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-scSb4_YWPjCGLLJFRsubPg-1; Thu, 10 Dec 2020 11:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A89B100A958; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 076801002388; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D6B4010FA0AB; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=whLHOsBRY9uTzZBcWpVaxSpApfI2gzRbAk+ZaPehyaY=; b=A4TtoGsdbk10WLQUBFI2nJZLmta88pWAm60pvXBMAFERH1u4/jvTDXy0146NofCWoApEpJ +ff1oC3fwUjWSe6l/FggbcyCxXMENCBK4ByAe9t+/k3RQMGhW3tu5UDHDJh5g95n0LiUSr a6Ua7D/ppRTYjFaGOXHvtKrJtmeSkCc= X-MC-Unique: scSb4_YWPjCGLLJFRsubPg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 09/13] qga: Tweak a guest-shutdown error message Date: Thu, 10 Dec 2020 17:31:28 +0100 Message-Id: <20201210163132.2919935-10-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change Parameter 'mode' expects halt|powerdown|reboot to Parameter 'mode' expects 'halt', 'powerdown', or 'reboot' for consistency with similar error messages elsewhere. Cc: Michael Roth Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-9-armbru@redhat.com> --- qga/commands-win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 87dc43e837..ba1fd07d06 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -334,7 +334,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode= , Error **errp) shutdown_flag |=3D EWX_REBOOT; } else { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "mode", - "halt|powerdown|reboot"); + "'halt', 'powerdown', or 'reboot'"); return; } =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 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=1607619361; cv=none; d=zohomail.com; s=zohoarc; b=LzYZhcy4DqTuzMO+MMBYdMRV3Y37i+X6nrNSLIqb/TLCEXjIsFchv7FVyv4ew+VkrD3CuPMyS7kGvmVxE5vUxezmgEYhtn5rjtmib6Pq3puIGcwalc2M5FWL6K8Zl5dKGN77ATY+Rg7VxDK7EGdtu/aawhOv3FI41t9MIiw009c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607619361; 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=70IyvxiTdghA2P+x8r/0EH+VVOaFEVaJwPmFwrFXF/o=; b=ny3fmzI039E/1EY3L7PGr6vzuDbM82b+MSbmZZ6r4qJGHhUetHQ5ZY/6vL5tT2iH195qzxDUAGcwc7Wbt0v1euC/jXps1Ujp5ZtXY6sjqLu4cvPpywW98+SP7o00r6EoibusxqRxxOzvr3yE/Ox2x4NQO8fJIrpr9fZTpqOgjd4= 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 1607619361032644.722445081516; Thu, 10 Dec 2020 08:56:01 -0800 (PST) Received: from localhost ([::1]:41462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPEV-0007rz-Cl for importer@patchew.org; Thu, 10 Dec 2020 11:55:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrj-0008Ma-5j for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrY-0003TP-0X for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-aJ9RKLg_N-io09jA8Jlbag-1; Thu, 10 Dec 2020 11:32:08 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7761981CBF6; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 129535D9CC; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DA05A10FA0AC; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=70IyvxiTdghA2P+x8r/0EH+VVOaFEVaJwPmFwrFXF/o=; b=C2u+3Hq4Ig06Ids6j7LkvZ78+htQEfKc5nSEPwbn3/msyzz904yJyQxV294itKw0Zxt0FS O69KPPhDRgmyq9ennZ7dQt3kXE/1sjt5qyM3M6fCsWz2jXI7Sb80JYoHErA5JnEShM1dN9 ZY5wdfcKlyj07/8zFS/Qxpx+pKCrDcE= X-MC-Unique: aJ9RKLg_N-io09jA8Jlbag-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 10/13] qom: Improve {qom, device}-list-properties error messages Date: Thu, 10 Dec 2020 17:31:29 +0100 Message-Id: <20201210163132.2919935-11-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) device-list-properties reports Parameter 'typename' expects device when @typename exists, but isn't a TYPE_DEVICE. Improve this to Parameter 'typename' expects a non-abstract device type qom-list-properties reports Parameter 'typename' expects object when @typename exists, but isn't a TYPE_OBJECT. Improve this to Parameter 'typename' expects a QOM type Cc: Paolo Bonzini Cc: "Daniel P. Berrang=C3=A9" Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-10-armbru@redhat.com> --- qom/qom-qmp-cmds.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 310ab2d048..2dd233f293 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -138,15 +138,10 @@ ObjectPropertyInfoList *qmp_device_list_properties(co= nst char *typename, return NULL; } =20 - klass =3D object_class_dynamic_cast(klass, TYPE_DEVICE); - if (klass =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_DE= VICE); - return NULL; - } - - if (object_class_is_abstract(klass)) { + if (!object_class_dynamic_cast(klass, TYPE_DEVICE) + || object_class_is_abstract(klass)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", - "non-abstract device type"); + "a non-abstract device type"); return NULL; } =20 @@ -208,9 +203,9 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const c= har *typename, return NULL; } =20 - klass =3D object_class_dynamic_cast(klass, TYPE_OBJECT); - if (klass =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_OB= JECT); + if (!object_class_dynamic_cast(klass, TYPE_OBJECT)) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", + "a QOM type"); return NULL; } =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607624799; cv=none; d=zohomail.com; s=zohoarc; b=AcuqachwdCs/YSFYxbDKhS7pJBBBqbN1G9sJzQa9Ym2V1slqUci86QIwGO2tjjPs/tXpWiuI4LSLv49JvBcjOM/hBVhZctNCrh+ha2htlzVz9C2Z8pjClf2MTcmZ1a8BCR213fMwiNPOCBrUrynF9vDkVAfWlzINRuXNBZYeDFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607624799; 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=HpIOkMETxTNvn4IdWCeFq9C+flnFXsj4VtwtYrpYdrM=; b=aSY1wb0ZaXT+2gwRJIU17mb8VrKNZxACTfp0aRZGNOkCiEJw38XT/MhF0GvToz8hgtCo5Jb+NAHtLwirSXGMKKjz9ifzyXdC1yRZJZgCoPjXwEsAWT1ZuBCKWEEr8JvOgU094cw87zzbmqUCXjpvbWqPMS+VNHenhvoClCzTm5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607624797079293.47671195960334; Thu, 10 Dec 2020 10:26:37 -0800 (PST) Received: from localhost ([::1]:49904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPJL-0003F0-27 for importer@patchew.org; Thu, 10 Dec 2020 12:00:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrj-0008NI-Ep for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrZ-0003TX-3K for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-1b8KuS0iMk-NfnP1f36pFA-1; Thu, 10 Dec 2020 11:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76A39100A959; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44FAA5C6B8; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DD20610FA0AD; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpIOkMETxTNvn4IdWCeFq9C+flnFXsj4VtwtYrpYdrM=; b=Xpq38H5Ke9+G/ncbtqwFCfjTG4IcFSd65O08slfwajs8Iaro5VHz6IYj1Iu15twH69kIqD n/sdQdW5kn4Ek2e3SbCqh59XeRjAB1Z4/osZ5dGTEbWDp5ZxaM/6bSG+4jWqm9canvYB62 tYcv1wITDrwQjqFKt8jHiQV5qBkt1x4= X-MC-Unique: 1b8KuS0iMk-NfnP1f36pFA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 11/13] Tweak a few "Parameter 'NAME' expects THING" error message Date: Thu, 10 Dec 2020 17:31:30 +0100 Message-Id: <20201210163132.2919935-12-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change to "expects a THING" where that's an obvious improvement Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-11-armbru@redhat.com> --- block/quorum.c | 2 +- blockdev.c | 2 +- chardev/char.c | 2 +- hw/core/qdev-properties-system.c | 2 +- softmmu/qdev-monitor.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index b10fc2089e..4b08a199b7 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -856,7 +856,7 @@ static int quorum_valid_threshold(int threshold, int nu= m_children, Error **errp) =20 if (threshold < 1) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "vote-threshold", "value >=3D 1"); + "vote-threshold", "a value >=3D 1"); return -ERANGE; } =20 diff --git a/blockdev.c b/blockdev.c index d05a8740f4..6c7be7c522 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2991,7 +2991,7 @@ static void blockdev_mirror_common(const char *job_id= , BlockDriverState *bs, } if (granularity & (granularity - 1)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity", - "power of 2"); + "a power of 2"); return; } =20 diff --git a/chardev/char.c b/chardev/char.c index aa4282164a..a9b8c5a9aa 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -521,7 +521,7 @@ static const ChardevClass *char_get_class(const char *d= river, Error **errp) =20 if (object_class_is_abstract(oc)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "abstract device type"); + "an abstract device type"); return NULL; } =20 diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 9d80a07d26..8912fb4e9c 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -776,7 +776,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, cons= t char *name, } if (value < -1 || value > 255) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name ? name : "null", "pci_devfn"); + name ? name : "null", "a value between -1 and 255"); return; } *ptr =3D value; diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 301089eaea..31e5b589b7 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -237,7 +237,7 @@ static DeviceClass *qdev_get_device_class(const char **= driver, Error **errp) =20 if (object_class_is_abstract(oc)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "non-abstract device type"); + "a non-abstract device type"); return NULL; } =20 @@ -245,7 +245,7 @@ static DeviceClass *qdev_get_device_class(const char **= driver, Error **errp) if (!dc->user_creatable || (qdev_hotplug && !dc->hotpluggable)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "pluggable device type"); + "a pluggable device type"); return NULL; } =20 --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 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=1607619064; cv=none; d=zohomail.com; s=zohoarc; b=ayiBTmqdU0DVR3u1e10OVUj54FudEtCuYVG+uDPb9mLxr2nZbNNR7lAm0rZKFIwfgu9XeIeyZFXbrHYmmEaZWwrNq7ivxeOR/IfM2ksJ1O+FvjB83v7HL1drNaXUG3SnFvu4oWU6n4weCRx8Acc4bTcjjXupzYc9uoE6xPsB4eQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607619064; 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=jFExlQjclOJQPi9CsfYKEx9DSxVLykp97uzuP1FqE8o=; b=btOKktnc6eA2u07DH8VEqkz0l/B6RnDfzrLyKr688pntqDAy5RzLhkmtUgZz4wR/OyN4dLf/Ovv35sRUGNTCfHzFyaDRnD//5ntWhRgiJZiMFdIVddEVkLiC8HGZ7VruNtsTNxE4Q/TKdTUsiUafVOI+y/bVReLzpLvNF0V8WI4= 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 1607619064577830.884899473259; Thu, 10 Dec 2020 08:51:04 -0800 (PST) Received: from localhost ([::1]:33102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knP9i-0003ve-U2 for importer@patchew.org; Thu, 10 Dec 2020 11:51:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrO-0008Gb-Ot for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrK-0003Rq-MG for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-WgIPKD-YMwaV7Pw_A3zo2w-1; Thu, 10 Dec 2020 11:31:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD5B1801ABE; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4543E5C6C1; Thu, 10 Dec 2020 16:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E0E4310FA0B5; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jFExlQjclOJQPi9CsfYKEx9DSxVLykp97uzuP1FqE8o=; b=Bvjorx+gte8Z3SUSECBMRs4+1tGVzsbWwyMxmSJ91hP7WPFBOr48+egZkWWa5EHp3aoHzR 8nCIcG1cPSycXydz8OROgE/cpxXKjKZMe0ctkqe0N87ZMOqS//e3C4A5OHccbqjd3WXqDn BKMmz9v9+I0m80KqmmpNaPJfAyBzjJc= X-MC-Unique: WgIPKD-YMwaV7Pw_A3zo2w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 12/13] qapi: Normalize version references x.y.0 to just x.y Date: Thu, 10 Dec 2020 17:31:31 +0100 Message-Id: <20201210163132.2919935-13-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Eduardo Habkost 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" We use x.y most of the time, and x.y.0 sometimes. Normalize for consistency. Reported-by: Eduardo Habkost Signed-off-by: Markus Armbruster Message-Id: <20201118064158.3359056-1-armbru@redhat.com> Reviewed-by: Eric Blake --- qapi/block-core.json | 28 ++++++++++++------------ qapi/block-export.json | 6 +++--- qapi/block.json | 2 +- qapi/char.json | 4 ++-- qapi/control.json | 14 ++++++------ qapi/machine-target.json | 22 +++++++++---------- qapi/machine.json | 46 ++++++++++++++++++++-------------------- qapi/migration.json | 16 +++++++------- qapi/misc-target.json | 2 +- qapi/misc.json | 30 +++++++++++++------------- qapi/net.json | 6 +++--- qapi/pci.json | 12 +++++------ qapi/qdev.json | 2 +- qapi/run-state.json | 16 +++++++------- qapi/ui.json | 40 +++++++++++++++++----------------- 15 files changed, 123 insertions(+), 123 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 04ad80bc1e..04c5196e59 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -302,7 +302,7 @@ # @ro: true if the backing device was open read-only # # @drv: the name of the block format used to open the backing device. As of -# 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', +# 0.14 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', # 'http', 'https', 'luks', 'nbd', 'parallels', 'qcow', # 'qcow2', 'raw', 'vdi', 'vmdk', 'vpc', 'vvfat' @@ -389,7 +389,7 @@ # @deprecated: Member @encryption_key_missing is deprecated. It is # always false. # -# Since: 0.14.0 +# Since: 0.14 # ## { 'struct': 'BlockDeviceInfo', @@ -607,7 +607,7 @@ # @deprecated: Member @dirty-bitmaps is deprecated. Use @inserted # member @dirty-bitmaps instead. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockInfo', 'data': {'device': 'str', '*qdev': 'str', 'type': 'str', 'removable': 'b= ool', @@ -655,7 +655,7 @@ # Returns: a list of @BlockInfo describing each virtual block device. Filt= er # nodes that were created implicitly are skipped over. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -812,17 +812,17 @@ # @wr_operations: The number of write operations performed by the device. # # @flush_operations: The number of cache flush operations performed by the -# device (since 0.15.0) +# device (since 0.15) # # @unmap_operations: The number of unmap operations performed by the device # (Since 4.2) # -# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.= 0). +# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15). # -# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15= .0). +# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15= ). # # @flush_total_time_ns: Total time spent on cache flushes in nanoseconds -# (since 0.15.0). +# (since 0.15). # # @unmap_total_time_ns: Total time spent on unmap operations in nanoseconds # (Since 4.2) @@ -884,7 +884,7 @@ # # @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockDeviceStats', 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int', @@ -987,7 +987,7 @@ # @backing: This describes the backing block device if it has one. # (Since 2.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockStats', 'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str', @@ -1011,7 +1011,7 @@ # # Returns: A list of @BlockStats for each virtual block devices. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1299,7 +1299,7 @@ # Returns: - nothing on success # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1484,7 +1484,7 @@ # Returns: - nothing on success # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -4852,7 +4852,7 @@ # Note: If action is "stop", a STOP event will eventually follow the # BLOCK_IO_ERROR event # -# Since: 0.13.0 +# Since: 0.13 # # Example: # diff --git a/qapi/block-export.json b/qapi/block-export.json index a9f488f99c..4eeac7842d 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -54,7 +54,7 @@ # # Returns: error if the server is already running. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-start', 'data': { 'addr': 'SocketAddressLegacy', @@ -155,7 +155,7 @@ # Returns: error if the server is not running, or export with the same name # already exists. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-add', 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated']= } @@ -211,7 +211,7 @@ # Stop QEMU's embedded NBD server, and unregister all devices previously # added via @nbd-server-add. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-stop' } =20 diff --git a/qapi/block.json b/qapi/block.json index a009f7d3a2..82fcf2c914 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -107,7 +107,7 @@ # - If @device is not a valid block device, DeviceNotFound # Notes: Ejecting a device with no media results in success # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/char.json b/qapi/char.json index 43486d1daa..58338ed62d 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -24,7 +24,7 @@ # Notes: @filename is encoded using the QEMU command line character device # encoding. See the QEMU man page for details. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'ChardevInfo', 'data': { 'label': 'str', @@ -38,7 +38,7 @@ # # Returns: a list of @ChardevInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/control.json b/qapi/control.json index 134f842baf..9c8a51352d 100644 --- a/qapi/control.json +++ b/qapi/control.json @@ -87,7 +87,7 @@ # exact format depends on the downstream however it highly # recommended that a unique name is used. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VersionInfo', 'data': {'qemu': 'VersionTriple', 'package': 'str'} } @@ -99,7 +99,7 @@ # # Returns: A @VersionInfo object describing the current version of QEMU. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -126,7 +126,7 @@ # # @name: The command name # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'CommandInfo', 'data': {'name': 'str'} } =20 @@ -137,7 +137,7 @@ # # Returns: A list of @CommandInfo for all supported commands # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -166,7 +166,7 @@ # # @name: The event name # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'EventInfo', 'data': {'name': 'str'} } =20 @@ -182,7 +182,7 @@ # # Returns: A list of @EventInfo. # -# Since: 1.2.0 +# Since: 1.2 # # Example: # @@ -212,7 +212,7 @@ # guaranteed. When using this interface, a premature EOF would not be # unexpected. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/machine-target.json b/qapi/machine-target.json index fec3bb8679..e7811654b7 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -17,7 +17,7 @@ # @name: the name of the CPU definition the model is based on # @props: a dictionary of QOM properties to be applied # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelInfo', 'data': { 'name': 'str', @@ -49,7 +49,7 @@ # version or machine-type, use @static (but keep in mind that some f= eatures may # be omitted). # -# Since: 2.8.0 +# Since: 2.8 ## { 'enum': 'CpuModelExpansionType', 'data': [ 'static', 'full' ] } @@ -73,7 +73,7 @@ # @subset: If model A is a subset of model B, model A is guaranteed to run # where model B runs. There are no guarantees about the other way. # -# Since: 2.8.0 +# Since: 2.8 ## { 'enum': 'CpuModelCompareResult', 'data': [ 'incompatible', 'identical', 'superset', 'subset' ] } @@ -85,7 +85,7 @@ # # @model: the baselined CpuModelInfo. # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelBaselineInfo', 'data': { 'model': 'CpuModelInfo' }, @@ -107,7 +107,7 @@ # CPU models identical. If the special property name "type" is included, t= he # models are by definition not identical and cannot be made identical. # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelCompareInfo', 'data': { 'result': 'CpuModelCompareResult', @@ -151,7 +151,7 @@ # Note: this command isn't specific to s390x, but is only implemented # on this architecture currently. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-comparison', 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' }, @@ -194,7 +194,7 @@ # Note: this command isn't specific to s390x, but is only implemented # on this architecture currently. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-baseline', 'data': { 'modela': 'CpuModelInfo', @@ -209,7 +209,7 @@ # # @model: the expanded CpuModelInfo. # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelExpansionInfo', 'data': { 'model': 'CpuModelInfo' }, @@ -246,7 +246,7 @@ # with a wrong type. Also returns an error if an expansion type is # not supported. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-expansion', 'data': { 'type': 'CpuModelExpansionType', @@ -306,7 +306,7 @@ # If @unavailable-features is not present, runnability # information for the CPU is not available. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'CpuDefinitionInfo', 'data': { 'name': 'str', @@ -325,7 +325,7 @@ # # Returns: a list of CpuDefInfo # -# Since: 1.2.0 +# Since: 1.2 ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'], 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386= ) || defined(TARGET_S390X) || defined(TARGET_MIPS)' } diff --git a/qapi/machine.json b/qapi/machine.json index 7c9a263778..330189efe3 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -71,7 +71,7 @@ # @arch: architecture of the cpu, which determines which additional fields # will be listed (since 2.6) # -# Since: 0.14.0 +# Since: 0.14 # # Notes: @halted is a transient state that changes frequently. By the tim= e the # data is sent to the client, the guest may no longer be halted. @@ -196,7 +196,7 @@ # # Returns: a list of @CpuInfo for each virtual CPU # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -319,23 +319,23 @@ # @is-default: whether the machine is default # # @cpu-max: maximum number of CPUs supported by the machine type -# (since 1.5.0) +# (since 1.5) # -# @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0) +# @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7) # # @numa-mem-supported: true if '-numa node,mem' option is supported by # the machine type and false otherwise (since 4.1) # # @deprecated: if true, the machine type is deprecated and may be removed # in future versions of QEMU according to the QEMU deprecation -# policy (since 4.1.0) +# policy (since 4.1) # # @default-cpu-type: default CPU model typename if none is requested via # the -cpu argument. (since 4.2) # # @default-ram-id: the default ID of initial RAM memory backend (since 5.2) # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'MachineInfo', 'data': { 'name': 'str', '*alias': 'str', @@ -351,7 +351,7 @@ # # Returns: a list of MachineInfo # -# Since: 1.2.0 +# Since: 1.2 ## { 'command': 'query-machines', 'returns': ['MachineInfo'] } =20 @@ -386,7 +386,7 @@ # # @arch: the target architecture # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'TargetInfo', 'data': { 'arch': 'SysEmuTarget' } } @@ -398,7 +398,7 @@ # # Returns: TargetInfo # -# Since: 1.2.0 +# Since: 1.2 ## { 'command': 'query-target', 'returns': 'TargetInfo' } =20 @@ -409,7 +409,7 @@ # # @UUID: the UUID of the guest # -# Since: 0.14.0 +# Since: 0.14 # # Notes: If no UUID was specified for the guest, a null UUID is returned. ## @@ -422,7 +422,7 @@ # # Returns: The @UuidInfo for the guest # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -457,7 +457,7 @@ # # Performs a hard reset of a guest. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -472,7 +472,7 @@ # # Requests that a guest perform a powerdown operation. # -# Since: 0.14.0 +# Since: 0.14 # # Notes: A guest may or may not respond to this command. This command # returning does not indicate that a guest has accepted the request= or @@ -549,7 +549,7 @@ # # Returns: If successful, nothing # -# Since: 0.14.0 +# Since: 0.14 # # Note: prior to 2.1, this command was only supported for x86 and s390 VMs # @@ -570,7 +570,7 @@ # # @present: true if KVM acceleration is built into this executable # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'KvmInfo', 'data': {'enabled': 'bool', 'present': 'bool'} } =20 @@ -581,7 +581,7 @@ # # Returns: @KvmInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -933,7 +933,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Errors were not reliably returned until 1.1 # @@ -962,7 +962,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Errors were not reliably returned until 1.1 # @@ -1185,7 +1185,7 @@ # the balloon size may not have changed. A guest can change the ba= lloon # size independent of this command. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1205,7 +1205,7 @@ # @actual: the logical size of the VM in bytes # Formula used: logical_vm_size =3D vm_ram_size - balloon_size # -# Since: 0.14.0 +# Since: 0.14 # ## { 'struct': 'BalloonInfo', 'data': {'actual': 'int' } } @@ -1220,7 +1220,7 @@ # kernel module cannot support it, KvmMissingCap # - If no balloon device is present, DeviceNotActive # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1268,7 +1268,7 @@ # is omitted if target doesn't support memory hotplug # (i.e. CONFIG_MEM_DEVICE not defined at build time). # -# Since: 2.11.0 +# Since: 2.11 ## { 'struct': 'MemoryInfo', 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } @@ -1284,7 +1284,7 @@ # -> { "execute": "query-memory-size-summary" } # <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } # -# Since: 2.11.0 +# Since: 2.11 ## { 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } =20 diff --git a/qapi/migration.json b/qapi/migration.json index 3c75820527..d1d9632c2a 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -46,7 +46,7 @@ # @pages-per-second: the number of memory pages transferred per second # (Since 4.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , @@ -224,7 +224,7 @@ # only returned if VFIO device is present, migration is supported b= y all # VFIO devices and status is 'active' or 'completed' (since 5.2) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MigrationInfo', 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', @@ -252,7 +252,7 @@ # # Returns: @MigrationInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1143,7 +1143,7 @@ # @tls-port: spice tcp port for tls-secured channels # @cert-subject: server certificate subject # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1343,7 +1343,7 @@ # # Notes: This command succeeds even if there is no migration process runni= ng. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1383,7 +1383,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1407,7 +1407,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -1486,7 +1486,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: # diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 1e561fa97b..cbe5135264 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -12,7 +12,7 @@ # # Note: This event is rate-limited. # -# Since: 0.13.0 +# Since: 0.13 # # Example: # diff --git a/qapi/misc.json b/qapi/misc.json index 40df513856..27ccd7385f 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -27,7 +27,7 @@ # # Returns: nothing on success. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -47,7 +47,7 @@ # # @name: The name of the guest # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'NameInfo', 'data': {'*name': 'str'} } =20 @@ -58,7 +58,7 @@ # # Returns: @NameInfo of the guest # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -132,7 +132,7 @@ # # Stop all guest VCPU execution. # -# Since: 0.14.0 +# Since: 0.14 # # Notes: This function will succeed even if the guest is already in the st= opped # state. In "inmigrate" state, it will ensure that the guest @@ -152,7 +152,7 @@ # # Resume guest VCPU execution. # -# Since: 0.14.0 +# Since: 0.14 # # Returns: If successful, nothing # @@ -210,7 +210,7 @@ # # Returns: the output of the command as a string # -# Since: 0.14.0 +# Since: 0.14 # # Notes: This command only exists as a stop-gap. Its use is highly # discouraged. The semantics of this command are not @@ -264,7 +264,7 @@ # Returns: - Nothing on success. # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -296,7 +296,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: If @fdname already exists, the file descriptor assigned to # it will be closed and replaced by the received file @@ -322,7 +322,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -342,7 +342,7 @@ # @fd: The file descriptor that was received via SCM rights and # added to the fd set. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'AddfdInfo', 'data': {'fdset-id': 'int', 'fd': 'int'} } =20 @@ -363,7 +363,7 @@ # # If @fdset-id is not specified, a new fd set will be created. # -# Since: 1.2.0 +# Since: 1.2 # # Example: # @@ -388,7 +388,7 @@ # Returns: - Nothing on success # - If @fdset-id or @fd is not found, FdNotFound # -# Since: 1.2.0 +# Since: 1.2 # # Notes: The list of fd sets is shared by all monitor connections. # @@ -412,7 +412,7 @@ # # @opaque: A free-form string that can be used to describe the fd. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'FdsetFdInfo', 'data': {'fd': 'int', '*opaque': 'str'} } @@ -426,7 +426,7 @@ # # @fds: A list of file descriptors that belong to this fd set. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'FdsetInfo', 'data': {'fdset-id': 'int', 'fds': ['FdsetFdInfo']} } @@ -438,7 +438,7 @@ # # Returns: A list of @FdsetInfo # -# Since: 1.2.0 +# Since: 1.2 # # Note: The list of fd sets is shared by all monitor connections. # diff --git a/qapi/net.json b/qapi/net.json index a3a1336001..c31748c87f 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -20,7 +20,7 @@ # Returns: Nothing on success # If @name is not a valid network device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Not all network adapters support setting link status. This comma= nd # will succeed even if the network adapter does not support link st= atus @@ -42,7 +42,7 @@ # # Additional arguments depend on the type. # -# Since: 0.14.0 +# Since: 0.14 # # Returns: Nothing on success # If @type is not a valid network backend, DeviceNotFound @@ -67,7 +67,7 @@ # Returns: Nothing on success # If @id is not a valid network backend, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/pci.json b/qapi/pci.json index b79cbd787b..ee7c659fec 100644 --- a/qapi/pci.json +++ b/qapi/pci.json @@ -18,7 +18,7 @@ # # @limit: the ending address (guest physical) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciMemoryRange', 'data': {'base': 'int', 'limit': 'int'} } =20 @@ -38,7 +38,7 @@ # # @mem_type_64: if @type is 'memory', true if the BAR is 64-bit # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciMemoryRegion', 'data': {'bar': 'int', 'type': 'str', 'address': 'int', 'size': 'int', @@ -82,7 +82,7 @@ # # @devices: a list of @PciDeviceInfo for each device on this bridge # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciBridgeInfo', 'data': {'bus': 'PciBusInfo', '*devices': ['PciDeviceInfo']} } @@ -148,7 +148,7 @@ # Notes: the contents of @class_info.desc are not stable and should only be # treated as informational. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciDeviceInfo', 'data': {'bus': 'int', 'slot': 'int', 'function': 'int', @@ -165,7 +165,7 @@ # # @devices: a list of devices on this bus # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciInfo', 'data': {'bus': 'int', 'devices': ['PciDeviceInfo']= } } =20 @@ -179,7 +179,7 @@ # all PCI devices attached to it. Each device is represented by a # json-object. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/qdev.json b/qapi/qdev.json index 13254529bf..b83178220b 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -86,7 +86,7 @@ # DEVICE_DELETED event. Guest reset will automatically complete rem= oval # for all devices. # -# Since: 0.14.0 +# Since: 0.14 # # Example: # diff --git a/qapi/run-state.json b/qapi/run-state.json index 964c8ef391..b2f77cbf3f 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -107,7 +107,7 @@ # # @status: the virtual machine @RunState # -# Since: 0.14.0 +# Since: 0.14 # # Notes: @singlestep is enabled through the GDB stub ## @@ -121,7 +121,7 @@ # # Returns: @StatusInfo reflecting all VCPUs # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -149,7 +149,7 @@ # Note: If the command-line option "-no-shutdown" has been specified, qemu= will # not exit, and a STOP event will eventually follow the SHUTDOWN eve= nt # -# Since: 0.12.0 +# Since: 0.12 # # Example: # @@ -165,7 +165,7 @@ # Emitted when the virtual machine is powered down through the power contr= ol # system, such as via ACPI. # -# Since: 0.12.0 +# Since: 0.12 # # Example: # @@ -187,7 +187,7 @@ # # @reason: The @ShutdownCause of the RESET. (since 4.0) # -# Since: 0.12.0 +# Since: 0.12 # # Example: # @@ -202,7 +202,7 @@ # # Emitted when the virtual machine is stopped # -# Since: 0.12.0 +# Since: 0.12 # # Example: # @@ -217,7 +217,7 @@ # # Emitted when the virtual machine resumes execution # -# Since: 0.12.0 +# Since: 0.12 # # Example: # @@ -288,7 +288,7 @@ # # Note: This event is rate-limited. # -# Since: 0.13.0 +# Since: 0.13 # # Example: # diff --git a/qapi/ui.json b/qapi/ui.json index 6c7b33cb72..d08d72b439 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -27,7 +27,7 @@ # Returns: - Nothing on success # - If Spice is not enabled, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -56,7 +56,7 @@ # Returns: - Nothing on success # - If @protocol is 'spice' and Spice is not active, DeviceNotFou= nd # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Time is relative to the server and currently there is no way to # coordinate server time with client time. It is not recommended to @@ -88,7 +88,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -156,7 +156,7 @@ # # @tls: true if the channel is encrypted, false otherwise. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'SpiceChannel', 'base': 'SpiceBasicInfo', @@ -215,7 +215,7 @@ # # @channels: a list of @SpiceChannel for each active spice channel # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'SpiceInfo', 'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port':= 'int', @@ -230,7 +230,7 @@ # # Returns: @SpiceInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -278,7 +278,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -305,7 +305,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -333,7 +333,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -420,7 +420,7 @@ # @sasl_username: If SASL authentication is in use, the SASL username # used for authentication. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VncClientInfo', 'base': 'VncBasicInfo', @@ -462,7 +462,7 @@ # # @clients: a list of @VncClientInfo of all currently connected clients # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VncInfo', 'data': {'enabled': 'bool', '*host': 'str', @@ -555,7 +555,7 @@ # # Returns: @VncInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -619,7 +619,7 @@ # Note: This event is emitted before any authentication takes place, thus # the authentication ID is not provided # -# Since: 0.13.0 +# Since: 0.13 # # Example: # @@ -647,7 +647,7 @@ # # @client: client information # -# Since: 0.13.0 +# Since: 0.13 # # Example: # @@ -674,7 +674,7 @@ # # @client: client information # -# Since: 0.13.0 +# Since: 0.13 # # Example: # @@ -709,7 +709,7 @@ # # @absolute: true if this device supports absolute coordinates as input # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MouseInfo', 'data': {'name': 'str', 'index': 'int', 'current': 'bool', @@ -722,7 +722,7 @@ # # Returns: a list of @MouseInfo for each device # -# Since: 0.14.0 +# Since: 0.14 # # Example: # @@ -792,7 +792,7 @@ # 'sysrq' will be transparently changed to 'print', so they # are effectively synonyms. # -# Since: 1.3.0 +# Since: 1.3 # ## { 'enum': 'QKeyCode', @@ -824,7 +824,7 @@ # # Represents a keyboard key. # -# Since: 1.3.0 +# Since: 1.3 ## { 'union': 'KeyValue', 'data': { @@ -847,7 +847,7 @@ # Returns: - Nothing on success # - If key is unknown or redundant, InvalidParameter # -# Since: 1.3.0 +# Since: 1.3 # # Example: # --=20 2.26.2 From nobody Fri May 17 07:56:05 2024 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=1607619389; cv=none; d=zohomail.com; s=zohoarc; b=isL6HmsUCOILoDU+IDPALFTEOB6HatgR6pgxlV++Py8iM2URUCWVVwDLFGxi7k1uzPxdxmCkPcZAFDC7nuwakY5vWZfgLPFVJ01TY4PiDGpHZQ4ZDowhOrPFh7NqdA/eRg5FDLXdq3ZyhY+AdGPVPRVB9UIM4+mOQIJ0hae08XE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607619389; 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=tZrxi30WwUoJ1C0j/7wqKTKn6AM2VSa1C1oPUxEWR6I=; b=SFtgAXdS2eyypipMVQDUQyYfOC+h/QM+Vx8jk+iur5ryTGmo9nY78feyU1slp0PpdtK4Cagn+se/8ZGhyinC7X5UMmJ0HsHMpWIJZYgfYMPMPBe41ZeUkoP05OJ0SRiEYkIsWDZr0xZQv52YdvprlfxSZw0PVDdaxWTlPZUAlyY= 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 16076193892317.447566284924619; Thu, 10 Dec 2020 08:56:29 -0800 (PST) Received: from localhost ([::1]:42742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knPEv-0008Sa-Mc for importer@patchew.org; Thu, 10 Dec 2020 11:56:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrl-0008Rc-J2 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrZ-0003TJ-8F for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-CGDUiNawPEOlMmsv2iyXLA-1; Thu, 10 Dec 2020 11:32:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ACE66195D57B; Thu, 10 Dec 2020 16:31:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C60160BF1; Thu, 10 Dec 2020 16:31:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E452710FA0BE; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tZrxi30WwUoJ1C0j/7wqKTKn6AM2VSa1C1oPUxEWR6I=; b=eiUhH4ids6UCKNyEuLw2HLOQLYxeONSN/NPAHQgi7tA5T0NmoNxymi0WC7hdCN5ArrJLt+ +uNWJo0SwZbRXnPFpdblYdBCkMoDKmephOkTnu+Z0YVgFnNGasqIj6r0zyNE88m6JY6AJM LBg+LFyBc9ZMOSEVZLVXNDW6RQyw8sY= X-MC-Unique: CGDUiNawPEOlMmsv2iyXLA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 13/13] docs/devel/writing-qmp-commands.txt: Fix docs Date: Thu, 10 Dec 2020 17:31:32 +0100 Message-Id: <20201210163132.2919935-14-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: peter.maydell@linaro.org, Zihao Chang 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" From: Zihao Chang Fix the example of add qmp hello-world example. Without ":", make will report error: ../qapi/misc.json:573:2: line should end with ':' Signed-off-by: Zihao Chang Message-Id: <20201201143308.1626-1-changzihao1@huawei.com> Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster --- docs/devel/writing-qmp-commands.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/writing-qmp-commands.txt b/docs/devel/writing-qmp-c= ommands.txt index 46a6c48683..28984686c9 100644 --- a/docs/devel/writing-qmp-commands.txt +++ b/docs/devel/writing-qmp-commands.txt @@ -243,7 +243,7 @@ There are many examples of such documentation in the sc= hema file already, but here goes "hello-world"'s new entry for qapi/misc.json: =20 ## -# @hello-world +# @hello-world: # # Print a client provided string to the standard output stream. # --=20 2.26.2