From patchwork Tue Mar 12 14:13:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 779739 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp2043876wrt; Tue, 12 Mar 2024 07:16:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgNshK8FUi2g1ejz6AFZ9RHvOzbFZ360tMWa9EMxOEiqVqUvyqWVXPU/BTCZo6evmYO8Jeq/jvXLGQFjfm+Ucv X-Google-Smtp-Source: AGHT+IHpmzYAfLG63jGuN7WhQSEqnqaQxe0yKmIuCXUqsIxOGS2MRAVJf7EHLCAiNkPpQ2eg/e8H X-Received: by 2002:a05:620a:1476:b0:788:31c7:e09a with SMTP id j22-20020a05620a147600b0078831c7e09amr471804qkl.27.1710252990498; Tue, 12 Mar 2024 07:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710252990; cv=none; d=google.com; s=arc-20160816; b=kwnljGEbjxaGRSTM/zhPLhPOrrsJZVOyUVDgWsaHuznR+wSkonTti2kA7mbtInCYf6 TW6JRYdO6RFb/zepJntvA78B/sKc60pWpzE1VVM/HevjV7xbB2HzIf85mrp3+iGf8vgw 895esyhnNa9a/rmjjvtWWEXyH/Qjrg1s/J97vbFOJHLwVWp6rn/1bAxqEBO53HMC89sB +dOFI8TK2aUN8TFTaSxr/aIXX11UQpXBYOHIVU+AjjJvz4oX0bVUkKCdbFz2TmWgP34Y GtbNe7f4Zdr6QhtUhXeKqKvYzvAAdHTGOu+fw5z1oOB6AQWM6wAULUpzU0nnOA0aYQ0D Y9Uw== 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=NKE63curOgdTK2baXfnZucAY8e4SHkvymOxORcMj/Y8=; fh=fAmwTs3MrViTQmBAE7SGmOjzlZKf5SCf6zHzWyrruUg=; b=YWTkPqTPbwqYXA32qdXMSIbjsvukNNO9kdxuNVySSdMghm+4/55Ma1UozBsp4AENGb Ezkfw8QKr4Z8EaQA0anuKONECPeDqveg+usr1XQTaeCTw2dXJmPgS+4jBMEwuKAgjJjN ZR3BimpC6jI4s0kqMSdoRMPOXUfavVL2nOQZaE/3hcMZxld7XrjVLRDLGeHPmTjp3+Ws W5baNaZ4giUkEz66noAbAZH1YCTouO0/hNsWGIuwjZbxVQ9HhuwQAu7UdcHa7HdcLYFy 7ynxJwWbINMInL/KCJoIT1uk1TEfJ94p8rahkoDvMpkkH3Cv77owuPdiUhV5etOlzGEv chcw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=N1IedIXd; 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 wg14-20020a05620a568e00b0078875a08f90si2664536qkn.78.2024.03.12.07.16.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2024 07:16:30 -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=N1IedIXd; 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 1rk2th-0000kf-7q; Tue, 12 Mar 2024 10:14:29 -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 1rk2tH-0000cs-Te for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:14:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2t5-0002BY-Mq for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:14:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710252831; 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=NKE63curOgdTK2baXfnZucAY8e4SHkvymOxORcMj/Y8=; b=N1IedIXdOPZZfOXgzZbK8Eb/4dEFIJfnSo4AlirHemTV/3T1kA0pq5aKpNBq7crVTt6A9b DKOBOhIIn4rrSm8lzf8GNK9NbKA1KvHrb0Y/INxejWgR59JsLq2MVrZARv4T9vAHjNuNTX sJq51AZeSey0fZBrXOl0bY3rSXP7kTM= 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-70-iyVE-2UiPESFyclhYT29Ew-1; Tue, 12 Mar 2024 10:13:46 -0400 X-MC-Unique: iyVE-2UiPESFyclhYT29Ew-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 BEA171C54048; 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 99D4110F53; Tue, 12 Mar 2024 14:13:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 415B721E68BD; 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, Juan Quintela Subject: [PATCH 09/10] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition Date: Tue, 12 Mar 2024 15:13:42 +0100 Message-ID: <20240312141343.3168265-10-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.5 Received-SPF: pass client-ip=170.10.133.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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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, manually removing the definition in include/qapi/qmp/qerror.h. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Juan Quintela Signed-off-by: Markus Armbruster Reviewed-by: Zhao Liu --- include/qapi/qmp/qerror.h | 3 --- migration/migration.c | 2 +- migration/options.c | 4 ++-- migration/savevm.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index b723830eff..385a4876d6 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -23,9 +23,6 @@ #define QERR_IO_ERROR \ "An IO error has occurred" -#define QERR_MIGRATION_ACTIVE \ - "There's a migration process in progress" - #define QERR_MISSING_PARAMETER \ "Parameter '%s' is missing" diff --git a/migration/migration.c b/migration/migration.c index a49fcd53ee..e4a68dfb62 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1961,7 +1961,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, } if (migration_is_running(s->state)) { - error_setg(errp, QERR_MIGRATION_ACTIVE); + error_setg(errp, "There's a migration process in progress"); return false; } diff --git a/migration/options.c b/migration/options.c index c5115f1b5c..5a446e8925 100644 --- a/migration/options.c +++ b/migration/options.c @@ -682,7 +682,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp) bool new_caps[MIGRATION_CAPABILITY__MAX]; if (migration_is_running(s->state)) { - error_setg(errp, QERR_MIGRATION_ACTIVE); + error_setg(errp, "There's a migration process in progress"); return false; } @@ -726,7 +726,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, bool new_caps[MIGRATION_CAPABILITY__MAX]; if (migration_is_running(s->state) || migration_in_colo_state()) { - error_setg(errp, QERR_MIGRATION_ACTIVE); + error_setg(errp, "There's a migration process in progress"); return; } diff --git a/migration/savevm.c b/migration/savevm.c index dc1fb9c0d3..19ca297e15 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1706,7 +1706,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) MigrationStatus status; if (migration_is_running(ms->state)) { - error_setg(errp, QERR_MIGRATION_ACTIVE); + error_setg(errp, "There's a migration process in progress"); return -EINVAL; }