From patchwork Tue Mar 12 14:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 779737 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp2043486wrt; Tue, 12 Mar 2024 07:15:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBCs2VPv8KlVryG6296Kjvp9QuZP1qMe7K06un/LkJGdF0MPVxrP06zcqMAIMMI1KhMxquaP/pPR7z0MNr9WGZ X-Google-Smtp-Source: AGHT+IF8s+uCeaV5GMXlKbhF1CT9JanR7uhNYjytwJB8GhYHmySk+/STx2x5EF+0SrGnBs+mJJrb X-Received: by 2002:ae9:e203:0:b0:788:41fe:37c with SMTP id c3-20020ae9e203000000b0078841fe037cmr2121625qkc.42.1710252945839; Tue, 12 Mar 2024 07:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710252945; cv=none; d=google.com; s=arc-20160816; b=Se/T56IdnKKqo10bdCgMZakGqNo9k8jNdYcAXERNFR8Ff+5bLFWnsT4OdS1+sLDANl 1Xv3/e9V1Vpf3DwfZ0rPMHQkGh4lQGr8dvHYBSO7jDWZ2SsEuKxzt3LEHDyxH7/oVq3V Oxdphq3MPp9CcUVHk6mCwyNQqTu46kK10zQABW5UBxnVaT3SZu+IIhHMbrSmAMPIXK1C zdmwayFciJMFoNWDV5yYBV8g2jr3nSRsaHswqfqgTqYIjU0/iG7HAabxaYN5hUfnc6yS hAeeo+1PSwt2PK1z6Uxu5J24/axiFIBtD48MLiD8A/Yh4Q55MgwwBaq3SgtCF+87jMJa amrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=a1BAftT8z48Vt5DWdMlzg8ja8eBDK/wd67jBTXaOBwk=; fh=i4ioI8lUmTcl2WtN/8i487arEjQwzVsrUlEe7C7mKeY=; b=YhIs/iGTkfwuIxYC59XEnd10wasYi0aKVlMJ5SLCXh5DKXtiKDLYVwmJEP3O3DCtdb mYLwKLHOuXJRblWl79L63btaPb0GEnqj5yUfxc6ymhR+xcdCeHveM5b1LqCFkhGOzkpI b9kUJZUiez1G0myfLnX844yTOnjvgbOTAKeEHRYiOKN7lRszfnDp0nRFqOhaL1+VhPe2 Le3efNy9/tTElDhXAzNC19QTehH1F5t/rBK7C3VH8OeHNrJwwH4eq2iIL50+grIVPhwN 2YUd0tctoZDoIjyNv6JuSFPgk/Sbc+0JUeSSeHkXQ1irvScrv0hjNpHMfjGKAOEBCfjz 2RQQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Pfa/hsyi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bs10-20020a05620a470a00b00785d8901d7esi8395154qkb.246.2024.03.12.07.15.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2024 07:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Pfa/hsyi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk2uM-0002TK-D0; Tue, 12 Mar 2024 10:15:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2tL-0000fJ-9G for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:14:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2t8-0002Cd-4m for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:14:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710252833; 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=a1BAftT8z48Vt5DWdMlzg8ja8eBDK/wd67jBTXaOBwk=; b=Pfa/hsyiv/7zJ3ev5U4xYMF+GuWn5Zbh6qzOo3fA0ZVR5FbXXbSF6FMhxvQPlEFFTwXVco sE3rhe0IrT1Lu34XoLZLM33dLxSEWkqArDCfKk4rvmqlNnJfLB4Bbn9I81ZspT9V1RVt6T Wyas0QrXwyaTaZ35WrTOv7yphqlnSa0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-321-tCub1hvOM8WywVSZL0cnXA-1; Tue, 12 Mar 2024 10:13:46 -0400 X-MC-Unique: tCub1hvOM8WywVSZL0cnXA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70C0B1C54038; Tue, 12 Mar 2024 14:13:45 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C5AD40C6CB1; Tue, 12 Mar 2024 14:13:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2E8DB21E692E; Tue, 12 Mar 2024 15:13:43 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, philmd@linaro.org Subject: [PATCH 03/10] qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM definition Date: Tue, 12 Mar 2024 15:13:36 +0100 Message-ID: <20240312141343.3168265-4-armbru@redhat.com> In-Reply-To: <20240312141343.3168265-1-armbru@redhat.com> References: <20240312141343.3168265-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@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.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Address the comment added in commit 4629ed1e98 ("qerror: Finally unused, clean up"), from 2015: /* * These macros will go away, please don't use * in new code, and do not add new ones! */ Mechanical transformation using sed, and manual cleanup. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Reviewed-by: Zhao Liu --- include/qapi/qmp/qerror.h | 3 --- block/snapshot.c | 7 ++++--- blockdev.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 06a1d2248e..daa889809b 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -17,9 +17,6 @@ * add new ones! */ -#define QERR_DEVICE_HAS_NO_MEDIUM \ - "Device '%s' has no medium" - #define QERR_DEVICE_NO_HOTPLUG \ "Device '%s' does not support hotplugging" diff --git a/block/snapshot.c b/block/snapshot.c index 8694fc0a3e..e2c18d3f8f 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -28,7 +28,6 @@ #include "block/qdict.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" #include "qemu/option.h" #include "sysemu/block-backend.h" @@ -359,7 +358,8 @@ int bdrv_snapshot_delete(BlockDriverState *bs, GLOBAL_STATE_CODE(); if (!drv) { - error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); + error_setg(errp, "Device '%s' has no medium", + bdrv_get_device_name(bs)); return -ENOMEDIUM; } if (!snapshot_id && !name) { @@ -437,7 +437,8 @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs, GRAPH_RDLOCK_GUARD_MAINLOOP(); if (!drv) { - error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); + error_setg(errp, "Device '%s' has no medium", + bdrv_get_device_name(bs)); return -ENOMEDIUM; } if (!snapshot_id && !name) { diff --git a/blockdev.c b/blockdev.c index d8fb3399f5..bd408e3e75 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1395,7 +1395,7 @@ static void external_snapshot_action(TransactionAction *action, bdrv_drained_begin(state->old_bs); if (!bdrv_is_inserted(state->old_bs)) { - error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + error_setg(errp, "Device '%s' has no medium", device); return; }