From patchwork Thu Jan 18 20:06:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13523195 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C10AE2E62A for ; Thu, 18 Jan 2024 20:08:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705608501; cv=none; b=aDP89HpcCc9Kz3kkHr5VCAUZ/5UH5pmP6gpApZzDqSKPvyUYNm7c0ppElHEs7ocUeub4BQwPF0E24Y9dWx1LVha7ssB4VqcUOlnw+/t1dYsG3glDi1zESs0IoMGyeWajQBaROW06EN5d/7XuA3uoPyOoCBQYD9fNLTyz4xMBngE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705608501; c=relaxed/simple; bh=vxM7rZgRIdZCOLEefBS8aM3zBBR/LN6UIE+U89tGxFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kOTA6CZyWbL4wXlgKExwql9fbb1sxewmMnFUxZEsBBP212Fl3cK0vSHKCMiipATNNTHPyZQTSmucyzzy/oH9y0FIUAZYoNYZsJQ7RlDApL0IXo7wzetAuSXkYQ86Y1n9jjLG1EOY9ym7Nm56RA9IL8FbqftlcGW/NAxc5i82zeM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=oS2NhRLD; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oS2NhRLD" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-40e80046264so440675e9.0 for ; Thu, 18 Jan 2024 12:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705608498; x=1706213298; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7i3W6cKZo6jUarGFVlLnFc+nsCmIDidPRgxq67roFM8=; b=oS2NhRLDO+tJWMbFweL0Gqi3SFN1h5jyFPjUmTFEJYfqT8/NZTYw1HptJf7Q1kJMRQ bhGmMnDV1E+NFxHtWfOgZwySFLBPEqk6cfNyFD0tiyOxAELlVh7zH/oGWTr1RmL+i1cs 32tQ9CIkdoqYG3rNvFW/51jpVnRnXpy81TiHyj9hveLWvLQMy+0sqryfV4bFNPeI8pce Q0fJh5R7dALsBfMvhEjlENUGkKEo10VkPmuD+AIrdTG8KPVBAAq9PJMotztdK5TB/BPw U8AgDyM4t+L44gzAQl5zDIzeVnJeFa+7b8MY7x5KLJcznOdu2y22yJ65M9n79V5IlLyv VXag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705608498; x=1706213298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7i3W6cKZo6jUarGFVlLnFc+nsCmIDidPRgxq67roFM8=; b=ctixfJGB0iJ/IfNDFn8ajjBvrHspJCALwPRaNNq7nAzYTyJ8lqZ4tFFl5dTNfqVlad m3DU8BxzW53aKAGVUDvqjiQE275A+XLjx+F3EfFAc19Gf0p5rsznS3Yhifkt9IWAir0q Kk/lgoIHmyewh3nE/UCnQj2VTVSYG2ivpleYDQYwPWeYUBnyZ7LDwe05TZBkjzGhjR77 Sa4T69vcoJ3Wyjk1jnUXMqsGDIDT2oKTpkMYnAdrFpTSMru6L/cSv3W48OhSW4/V46A9 8i1NiFOsA2pkNoHOAHkHDYq6HDx4s3Q+lfrQJnkjlcH5zSiqnkwpJT70CM5KmlPwsbdi UaQA== X-Gm-Message-State: AOJu0Yx6EZnhszmravi1y54CC4nNWrS4Al/4mKHwn+EoxZD52cG1bd6N Y2HVMirHfpuP8vpqbWAX4lUOtFEWNX4P++ckT0mYMeL8UeQWW7172+0D1cmpzTY= X-Google-Smtp-Source: AGHT+IFoKd/89CskaiBLpvOHoHusNCnOu8tS11qS68UcjN3wO9IbW1+6ctvSRoHh+YJ/kkTBuD605w== X-Received: by 2002:a05:600c:46ce:b0:40e:5feb:699d with SMTP id q14-20020a05600c46ce00b0040e5feb699dmr926186wmo.164.1705608498089; Thu, 18 Jan 2024 12:08:18 -0800 (PST) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id s14-20020a5d69ce000000b00337478efa4fsm4783334wrw.60.2024.01.18.12.08.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 18 Jan 2024 12:08:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mitsyanko , qemu-arm@nongnu.org, Strahinja Jankovic , "Edgar E. Iglesias" , Igor Mammedov , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Eric Auger , Niek Linnenbank , "Michael S. Tsirkin" , Jan Kiszka , Marcin Juszkiewicz , Alistair Francis , Radoslaw Biernacki , Andrew Jeffery , Andrey Smirnov , Rob Herring , Shannon Zhao , Tyrone Ting , Beniamino Galvani , Alexander Graf , Leif Lindholm , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , Jean-Christophe Dubois , Joel Stanley , Hao Wu , kvm@vger.kernel.org Subject: [PATCH 16/20] hw/arm/armv7m: Make 'hw/intc/armv7m_nvic.h' a target agnostic header Date: Thu, 18 Jan 2024 21:06:37 +0100 Message-ID: <20240118200643.29037-17-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240118200643.29037-1-philmd@linaro.org> References: <20240118200643.29037-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now than we can access the M-profile bank index definitions from the target-agnostic "cpu-qom.h" header, we don't need the huge "cpu.h" anymore (except in hw/arm/armv7m.c). Reduce its inclusion to the source unit. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/intc/armv7m_nvic.h | 2 +- hw/arm/armv7m.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h index 6b4ae566c9..89fe8aedaa 100644 --- a/include/hw/intc/armv7m_nvic.h +++ b/include/hw/intc/armv7m_nvic.h @@ -10,7 +10,7 @@ #ifndef HW_ARM_ARMV7M_NVIC_H #define HW_ARM_ARMV7M_NVIC_H -#include "target/arm/cpu.h" +#include "target/arm/cpu-qom.h" #include "hw/sysbus.h" #include "hw/timer/armv7m_systick.h" #include "qom/object.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 1f21827773..edcd8adc74 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -21,6 +21,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "target/arm/idau.h" +#include "target/arm/cpu.h" #include "target/arm/cpu-features.h" #include "migration/vmstate.h"