From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtgF-00030N-Og for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXtg4-0004XN-7L for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46622 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtg3-0004WL-Tr for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:04 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 2 May 2013 15:35:41 +0200 Message-Id: <1367501755-32272-16-git-send-email-afaerber@suse.de> In-Reply-To: <1367501755-32272-1-git-send-email-afaerber@suse.de> References: <1367501755-32272-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov Put APIC_SPACE_SIZE in a public header so that it can be reused elsewhere later. Signed-off-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- hw/i386/kvm/apic.c | 2 +- hw/intc/apic.c | 2 +- hw/xen/xen_apic.c | 2 +- include/hw/i386/apic_internal.h | 2 -- target-i386/cpu.h | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index c6ff982..8f80425 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -174,7 +174,7 @@ static const MemoryRegionOps kvm_apic_io_ops =3D { static void kvm_apic_init(APICCommonState *s) { memory_region_init_io(&s->io_memory, &kvm_apic_io_ops, s, "kvm-apic-= msi", - MSI_SPACE_SIZE); + APIC_SPACE_SIZE); =20 if (kvm_has_gsi_routing()) { msi_supported =3D true; diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 2d79a9e..756dff0 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -874,7 +874,7 @@ static const MemoryRegionOps apic_io_ops =3D { static void apic_init(APICCommonState *s) { memory_region_init_io(&s->io_memory, &apic_io_ops, s, "apic-msi", - MSI_SPACE_SIZE); + APIC_SPACE_SIZE); =20 s->timer =3D qemu_new_timer_ns(vm_clock, apic_timer, s); local_apics[s->idx] =3D s; diff --git a/hw/xen/xen_apic.c b/hw/xen/xen_apic.c index a2eb8a1..a958782 100644 --- a/hw/xen/xen_apic.c +++ b/hw/xen/xen_apic.c @@ -39,7 +39,7 @@ static const MemoryRegionOps xen_apic_io_ops =3D { static void xen_apic_init(APICCommonState *s) { memory_region_init_io(&s->io_memory, &xen_apic_io_ops, s, "xen-apic-= msi", - MSI_SPACE_SIZE); + APIC_SPACE_SIZE); =20 #if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \ && CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 420 diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.h index 578241f..aac6290 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -66,8 +66,6 @@ =20 #define MAX_APICS 255 =20 -#define MSI_SPACE_SIZE 0x100000 - typedef struct APICCommonState APICCommonState; =20 #define TYPE_APIC_COMMON "apic-common" diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a1614e8..ab151d5 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1270,5 +1270,6 @@ uint32_t x86_cpu_apic_id_from_index(unsigned int cp= u_index); void enable_compat_apic_id_mode(void); =20 #define APIC_DEFAULT_ADDRESS 0xfee00000 +#define APIC_SPACE_SIZE 0x100000 =20 #endif /* CPU_I386_H */ --=20 1.8.1.4