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 */