From patchwork Fri Jul 30 10:59:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489319 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3046489jas; Fri, 30 Jul 2021 04:07:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynATlyvgP9PoxO9kS4Q8dKIf07owqcYLv+hhDoLVts14PBtN7jwz8AC2aFGtqxTiX5iIuZ X-Received: by 2002:a17:907:1687:: with SMTP id hc7mr1988517ejc.314.1627643259159; Fri, 30 Jul 2021 04:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627643259; cv=none; d=google.com; s=arc-20160816; b=STmAdF/2HyWp5kTr6VR0dos3T1OTPwP5rzjzgPXTXjeZlWhtaH+/MhESxMrJmuXLq5 cTP7kn3HlRc08ZpRKd3YCHRePIXuC4olVyByimh+lJOsmHOYwMEJHYyi+Vu+xQwgmPHK PbtGQ6EHQ7g3LkSpuQHpGS8pdlJCmYQA7v6yeSfthvX71BoUfbeA56M9X3N5vrv1VCMr IRhdeSEnDYg6ZC1LFdJFqihkoEbHaLcmBXBAtgiT+X8mVt+7XBV1aSxMyKR/UflhqZSR p2jKdFbuLtcS20zhP6EHgT+wAzLxHiXSWXRI0f5zLe80gTBW6zGcK1jyc2Uj0tL5Fnjn 0TJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=DIUHnJ9StEoveZf4Nm4WQZNeoUt/hCk/vohXCdTI0co=; b=G40Q4fnAB6QKXDyDYuzovtGRd7qvyOdyYORfJuvnr0sIwLPVy88GM/lM3u+HZRmQUW apFpk7O9rivu6XSMkTV3f+rs0DRa3+iMKteTRLCDMHRriDXpD2WVi05cDnHkSrg2BXbx dsfVw17J0ruGHQfI5odgxU8RBIGIYeDvIvgY2A7mST8RPlx2XsZi4uUtAVHOtJP3WcX9 xDYrOX/4/huhPBnBlWsl9bmjKnRfB2vbltj/covyM1OfAANxQ3KizcH6w+5k+I9S3qE+ j0wLELIV+olsY4sb4jj/3bDTVCSFjPHlbQuianN+TM4mKno6pync8EH5gZE1HWWEUNlc ZZTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="xQQK/+hj"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id rp18si1252913ejb.46.2021.07.30.04.07.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:07:39 -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=fail header.i=@linaro.org header.s=google header.b="xQQK/+hj"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QMa-0005o6-PJ for patch@linaro.org; Fri, 30 Jul 2021 07:07:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFD-0000A4-7N for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:59 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:43977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QFB-0002ZI-HX for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:58 -0400 Received: by mail-wr1-x436.google.com with SMTP id h14so10755366wrx.10 for ; Fri, 30 Jul 2021 03:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DIUHnJ9StEoveZf4Nm4WQZNeoUt/hCk/vohXCdTI0co=; b=xQQK/+hjng0KWP4e3Pk92ItKftKnHAo1MgndzPazELYNPEw1+dCtpvevd0NCFcE3rd wWLBle+KSHeqwq1iiyiyht8bRE249j7+xr2/lS9VBosqHgIGD9Grz0N59Ud+a7ABhNB6 hF1VBSLpCiLnbIK2GwqOTStSGHGxK4/IjDgJEdJK4zP8hd26yEJBDn+3UAcxws/BG6bu /NG1RI6XEfvbvTXFwPi8m/UdgytwmPmvhrqAjGLUgb5OAF7FZVeUDtDUKCXLdrw+9I49 TaDpeBrXWLKUVPe0yUN4KdIlCaZBPhFvNZAxXlKp+CfB1NbNP0ZHCNgyWbG1qQHAdyRP j6tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DIUHnJ9StEoveZf4Nm4WQZNeoUt/hCk/vohXCdTI0co=; b=VagZ0QtJqcFoTVkiVB4eYEuKMmiQta8fT6ELB60+3AD7ByDlP0KUHhhSL2NTYvyWif t2oYM1630roFIDVdTCjVr7sBwmKI4sF9x0UxI/bQoUijIK5m8vC5W9aGJ2nQ73mAigK4 sH9/2qHX5DoHDDRsdG8p+DO2CenH8B612gqBG5VvgwU+uF8ZjoR4JWbKraafgx3BOV5L m3aBKmR3h3hUrKvnCC71cLt+dOFPqdyyIWaKxZS5FmyEWGCyJnUqdDe9a0qCY5liZ64R vL9C+c3Rky5QcPPDV6qrQCXQB9cYunTfk3ciRHZhvY19A5QI2zpjvtUF+0wlryYSsIn9 vw0w== X-Gm-Message-State: AOAM5307OaWNg+dYNFMCMFed4pbRiWmEmii8S1Fc0GQZY/ARTC5yR3lI cYvVtB/fREgY0PGGvhqJ9nCMCVUPTlczYg== X-Received: by 2002:a05:6000:2c6:: with SMTP id o6mr2380312wry.241.1627642796229; Fri, 30 Jul 2021 03:59:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p2sm1349697wrr.21.2021.07.30.03.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 8/8] stubs: Remove unused arch_type.c stub Date: Fri, 30 Jul 2021 11:59:47 +0100 Message-Id: <20210730105947.28215-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210730105947.28215-1-peter.maydell@linaro.org> References: <20210730105947.28215-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 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: Paolo Bonzini , Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We added a stub for the arch_type global in commit 5964ed56d9a1 so that we could compile blockdev.c into the tools. However, in commit 9db1d3a2be9bf we removed the only use of arch_type from blockdev.c. The stub is therefore no longer needed, and we can delete it again, together with the QEMU_ARCH_NONE value that only the stub was using. Signed-off-by: Peter Maydell --- include/sysemu/arch_init.h | 2 -- stubs/arch_type.c | 4 ---- stubs/meson.build | 1 - 3 files changed, 7 deletions(-) delete mode 100644 stubs/arch_type.c -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index e7789399508..70c579560ad 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -24,8 +24,6 @@ enum { QEMU_ARCH_RX = (1 << 20), QEMU_ARCH_AVR = (1 << 21), QEMU_ARCH_HEXAGON = (1 << 22), - - QEMU_ARCH_NONE = (1 << 31), }; extern const uint32_t arch_type; diff --git a/stubs/arch_type.c b/stubs/arch_type.c deleted file mode 100644 index fc5423bc98a..00000000000 --- a/stubs/arch_type.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "qemu/osdep.h" -#include "sysemu/arch_init.h" - -const uint32_t arch_type = QEMU_ARCH_NONE; diff --git a/stubs/meson.build b/stubs/meson.build index d3fa8646b38..717bfa9a999 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -1,4 +1,3 @@ -stub_ss.add(files('arch_type.c')) stub_ss.add(files('bdrv-next-monitor-owned.c')) stub_ss.add(files('blk-commit-all.c')) stub_ss.add(files('blk-exp-close-all.c'))