From patchwork Tue May 22 10:35:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 160622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7D398B6F9A for ; Tue, 22 May 2012 22:01:21 +1000 (EST) Received: from localhost ([::1]:38494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWmSg-00050B-3o for incoming@patchwork.ozlabs.org; Tue, 22 May 2012 06:37:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWmRp-0002wf-61 for qemu-devel@nongnu.org; Tue, 22 May 2012 06:36:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWmRk-0003u1-Bz for qemu-devel@nongnu.org; Tue, 22 May 2012 06:36:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWmRk-0003sh-4I for qemu-devel@nongnu.org; Tue, 22 May 2012 06:36:08 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4MAa5f7016376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 May 2012 06:36:06 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4MAZsSv005874; Tue, 22 May 2012 06:36:03 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 22 May 2012 12:35:52 +0200 Message-Id: <1337682954-20618-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1337682954-20618-1-git-send-email-imammedo@redhat.com> References: <1337682954-20618-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, sw@weilnetz.de, mtosatti@redhat.com, blauwirbel@gmail.com, avi@redhat.com, jan.kiszka@siemens.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH qom-next 3/5] pc: move apic_mapped initialization into common apic init code 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move from apic_init in pc.c the code that belongs to apic_init_common and create/init apic in pc_new_cpu instead of separate func. Signed-off-by: Igor Mammedov --- hw/apic_common.c | 16 ++++++++++++++++ hw/msi.h | 2 ++ hw/pc.c | 47 ++++++++--------------------------------------- 3 files changed, 26 insertions(+), 39 deletions(-) diff --git a/hw/apic_common.c b/hw/apic_common.c index 23d51e8..703931b 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -21,6 +21,7 @@ #include "apic_internal.h" #include "trace.h" #include "kvm.h" +#include "msi.h" static int apic_irq_delivered; bool apic_report_tpr_access; @@ -284,6 +285,7 @@ static int apic_init_common(SysBusDevice *dev) APICCommonClass *info; static DeviceState *vapic; static int apic_no; + static int apic_mapped; if (apic_no >= MAX_APICS) { return -1; @@ -295,6 +297,20 @@ static int apic_init_common(SysBusDevice *dev) sysbus_init_mmio(dev, &s->io_memory); + /* XXX: mapping more APICs at the same memory location */ + if (apic_mapped == 0) { + /* NOTE: the APIC is directly connected to the CPU - it is not + on the global memory bus. */ + /* XXX: what if the base changes? */ + sysbus_mmio_map(sysbus_from_qdev(&s->busdev.qdev), 0, MSI_ADDR_BASE); + apic_mapped = 1; + } + + /* KVM does not support MSI yet. */ + if (!kvm_irqchip_in_kernel()) { + msi_supported = true; + } + if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } diff --git a/hw/msi.h b/hw/msi.h index 3040bb0..abd52b6 100644 --- a/hw/msi.h +++ b/hw/msi.h @@ -40,4 +40,6 @@ static inline bool msi_present(const PCIDevice *dev) return dev->cap_present & QEMU_PCI_CAP_MSI; } +#define MSI_ADDR_BASE 0xfee00000 + #endif /* QEMU_MSI_H */ diff --git a/hw/pc.c b/hw/pc.c index 00d738d..0eb0b73 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -879,44 +879,6 @@ DeviceState *cpu_get_current_apic(void) } } -static DeviceState *apic_init(void *env, uint8_t apic_id) -{ - DeviceState *dev; - static int apic_mapped; - - if (kvm_irqchip_in_kernel()) { - dev = qdev_create(NULL, "kvm-apic"); - } else if (xen_enabled()) { - dev = qdev_create(NULL, "xen-apic"); - } else { - dev = qdev_create(NULL, "apic"); - } - - qdev_prop_set_uint8(dev, "id", apic_id); - qdev_prop_set_ptr(dev, "cpu_env", env); - qdev_init_nofail(dev); - - /* XXX: mapping more APICs at the same memory location */ - if (apic_mapped == 0) { - /* NOTE: the APIC is directly connected to the CPU - it is not - on the global memory bus. */ - /* XXX: what if the base changes? */ - sysbus_mmio_map(sysbus_from_qdev(dev), 0, MSI_ADDR_BASE); - apic_mapped = 1; - } - - /* KVM does not support MSI yet. */ - if (!kvm_irqchip_in_kernel()) { - msi_supported = true; - } - - if (xen_msi_support()) { - msi_supported = true; - } - - return dev; -} - void pc_acpi_smi_interrupt(void *opaque, int irq, int level) { CPUX86State *s = opaque; @@ -943,7 +905,14 @@ static X86CPU *pc_new_cpu(const char *cpu_model) } env = &cpu->env; if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { - env->apic_state = apic_init(env, env->cpuid_apic_id); + if (kvm_irqchip_in_kernel()) { + env->apic_state = qdev_create(NULL, "kvm-apic"); + } else { + env->apic_state = qdev_create(NULL, "apic"); + } + qdev_prop_set_uint8(env->apic_state, "id", env->cpuid_apic_id); + qdev_prop_set_ptr(env->apic_state, "cpu_env", env); + qdev_init_nofail(env->apic_state); } qemu_register_reset(pc_cpu_reset, cpu); pc_cpu_reset(cpu);