From patchwork Wed Sep 29 16:25:40 2021 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: 12526285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FC7EC433F5 for ; Wed, 29 Sep 2021 16:25:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6DB6C613DA for ; Wed, 29 Sep 2021 16:25:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345415AbhI2Q11 (ORCPT ); Wed, 29 Sep 2021 12:27:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344369AbhI2Q11 (ORCPT ); Wed, 29 Sep 2021 12:27:27 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAE1CC06161C for ; Wed, 29 Sep 2021 09:25:45 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 205-20020a1c01d6000000b0030cd17ffcf8so5792025wmb.3 for ; Wed, 29 Sep 2021 09:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M/z4q4xz14vgf03sCSRqWiasmkSgRNoaEpSx63WFnDY=; b=igiiKPlvIDm8zChKBHOMyJP322gF3d26cumMjCt6yPZC74LDPbg7U8LzKzSQ/6iptZ 5g1DhUa15KakutnkKuLEDFUkSyPhQA/3HLhZUa46hXGckOUerErl77O7Bu4wH+dMoFIX AVCDbuGAbzm+2EjiTG2xqxEmR5OYpogI+onROaCnlCJ78b30n5R3YxoFvN4sW6SjOGxa bUIX0KSvJGV/NaICZpY+hoVQCrzv3Im6P9sAiyZzH2IWL563/dmHr49HNl3Xl4XOxdWM /ZPwdVbvkGEpVNJ7fFWf1aBr3BLFg7vMNDJzgYfhpVxFxr+FVX97y0ou9ZWGHXqSnz3G 9rog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=M/z4q4xz14vgf03sCSRqWiasmkSgRNoaEpSx63WFnDY=; b=uGhpMC+HOy3PmKCxwM3geDqxXwE05DS5v9434BVP4qme3sfUM7I6YW5c33+QGW54mf xwoXLw64BzmU8c6al4uDuzknCAyAS7SZaRRzfKTX1EZy3jzRMFsWDPQCXisAPYN6O21j PhPaCjSPGRLnal5P5LSqwbcD3sfKuo2JjvoOeQiedD2vYbXr8usABRtJwmcsWp9pg0mZ 369tVdnI8QuTh3Rl2iEOZbV4efhxH/uUdQnB2dYFw7aOiE2gouTJMKdxTQdKo/THfe3Z LxG/V+hI+uX1aNqLuAQJ92n+gtowsse8MEWaVcKUNCOJ5SOfdoP8LtsFxitT0N0/9/31 KcTQ== X-Gm-Message-State: AOAM5305k/h51uiKQelePeMy6FD0yaLXMpBktbdoBf61golKLWyVOhGm DHZfc9OqEC/C4YomspiBxOE= X-Google-Smtp-Source: ABdhPJyLLpxoz6jaXKWjW6InwgnCAvHajZusY6QZz9HuVLPUXr8V71rbe7b4dOtV1UdviDt/S287/g== X-Received: by 2002:a1c:1f0d:: with SMTP id f13mr875976wmf.25.1632932744137; Wed, 29 Sep 2021 09:25:44 -0700 (PDT) Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id e5sm398966wrd.1.2021.09.29.09.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 09:25:41 -0700 (PDT) Sender: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kamil Rytarowski , Roman Bolshakov , Marcel Apfelbaum , Eduardo Habkost , haxm-team@intel.com, kvm@vger.kernel.org, Reinoud Zandijk , Sunil Muthuswamy , Colin Xu , "Michael S. Tsirkin" , Richard Henderson , Wenchao Wang , Cameron Esfahani , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2] target/i386: Include 'hw/i386/apic.h' locally Date: Wed, 29 Sep 2021 18:25:40 +0200 Message-Id: <20210929162540.2520208-1-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Instead of including a sysemu-specific header in "cpu.h" (which is shared with user-mode emulations), include it locally when required. Acked-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 4 ---- hw/i386/kvmvapic.c | 1 + hw/i386/x86.c | 1 + target/i386/cpu-dump.c | 1 + target/i386/cpu-sysemu.c | 1 + target/i386/cpu.c | 1 + target/i386/gdbstub.c | 4 ++++ target/i386/hax/hax-all.c | 1 + target/i386/helper.c | 1 + target/i386/hvf/hvf.c | 1 + target/i386/hvf/x86_emu.c | 1 + target/i386/nvmm/nvmm-all.c | 1 + target/i386/tcg/seg_helper.c | 4 ++++ target/i386/tcg/sysemu/misc_helper.c | 1 + target/i386/tcg/sysemu/seg_helper.c | 1 + target/i386/whpx/whpx-all.c | 1 + 16 files changed, 21 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index c2954c71ea0..4411718bb7a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2045,10 +2045,6 @@ typedef X86CPU ArchCPU; #include "exec/cpu-all.h" #include "svm.h" -#if !defined(CONFIG_USER_ONLY) -#include "hw/i386/apic.h" -#endif - static inline void cpu_get_tb_cpu_state(CPUX86State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) { diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 43f8a8f679e..7333818bdd1 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -16,6 +16,7 @@ #include "sysemu/hw_accel.h" #include "sysemu/kvm.h" #include "sysemu/runstate.h" +#include "hw/i386/apic.h" #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 00448ed55aa..e0218f8791f 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -43,6 +43,7 @@ #include "target/i386/cpu.h" #include "hw/i386/topology.h" #include "hw/i386/fw_cfg.h" +#include "hw/i386/apic.h" #include "hw/intc/i8259.h" #include "hw/rtc/mc146818rtc.h" diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index 02b635a52cf..0158fd2bf28 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -22,6 +22,7 @@ #include "qemu/qemu-print.h" #ifndef CONFIG_USER_ONLY #include "hw/i386/apic_internal.h" +#include "hw/i386/apic.h" #endif /***********************************************************/ diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c index 37b7c562f53..4e8a6973d08 100644 --- a/target/i386/cpu-sysemu.c +++ b/target/i386/cpu-sysemu.c @@ -30,6 +30,7 @@ #include "hw/qdev-properties.h" #include "exec/address-spaces.h" +#include "hw/i386/apic.h" #include "hw/i386/apic_internal.h" #include "cpu-internal.h" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b029f1bdf1..52422cbf21b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -33,6 +33,7 @@ #include "standard-headers/asm-x86/kvm_para.h" #include "hw/qdev-properties.h" #include "hw/i386/topology.h" +#include "hw/i386/apic.h" #ifndef CONFIG_USER_ONLY #include "exec/address-spaces.h" #include "hw/boards.h" diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index 098a2ad15a9..5438229c1a9 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -21,6 +21,10 @@ #include "cpu.h" #include "exec/gdbstub.h" +#ifndef CONFIG_USER_ONLY +#include "hw/i386/apic.h" +#endif + #ifdef TARGET_X86_64 static const int gpr_map[16] = { R_EAX, R_EBX, R_ECX, R_EDX, R_ESI, R_EDI, R_EBP, R_ESP, diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c index bf65ed6fa92..cd89e3233a9 100644 --- a/target/i386/hax/hax-all.c +++ b/target/i386/hax/hax-all.c @@ -32,6 +32,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "hw/boards.h" +#include "hw/i386/apic.h" #include "hax-accel-ops.h" diff --git a/target/i386/helper.c b/target/i386/helper.c index 533b29cb91b..874beda98ae 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -26,6 +26,7 @@ #ifndef CONFIG_USER_ONLY #include "sysemu/hw_accel.h" #include "monitor/monitor.h" +#include "hw/i386/apic.h" #endif void cpu_sync_bndcs_hflags(CPUX86State *env) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 4ba6e82fab3..50058a24f2a 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -70,6 +70,7 @@ #include #include "hw/i386/apic_internal.h" +#include "hw/i386/apic.h" #include "qemu/main-loop.h" #include "qemu/accel.h" #include "target/i386/cpu.h" diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c index 7c8203b21fb..fb3e88959d4 100644 --- a/target/i386/hvf/x86_emu.c +++ b/target/i386/hvf/x86_emu.c @@ -45,6 +45,7 @@ #include "x86_flags.h" #include "vmcs.h" #include "vmx.h" +#include "hw/i386/apic.h" void hvf_handle_io(struct CPUState *cpu, uint16_t port, void *data, int direction, int size, uint32_t count); diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index a488b00e909..944bdb49663 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -22,6 +22,7 @@ #include "qemu/queue.h" #include "migration/blocker.h" #include "strings.h" +#include "hw/i386/apic.h" #include "nvmm-accel-ops.h" diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index baa905a0cd6..76b4ad918a7 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -28,6 +28,10 @@ #include "helper-tcg.h" #include "seg_helper.h" +#ifndef CONFIG_USER_ONLY +#include "hw/i386/apic.h" +#endif + /* return non zero if error */ static inline int load_segment_ra(CPUX86State *env, uint32_t *e1_ptr, uint32_t *e2_ptr, int selector, diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/misc_helper.c index 9ccaa054c4c..b1d3096e9c9 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -24,6 +24,7 @@ #include "exec/cpu_ldst.h" #include "exec/address-spaces.h" #include "tcg/helper-tcg.h" +#include "hw/i386/apic.h" void helper_outb(CPUX86State *env, uint32_t port, uint32_t data) { diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/seg_helper.c index bf3444c26b0..34f2c65d47f 100644 --- a/target/i386/tcg/sysemu/seg_helper.c +++ b/target/i386/tcg/sysemu/seg_helper.c @@ -24,6 +24,7 @@ #include "exec/cpu_ldst.h" #include "tcg/helper-tcg.h" #include "../seg_helper.h" +#include "hw/i386/apic.h" #ifdef TARGET_X86_64 void helper_syscall(CPUX86State *env, int next_eip_addend) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 3e925b9da70..9ab844fd05d 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -20,6 +20,7 @@ #include "qemu/main-loop.h" #include "hw/boards.h" #include "hw/i386/ioapic.h" +#include "hw/i386/apic.h" #include "hw/i386/apic_internal.h" #include "qemu/error-report.h" #include "qapi/error.h"