From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548519; cv=none; d=zohomail.com; s=zohoarc; b=df6FR/n3G+CynyofiLTtPfTJ1GHZTYLJW+GCknUE//VFEpX60pogonlEN0KFOTor6UciyyTQEOkz9YnWlSsrmyp+RjtbFHBVIMGHMyEGz9f2fk6sR3/adm9vCtFuGB7vzvqPx8eaeWwNq3p41gxuhknkliXJBB1X5joV88laD/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=zJfRYk8AR4coyrrBWAVu9mbwtHAPCSHQTNG8rfhtJcI=; b=igrpwVDuBz7i5bFOvYNkNa/BnOaKqgSi8MotDws6S5Kw+zX8Oa2bLoESkVYtlHVTBdND9Rw3d7xiR0E0HnVHQ8OA70v4Ek72M/LG3mHRygNKgWHq6erMEZbZh4BtDBaL1CVIwMta/wiE6AXgHcqtCr8rS4wroVutQtabAtOKTV4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635548519420905.2076796743358; Fri, 29 Oct 2021 16:01:59 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-583-SEcLWs5lO8KazE0Uletodg-1; Fri, 29 Oct 2021 19:01:55 -0400 Received: by mail-wr1-f69.google.com with SMTP id q17-20020adfcd91000000b0017bcb12ad4fso1318561wrj.12 for ; Fri, 29 Oct 2021 16:01:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id d8sm3375297wrm.76.2021.10.29.16.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548518; 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=zJfRYk8AR4coyrrBWAVu9mbwtHAPCSHQTNG8rfhtJcI=; b=JbJq5BPcYKBfugoWv2rBQRYUParOUKPEQZSNvuISvatOzEoFTJeyTH+q+JKqu8PoKvqlSt Xzltmz6HUQKfV468+S0kJwvUFSDAjLPi1T0RKsTEA8n6dI+d+NXTHJ13xcnsa9ug34/6hb DDBXgt21ACsDbDdOVjw6j257UIDpxTM= X-MC-Unique: SEcLWs5lO8KazE0Uletodg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zJfRYk8AR4coyrrBWAVu9mbwtHAPCSHQTNG8rfhtJcI=; b=ZlZqP5aY5/PSzB1ylGa7zK4cm+gwY2h8vxef6O4k5ISHfvu+mVktGxJJxl3gPZJaQ7 28G9s3UIE0PPKtnNJZXXpKoBLic/pF8kdaAdIMRn1MJ/YuqwGSM/mgLtVWpzsP9T7DOk WWXtcoSAn0Vh51Gf9No8AsxIwDLLoR6QGoV2quqi/Zi3oGyFZq12vwQkLqho1to7GrnL d4ziR8Yw4bmNh/s05AU2abhZsyEi37OD7m/HcF3ZOjKzrZQp8hEv5/Vv3aRar58/XOZl LXQv2GMKyz7IF2l1qcLfAs+dzH6zlcW2aRre+hm8WG6kQiWhj7yKwsAKbcRgZzdeOAXb C/uw== X-Gm-Message-State: AOAM531Bi0GeYbY6QyZt/39YHTod5TfPmOlurtQYy6URukLEqP1aDTI+ ewVBYW+s0pN54NC+gHJt4hvnPwTonOTO/3ZxF08fVY8d7ImeFsDeA2vR1YWSZpn1NAwoJB6N9Ft 7uxXt9skeqfWkJg== X-Received: by 2002:adf:f88c:: with SMTP id u12mr7057021wrp.29.1635548513889; Fri, 29 Oct 2021 16:01:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9t9VWGQVR+ZmAw9HSzcDDibiaL4VAowMPM+HHB4IPlqg7doqjSeKYtJu8UWnMVUEcAbITZg== X-Received: by 2002:adf:f88c:: with SMTP id u12mr7057003wrp.29.1635548513775; Fri, 29 Oct 2021 16:01:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 1/5] hw/core: Remove use of QERR_UNSUPPORTED Date: Sat, 30 Oct 2021 01:01:43 +0200 Message-Id: <20211029230147.2465055-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548524480100001 QERR_UNSUPPORTED definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde --- hw/core/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 481c4b3c7e5..b4b4a1ed286 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -70,7 +70,7 @@ void nmi_monitor_handle(int cpu_index, Error **errp) if (ns.handled) { error_propagate(errp, ns.err); } else { - error_setg(errp, QERR_UNSUPPORTED); + error_setg(errp, "This command is not currently supported"); } } =20 --=20 2.31.1 From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548522; cv=none; d=zohomail.com; s=zohoarc; b=CIpvfrmRCbdudNC1AEh4Zji43ZFb8np2eT4kavq0CXSWxg1/2ZgaF0R3C7FNPQHOm1HTt0CwClCXLvS2A+iFAcspYTRhNbNxXLRIQ5nvoutemW1JOGthI/1RgLBoZNSoN/8q3d6w7EbTLXhjFThQfUnnD7k6BQWYA6wz6bSzdYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548522; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1KYz/UdhAmH8P9QWlY1OZZZXezRyAQ5qqSfYZdu5lm4=; b=MH+4bE6QPGRTiuBM71zQ8mHkdyFv+QDqXQWXPnnQRJ7OEqkW9uKOb2kqnHampdTQL5Ixyw5p5jg2DToQAhTQc4iioWRMm/EPfwRs5EPOK+wwkBvVDhK561QOHTUdOe1G88Ot6hxTEfCJxYCy1xI6dr/OSQVJuQ7ZwB0iTuO7liU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635548522331964.9904244149503; Fri, 29 Oct 2021 16:02:02 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-DE-H2w7QM96IWTwHAudxeg-1; Fri, 29 Oct 2021 19:01:59 -0400 Received: by mail-wr1-f69.google.com with SMTP id a15-20020a056000188f00b00161068d8461so4166338wri.11 for ; Fri, 29 Oct 2021 16:01:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id j8sm438981wrh.16.2021.10.29.16.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548521; 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=1KYz/UdhAmH8P9QWlY1OZZZXezRyAQ5qqSfYZdu5lm4=; b=MSK5N5gHWkmMKVBasDc/Ke+ThG6T1QBzQT7stTvmTXXE1TjXSwOcznP5gve45Yz9AQWXXr FfxP+JEt4/l3nTGJId2rcAXQU/EO5ypOUV9gOPFBFXcEYFaU7T8gDKL+q7jo8FhP4HLmmK 1lT01WyRaHzxovpw1q6AR9BV6kI+1B8= X-MC-Unique: DE-H2w7QM96IWTwHAudxeg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1KYz/UdhAmH8P9QWlY1OZZZXezRyAQ5qqSfYZdu5lm4=; b=FhaiVK3cgE7PWkYOCQRTCWMRCf/C1gmN+gnjcvqpeY/zS3/Eb1wA/shMcFejyzFOBr 1E6fYTga/zg+dwcTUZCRet8eonncnNyT6ktTW1RbERg6aJ+YfX+5pfDzE/4g6P/WLF7j pzhBCHvY4yKt6NMvOcOrbeIZe0gWZumcBP4COzzqdU+Dzv86egWCNOyfdnnSbse47B9o 4wxc38RH0g+nxU7AhM7+np7NpKY1msCLG/Ii0Q0cHVSp2uQdVe0txtHuUQvqVaP1K50r YUsjR/1HmCVERQjUaMQQff7TRCLDK/330TtOVQU+o7rVB9XGKDCoe/rWzWWloDakyvwU d7ZQ== X-Gm-Message-State: AOAM533JtSbztClkJ/4/AQLSNOy11RYDB5KRAfdaK2Yml5QSTl4MGyWG plosZp6DA31FtDyLC/VCCWSifnveZKW3/sTOovWcoRaFoqEAkRRQEeZlOObvDCeRdS7VwCAIPTC 5NoipSCwjrETx3A== X-Received: by 2002:adf:d082:: with SMTP id y2mr9309843wrh.214.1635548518449; Fri, 29 Oct 2021 16:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqd3jLhb642v19dO3IYaGDIiNE2tHrW5aU1ws2A8YhfwZyL+M3vSzld+QTwXSbKxWAv/pUiQ== X-Received: by 2002:adf:d082:: with SMTP id y2mr9309828wrh.214.1635548518336; Fri, 29 Oct 2021 16:01:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 2/5] hw/core: Remove use of QERR_FEATURE_DISABLED Date: Sat, 30 Oct 2021 01:01:44 +0200 Message-Id: <20211029230147.2465055-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548525217100003 QERR_FEATURE_DISABLED definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde --- hw/core/machine-qmp-cmds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 216fdfaf3a0..f2eff433bf0 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -138,7 +138,8 @@ HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error = **errp) MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 if (!mc->has_hotpluggable_cpus) { - error_setg(errp, QERR_FEATURE_DISABLED, "query-hotpluggable-cpus"); + error_setg(errp, + "The feature 'query-hotpluggable-cpus' is not enabled"); return NULL; } =20 --=20 2.31.1 From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548528; cv=none; d=zohomail.com; s=zohoarc; b=mJcQlrI/qY972iqCyAQy/mG07+7cnTZOAIB87UHKsKQog8XJrKcromE8SZgfI/gGuBex5mbXIaWt5z+Lon+cF6xxBbXOWf17vfQAwUMQS7MaADTxf2b93+y70xw5TRuFUyV1YEsI6S4T+xH19o9T7nt1DNad/Esu3IeW8QTpxnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=bsiQr+dGOrvM+jm5zUFtyzX3lPKl69thcSqmOh5We5Hlcciade1a0735yHM4Qd1/SFMvUy20W7hgyETFGyIttqCs9xUHFHE1qw1LZ+l0n3wLkRVnh2Cl41glEugkF3giS4MGETntx3wjv3l6n+gzBhKQgMPL4JGW1poRUV7D/a4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635548528394107.4914296004116; Fri, 29 Oct 2021 16:02:08 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-qyqbpcGbORaM68woyvjj7g-1; Fri, 29 Oct 2021 19:02:04 -0400 Received: by mail-wr1-f69.google.com with SMTP id k8-20020a5d5248000000b001763e7c9ce5so3023935wrc.22 for ; Fri, 29 Oct 2021 16:02:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id m34sm5465765wms.25.2021.10.29.16.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548527; 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=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=MYWHDBg+0ADWAXqpwgqgeGdtdTh9WdCY9IKupfWOBhXIYWu9pOHTmfnfB0ekYjGFGL80po xmcFbno30LUdVSPRxK+PxURe8sByDEgPZC16NYlc7vKyuvAojUcK8WVfYzBS6eKdUEHVnf S/9TovVhzUss2c/rpfgxGR4Pa8vFoPg= X-MC-Unique: qyqbpcGbORaM68woyvjj7g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=TqcxvNEgc5Tig5gZamAkpufUW8J+JXWKkoJzaH5ciVt8Vqxzk2oK77u7/1R5ZSdZ+f Ka4Z/ltvvAg2kiGcx0HxdzaxeHpK0yG17WCjQo0VXy+Dh8F66RvWUdK3bdEVZcwnrj38 WxWqp48FkRGzzzYmte2/PN45JLMUfIiMY9xcpQ/Ik9IZGmTIAD/eBHMoAtnSITNpx3FW UKqHuVprVnNZVWmd1tur+/1ypkUl1yg7ZXb4DKyFer93nfuCz/d9A4hMAeHGtooJLYa6 nk2DtHjfxy6rXB6Bhuc2kpcos+O7RIeEYyGLUuvjvcZB1PP2uEZnJ8Zavr5deqBkeSYp 2QJw== X-Gm-Message-State: AOAM531O3phBWqQy7ByXnjt0xFoLEmfgVSIxKe1M6f9v0qx7qJodqJpT BinETAwBMgufN5+xNkrkz/WBLva3jCYt9au0bRreGpAiWXKaEuA4ZU2YmWQDdv9I7DbvDj4nVpY qi1B3VphGOGsfXg== X-Received: by 2002:a1c:9a16:: with SMTP id c22mr7459164wme.160.1635548522940; Fri, 29 Oct 2021 16:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQG9w/QB44HVwDMNYUNEl0fIIEo3NlqkQGCmSiNb0t7Twi0YKWXHqfiI67mdWPjqij9YdvKw== X-Received: by 2002:a1c:9a16:: with SMTP id c22mr7459151wme.160.1635548522811; Fri, 29 Oct 2021 16:02:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 3/5] hw/core: Remove uses of QERR_DEVICE_NO_HOTPLUG Date: Sat, 30 Oct 2021 01:01:45 +0200 Message-Id: <20211029230147.2465055-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548530606100001 QERR_DEVICE_NO_HOTPLUG definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace the two uses and drop the definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde Reviewed-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 3 --- hw/core/qdev.c | 3 ++- softmmu/qdev-monitor.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 596fce0c54e..f49ae01cdb0 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -26,9 +26,6 @@ #define QERR_DEVICE_IN_USE \ "Device '%s' is in use" =20 -#define QERR_DEVICE_NO_HOTPLUG \ - "Device '%s' does not support hotplugging" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7f06403752d..14375861c36 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -734,7 +734,8 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) static int unattached_count; =20 if (dev->hotplugged && !dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj)); + error_setg(errp, "Device '%s' does not support hotplugging", + object_get_typename(obj)); return; } =20 diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 4851de51a5c..35a885a6623 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -896,7 +896,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) } =20 if (!dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, + error_setg(errp, "Device '%s' does not support hotplugging", object_get_typename(OBJECT(dev))); return; } --=20 2.31.1 From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548531; cv=none; d=zohomail.com; s=zohoarc; b=DR+351hxXyeiMnrn3SWtsXq1GR6jyvrQZAbZZHgD7Wo+of1QJwxQpd8Hrfx9T+aUDYgZDAwzrIrcAHRfbwPW3XuS89ieT7QXWcDVLmDluDYsbkQAk+FT6n76yX7x3fSZfOyZxTeh/kpCpeN5TS+yjRf+3xf4S+jOtJjMLvMIzn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548531; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=fr5VMOOKt0GVUz4qiC1RIeVWBlnPu1If/ZrGlw1UN7k=; b=PbX/FwuWq6RRyFZr04SnUDlst34nflXBrjBV+poIGcN8wWweo0AD3PPyBKDRP4HZuoo+T4kFAlq+fuHTM0dg8dk3WveFvswBL7Cpm7qc4RNkdw460QZZwda7GB8muVP5oOewtvDak9Jk7XJdhlxgxbRZNG/yAXTS7MF1SnZ0RYE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635548531170367.11447121943604; Fri, 29 Oct 2021 16:02:11 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-5c1CRdgzMa-TkR5c-1gUOA-1; Fri, 29 Oct 2021 19:02:08 -0400 Received: by mail-wr1-f72.google.com with SMTP id d13-20020adfa34d000000b00160aa1cc5f1so4144822wrb.14 for ; Fri, 29 Oct 2021 16:02:08 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id t15sm5909999wmi.24.2021.10.29.16.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548530; 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=fr5VMOOKt0GVUz4qiC1RIeVWBlnPu1If/ZrGlw1UN7k=; b=FTn//fCrcFP+cOMAgkptdzfz8w51wtrnADx5bA2N/pnN6UOejJLcj+tFtLwWOtQKJ/fVSP XMLJ+amm7zELwbvpfFp4YyylO2pS1Y0LrXsJ7XZYDFgM6mDJEnNOCcy8awA/1wW/wF/F9w 7viSCahMVdyk4DUvn0Ln3fTVyqEtxB4= X-MC-Unique: 5c1CRdgzMa-TkR5c-1gUOA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fr5VMOOKt0GVUz4qiC1RIeVWBlnPu1If/ZrGlw1UN7k=; b=atlP6BC+KfBmLK9bD4WfsOMgso329OOxIfkl6weKBq9TsCeDu/GT6e+netwq+u88xJ HH1mYFaqup3ZS0SIgBYmLOxEWYYyPaCzwUz/6NP1G7DCKl6Ohpht2Ta7QEtmkeL4uD85 OjIFPFWoQ6PgFMTcsWWELQR2o176LHTeQhNhldTtFTTelmnpfNOhoRRefMXSP8QTI5Rs sEatpfzHm6sIWoPX+ZO9HHADgtjPUwm/vtFYOyLsCb6Dr2m441FoDISuWpuHKxP6p/zE tZGZjWncnFZiTXvcM0P63h2EcANZvsz/VLbjL0slIKljSzsODj6DEZ0vwxmRhM3jl8lG votQ== X-Gm-Message-State: AOAM531PQdWa7vRSNPBZi+DHGO+x1ZLR8AZf8uS21cFwa37wIXah2ATb /DS26BioLLeG+i9uqYazFSf+NzDi1wqblba3pjMLyz9v864Wjgw4gx9mJ2ndxkUc1eIK/a/R/NS UL19h2L5uz6WS7g== X-Received: by 2002:a05:600c:a42:: with SMTP id c2mr22554139wmq.154.1635548527607; Fri, 29 Oct 2021 16:02:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrpGWrJ5Q0pokQ5CxmKPkdczx/jh1JX9VeyM4eidl/CsZRs06Mr2UwFWc0wU0GO0poqdcoCw== X-Received: by 2002:a05:600c:a42:: with SMTP id c2mr22554117wmq.154.1635548527432; Fri, 29 Oct 2021 16:02:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 4/5] hw/core: Remove uses of QERR_PROPERTY_VALUE_BAD Date: Sat, 30 Oct 2021 01:01:46 +0200 Message-Id: <20211029230147.2465055-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548532599100003 QERR_PROPERTY_VALUE_BAD definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace the two uses and drop the definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde --- include/qapi/qmp/qerror.h | 3 --- hw/core/qdev-properties.c | 2 +- target/i386/cpu.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index f49ae01cdb0..a3f44fc4a1e 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -50,9 +50,6 @@ #define QERR_PERMISSION_DENIED \ "Insufficient permission to perform this operation" =20 -#define QERR_PROPERTY_VALUE_BAD \ - "Property '%s.%s' doesn't take value '%s'" - #define QERR_PROPERTY_VALUE_OUT_OF_RANGE \ "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", = maximum: %" PRId64 ")" =20 diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index c34aac6ebc9..dbea4cf8e5e 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -663,7 +663,7 @@ void error_set_from_qdev_prop_error(Error **errp, int r= et, Object *obj, break; default: case -EINVAL: - error_setg(errp, QERR_PROPERTY_VALUE_BAD, + error_setg(errp, "Property '%s.%s' doesn't take value '%s'", object_get_typename(obj), name, value); break; case -ENOENT: diff --git a/target/i386/cpu.c b/target/i386/cpu.c index fc3ed80ef1e..bc63b80e5bd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4469,7 +4469,7 @@ static void x86_cpuid_set_vendor(Object *obj, const c= har *value, int i; =20 if (strlen(value) !=3D CPUID_VENDOR_SZ) { - error_setg(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value); + error_setg(errp, "Property '.vendor' doesn't take value '%s'", val= ue); return; } =20 --=20 2.31.1 From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548535; cv=none; d=zohomail.com; s=zohoarc; b=GkoQ0ji0FczzQaBIVNWw4h/2iyNTn5XSVCj4t2G+xZ+tOQ0skCnoYLvsvTKDua1u7p4uWTuXB8brJuxmiettetuf6lZrZetyEwcjlm1K+KSUwWJz/zj1llJhsckC4YGnW0IQ+3GfVuPSQa5EnBaBh5PZoXWeJEmzWlTxZgCXN10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548535; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Vq+fC/d3R5UiDSG7Jt7xtQP8jc30+C5PYqqO1nlP6U8=; b=KRp4JZ8Z3CiUPHX8yAsIB0mV9nU55fW34Ro7aHjHiFSH3439kiupBSO02iyFd7Q2TshR3kfkqSfemFwq1d8oV9xPipPOpcErz9aSuAbqYT6XrP39ZSs7UWhXkZ6dz2BVJJ5hEvmqVE+bcmyRK68JfOeKNGeX5ETngQ2C60fYSnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635548535372148.99336553095839; Fri, 29 Oct 2021 16:02:15 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-122-MuNhsEDcOjCn00bCBaWjeQ-1; Fri, 29 Oct 2021 19:02:13 -0400 Received: by mail-wr1-f69.google.com with SMTP id a2-20020a5d4d42000000b0017b3bcf41b9so1412008wru.23 for ; Fri, 29 Oct 2021 16:02:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id p19sm9638801wmg.29.2021.10.29.16.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548534; 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=Vq+fC/d3R5UiDSG7Jt7xtQP8jc30+C5PYqqO1nlP6U8=; b=BnXw8JnraVFZE5nTApinZHHXCFd+zDAEr0+RhggwmAWiSe6jw1snzDPlVsLuEhgSeVOi/E WVLYbHnaCM5VnXVYAxz97lVqlir+VMBKblMiHi56E6kZDVO41XEvQ0kqJpCg9E2/s91Ten XMkeBNGdxRuydaB7W/IK8JrasLIV6IU= X-MC-Unique: MuNhsEDcOjCn00bCBaWjeQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vq+fC/d3R5UiDSG7Jt7xtQP8jc30+C5PYqqO1nlP6U8=; b=0s1RoY4yriVLQX8OpqjE0KA3I8FWFOT7zf4XTtt3q5FhfMdwL/uqNau3qEeWELsJAm yl85WzwTfVV/Ccmhr6GeqAxwmt4R0m6nI+DAYIvaxvXeBseAqx18XIRmn81L27ucBCHR N4hJT57cjU6LYfy/XL/x+4ChSkNoVDXog2yctWOr5eksbbv3WjqqAhOFiTHesZWh9jXB n0uMQWUdXQFiqvaWBq1uK3hRgGHUvZdh/sSPoMSeRqh9vL9Mb2VDmG0PJyv2TjvyBIOo cgVrNbIF1e32QXNes7PQjUkpgAqJvrpqY4xsj98zdj4kqcvgsDZ3ayVyDBiDoZXhe+/x bdWA== X-Gm-Message-State: AOAM532QWCE84rD17curEW3iCKeKGAjZ9vyXNVhc7CY4ZWNex/YYr4vd 2Clx2Oe+LEt0lFCyio+y2i4HYvgnAuXdY81Mn7sRHn5TxA5nbUWt3ajR5NUdpET6aSeOopmfei3 4cbyIaTEkV3qd4g== X-Received: by 2002:a05:6000:10cb:: with SMTP id b11mr6321002wrx.71.1635548531983; Fri, 29 Oct 2021 16:02:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwOArmsAhWiKJ879Rn29c5YA1m9/W00kRbvTKdh/4JNiQCsXV3SAgs71ZhEOgZbapkG8OSMw== X-Received: by 2002:a05:6000:10cb:: with SMTP id b11mr6320985wrx.71.1635548531789; Fri, 29 Oct 2021 16:02:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 5/5] hw/core: Remove uses of QERR_INVALID_PARAMETER_VALUE Date: Sat, 30 Oct 2021 01:01:47 +0200 Message-Id: <20211029230147.2465055-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548536942100001 QERR_INVALID_PARAMETER_VALUE definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace the definitions used in hw/core/. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde Reviewed-by: Markus Armbruster --- hw/core/qdev-properties-system.c | 2 +- monitor/misc.c | 3 +-- softmmu/cpus.c | 3 +-- softmmu/qdev-monitor.c | 7 +++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index a91f60567aa..91b322fe372 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -749,7 +749,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, cons= t char *name, return; } if (value < -1 || value > 255) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + error_setg(errp, "Parameter '%s' expects %s", name ? name : "null", "a value between -1 and 255"); return; } diff --git a/monitor/misc.c b/monitor/misc.c index ffe79668706..5a33458173e 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -125,8 +125,7 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, if (has_cpu_index) { int ret =3D monitor_set_cpu(&hmp.common, cpu_index); if (ret < 0) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); + error_setg(errp, "Parameter 'cpu-index' expects a CPU number"); goto out; } } diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840b..0e7f44154fa 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -741,8 +741,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char= *filename, =20 cpu =3D qemu_get_cpu(cpu_index); if (cpu =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); + error_setg(errp, "Parameter 'cpu-index' expects a CPU number"); return; } =20 diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 35a885a6623..27f3a1248ac 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -241,16 +241,15 @@ 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", - "a non-abstract device type"); + error_setg(errp, + "Parameter 'driver' expects a non-abstract device type"= ); return NULL; } =20 dc =3D DEVICE_CLASS(oc); if (!dc->user_creatable || (phase_check(PHASE_MACHINE_READY) && !dc->hotpluggable)) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "a pluggable device type"); + error_setg(errp, "Parameter 'driver' expects a pluggable device ty= pe"); return NULL; } =20 --=20 2.31.1