From patchwork Wed Apr 24 08:03:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 791507 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp700543wrq; Wed, 24 Apr 2024 01:05:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUN/V3b0cIIU+vO7MNhe/JBToWxquBwjbSsQ5FCjdPZyT69+H+NUsaisYJWxRzwsW5BEGS0DtJbgQcA8eJn9UKg X-Google-Smtp-Source: AGHT+IH+10sSTR5n9XEZ5wqR34repbUPsO4vjYgDaWV0EU80vx9JULJSsTU8W2f5MqD4z9MXHvqN X-Received: by 2002:ac8:7fd3:0:b0:437:bcac:a770 with SMTP id b19-20020ac87fd3000000b00437bcaca770mr1969518qtk.55.1713945951164; Wed, 24 Apr 2024 01:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945951; cv=none; d=google.com; s=arc-20160816; b=irFoYB3sArp4oE8c8kLH21Xn8apkdIzGX4qdAI3Z5FJnlTngNnQmqGhjKc0jO5fTTl feupH8ozoefswSrpnog4snYbZ7l4juCWXHG35xd64lVTdJ/PGEmN9ePTm61xHWj0yX+G ww4o9Qa0KKEvLjDXcD6+fdJMD6wCbsjUxgJ2+OcBlm395RiKPUdCSTSB0GCCj/hCMu6t 112d6QecVE7OyqQGM2l1dr+16TSqHlWtJ1KL4U/Gr+B4iqgBtbsDNFGiF5jnLuEKPA7B eu5fTOI+yon36l2/qnM23EZIBQwcTasuE9YEjRdteuG2X2hNcixbf8iLcI109rmwXzZd xeXQ== 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=NiuiV2XNWoLOe0i8EiZrScnl5eVDDJW6PHINxn2sw/0=; fh=pGUaj4AwlbyGMsnOdYJwwNSDodFSz8lwvV6eBoMyFw4=; b=TWfzB6CaGM9ZIKnsEOnWhXwRaAjeLmhYCP9jQ1Kg2Kwv6dqc9/Kr/lQtn+rWPXnkxd VDmjBP+2jaXTnhXIlJeX5JQ0jyMF1HG7b206gYVk2vIS2gc6TxjBAkkyX2MPjaW6/Tj3 r32f8UQKZGTsPEropPhmV7DO+Thwm7HgVXyGoVwy+fb5HNpJjmPQkb6Iqn91BkEz0j1o ZSIAuTfl4prJ0U7x3B98paGXANm8Wn+IKGQLk2Zn9qRqowWByLnAdYGYhNkrh5pnlEkm IL3f85x+YDvJCyAlkeolTu7ksvObuYUz68en62hHcKt728z+Otzdk3WSsA3Hc0El9J+l z/aQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pg+WD1YO; 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 16-20020ac85750000000b00439a1f8e7c7si7107711qtx.156.2024.04.24.01.05.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 01:05:51 -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=Pg+WD1YO; 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 1rzXbx-0006ra-Hz; Wed, 24 Apr 2024 04:04:13 -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 1rzXbW-0005ss-OO for qemu-devel@nongnu.org; Wed, 24 Apr 2024 04:03:49 -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 1rzXbR-0003nI-Ms for qemu-devel@nongnu.org; Wed, 24 Apr 2024 04:03:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945820; 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=NiuiV2XNWoLOe0i8EiZrScnl5eVDDJW6PHINxn2sw/0=; b=Pg+WD1YOAMihhAGu9PCudo49jsD9Dt0SpsMdQ0Qtbf6ZzHBiHZqaAp8eIX5ovwzIOdM6pF 3c4oGzQPSLntr1TDaNohG9QwqU/uncuo7gJZDGQPsCulzirWWNQ8i8SLyHSjv5Yto3qGN4 eCc4Q/XcjJNrm0vkZ8xO+DNB4szIfkY= 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-695-9BK_vXyENPqZQA65VJvL8w-1; Wed, 24 Apr 2024 04:03:38 -0400 X-MC-Unique: 9BK_vXyENPqZQA65VJvL8w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 39CD31C03159; Wed, 24 Apr 2024 08:03:38 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19F5A1121312; Wed, 24 Apr 2024 08:03:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3E1B221E669B; Wed, 24 Apr 2024 10:03:37 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 03/10] qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM definition Date: Wed, 24 Apr 2024 10:03:30 +0200 Message-ID: <20240424080337.2782594-4-armbru@redhat.com> In-Reply-To: <20240424080337.2782594-1-armbru@redhat.com> References: <20240424080337.2782594-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.67, 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.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 Message-ID: <20240312141343.3168265-4-armbru@redhat.com> --- 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 8242b4abac..8fd1756777 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 057601dcf0..08eccc9052 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, + error_setg(errp, "Device '%s' has no medium", bdrv_get_device_or_node_name(state->old_bs)); return; }