From nobody Mon Feb 9 15:10:22 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: 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