From patchwork Wed Mar 16 10:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8598141 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C213EC0553 for ; Wed, 16 Mar 2016 11:03:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43A7A2008F for ; Wed, 16 Mar 2016 11:03:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9306B20304 for ; Wed, 16 Mar 2016 11:03:40 +0000 (UTC) Received: from localhost ([::1]:55068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9Eq-0007de-0a for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 07:03:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zK-0003Rc-JV for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8zJ-0002Cz-JK for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:38 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:36951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zJ-0002Ct-BN for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:37 -0400 Received: by mail-wm0-x229.google.com with SMTP id p65so66048421wmp.0 for ; Wed, 16 Mar 2016 03:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=YfDJaz/z+MxMtFgc2/nM9dav3a3CIB7g/f9qDVCR9co=; b=a85jbZ9nG2agusRwLpLXtLlWTsN2kekjwtu7WBHZckshM1hCUNXI/9X5nGC2RDQoFt BeQn8G6HuqHlDB2Yyg3ECODlqbdtELN03/qh7FtF8qjBC+z21HJiIoULmMvciG97Ag1i oJipxSXtMEBXSjdjlprBx5ac074ab+mHKpS3qlRGtzgvIbvt0b4nqSTzyscRKhEgeEEH 3hvTE8b5hJxnILidFyJQDvVXQW6FG2IA+x5qHCj+t2JI1mH9LEfQ91aA8VPoTBolg3SH Pc2gOLgj9J8Ja18MQy/XVaDcmuMdaidG+x/wMqnz5IJDRpUO98jjwxqPajb/hHrlPmJ7 72fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=YfDJaz/z+MxMtFgc2/nM9dav3a3CIB7g/f9qDVCR9co=; b=PzMJmj0FGrOvpQauxar3Jhofwu56iIKcnKDSAmIPmNm5Tzb9d9pfL67bCes3Lt7tbn /ZAVogXUbUnqDPrdUdTMEHhrpaBJD4KzWVP7qpxKXVWM4ME4oOsbizAhvTRodepKCyZv YjUMCTNav7SxH7OOATMk6/wScVmOli2N4ihMIL2vhoH/V3EVf0S0szKtXL5qNZp7Uw2y jMwKWHt0znGlQ/q7A28N+eIkB0W5ZQT2+kf2vqCmVNjOjGTALuGoMVv4uctKqJO83eXY W6+0bcV8CmqNgizYazrV4nQtMc5RJ6J5dCr5vA0H/lx9Sc5aTZoJEM02AttmduxVAhEg u1Dw== X-Gm-Message-State: AD7BkJIKTSNSeUyDdCMQtG8W73mQWI8t5pmAz6PZmt583acfTzv3UotDb5cmL2oqwEzGSA== X-Received: by 10.194.249.42 with SMTP id yr10mr3035014wjc.12.1458125256751; Wed, 16 Mar 2016 03:47:36 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:41 +0100 Message-Id: <1458125219-131698-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Paolo Bonzini --- hw/intc/ioapic.c | 1 + include/hw/i386/apic.h | 5 ----- target-i386/cpu.h | 7 +++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 378e663..4f42b91 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -24,6 +24,7 @@ #include "monitor/monitor.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/i386/apic.h" #include "hw/i386/ioapic.h" #include "hw/i386/ioapic_internal.h" #include "include/hw/pci/msi.h" diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h index 51eb6d3..ea48ea9 100644 --- a/include/hw/i386/apic.h +++ b/include/hw/i386/apic.h @@ -18,15 +18,10 @@ void cpu_set_apic_tpr(DeviceState *s, uint8_t val); uint8_t cpu_get_apic_tpr(DeviceState *s); void apic_init_reset(DeviceState *s); void apic_sipi(DeviceState *s); -void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip, - TPRAccess access); void apic_poll_irq(DeviceState *d); void apic_designate_bsp(DeviceState *d, bool bsp); /* pc.c */ DeviceState *cpu_get_current_apic(void); -/* cpu.c */ -bool cpu_is_bsp(X86CPU *cpu); - #endif diff --git a/target-i386/cpu.h b/target-i386/cpu.h index c2f4af4..60dc97c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1451,7 +1451,11 @@ void do_interrupt_x86_hardirq(CPUX86State *env, int intno, int is_hw); void do_smm_enter(X86CPU *cpu); void cpu_smm_update(X86CPU *cpu); +/* apic.c */ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); +void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip, + TPRAccess access); + /* Change the value of a KVM-specific default * @@ -1477,4 +1481,7 @@ void enable_compat_apic_id_mode(void); void x86_cpu_dump_local_apic_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, int flags); +/* cpu.c */ +bool cpu_is_bsp(X86CPU *cpu); + #endif /* CPU_I386_H */