[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/8] pc: Enable MSI support at APIC level
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 4/8] pc: Enable MSI support at APIC level |
Date: |
Thu, 10 May 2012 18:02:53 -0300 |
Push msi_supported enabling to the APIC implementations where we can
encapsulate the decision more cleanly, hiding the details from the
generic code.
CC: Stefano Stabellini <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/apic.c | 2 ++
hw/pc.c | 9 ---------
hw/xen.h | 10 ----------
hw/xen_apic.c | 5 +++++
4 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/hw/apic.c b/hw/apic.c
index 4eeaf88..a337790 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -862,6 +862,8 @@ static void apic_init(APICCommonState *s)
s->timer = qemu_new_timer_ns(vm_clock, apic_timer, s);
local_apics[s->idx] = s;
+
+ msi_supported = true;
}
static void apic_class_init(ObjectClass *klass, void *data)
diff --git a/hw/pc.c b/hw/pc.c
index 4d34a33..6691b18 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -911,15 +911,6 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
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;
}
diff --git a/hw/xen.h b/hw/xen.h
index 3ae4cd0..e5926b7 100644
--- a/hw/xen.h
+++ b/hw/xen.h
@@ -57,14 +57,4 @@ void xen_register_framebuffer(struct MemoryRegion *mr);
# define HVM_MAX_VCPUS 32
#endif
-static inline int xen_msi_support(void)
-{
-#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
- && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
- return xen_enabled();
-#else
- return 0;
-#endif
-}
-
#endif /* QEMU_HW_XEN_H */
diff --git a/hw/xen_apic.c b/hw/xen_apic.c
index 1725ff6..a9e101f 100644
--- a/hw/xen_apic.c
+++ b/hw/xen_apic.c
@@ -40,6 +40,11 @@ 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);
+
+#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
+ && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
+ msi_supported = true;
+#endif
}
static void xen_apic_set_base(APICCommonState *s, uint64_t val)
--
1.7.3.4
- [Qemu-devel] [PATCH v3 0/8] uq/master: MSI support for in-kernel irqchip mode, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 1/8] kvm: Refactor KVMState::max_gsi to gsi_count, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 2/8] Introduce MSIMessage structure, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 3/8] kvm: Introduce basic MSI support for in-kernel irqchips, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 5/8] kvm: x86: Wire up MSI support for in-kernel irqchip, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 4/8] pc: Enable MSI support at APIC level,
Jan Kiszka <=
- [Qemu-devel] [PATCH v3 6/8] kvm: Update kernel headers, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 7/8] kvm: Add support for direct MSI injections, Jan Kiszka, 2012/05/10
- [Qemu-devel] [PATCH v3 8/8] kvm: Enable in-kernel irqchip support by default, Jan Kiszka, 2012/05/10