From mboxrd@z Thu Jan 1 00:00:00 1970 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 E3AA3C433F5 for ; Wed, 29 Sep 2021 16:31:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB9F561462 for ; Wed, 29 Sep 2021 16:31:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345927AbhI2Qck (ORCPT ); Wed, 29 Sep 2021 12:32:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345919AbhI2Qck (ORCPT ); Wed, 29 Sep 2021 12:32:40 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E62A8C06161C for ; Wed, 29 Sep 2021 09:30:58 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id w29so5287021wra.8 for ; Wed, 29 Sep 2021 09:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=mc0p2V+4e9u0RQdTnp/cg9+KLmU6XIVOX4G50p95VSs=; b=AHsw5ohw7cEyeZRk5M2LIESvfthqLQpOeaemC3ssnjLnNF2T+tZ2Nk1icpQT0i06gs aPe9dgYb2mJHB9AmPl1geiQ4UFLANQmd1EV1qraL1fTFFRtt3UQ9KuKGDsAvA+z5ViBV jetn3OUC8ZLVLzm5pf43mSHCE5T8dS725wShk3mfZh3pQtiOvoh2wKS0Dai/S0yJsm03 a9z5uzFRURoDvyTKj7839yO8I2Smeb770xgabGzogTaPbaQ2TOaXUCmo2WJErHuJVwt2 jcIjXTTw4Hbze2bUJmvZuSoT1S7V8u5yNY+92EyRO77zs88ft61Xce7RJmEzPAQ+TPIN KMTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=mc0p2V+4e9u0RQdTnp/cg9+KLmU6XIVOX4G50p95VSs=; b=chKNeOMMCOU9HpAL/7rzndz87ZN1dTB6pvEmSkYyESPOygCXuA4bLK6HGZ4G2yt6/i dzo7yngmJc03yy33aNyy5rDuvpeqDFiA+flhY9/tEk/sdkR3dtH3OTirEdbSPVBC53WA Zg6PM9G53qExOziPyS5d4PU3+pk4ZYHhY6M8g2t9fzrTaVCYYh4HHPg8ryGinz3FOm49 KcDkWrudFfOrJFcX2T+ox/VvlmjEFqVP8jNRbDuaEll/aYHZYs3cADZk6ltj/Jg1D3s5 /n8jeKxw+EIoNQH/c54Jze0Gi03A5LYzyl1DQR7mShpYZ5jjMkzj4YGq3+8i3UKcyJzp Lh5A== X-Gm-Message-State: AOAM53071+Q/zFb49qt9zj6wMAvZ43Wta42V3vwx05v3gecilfyzjNsA gCpD6pXexWcqDwbA403uT1k= X-Google-Smtp-Source: ABdhPJxOtAvhG6zGp6bfZip6tzCd5iX6n4VLqiZyj/4qKmlM8VfW3QKvNaclWZIou608tMYA81dTeA== X-Received: by 2002:a5d:4a41:: with SMTP id v1mr962025wrs.324.1632933057570; Wed, 29 Sep 2021 09:30:57 -0700 (PDT) Received: from [192.168.1.36] (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v20sm367260wra.73.2021.09.29.09.30.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Sep 2021 09:30:57 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Message-ID: Date: Wed, 29 Sep 2021 18:30:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH v2] target/i386: Include 'hw/i386/apic.h' locally Content-Language: en-US To: qemu-devel@nongnu.org Cc: Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Richard Henderson , Roman Bolshakov , Cameron Esfahani , Kamil Rytarowski , haxm-team@intel.com, Colin Xu , Paolo Bonzini , Reinoud Zandijk , Sunil Muthuswamy , Wenchao Wang References: <20210929162540.2520208-1-f4bug@amsat.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: <20210929162540.2520208-1-f4bug@amsat.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 9/29/21 18:25, Philippe Mathieu-Daudé wrote: > 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/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 > + Self-NAck (incorrectly rebased on top of commit 0792e6c88d4 ("target/i386: Move x86_cpu_exec_interrupt() under sysemu/ folder"). > 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" From mboxrd@z Thu Jan 1 00:00:00 1970 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 869C3C433F5 for ; Wed, 29 Sep 2021 16:33:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48FCB613D0 for ; Wed, 29 Sep 2021 16:33:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 48FCB613D0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:50880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVcWL-0003Hg-CN for qemu-devel@archiver.kernel.org; Wed, 29 Sep 2021 12:33:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVcU1-0001A1-Ho; Wed, 29 Sep 2021 12:31:01 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVcTz-0004ZL-MV; Wed, 29 Sep 2021 12:31:00 -0400 Received: by mail-wr1-x435.google.com with SMTP id h15so3684299wrc.3; Wed, 29 Sep 2021 09:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=mc0p2V+4e9u0RQdTnp/cg9+KLmU6XIVOX4G50p95VSs=; b=AHsw5ohw7cEyeZRk5M2LIESvfthqLQpOeaemC3ssnjLnNF2T+tZ2Nk1icpQT0i06gs aPe9dgYb2mJHB9AmPl1geiQ4UFLANQmd1EV1qraL1fTFFRtt3UQ9KuKGDsAvA+z5ViBV jetn3OUC8ZLVLzm5pf43mSHCE5T8dS725wShk3mfZh3pQtiOvoh2wKS0Dai/S0yJsm03 a9z5uzFRURoDvyTKj7839yO8I2Smeb770xgabGzogTaPbaQ2TOaXUCmo2WJErHuJVwt2 jcIjXTTw4Hbze2bUJmvZuSoT1S7V8u5yNY+92EyRO77zs88ft61Xce7RJmEzPAQ+TPIN KMTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=mc0p2V+4e9u0RQdTnp/cg9+KLmU6XIVOX4G50p95VSs=; b=RSjyMfGApe3jylNAk6WuIW0YD6wI34byuAI6Jg6sMf3OEHNjSOB1DWSIlWVGMU2nlH wD3qoAHKw5zf62EaGdf4y2LBXUOVdqWGZwQkZiotAbjp0/cgLorRIV1uMcJqloEb52KA MDyza5h7YUI8/owGeL94p0FcpJ+JjKhv0KcvReDsNmTXWBlypQtfJOGH5pbMW5juUfxz jmfmRLcnwYtew9lWHj7Ua0/VoZltSZjOpxM1aVkvRP0sO4a73akBLCPC52en2d6rbNmw L4KuCrvAbiIdZW0aLIT9w0OTwlX4MXhoF4Nj67f8u38SGBao7r9yWca4PWdqXHtTq1o1 hsmA== X-Gm-Message-State: AOAM533Dhb7XwRPkIIrL19VcRpAXGo0/7mYLP8T9xvcvA1Bvjsnt/AkE nMl3L3hdNajzN/kB4keQN5GFcMUcIGE= X-Google-Smtp-Source: ABdhPJxOtAvhG6zGp6bfZip6tzCd5iX6n4VLqiZyj/4qKmlM8VfW3QKvNaclWZIou608tMYA81dTeA== X-Received: by 2002:a5d:4a41:: with SMTP id v1mr962025wrs.324.1632933057570; Wed, 29 Sep 2021 09:30:57 -0700 (PDT) Received: from [192.168.1.36] (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v20sm367260wra.73.2021.09.29.09.30.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Sep 2021 09:30:57 -0700 (PDT) Message-ID: Date: Wed, 29 Sep 2021 18:30:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH v2] target/i386: Include 'hw/i386/apic.h' locally Content-Language: en-US To: qemu-devel@nongnu.org References: <20210929162540.2520208-1-f4bug@amsat.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: <20210929162540.2520208-1-f4bug@amsat.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-3.03, 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: Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Richard Henderson , Kamil Rytarowski , Cameron Esfahani , Roman Bolshakov , haxm-team@intel.com, Colin Xu , Paolo Bonzini , Sunil Muthuswamy , Reinoud Zandijk , Wenchao Wang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/29/21 18:25, Philippe Mathieu-Daudé wrote: > 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/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 > + Self-NAck (incorrectly rebased on top of commit 0792e6c88d4 ("target/i386: Move x86_cpu_exec_interrupt() under sysemu/ folder"). > 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"