[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE |
Date: |
Thu, 2 May 2013 15:35:41 +0200 |
From: Igor Mammedov <address@hidden>
Put APIC_SPACE_SIZE in a public header so that it can be
reused elsewhere later.
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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 = {
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);
if (kvm_has_gsi_routing()) {
msi_supported = 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 = {
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);
s->timer = qemu_new_timer_ns(vm_clock, apic_timer, s);
local_apics[s->idx] = 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 = {
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);
#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
&& CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 578241f..aac6290 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -66,8 +66,6 @@
#define MAX_APICS 255
-#define MSI_SPACE_SIZE 0x100000
-
typedef struct APICCommonState APICCommonState;
#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
cpu_index);
void enable_compat_apic_id_mode(void);
#define APIC_DEFAULT_ADDRESS 0xfee00000
+#define APIC_SPACE_SIZE 0x100000
#endif /* CPU_I386_H */
--
1.8.1.4
- [Qemu-devel] [PATCH 06/29] pc: Update rtc_cmos on CPU hot-plug, (continued)
- [Qemu-devel] [PATCH 06/29] pc: Update rtc_cmos on CPU hot-plug, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 19/29] target-i386: Attach ICC bus to CPU on its creation, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 22/29] QMP: Add cpu-add command, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 23/29] pc: Implement QEMUMachine::hot_add_cpu hook, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 29/29] Drop redundant resume_all_vcpus() from main(), Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 18/29] target-i386: Introduce ICC bus/device/bridge, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 28/29] cpus: Fix pausing TCG CPUs while in vCPU thread, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 16/29] kvmvapic: Make dependency on sysbus.h explicit, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 25/29] target-i386/kvm.c: Code formatting changes, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 07/29] cpu: Introduce get_arch_id() method and override it for X86CPU, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE,
Andreas Färber <=
- [Qemu-devel] [PATCH 24/29] target-i386: Group together level, xlevel, xlevel2 fields, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 26/29] target-i386: Break CPUID feature definition lines, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 17/29] cpu: Move cpu_write_elfXX_note() functions to CPUState, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 20/29] target-i386: Move APIC to ICC bus, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 27/29] target-i386: Replace cpuid_*features fields with a feature word array, Andreas Färber, 2013/05/02