From patchwork Fri Apr 8 20:28:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8785961 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 02C36C0553 for ; Fri, 8 Apr 2016 20:45:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ED95202B8 for ; Fri, 8 Apr 2016 20:45:21 +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 9E34C20172 for ; Fri, 8 Apr 2016 20:45:20 +0000 (UTC) Received: from localhost ([::1]:58184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aodHM-0002cP-27 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:45:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2K-0004TS-Ls for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod2J-000299-Mo for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:48 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2J-00028x-GK for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:47 -0400 Received: by mail-wm0-x244.google.com with SMTP id n3so6851157wmn.1 for ; Fri, 08 Apr 2016 13:29:45 -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=TYIbTeSpzykbyivGZhKM71JawztduJa/r23KQz3j8MI=; b=kVuZ5QfSqbcWidoCLrIR1zb7BTwcBbB/Af0gLctwqZwMznwMwdp10C+ApFKf/G4sXh DpG+3NOxhLFU9ALmVRV/AzKeQbX3CXZ5nIsDnFJR931sGjoZoJGkZnbfrP+fKsbcQ5Wn EhjvG64rbrs8i5IDrhjJAr+CB6+xtOmnVLtr/6tPT9WxfQU/EOAvSmK1oxx/sByr0ZfV nSuebPOJENHPc2KmJS5X3zNiWn2wdijfoca8WK2VAUw+WHIjRaZhUI0p5itphayoGXRf 2/OviK/fYAcjx2/W5NXRq4Nr/xsxOk1OSyyhqI2UalQwO6x1KdU7y571eNF/ryXMwR7r jPMA== 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=TYIbTeSpzykbyivGZhKM71JawztduJa/r23KQz3j8MI=; b=LWzCmE+HS0DbG6cqK/NYgw21aXWIYuSu3kA0Au0geRb/5HoAezGaNmKHiMiMYl4zkf yrgIoOSI+XAnR/hpkvrJsKtD6YmYSRsPstly83JOSp2wEpjqDCdHF+LRRfVdFt6CNPHd RdkhG+99qCUjzlZrt9Gz68+/BPU6fcEYcswI/b4ieu+DmQgo+nHj/UyiKDn2jKqoKDQB 9ag04Uu1Kjyb1vQ557A2OLy6DI7U072ZNQas5xEsoteIb9iz987kJ3Id45+Zfx3Q1u1t yNd3gNVOYOr2X3F8639/5PAVesRWLY70UbxdRVSdANvK5YOStnPTL11hwoTBq6jDJ9ht MKjw== X-Gm-Message-State: AD7BkJLORfK0qjhO+72Py2xXpTAk/oy4MxBzgSpDI16AY3SvNC1d/c3QtZ/2vUZ+QShZyQ== X-Received: by 10.28.15.146 with SMTP id 140mr6080182wmp.27.1460147384750; Fri, 08 Apr 2016 13:29:44 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:51 +0200 Message-Id: <1460147350-7601-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-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::244 Subject: [Qemu-devel] [PATCH 31/50] apic: move target-dependent definitions to cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" 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 9614c88..2200aeb 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1455,7 +1455,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 * @@ -1481,4 +1485,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 */