From patchwork Fri Feb 3 14:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 650034 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp848909pva; Fri, 3 Feb 2023 06:29:56 -0800 (PST) X-Google-Smtp-Source: AK7set9Gp2ypf6tNWM/mlJYVFUJ2/FAxoWenSAU31MdxorA+OZJGIZffWgRK2NoXpyFcmypG6/w5 X-Received: by 2002:ac8:5a55:0:b0:3b8:29a0:edb7 with SMTP id o21-20020ac85a55000000b003b829a0edb7mr19503397qta.59.1675434596319; Fri, 03 Feb 2023 06:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675434596; cv=none; d=google.com; s=arc-20160816; b=IIOAAAOiQK1SMIPszlLs8Yi80Q1IsTLVd1Nu1XxWSeO49cKiJRcD4gKmikbHzHWkYq 6+VYoO7MPobBVpjRoVW9qS5UPn3FGjAdyeWRJNaXn1mqS9kTp/iUjfgiVvBMXd0C5chn glCXXMx7OR9LU6S8Pwpuplg5PkulQKmZYY3rBKmYcoA6kmaYa3g2FoXzbPEwCv+eZj9Z Jx4iNxhVaC7LjOYOGt7RNF+QL5SVhfMGCK8IhnVvTY37wtQo8mf1SzY++9YT4r7atGV/ jp6Tdjnhp6l8C3oTvesZ88NLQROByz7FmdWSWVo2jzv2tleIkH1kkwOnvpz9uEUsnpx0 wmbA== 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:to:from :dkim-signature; bh=Li+pWB+M1ny80ksWu15v+SH9Uhscz2fzZUVC1wklHOc=; b=tpwEjpXhwKo17RvH/oVonQUTxdq6+FLqYjbcYPEkCPwrCBHOriRNjne8MQN8T5wm2d xjq8BTFGwzIKd2Z7iFDLh1HnWE4p8e0/jU/CtKWUO1l0PC3hLCAs8qnH7LXXMPXY2Abm TxoDtlRhuEYMKEn0tOol3UfVSDdndBXr6U2xb9IWEsuABwsbnfJzKAAeMnVKOSKbgql4 Yp6r8dtaPOeOWoE9NlTiHfun3MAJztWk/f6ilIqh84u6P8ozlCDFneYAqURh7k+UWlVR c3KMfwxmxB2b/9r/GMxA2CeN2WM9mFUkVET8oh40FXQxhF7wgUVR3JWpRgXORVHbuUiF acgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JXAzJ6aV; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v21-20020a05622a131500b003b9ba906cb4si1853957qtk.538.2023.02.03.06.29.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Feb 2023 06:29:56 -0800 (PST) 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=@linaro.org header.s=google header.b=JXAzJ6aV; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNx4T-0006ev-Ax; Fri, 03 Feb 2023 09:29:46 -0500 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 1pNx4H-0006ao-GA for qemu-devel@nongnu.org; Fri, 03 Feb 2023 09:29:34 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNx4F-00053d-PZ for qemu-devel@nongnu.org; Fri, 03 Feb 2023 09:29:33 -0500 Received: by mail-wm1-x333.google.com with SMTP id q8so3999534wmo.5 for ; Fri, 03 Feb 2023 06:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Li+pWB+M1ny80ksWu15v+SH9Uhscz2fzZUVC1wklHOc=; b=JXAzJ6aVeUmX4jW3n9mI3bu2+wJS722OrZm05c5aowDEyyYgjIns4tJnH08sspHz4F ImcBWQvlGK+RmFJneHyUPcTJ//dwA662ZZMuQnSEhVgc6UgExAEp9eZpYRgDNwAGqy1c w1TVE131EIIFGp8+JYV+ACc5lbukcnPjiLhX2OJW8FPqcK2Nf+NATA4a1bpku8qP/r+c UCRBgJ44wW7fvcUzdUT7SBWgYJv9CrreUiMaGwnCCuWhMcsskJHunAuh7hZm0cAuPzVq FUfzrO5g9rvqgwMS88kQ2iHJiD20jBL4wEJjmMBj9OrfY1U/ovj1Y4+/jJbgBfxqdTae WXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Li+pWB+M1ny80ksWu15v+SH9Uhscz2fzZUVC1wklHOc=; b=SmvmmNHhLeuUFKD8jt6v818ll7evXcrO8u8WULDAZBjPeZfr4rjpi3+mackQ96mlnR m2jfZO5Dk/PCYOpA+o9zra5A6y6xlSes6Kq/Ph4IBkapzPgCF3T3O4l5dsEZYcvxNdMO PUrgOoc1FQQ/0X3Y7VSiMovRpjmxgJBcdTQrlm+f+IGEB42PY3g5Ucc6draCHlADwY6F wVQWoD586s6uP1YRAJkiXxVLKeroq3ZNiwLjyrgYonjosWRrF8FgK+itGWTI94SeJZAn Pjz7qyGJ7IYkUVSBqhLQ/kOZoCkz2xWsrg6QjHnGMR8V+ni8YVDBta4/RFrFkiut7hFj F6Xw== X-Gm-Message-State: AO0yUKXsCPKvNZyHQhnirC/94uyYuXs96Woa2lgHYvFSrz1mpdZzOxEs MERSelTHuqttuDIVqlhlgPg1csWXXha1raiN X-Received: by 2002:a05:600c:314a:b0:3df:ee43:860b with SMTP id h10-20020a05600c314a00b003dfee43860bmr731698wmo.23.1675434570103; Fri, 03 Feb 2023 06:29:30 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j14-20020a05600c130e00b003df241f52e8sm2578492wmf.42.2023.02.03.06.29.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 06:29:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/33] hw/arm: Use TYPE_ARM_SMMUV3 Date: Fri, 3 Feb 2023 14:28:55 +0000 Message-Id: <20230203142927.834793-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230203142927.834793-1-peter.maydell@linaro.org> References: <20230203142927.834793-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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.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: Richard Henderson Use the macro instead of two explicit string literals. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Message-id: 20230124232059.4017615-1-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- hw/arm/sbsa-ref.c | 3 ++- hw/arm/virt.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 4bb444684f4..8378441dbb1 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -29,6 +29,7 @@ #include "exec/hwaddr.h" #include "kvm_arm.h" #include "hw/arm/boot.h" +#include "hw/arm/smmuv3.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/ide/internal.h" @@ -574,7 +575,7 @@ static void create_smmu(const SBSAMachineState *sms, PCIBus *bus) DeviceState *dev; int i; - dev = qdev_new("arm-smmuv3"); + dev = qdev_new(TYPE_ARM_SMMUV3); object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ea2413a0bad..90a7099d3b5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1343,7 +1343,7 @@ static void create_smmu(const VirtMachineState *vms, return; } - dev = qdev_new("arm-smmuv3"); + dev = qdev_new(TYPE_ARM_SMMUV3); object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort);