From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWoQC-0002GQ-Io for qemu-devel@nongnu.org; Tue, 22 May 2012 08:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWoQA-0002af-9T for qemu-devel@nongnu.org; Tue, 22 May 2012 08:42:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWoQA-0002aP-1R for qemu-devel@nongnu.org; Tue, 22 May 2012 08:42:38 -0400 Message-ID: <4FBB89B7.50704@redhat.com> Date: Tue, 22 May 2012 14:42:31 +0200 From: Igor Mammedov MIME-Version: 1.0 References: <1337682954-20618-1-git-send-email-imammedo@redhat.com> <1337682954-20618-4-git-send-email-imammedo@redhat.com> <4FBB6EFA.5080001@siemens.com> In-Reply-To: <4FBB6EFA.5080001@siemens.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH qom-next 3/5] pc: move apic_mapped initialization into common apic init code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: "aliguori@us.ibm.com" , "ehabkost@redhat.com" , "sw@weilnetz.de" , "mtosatti@redhat.com" , "qemu-devel@nongnu.org" , "blauwirbel@gmail.com" , "avi@redhat.com" , "pbonzini@redhat.com" , "afaerber@suse.de" On 05/22/2012 12:48 PM, Jan Kiszka wrote: > On 2012-05-22 07:35, Igor Mammedov wrote: >> 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); > > While at it, you should drop MSI_ADDR_BASE definition from pc.c. Consider it done. > >> - 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; >> -} >> - > > You are loosing some xen bits here. But this will collide with latest > kvm pull request > (http://thread.gmane.org/gmane.comp.emulators.kvm.devel/91171) anyway. > You may want to base on uq/master. > This patchset is based on Andreas' qom-next tree. Probably I should wait till above mentioned kvm pull is pulled in and it aprears in qom-next. ... -- ----- Thanks, Igor