From patchwork Fri Jul 30 10:59:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489315 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3043573jas; Fri, 30 Jul 2021 04:03:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSkOI7slxskjltl4GKPuwfpd6iYVCrzI/0cQi0DXGYAq9YYPX8wNmrZYy3fNXDfxB4hUlq X-Received: by 2002:adf:ffca:: with SMTP id x10mr2392297wrs.221.1627643034862; Fri, 30 Jul 2021 04:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627643034; cv=none; d=google.com; s=arc-20160816; b=aBw4VND0mgilM09uEmNvMZ4rXmluQmKs8pEloNUWuegogTSIAbS+Uz6sVVTOdzDIJH e8wt8mPF7bZ39/mXO6gXwOjducaFQwZRoYOjmfUY5AMEk6eyuJ3164f1H0+7Z6CkEP1v MBZ3yNIFcPZ2Oyh9xrtNxECa54pICsHn+JmMVhJebl41ZO4fUukzV4USR4RBOc4mWUwD McHNQMPoGtFSbkQzHXwl15W5JrTsxzptRvid87jeghFU+ndjhA9KyvhxmxfquKG2ZT26 VU+Yszuny2dkyRPOJG8q0Uu7gCyk/mtSNzoYbeiNIhn1FTXw7Jxwqhgww/hKb6YcdGlH NwBw== 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=jpp+UbRt9od094/ktfFBQRT7Dj2SocCNez7NCpcCa0Q=; b=s4aVwYhbMX5XI/Ewk7h/gqzDIdR7ZEdQbDSq3bRF9VHXIIFdjN7sz06ujIdXdOe5la GgU/rVuamR7lQtSoV63ddQ7giNQR/KwR5yowpsu9+VoYvrRK49AsBoy3A8yYzy7Nlqj0 2zkNkaJ/9jXrHfJ6KDPKmqSTO7zSET4dZyvoNB/SKHoyPVrHsEuPil0fAEYOPPNFraJt E+2NRdr3ynz3EBaHBH3G7R9FZLio9Dr0D0Mx8rMd8ytwEMtc5ZYSCQEdkslEmdKnwbZc /J0nkgzT8O98pv11xySoow7wXwfAyD6fMe5NgDKpTE011XL9ycmpxFc1OkZT4NzreEcM wx4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NddzzQ4p; 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 j23si1634937eje.551.2021.07.30.04.03.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:03:54 -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=NddzzQ4p; 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]:38898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QIz-0005pY-PC for patch@linaro.org; Fri, 30 Jul 2021 07:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QF7-0008RD-I4 for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:45054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF6-0002US-2G for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:53 -0400 Received: by mail-wr1-x433.google.com with SMTP id z4so10781172wrv.11 for ; Fri, 30 Jul 2021 03:59:51 -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=jpp+UbRt9od094/ktfFBQRT7Dj2SocCNez7NCpcCa0Q=; b=NddzzQ4pkotlILiqv51ekckBtC6DADYyGr/UVz1rDv+uL2CqNbrfxSL1vzRltlpNi9 8LO0e6TXuiIK6pzBYYiFPGpAJpnU2ouioRRAFXJCrT4tC3W6vD95YNu18Dt3QTSD9UzZ iYb73dkSWZnZqfwsozltHkejvYF7nvQMTIu4Y+juEYQFKhxxz3tKaTAHdCPickFET0F/ VZYkhJvJVLSciubRfMTSMgUFa9jxtTYkQf1FmjoNTtsu88KZg3fgbt2DIiRCKG2PgCno vOFMkBv0zFUiipcsn65qFU4v4kSAAYuT7dIQI2dli5uSgHbzMhO4lgX0NICtq7RSYGsn WerA== 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=jpp+UbRt9od094/ktfFBQRT7Dj2SocCNez7NCpcCa0Q=; b=ryxzuWi6N3dGsvHwkm7JSUP+pxkdh1oeeuN4lQplS8MRql2Ct69StohJ4BUd+CAtUi MLGzy3H6CzolEDbdDWjSm5Mv08MKYG9PWSSYbGk1Rm0qu5GuJLWd2qZFkjIgnUGsUGUD EdiQFFkMNnU6t58bothvg6kMgNUkShrunlG6lMpaRs7lolDe0zGp1OSVbIbHr7A7RtT4 HMPel7zbpAM1HyZ51rGyz9836yACFBRGS0kediMWP2n27qIkYs36S+ngFcf+hIrStbG9 joZsJZ4/e3jZJJRl2QIqe0c1+7CuGqSFuf9Bx4E3YjRXDhxqBFAIRA6RmPYn8YFJ0XeM FiUQ== X-Gm-Message-State: AOAM532Upy2W6bOJ+E9k8lkmd0Z/OQ3AGI6VDW/8pvxqFkPp31ResPsF 2vd2hD5kDqbtZtaWi2TmaBqzTZv9YIfKig== X-Received: by 2002:a05:6000:248:: with SMTP id m8mr2423767wrz.145.1627642790913; Fri, 30 Jul 2021 03:59:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 1/8] softmmu: Use accel_find("xen") instead of xen_available() Date: Fri, 30 Jul 2021 11:59:40 +0100 Message-Id: <20210730105947.28215-2-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::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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" The xen_available() function is used only to produce an error for some Xen-specific command line options in QEMU binaries where Xen support was not compiled in: it just returns the value of the CONFIG_XEN define. Now that accelerators are QOM classes, we can check for "does this binary have Xen compiled in" with accel_find("xen"), and drop the xen_available() function. Signed-off-by: Peter Maydell --- include/sysemu/arch_init.h | 1 - softmmu/arch_init.c | 9 --------- softmmu/vl.c | 6 +++--- 3 files changed, 3 insertions(+), 13 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index e723c467eb2..7acfc62418f 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -30,7 +30,6 @@ enum { extern const uint32_t arch_type; int kvm_available(void); -int xen_available(void); /* default virtio transport per architecture */ #define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 6ff9f30badd..3f4d7c1b1cd 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -96,12 +96,3 @@ int kvm_available(void) return 0; #endif } - -int xen_available(void) -{ -#ifdef CONFIG_XEN - return 1; -#else - return 0; -#endif -} diff --git a/softmmu/vl.c b/softmmu/vl.c index 4dee472c794..a32d15b6a1f 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3429,21 +3429,21 @@ void qemu_init(int argc, char **argv, char **envp) has_defaults = 0; break; case QEMU_OPTION_xen_domid: - if (!(xen_available())) { + if (!(accel_find("xen"))) { error_report("Option not supported for this target"); exit(1); } xen_domid = atoi(optarg); break; case QEMU_OPTION_xen_attach: - if (!(xen_available())) { + if (!(accel_find("xen"))) { error_report("Option not supported for this target"); exit(1); } xen_mode = XEN_ATTACH; break; case QEMU_OPTION_xen_domid_restrict: - if (!(xen_available())) { + if (!(accel_find("xen"))) { error_report("Option not supported for this target"); exit(1); } From patchwork Fri Jul 30 10:59:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489312 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3040481jas; Fri, 30 Jul 2021 04:00:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXrMl6nUuVINBGu0lQ4RbHpExef+2xl6+vKvzvh2c2c/3oZqcuH9CY3wswVFfsy4pKRp/2 X-Received: by 2002:a25:2785:: with SMTP id n127mr2328165ybn.235.1627642823351; Fri, 30 Jul 2021 04:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627642823; cv=none; d=google.com; s=arc-20160816; b=dS1plJgL/IEWm1dNNsjc/ii1wlK/tEqbn9wB6GLV4NgUAsH517/TnCoij4IO5XrUrI BqYl+RthuAZxJ1j4pq9xQM0SekayeQAeBYYAfwuY6BeYkYJI8lAeS34p+r5EI7SUpawz VGSeqd5XFb/BtRU3UvlgQJv2cOFmOm3ltPvHZRXz17Da5Msoa79dMHOtmNEffNLS0axK uup9U5ADy98Xe1TGJAK7Y5ozed7Mmw6Q4oVi6BgyvHoTqamYcpwn63S9Tfil/uU9yyar bPnkYNPiBvtHboy1u/MoPXJJWd69hJGaLuXFK2pD59Xa7qmx3Pcj3dWVhLiwaG0cMi3x QWpw== 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=grrH4yZDT83NlMAFyF6VZHzq6DhTbZi1iqbpXWdsyig=; b=dXAWfaHsO+SrD9vrmldpnxfDn9LL6GfBP5wGiolzQYOart5h/54BP8Xo/gQC5DtEn5 7GW6JEDIYipVcAB+GOw0giB8NFKYx3EUHteityeohcdOE1xecgJnoQwHzkhpTaG6HJ1u V5pPjWEiXHJIGuqy7T8MkFdJSB+o6bW694fwqD4DMsNW1As1+amwqxmY2DvQCyyNdD6S RIDo4Sc+hy2HAzIjMBQHUi4bnFsL5kOoZ5SSlvCrWNepb3Xp4jz9Stni9H2U8//flA4h yy+/K+GWdl8xGTrgNRUMlpS+uw6wRiqbSNfuHITG+VjXquE5Slj6lqcAt32tA1ED9I/5 0rmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h3DysLmh; 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 s9si1560185ybo.180.2021.07.30.04.00.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:00:23 -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=h3DysLmh; 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]:59018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QFa-0008VE-PV for patch@linaro.org; Fri, 30 Jul 2021 07:00:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QF9-0008SQ-JZ for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF7-0002Ur-28 for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: by mail-wr1-x431.google.com with SMTP id n12so10807830wrr.2 for ; Fri, 30 Jul 2021 03:59:52 -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=grrH4yZDT83NlMAFyF6VZHzq6DhTbZi1iqbpXWdsyig=; b=h3DysLmhKRgDni3tfJGA2E7gQdK8+caQVKW98P9d4Z2ve24J2IxnpsOc7nBJCyn97C hS3jGQoV2qliLBLPlio4MbYkIqRhKzpyxlwl3yv4/ZNQGXMGuTkgr2cJfFElnNyV7OSZ hC3mpadqVOZGaezUIy+u8NALfEKVs1wXR23H5uMJjDiFEMI9QUuopNdT6nCaRoBI8Hmo 3j2/NSE93iAto+np9Cg2XeKJts5n8mOKP4XFAyXEFa1oEsz0hl1v36RUGSZuFbmXMDUZ NMyaczDlynZdPZ35YSAIAbZ8n99bEkEyzxcEZ1JRBaT+jYs1h/k2vDpcv8Q1o1wxfq7s wTpA== 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=grrH4yZDT83NlMAFyF6VZHzq6DhTbZi1iqbpXWdsyig=; b=Er3T8SWGDl3ah8VN9V7351Ov1utVtAAtk27rqx6qMMQSo77pmPcW14OtYTm/BqScrj s5b3CG8DZbUyjPFlnMuE3+TPbL6eZHJlmYtf3HUGw2rdrP3mIok/3zP3UTAhio623aaT 2CeUULrtq6//if0n0HH6iWfBKtijteCdZbH3Zx+GJfRUMeTwoBdMD1rwImeZF38u6fIf 1pF+qsfnOjhOyCTRclvV+dift9Iz7s+80f/INqr0cwuoctg8eI4gRjESnNAkctAdMTVA /5vFRm5lh5AbixTmCMyzAMQrKxPRu9dV5GBfPKWexgwjuhlwPNYqh74T/StVZdSVo4bV 4KmQ== X-Gm-Message-State: AOAM531mlvcCAe+Vt3se4hP8ArGkCC0bVpYQUkIlmxJQD7mCQkkYzO+L rcoVKOb9a1+3J2lpAKi0R5V2tqLAnbo0Pw== X-Received: by 2002:a05:6000:232:: with SMTP id l18mr2426923wrz.24.1627642791608; Fri, 30 Jul 2021 03:59:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 2/8] monitor: Use accel_find("kvm") instead of kvm_available() Date: Fri, 30 Jul 2021 11:59:41 +0100 Message-Id: <20210730105947.28215-3-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::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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" The kvm_available() function reports whether KVM support was compiled into the QEMU binary; it returns the value of the CONFIG_KVM define. The only place in the codebase where we use this function is in qmp_query_kvm(). Now that accelerators are based on QOM classes we can instead use accel_find("kvm") and remove the kvm_available() function. Signed-off-by: Peter Maydell --- include/sysemu/arch_init.h | 2 -- monitor/qmp-cmds.c | 2 +- softmmu/arch_init.c | 9 --------- 3 files changed, 1 insertion(+), 12 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 7acfc62418f..57caad1c675 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -29,8 +29,6 @@ enum { extern const uint32_t arch_type; -int kvm_available(void); - /* default virtio transport per architecture */ #define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index f7d64a64577..9ddb9352e65 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -58,7 +58,7 @@ KvmInfo *qmp_query_kvm(Error **errp) KvmInfo *info = g_malloc0(sizeof(*info)); info->enabled = kvm_enabled(); - info->present = kvm_available(); + info->present = accel_find("kvm"); return info; } diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 3f4d7c1b1cd..9011af74e4a 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -87,12 +87,3 @@ int graphic_depth = 32; #endif const uint32_t arch_type = QEMU_ARCH; - -int kvm_available(void) -{ -#ifdef CONFIG_KVM - return 1; -#else - return 0; -#endif -} From patchwork Fri Jul 30 10:59:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489318 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3045744jas; Fri, 30 Jul 2021 04:06:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUR6TYdc+Xdd6PStwNk2jOdnJwZ3mk5dLQUcAjZTBBefwOh9omv+maRofOZi5fQYDDCJwR X-Received: by 2002:a1f:1cd7:: with SMTP id c206mr901285vkc.22.1627643204008; Fri, 30 Jul 2021 04:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627643204; cv=none; d=google.com; s=arc-20160816; b=Vu+WDBK+kMBDWuBz+FlQybfGspeXggiEBWllJhVD4eN3CkJ+cbDUctYRfP7ntYZOnC 6ny7eZmD1OAW35msffWhRFo6KYpmzcl9ALagyRQ789Ms2vOnM871+RUdVfnAL4eMN8V1 dgLsr5mFDQnRSN2YT22X3XekErAJtpMZyYXp3ksLTXjZJ7E8gji+DuGh5OZxgFDDBsPO Z+3gC229X4X+Hn7hZxMrfplhx58d0kt8iqodicWxTeDf0MJBIweqkFgJi+owx7ZI38r6 RsRBlHpOBV6I4b7pLPnxgFNxTWfjXdA0LHgaFSMDN1KjSMDSR4zfZ9kLjqL67sxHc0Nw jTHA== 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=iuBWBP4vcXuymhCT8y6Q6tBW7TauWFamJhEjeIMDokc=; b=pogd1p6qGZ5ICG0nnpY+L5h6jyj4NdYcrauTH4eVuybvQwbux2JzWCwEjSnMshsFfb pECGMBZkYgbiwQm8lixWZsK9kx+z67ZeOvnoV3khEoIHjIKRF+9IDy40mU991Y3OXkRT eCl95DfuuQeizI/I6X0MmIAzmQPEDkAoyQQpFqnX+VJPVy785DhyMB82nljrM2Nx0S6E U9DXSsGOv57zjYXAApWijkp2SifS1S0qaZPs7PnmoNPQKoEdQTf1m214xbJ0Ay9WIRj3 kfNYDHIwdleEr7G7qwgUDwuW2u2/Nd5yDYJUNAEZWPmOFBT5qr5dg9ngPekTL0ZlVAWM pf9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mr0j8nUb; 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 a12si370143uan.0.2021.07.30.04.06.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:06:43 -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=mr0j8nUb; 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]:46156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QLj-0002VK-5i for patch@linaro.org; Fri, 30 Jul 2021 07:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QF9-0008SJ-Ev for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF7-0002Vz-Vr for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: by mail-wm1-x32f.google.com with SMTP id o5-20020a1c4d050000b02901fc3a62af78so8918874wmh.3 for ; Fri, 30 Jul 2021 03:59:53 -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=iuBWBP4vcXuymhCT8y6Q6tBW7TauWFamJhEjeIMDokc=; b=mr0j8nUbFHySFwzQZ85dAARv71QqFrxjm7qz/dtn0c5CKLy24RRQW01luQ8ExBytj1 qM1gGwV07KEVpYcb65rdeO0XwXE/b4Zjv3UFp/8O2yy0vN7mqjfbLHaXlhfEawGiPRD/ irIOOGfAqTNvFX3RQwukjUgJXhcZEWxFSHgM7kDsIdVbCRKd4B1o3Hkg2enCCSHwOU2N RNN0xB+iRwtm5tUgwxmbFMtwWXdIyABowizIdOw9YYoYZI11xDatCjA76nuHSdKgth9b ovi58ryAA12aVr9MOG3aTrPJLUK8hKzhRTO3kOQriVbDeu5RW5h1ItLm/JiYnYR8NfgV wcdw== 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=iuBWBP4vcXuymhCT8y6Q6tBW7TauWFamJhEjeIMDokc=; b=KqGDGC9Ca+ru5ZxsdCWvH14TBZgYsJnlAAVfMgFCkYwvqEj91ec0dLG+K4xkVPzHqD Tn73CdkR6Q/nHstv14rjL5JwN/KWfm05hjZLgrzhMvE7uphBAP+g8WA0vxPHdbVN7OaD toytuXxnX1msOi+ufMl6fWB6HbOiKZg66P1Ee1JdyMcnqqeSe+NtW9yyPb9RAMvt1q7e UvAea9vxSWAbRbGuu4or/85HHS4jDTckTIWa3d0g/XaAhLn6E+FfkwwPLC/G4iJc8R36 AuS8u+1pt1ItfTLLslLAuyXLwS0+Ym+xf5Yfa9GlMhXO++IeleRvAPu+q0SB7c+ooB6H n7ZQ== X-Gm-Message-State: AOAM532qj7/2iWcvKxrOAvf+eKS6vlZ8+WoIroJLMgcuy0jJYZqRHmqy Y/rqrCeKMvh+BcNIHTUKcqqZj3mBz4K0vA== X-Received: by 2002:a05:600c:c9:: with SMTP id u9mr2406848wmm.146.1627642792444; Fri, 30 Jul 2021 03:59:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 3/8] softmmu/arch_init.c: Trim down include list Date: Fri, 30 Jul 2021 11:59:42 +0100 Message-Id: <20210730105947.28215-4-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::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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" arch_init.c does very little but has a long list of #include lines. Remove all the unnecessary ones. Signed-off-by: Peter Maydell --- softmmu/arch_init.c | 7 ------- 1 file changed, 7 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 9011af74e4a..91cbf883e28 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -23,13 +23,6 @@ */ #include "qemu/osdep.h" #include "sysemu/arch_init.h" -#include "hw/pci/pci.h" -#include "hw/audio/soundhw.h" -#include "qapi/error.h" -#include "qemu/config-file.h" -#include "qemu/error-report.h" -#include "hw/acpi/acpi.h" -#include "qemu/help_option.h" #ifdef TARGET_SPARC int graphic_width = 1024; From patchwork Fri Jul 30 10:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489313 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3040545jas; Fri, 30 Jul 2021 04:00:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLvVet2xnPLWIwIO2jiAT2NIty2dxL/efrHCvDAZNGBEM6Y0bWggXdSH1stY4tmaXBibLE X-Received: by 2002:a25:ea52:: with SMTP id o18mr2532237ybe.150.1627642828033; Fri, 30 Jul 2021 04:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627642828; cv=none; d=google.com; s=arc-20160816; b=N++1PKg67X1Xcm7Zr+djPrziFDeX7u91WiLuz6VK/Meo+VE21Qod0kNWjl/omxExz+ drc4aHchHtCAFq+6FwzNwk395etLsp+2qnjKPw+6Zy/SY4nJcaexjD/8Hhe9uFxoNX77 vDHzB6xTsrq2gKodsvZ5I1CWMnvEQXUr1d/BUocQFJevQIwCIU3ZYBCswxwyv44Ax1fO mmDMVkm8yuKGEqrWS82U33YMCGW+1P0EKMLwHhhOUf9tlyuO/M0jlEM1GY0ET+9xHu6D l3fD4lGJz6DAFjWiiRXilzJZKkc4Qx0Qvm3ggyUJhbn7ovl8u7NSMJOXjPvfpycmgF6u DRiw== 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=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=a9rRscx5muEbavO//qV/6nTtoz/3/Z82Rn3ERXDifX0AWH8ItTj/YXpRP/hD60khE6 /nnVAuok68xsEs3V05cY1bMyKs6bwf3uI/a4NW8y2HSytreJ321U6SIyNzKVNV//yTlt +B+S8M+kFKD2Al7Dm8wj4m0K6AhX6TPNp9ylg/+S8PTxgKOKlZTLO6E5ocMZD+6yn2+w Y6uAQZ0zxLDiSRrvR78fZPP9Lnl/0Ho7Ky+wz8rgbfCNdPng6tcp0N2FNuY2+lb8AVVY +LCXj6aMdrKFav59i7Orp3+JWrv3plj2gACn+NH916Jlc9DaKUN65uQunUCPgt8bit/m vAgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K0ObMVVO; 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 q129si1711263ybc.242.2021.07.30.04.00.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:00:28 -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=K0ObMVVO; 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]:59124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QFf-00007e-Dl for patch@linaro.org; Fri, 30 Jul 2021 07:00:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFA-0008Tn-6m for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:56 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF8-0002Wc-Hd for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q3so10852859wrx.0 for ; Fri, 30 Jul 2021 03:59:54 -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=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=K0ObMVVOQq03E9p/YE2RRhfwHHxjOsf1Ug8jzdm4jKxPAJbB4kIEkPPUZ0pqLNBeAV gmZ1XBiPbo6zWnNh+ttMsie/lugtuhd9WwkU3OfJCJSzXVnmDN+SjOgJcKZKq6f7BHjK gqFPTyaVnWHiR7196osu1ZFHN4s2ym5ss+KQgZRcuX8pYTr8cxm46XhCS1PnDX3GFvhJ fzbtROtLHqES6Aa2/O9eJsdkjjntwhTZMBXZinU2T0USp7Nzs0cQI+513otxiSja9ier 97qPRsIvSWTNg1mTRY3qNqWEBuZBpe9o61uWbABJrf7YOe/plhr8L/1EtBITi3I/ld5A XS3w== 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=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=U0Po7fHWhdAqORkPmz78lsBuE8tDRRGSPQcW434iXWWSNfTagDa+8bKEKOwHWoDh9x T9ox2uRbfWllt8TsptA9thFX/bWEsGJlwTpDCXbLLd1gecUSjlqZCd2CjLyRVUoHsm+I 2DUyUzil7NpD0uu19fn1b916ah4hIOSLnVkakzkwlNG6F0vm6XNmTaqZ4tTFFDHjf42w MQzI8y8HMxboczTvLbfIB0unTy2hs280NggWfgxG2bPJsLEEPbSXErzbL5VcE1zG5l8s FbROBnfqfSQcD/76DYKw0gfBybrDeBhJgzr3g0kCNQnuAEp+WlnnU7vCssHCnhtjGxnU Ns6Q== X-Gm-Message-State: AOAM5338kAjDGcScEMjL0+IPCg9uiMGw6P0RtaQhMTPdwtYKPtwXhgTt prOsDLRMm+6B7PCV/gK+sBiaGYcbrmUdfg== X-Received: by 2002:a05:6000:1625:: with SMTP id v5mr2395194wrb.80.1627642793254; Fri, 30 Jul 2021 03:59:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 4/8] meson.build: Define QEMU_ARCH in config-target.h Date: Fri, 30 Jul 2021 11:59:43 +0100 Message-Id: <20210730105947.28215-5-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::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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" Instead of using an ifdef ladder in arch_init.c (which we then have to manually update every time we add or remove a target architecture), have meson.build put "#define QEMU_ARCH QEMU_ARCH_FOO" in the config-target.h file. Signed-off-by: Peter Maydell --- meson.build | 2 ++ softmmu/arch_init.c | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/meson.build b/meson.build index f2e148eaf98..861965c286b 100644 --- a/meson.build +++ b/meson.build @@ -1625,6 +1625,8 @@ foreach target : target_dirs config_target_data.set(k, v) endif endforeach + config_target_data.set('QEMU_ARCH', + 'QEMU_ARCH_' + config_target['TARGET_BASE_ARCH'].to_upper()) config_target_h += {target: configure_file(output: target + '-config-target.h', configuration: config_target_data)} diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 91cbf883e28..8919405c7b2 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -38,45 +38,4 @@ int graphic_height = 600; int graphic_depth = 32; #endif - -#if defined(TARGET_ALPHA) -#define QEMU_ARCH QEMU_ARCH_ALPHA -#elif defined(TARGET_ARM) -#define QEMU_ARCH QEMU_ARCH_ARM -#elif defined(TARGET_CRIS) -#define QEMU_ARCH QEMU_ARCH_CRIS -#elif defined(TARGET_HPPA) -#define QEMU_ARCH QEMU_ARCH_HPPA -#elif defined(TARGET_I386) -#define QEMU_ARCH QEMU_ARCH_I386 -#elif defined(TARGET_M68K) -#define QEMU_ARCH QEMU_ARCH_M68K -#elif defined(TARGET_MICROBLAZE) -#define QEMU_ARCH QEMU_ARCH_MICROBLAZE -#elif defined(TARGET_MIPS) -#define QEMU_ARCH QEMU_ARCH_MIPS -#elif defined(TARGET_NIOS2) -#define QEMU_ARCH QEMU_ARCH_NIOS2 -#elif defined(TARGET_OPENRISC) -#define QEMU_ARCH QEMU_ARCH_OPENRISC -#elif defined(TARGET_PPC) -#define QEMU_ARCH QEMU_ARCH_PPC -#elif defined(TARGET_RISCV) -#define QEMU_ARCH QEMU_ARCH_RISCV -#elif defined(TARGET_RX) -#define QEMU_ARCH QEMU_ARCH_RX -#elif defined(TARGET_S390X) -#define QEMU_ARCH QEMU_ARCH_S390X -#elif defined(TARGET_SH4) -#define QEMU_ARCH QEMU_ARCH_SH4 -#elif defined(TARGET_SPARC) -#define QEMU_ARCH QEMU_ARCH_SPARC -#elif defined(TARGET_TRICORE) -#define QEMU_ARCH QEMU_ARCH_TRICORE -#elif defined(TARGET_XTENSA) -#define QEMU_ARCH QEMU_ARCH_XTENSA -#elif defined(TARGET_AVR) -#define QEMU_ARCH QEMU_ARCH_AVR -#endif - const uint32_t arch_type = QEMU_ARCH; From patchwork Fri Jul 30 10:59:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489314 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3042432jas; Fri, 30 Jul 2021 04:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvGL66MaguEn5eWPqAimsDWVEzGAjYzyE1OGcWXt7QdiFHqaIjYlx04ozOsB7Vufz1VN3f X-Received: by 2002:a25:ed08:: with SMTP id k8mr2504045ybh.494.1627642953380; Fri, 30 Jul 2021 04:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627642953; cv=none; d=google.com; s=arc-20160816; b=ayq+AEoVdVNx8j8q5ulg2PjpsI+jtYGCeR42yvhRy2bR5krd/JwFJYMN88/YW1JlB3 0DJVOtTVpZeCc//G2FKqMdg6BVNwoPu3peQ83TqY+CfZfsytFjC7eKuy/20i7sFRIoG9 ydGRFdWqB/K4OK5koWqwB1UJW+1/Z++zVwaHQN2Leg7m2YNmhftnte7pQAHiPGkYvIzv WLParsvqsRUpbkFF5aRCqYvsuf0dB54SSaqjYkJbqpP1xf4sPYt9luou5t3IEuNP1tB1 cBfUF9xU5RLL+ajs8Yw9GCQ1JwmzDgoJfdMEwfwHsDSlXo8turG0bwBGt8zSTcH8lgJR udkg== 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=XsapCyUHRinZlDpvG4U0uaAG0gEMTFq+6AdmrnSbtBs=; b=yzoCoZwR/ccNupqFlRvyNDOGdESMppZdPpOIjurzA2VG2uykXeQXNs/axQciaPgbUQ rfRnBPTi/bEpn+J/fD1Za6rsXS59OkHUB8TWppY53KEWfIh5Z5gYbCwG7RvW18f5Lsv+ zkA5j7JwWEDXO9rRVALNrHRzsMdHWlsLQRZN8OgDAlWjppMt/Iu4lDBLW9curXQbG6I/ y2zMxlA9b5AkRDElSQyjSP05HfMHEB/NFRc9SQCRhPdFG66AWtd22WCB0nAV1ACyNGgS DewflNs1EEbtYRpRO11j5bk9vJznqnCApOHRhHXUVTfHZKZPZPmj2nAIccbABXK10RIx qBhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vnq4gE+H; 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 s14si1479807ybu.146.2021.07.30.04.02.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:02:33 -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=Vnq4gE+H; 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]:59142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QHg-00008U-QF for patch@linaro.org; Fri, 30 Jul 2021 07:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFA-0008UW-KO for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:56 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF9-0002Wn-7Z for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:56 -0400 Received: by mail-wm1-x332.google.com with SMTP id n28-20020a05600c3b9cb02902552e60df56so6097470wms.0 for ; Fri, 30 Jul 2021 03:59:54 -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=XsapCyUHRinZlDpvG4U0uaAG0gEMTFq+6AdmrnSbtBs=; b=Vnq4gE+H2pFgwQ/7o1fTKc0Rcz+6hQwJ9e2obba1FC6jmPb/QErZg4+gZ6RR/6lyCq eGaaWLw+lXhK55qIzhUaDQIY0Vy0KCenDyFhuBvPdbel0gZxk8WgVIVXC77oVusGgT+g KQvre1Shs4fDhk300aKQp39PWnusx9Uw65wzUPU/nu3xPyfb2osKODXZkV5gQU7KWPfJ OJKBICeLE/w5aNr8KSX5zeBcyn1YoTH7/SrqEAi/EdA0UplfZADQKijo1+jY5Fvr4cER qvRAlUQs/vNfIK77Sd0bJ6eVXnwwHUuNaQPrVzIzozQ3qGIW0p3sdeyJz+1OKs2WOiPY z/Uw== 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=XsapCyUHRinZlDpvG4U0uaAG0gEMTFq+6AdmrnSbtBs=; b=JcvqfI2SLbmCG0KpmKOMEWu2DDWpmsgg/i5QFnZNq1jVli6oUUYKNFA/M6dvSxGR8E exjpupt1b4eUvEqIq7pG3kq+DSIR7yPZ1GOD18noAhZCo6M8fF3a3N/Xv96qtG0QlJm1 8lFS5lyHoYL/j/Ru/JAK19xgvU2NG28wXqbTzPsc4HS2MvvXz8KeiMBIMPLO/z1tVSxW 6PuH482I9UF8lZ8/BmnJLOhi+crLot83a1rRlUsVB/1DyAvqHWsxloUbcVlwOHE16Jj8 CNoYgd+oIEUrLWRPvnumDyeNMJ9QWtyC9/xWTqCD+QQf3zrEE3n61/TYuD4mzKzbCPSM LkTg== X-Gm-Message-State: AOAM533G0u6I6EX933q3+as3onHBGiuyuLG5sydhF6Jg1g5grygKCrjU ERBHmlsCoSZWbZOI7FpVy3ONK5HHSlQetQ== X-Received: by 2002:a7b:cb98:: with SMTP id m24mr2280819wmi.24.1627642793952; Fri, 30 Jul 2021 03:59:53 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 5/8] arch_init.h: Add QEMU_ARCH_HEXAGON Date: Fri, 30 Jul 2021 11:59:44 +0100 Message-Id: <20210730105947.28215-6-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::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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" When Hexagon was added we forgot to add it to the QEMU_ARCH_* enumeration. This doesn't cause a visible effect because at the moment Hexagon is linux-user only and the QEMU_ARCH_* constants are only used in softmmu, but we might as well add it in, since it's the only architecture currently missing from the list. Signed-off-by: Peter Maydell --- include/sysemu/arch_init.h | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Taylor Simpson diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 57caad1c675..60270c5ad15 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -23,6 +23,7 @@ enum { QEMU_ARCH_RISCV = (1 << 19), QEMU_ARCH_RX = (1 << 20), QEMU_ARCH_AVR = (1 << 21), + QEMU_ARCH_HEXAGON = (1 << 22), QEMU_ARCH_NONE = (1 << 31), }; From patchwork Fri Jul 30 10:59:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489316 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3043840jas; Fri, 30 Jul 2021 04:04:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeK5LVvA/Fykzr0g7ZN3CV/jgnXJINO2gNLhaB+sPCedCNXBCng/QSNpVXh/zw1Zsp5+lU X-Received: by 2002:a5d:5111:: with SMTP id s17mr2359758wrt.227.1627643056346; Fri, 30 Jul 2021 04:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627643056; cv=none; d=google.com; s=arc-20160816; b=rhMzNc8M2oXYqIvAJ/hPfz4Y8g5Oi9IVNkh8niEO9UrnL3ttAGGQ/LRkR4zgr1qkDH oFNuMwi4L/7zPzCD0RwtEKHUrrusjVO1OtvFY3PEpWE0GUVw8MFHEaXtKnRqECgzlRDu ToayetKT5gtJOjwSXbZoUprt6WxFE8pSmwwcJGiSrUvlg/L0A+Ke2p6ksSfg2z3L2WfO dQa2Qn6KW2ykpiWKETxHv78r1PQ7ng8y9aJfPbj4Y45xUeacvaGsBOWovACONWgghCuR 0JdE7BiIgpI4iGIVxHtNlLu/49fhQfhCsgX2rPnsxOEOrVHRs7xuFNEYzJQo0k05LZP9 djjQ== 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=K0LsDdqG46LkMTzSmmUO14QKu3yyiy2ujafOymlz2zw=; b=EADf9k9knrSZosuZUbXFVj0/aPuOFd7tPcBWKDVyICW4z9+m0s9FACp0Wzi3i0UmnK EPVxcONR3cd+UdvHCaCQncQ3EvIwuIhWXO2ZbTHtgH7PB8DuaOtW1g5WNpO2DADt5GnT 1FN8ysU14LKXIInkrvjZRSNTlWHUilW/jprhsnOgnQuX9BdrYdm2JpYiZ3foXimH0eK+ Rk+h1n7m8TEkHM2TCGbjjVwpu2o7ZdudkLjmur1UBEJ5/WnTil/Nmk7clofPTL8ik/XN VrJNpyd7YahlWm/wG01+1gm+gqQ4E8+BYar0T634ZaawCCCj8UkYJea4CB3YgoVeg2Jh ikhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Mv3wLyyo; 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 r20si1235793ejo.736.2021.07.30.04.04.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:04:16 -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=Mv3wLyyo; 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]:39512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QJL-0006Ej-8s for patch@linaro.org; Fri, 30 Jul 2021 07:04:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFB-000052-J3 for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:57 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:44760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QFA-0002XO-0C for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:57 -0400 Received: by mail-wm1-x334.google.com with SMTP id d131-20020a1c1d890000b02902516717f562so6121778wmd.3 for ; Fri, 30 Jul 2021 03:59:55 -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=K0LsDdqG46LkMTzSmmUO14QKu3yyiy2ujafOymlz2zw=; b=Mv3wLyyo38nn6sGZcE5VnPxF+IxzHuyB8c6mYNk4VqmU3m3s1mGLRF0e7+ViFg/b1+ j9p0q/BTwUFkwEoiq7CwKyQHEdypX1hW5kAvXqyEx7W+P5CpCLl5u2Ec8W931AtyLl4x Lrvu1zGOdtsM6JZAPkWkouhdi9uRlteu/e9LiLdM5lCqvg1SI5zaEUH+VDdX1d7KdguI FlKFrPD79rkjlkE4t9l04jN4b417Ww14gU+Ama+LbnclrQlImCDdUORT6iZJw7GpTIzu t+/IXDGBFLTP9+Jdo1kjPGZyIuxbsDp1Pqb2X3j9drj+0WG3MszwvYkfyROwoUZuEL7+ RIdA== 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=K0LsDdqG46LkMTzSmmUO14QKu3yyiy2ujafOymlz2zw=; b=A5KDCfq2KrodHMrJ9iwYUdY6ZY2+LUxV7UtmGivBK7Zeqe1srr+5J93G3cYws01SEo ThFK+iQYDDlwpgmdZVV1mOdixPOMVomOkBCvKtcXttgWVmZWVTyRXFaxpgqmVpuZk/Qt IPGMZwn/M/ZGJP7KYzfNnd1uCg/dibNfLERzOOoe4SkIyclU5MLUPUJwlqRr4qQ1SN1O 4xhcYdPJomY55wxlHIIqkaErL6bwF85rF87reKtN2+eu88bJoPojTlj41isyOwIKniJI uw+snuAUhlT6N3CxQhMAIZEq2Rq5gWjDLqcoT4QyYmqGyZvtQpN9ttovT/bhhquFBNRh dfGg== X-Gm-Message-State: AOAM532SmJu2LF2eRbDQ/DnV/Wg8/N94lTk0x5ausvmBOXnyi8u+qbVp 0f98wsoswRjt0IbwkM2aEiP2xwTvefWRhQ== X-Received: by 2002:a05:600c:1d11:: with SMTP id l17mr2315045wms.185.1627642794667; Fri, 30 Jul 2021 03:59:54 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 6/8] arch_init.h: Move QEMU_ARCH_VIRTIO_* to qdev-monitor.c Date: Fri, 30 Jul 2021 11:59:45 +0100 Message-Id: <20210730105947.28215-7-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::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.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" The QEMU_ARCH_VIRTIO_* defines are used only in one file, qdev-monitor.c. Move them to that file. Signed-off-by: Peter Maydell --- include/sysemu/arch_init.h | 9 --------- softmmu/qdev-monitor.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Markus Armbruster diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 60270c5ad15..e7789399508 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -30,13 +30,4 @@ enum { extern const uint32_t arch_type; -/* default virtio transport per architecture */ -#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ - QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ - QEMU_ARCH_MIPS | QEMU_ARCH_PPC | \ - QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ - QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA) -#define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) -#define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K) - #endif diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 721dec2d820..a304754ab91 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -52,6 +52,15 @@ typedef struct QDevAlias uint32_t arch_mask; } QDevAlias; +/* default virtio transport per architecture */ +#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ + QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ + QEMU_ARCH_MIPS | QEMU_ARCH_PPC | \ + QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ + QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA) +#define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) +#define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K) + /* Please keep this table sorted by typename. */ static const QDevAlias qdev_alias_table[] = { { "AC97", "ac97" }, /* -soundhw name */ From patchwork Fri Jul 30 10:59:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489317 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3044431jas; Fri, 30 Jul 2021 04:05:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH2LFoIG9EkYXHp7isxf+d4IaBqvr2S+vhuT73eysIR+zKh3x1A5D4cv2mp/H1VWI7O/0p X-Received: by 2002:a25:a241:: with SMTP id b59mr2483502ybi.522.1627643103082; Fri, 30 Jul 2021 04:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627643103; cv=none; d=google.com; s=arc-20160816; b=Vzk6v2U78NI2itkoyt56WZbYi9QAwEMDbKjZZch7nL+KGI277AtOltG7uTn9o+MUak UPtZaDGsWfp1lCwrNJZVEX3+jyS6YTcAtGZBETo4YDJG1uX3KY8lzJuP4o660ZDOb3wH 6a+tpzP/SL6RRVnUYLlPJP983/DcUegWErs1ZUPIjzXBZ5L1QJ8MA+P2k+W/lUWfNMj4 bF/VfNhUYtXv+vnvjvd5KDVaOaCC2AWcS5hB9qPeFW0NP4e7Hoczdd87LibYr0+s0gH4 ClF3dvzdNvHYlM7RhXraEOROolQoMUfrPF5uTJsgm9nEqrbKet7Yqzy9RURh6jKaxzxf akfA== 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=LOFXsljOiEvL5KbQ1IGVlqLTkAfDLwXLvWhbRp0q2kQ=; b=pXrEV0158KBP3bw1Gm9x1ZE8I7xJjBVUgYvdPAw38L1D0gqDpScHxUXh2RItJ2k4Hx sZljNDVAwLVLI4EUcQ2iva+zTS4i4p4UHqHlooTarpE17iop7ZMzOz9ZuIGHdYDYLov2 pAQiYrY/Eho7B/6E3YDX1DxjhfeT92e7rDCJS4ujNNuu+ctvS5zWA+Sca6QVn9Dc8VEH Fc2SLxFeuSJBahAF5N+QzkkPNGcuBekBIQYfgpDeVoF5veZ3kX7oC47Aso8cjrkDZmq4 rShcyBEXqBS72UL+fV2oD7A0nAySgOYNA9r4rFsx3SkO25hwn6eC00euc+kATcEwjG1t +pTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UolB3GrB; 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 r188si1625703ybc.223.2021.07.30.04.05.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:05:03 -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=UolB3GrB; 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]:39622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QK6-0006Ik-GV for patch@linaro.org; Fri, 30 Jul 2021 07:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFC-00008V-Kr for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:58 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QFA-0002YX-Nc for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:58 -0400 Received: by mail-wr1-x431.google.com with SMTP id n12so10808058wrr.2 for ; Fri, 30 Jul 2021 03:59:56 -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=LOFXsljOiEvL5KbQ1IGVlqLTkAfDLwXLvWhbRp0q2kQ=; b=UolB3GrBJVoWvyi3D/qfc88Hkav4Q4rouNVKn8TCCBjDK5dbQHnk9hoZYQy+Xn/8s0 BCngkK5Fq4vXeU4IX1KUYT5jXcE3u6n7kO6XkQrYG6zhiik2wGt+cfrXSCvv3vz19mkF 6izDdL6zeoKh+hiinYwi5kMde/96663hhOnqS0vjRu1B4H2y7xkkAgtqYVt2AX0gWq7f eEv3LnMfFKGZVhKMXksC5en+ZPPgFg3Gb2ocZd0yjjVs7n/u149BNlfrUZPpoMBFbBi0 ETEH0QXF/LYngpdEYMrbCK3vxl9wBYjuX+hjpRBr+KYZ9Jolb6Vba7ad0h5Sirk15Ipa io6g== 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=LOFXsljOiEvL5KbQ1IGVlqLTkAfDLwXLvWhbRp0q2kQ=; b=tdRKfhb6bwQ54CYfVT9YkdQJcW3zGq6QUzEtSeaFHPgQnhnTC9ced121Iovvea3dMV 4KRghtq5wOTC8meWypySYJmsvhrouAFV+YVWZIMu2m/av6kKuq09OBvpoNv6lqPSF/V0 oX8hSw8AINRMSWyyrftSMEz2UWCXHcEmNV3Qb95bT2YDIInaqOJf1HGiH7/zKNNq9JIx HDUnOYZM6Knwf+9f8+6HLbHTtZfjBVdOopq+u6CKSgBINZzBtFjahuTwxaTTz+BtwfFH FCxPaQp5KjFEaMaccR7RrcDr1GT1rgFTL2nU0nvdij/vyKnqqCg08+AgH49sgD8F7DP/ evHQ== X-Gm-Message-State: AOAM532pUzVC7cW2ea6L0nVctWjwFg+JnD02do5Klxxqmn5lr7f07mfz wz/CaXFf+aTs9AjE8vARD48V4ZKjECNc0w== X-Received: by 2002:a5d:4521:: with SMTP id j1mr2322783wra.44.1627642795509; Fri, 30 Jul 2021 03:59:55 -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.54 (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 7/8] arch_init.h: Don't include arch_init.h unnecessarily Date: Fri, 30 Jul 2021 11:59:46 +0100 Message-Id: <20210730105947.28215-8-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::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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" arch_init.h only defines the QEMU_ARCH_* enumeration and the arch_type global. Don't include it in files that don't use those. Signed-off-by: Peter Maydell --- blockdev.c | 1 - hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/mips/jazz.c | 1 - hw/mips/malta.c | 1 - hw/ppc/prep.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/virt.c | 1 - monitor/qmp-cmds.c | 1 - target/ppc/cpu_init.c | 1 - target/s390x/cpu-sysemu.c | 1 - 14 files changed, 14 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis diff --git a/blockdev.c b/blockdev.c index 3d8ac368a19..e79c5f3b5e8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -56,7 +56,6 @@ #include "sysemu/iothread.h" #include "block/block_int.h" #include "block/trace.h" -#include "sysemu/arch_init.h" #include "sysemu/runstate.h" #include "sysemu/replay.h" #include "qemu/cutils.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c2b9d62a358..102b2239468 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -65,7 +65,6 @@ #include "hw/xen/start_info.h" #include "ui/qemu-spice.h" #include "exec/memory.h" -#include "sysemu/arch_init.h" #include "qemu/bitmap.h" #include "qemu/config-file.h" #include "qemu/error-report.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 30b8bd6ea92..1bc30167acc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -43,7 +43,6 @@ #include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/sysbus.h" -#include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/xen/xen-x86.h" #include "exec/memory.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 04b4a4788d7..eeb0b185b11 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/loader.h" -#include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/rtc/mc146818rtc.h" #include "sysemu/kvm.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index d6183e18821..f5a26e174d5 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -35,7 +35,6 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "sysemu/sysemu.h" -#include "sysemu/arch_init.h" #include "hw/boards.h" #include "net/net.h" #include "hw/scsi/esp.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 7dcf175d726..b770b8d3671 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -38,7 +38,6 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" -#include "sysemu/arch_init.h" #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index acfc2a91d8e..25a2e86b421 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -40,7 +40,6 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" #include "hw/qdev-properties.h" -#include "sysemu/arch_init.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" #include "trace.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index ddc658c8d68..5b7b245e1f3 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -45,7 +45,6 @@ #include "hw/intc/sifive_plic.h" #include "hw/misc/sifive_e_prci.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/sysemu.h" static const MemMapEntry sifive_e_memmap[] = { diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 87bbd10b211..6cc1a62b0f7 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -55,7 +55,6 @@ #include "hw/intc/sifive_plic.h" #include "chardev/char.h" #include "net/eth.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index fead77f0c48..aae36f2cb4d 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -37,7 +37,6 @@ #include "hw/char/riscv_htif.h" #include "hw/intc/sifive_clint.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 4a3cd2599a5..0e55411045a 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,7 +36,6 @@ #include "hw/intc/sifive_plic.h" #include "hw/misc/sifive_test.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 9ddb9352e65..5c0d5e116b9 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -27,7 +27,6 @@ #include "sysemu/kvm.h" #include "sysemu/runstate.h" #include "sysemu/runstate-action.h" -#include "sysemu/arch_init.h" #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "qapi/error.h" diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 505a0ed6ac0..319a272d4c9 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -22,7 +22,6 @@ #include "disas/dis-asm.h" #include "exec/gdbstub.h" #include "kvm_ppc.h" -#include "sysemu/arch_init.h" #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/tcg.h" diff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c index df2c6bf6941..5471e01ee82 100644 --- a/target/s390x/cpu-sysemu.c +++ b/target/s390x/cpu-sysemu.c @@ -34,7 +34,6 @@ #include "hw/s390x/pv.h" #include "hw/boards.h" -#include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "hw/core/sysemu-cpu-ops.h" 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'))