From patchwork Fri Oct 29 23:01:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12593969 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01EC9C433F5 for ; Fri, 29 Oct 2021 23:03:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C28060F92 for ; Fri, 29 Oct 2021 23:03:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8C28060F92 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgauJ-0007xW-6p for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 19:03:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgasp-0005L4-Rz for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgasn-0006qs-MW for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:01:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548516; 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=CaUyEaPJQkM8dAEwML7nTxvyX4XRN5CSH/XElMHQCH1tUIq0ewr9ns4tfoqUMLVUgKy5cF 1e3uUfW/t8lU6t268PFWyuKa2vUiXydssXSH4xVihRjCXZc2zDVyqgkgTQg7RkWErPl+qV H+th/pu6xkB7TZTxEd58ppZr5wqRWhE= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-bfNfDXC3MzKZ4qPtgCmBAg-1; Fri, 29 Oct 2021 19:01:55 -0400 X-MC-Unique: bfNfDXC3MzKZ4qPtgCmBAg-1 Received: by mail-wr1-f70.google.com with SMTP id a15-20020a056000188f00b00161068d8461so4166244wri.11 for ; Fri, 29 Oct 2021 16:01:55 -0700 (PDT) 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=qChRJ0IjnODG3tRqVMBeK6ZpkCz/18GOTnyDFZap6xMIgj5mG7GOTXQbBU1zoaD1z3 jLnbxnJ5GpC5TwGLc3gHRy8hQ3vVzdM28CsAoeRCtRFeEiR9ULYZxNTBx4x2jxR5dLTs CcQj9giCP2RJh0I8lVRE58rBNVDWy8Vz7jD9q72JrzsNN9CXoOxw08quFRq4ahX9xQSf bI1m4gikDqXv75tlUl6DfUNRz+qTSBYsKpWzW8KTNgc8aIn1Hv3DLlZXgi/hulPSMP2L cwfZCW7VyFTUY9F3wE8+h+ebJZMyB/yygRzEmRmtXSuyScXpVQqqLOrfbU7oGqp6JtGb 1I/Q== X-Gm-Message-State: AOAM5310doNolkZzTvKPGHxco2SZVjBKrxrH5lMA4NY3MHgKprwAFZZM CkEotvB0f0BmNHP8VKO0+Uk4q6jufKn7T+9m7pU74FoFWpGV9Ckxf+giCGgrBHfKkebFmAxChwE 3DkNgumiMmFvOsLi5id0CvH6wpcM2Bvy4M9P6H8dg+OyxFtDrFZdo+C7FBcGUNwAq X-Received: by 2002:adf:f88c:: with SMTP id u12mr7057033wrp.29.1635548514009; Fri, 29 Oct 2021 16:01:54 -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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Damien Hedde , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QERR_UNSUPPORTED definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace it. Signed-off-by: Philippe Mathieu-Daudé --- 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"); } } From patchwork Fri Oct 29 23:01:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12593971 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47504C433EF for ; Fri, 29 Oct 2021 23:03:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE12C60F92 for ; Fri, 29 Oct 2021 23:03:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CE12C60F92 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgauK-00085R-LK for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 19:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgasu-0005RA-EO for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgass-0006sE-8d for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:04 -0400 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= 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-240-rbUZ2JAoNyCI6qGl0rszFw-1; Fri, 29 Oct 2021 19:02:00 -0400 X-MC-Unique: rbUZ2JAoNyCI6qGl0rszFw-1 Received: by mail-wr1-f72.google.com with SMTP id p17-20020adff211000000b0017b902a7701so1343764wro.19 for ; Fri, 29 Oct 2021 16:01:59 -0700 (PDT) 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=CSAzP3NVrRTBUmW7JP3AVfsl1h2J0u0CCeIGQvuqLK/+n85WJCo1iDKibgnGU7CNnk fHcUOcyprn8kbSNlfPvLLW9JwU5DvGcFfd88olGVdDBAl7dUTaltTmkorr61fGVNodKp vJt4+FCD9qZcOCV9h11wiv6dHPDW25x6JoqXkxZobp5FsF33bdwpYmNJv94xou0MYmM6 F99yfnMEJJHHVvVKcaSGFj3nBP4D3+moarJD88at00P3g9OfWdmtPZr38R3SC3ZxylBI eXfmF5VcT5euvBpXCng64ePnhpKEp+xpJkJ8LEGNeN3mK6YNswILDcbCSL5ngMzuwJYO dGsA== X-Gm-Message-State: AOAM531gFrXOr3wsI3y2i5Ck6hbe5xByg35Q9gpFvKvAVeK6iTPvsAgg B987GuiNlcRnx7qoo+F+FD7ITmdbfL/LCOYKuZVvWYd0SMnfsTD9d9n7Uc9XqdMzjL1ZKEg+LpD tsvz02asjeb67oqA9GSeyRip69K1O5QJytN5Qc6KMELE2iiUG8YGHxZi0yF8GUldj X-Received: by 2002:adf:d082:: with SMTP id y2mr9309847wrh.214.1635548518489; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Damien Hedde , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QERR_FEATURE_DISABLED definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace it. Signed-off-by: Philippe Mathieu-Daudé --- 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 = MACHINE_GET_CLASS(ms); 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; } From patchwork Fri Oct 29 23:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12593973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33340C433F5 for ; Fri, 29 Oct 2021 23:03:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C48F360230 for ; Fri, 29 Oct 2021 23:03:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C48F360230 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:56098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgauS-00005E-Nz for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 19:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgat0-0005eM-DR for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgasy-0006vA-CE for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:10 -0400 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= 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-517-hwqUgkNWM0yM9koCVacpXg-1; Fri, 29 Oct 2021 19:02:04 -0400 X-MC-Unique: hwqUgkNWM0yM9koCVacpXg-1 Received: by mail-wr1-f72.google.com with SMTP id d13-20020adf9b8d000000b00160a94c235aso4146391wrc.2 for ; Fri, 29 Oct 2021 16:02:04 -0700 (PDT) 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=4nm+NXrswYQqVSY0XPDjEVhCSZy0oBQBafkmqDNq3H5sP+DBBH4XPM2zOosdFaWuv6 +axHy2VDBXBIaaqV80tzLYxxMM3NUqb3OeM5fFSYRVr33DDzVpt5ke1erNWF3VLLH5X7 hlJ17/8CUGupC3h6gF7+Jnd5ojdeI+MzqqKk20o2vP5zowkuO3aPI4hHP3UptGE8ISHr elPjGiVHTry55OM5Qeu7HqOt6AnpHi1lA/lzQfMMZuhfaNiotLhzbHKLPTfNLcGXIkrA i5EA+NJ1hNzS/lSVOFVNFyBxsmEUnssdNiYjILrHxB5KZTuS5Lb2w0C1aAupkp3vjKVS bHOw== X-Gm-Message-State: AOAM532xkDU0Ree99IIJ/VXNtm3mThQITwHo0KlyDFegY1vjsD5SD04j rF95TpwptOcYiiTbsiisSdtiepFrv8VZexRAHnEIe6tfFht48W97v+J1qJ1PKh4Rt6BH5HkZP8k OoMsSZuU8syUw3KTn2HybeHC1TJIIZXDRwlFHfvKgpr+kaghspBtSih4eSUKuXcCu X-Received: by 2002:a1c:9a16:: with SMTP id c22mr7459178wme.160.1635548523069; Fri, 29 Oct 2021 16:02:03 -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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Damien Hedde , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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" -#define QERR_DEVICE_NO_HOTPLUG \ - "Device '%s' does not support hotplugging" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" 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; 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; } 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) } 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; } From patchwork Fri Oct 29 23:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12593979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C218DC433F5 for ; Fri, 29 Oct 2021 23:06:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8459860F92 for ; Fri, 29 Oct 2021 23:06:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8459860F92 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgaxW-0004dt-L4 for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 19:06:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgat2-0005iQ-Nq for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgat0-0006vS-NT for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:12 -0400 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= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-489-BbGmNmqdMYCXIe0vAUbNzQ-1; Fri, 29 Oct 2021 19:02:09 -0400 X-MC-Unique: BbGmNmqdMYCXIe0vAUbNzQ-1 Received: by mail-wr1-f71.google.com with SMTP id r12-20020adfdc8c000000b0017d703c07c0so876546wrj.0 for ; Fri, 29 Oct 2021 16:02:08 -0700 (PDT) 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=CZolA9Opuu7uKCI02JhSDLtyuQHK8abh8jCL2bUG/knCWPbTNRkpNwYGQeeHXoT3yW I1HS+O3AXxeYZjiernIV9GPrp/jGfmEu35DgFLT4NdGxqADHkjhyK1ckRqD3f1F3FgeP t20E55yrZc5eY+JAqVOBQ7NdwwB2eQrwV96l24Dm4NaHPHf0w/Cdn8z26KU+1aj/THJ2 Md+xH8YsNU8uPf+RoYMvzIIiAMePloJt1OoVG9j6WJ56qbvtR1SR4hK3sl2md3BB/NqF RBNvjVhaXSpq5Bn1mdQDzSV+itzwvhKKJ2HZDP4XBNFQKzkXl/0/xYJhJodk33UqcZRN 0q5g== X-Gm-Message-State: AOAM530b0RMCguTSEhx1xsh0aJe/8n9LmvWiVEx0D2WAaCQJcAlA+hzV /SychRcGeq2YHRl2fh/EhQCIgCV5IhN095TnrgvzB7Tpcl+7ym576H1MP413VWBQD3ni9eTbmuA HFYU4wX1A2i21XHGLKsVoT7ew/x8eRxv73UdqAK7KJzYcnR3/08L9czZr8MQfJJov X-Received: by 2002:a05:600c:a42:: with SMTP id c2mr22554147wmq.154.1635548527647; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Damien Hedde , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- 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" -#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 ")" 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 ret, 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 char *value, int i; if (strlen(value) != CPUID_VENDOR_SZ) { - error_setg(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value); + error_setg(errp, "Property '.vendor' doesn't take value '%s'", value); return; } From patchwork Fri Oct 29 23:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12593977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E019C433F5 for ; Fri, 29 Oct 2021 23:06:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D6A360230 for ; Fri, 29 Oct 2021 23:06:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1D6A360230 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgaxM-0004RC-7i for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 19:06:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgatB-0005zm-9q for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgat5-0006w7-7E for qemu-devel@nongnu.org; Fri, 29 Oct 2021 19:02:21 -0400 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= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-559-7zF9hZwjPlaWNBaGTuDa9w-1; Fri, 29 Oct 2021 19:02:13 -0400 X-MC-Unique: 7zF9hZwjPlaWNBaGTuDa9w-1 Received: by mail-wr1-f71.google.com with SMTP id q7-20020adff507000000b0017d160d35a8so945867wro.4 for ; Fri, 29 Oct 2021 16:02:13 -0700 (PDT) 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=qfwFNwwz7SEZyhturVi3Lv81faYCpRmA1WfBmbDKz6/sWe9fkuZQcdCbEZQ6qqfNuA sqkbm5qgmwr8JUlYuBTnet22Homkqi2AbP0DO8Unf9QQSdTUtHYYHtnQp0jLrnxR1H5V YnJn9VIhbaGK5yJlkLA1ezxSgFqN8xXmyyKJNjPRNlYWkGy6ww3hXE4msAoEKNAsaK33 h7mOey7TXvyMxL64h3f2Opf+STX8UQcBCvj1RroIIRZUlUzrtY0km01sX5lC7dGNgdfa cHNpAZcC4Q3qA4HPKftvC1RFGUNaP9nUmJXGCbLuvwEoc9tPIZL+cxuOLtgWvLDeRWbK J5KA== X-Gm-Message-State: AOAM5314pBYxPqNxII9wKFNxj0fZOH5KBXifh4S7bJBeS5TZKsobyqnK gyPiU2VoKnn/2zs8bclLT710TfHVJR5XTZLJj1T0oACP/k132KfLbR784AZK9ZTJ+W7CQnTv7CD R1QzmQ0lWAjGSB3qlHVaZUlL2tUOFwmrYufUyPpkqHHiPQLallwH288FXOfvE5DAs X-Received: by 2002:a05:6000:10cb:: with SMTP id b11mr6321016wrx.71.1635548532062; Fri, 29 Oct 2021 16:02:12 -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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: Damien Hedde , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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-system.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, const 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_line, bool has_cpu_index, if (has_cpu_index) { int ret = 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, cpu = qemu_get_cpu(cpu_index); if (cpu == NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); + error_setg(errp, "Parameter 'cpu-index' expects a CPU number"); return; } 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) } 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; } dc = 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 type"); return NULL; }