[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 14/18] kvm: x86: Establish IRQ0 override control
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v6 14/18] kvm: x86: Establish IRQ0 override control |
Date: |
Fri, 13 Jan 2012 18:35:09 +0100 |
KVM is forced to disable the IRQ0 override when we run with in-kernel
irqchip but without IRQ routing support of the kernel. Set the fwcfg
value correspondingly. This aligns us with qemu-kvm.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/pc.c | 3 ++-
kvm-all.c | 5 +++++
kvm-stub.c | 5 +++++
kvm.h | 2 ++
sysemu.h | 1 -
vl.c | 1 -
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 3f69e09..9519079 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -39,6 +39,7 @@
#include "msi.h"
#include "sysbus.h"
#include "sysemu.h"
+#include "kvm.h"
#include "blockdev.h"
#include "ui/qemu-spice.h"
#include "memory.h"
@@ -609,7 +610,7 @@ static void *bochs_bios_init(void)
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, (uint8_t *)acpi_tables,
acpi_tables_len);
- fw_cfg_add_bytes(fw_cfg, FW_CFG_IRQ0_OVERRIDE, &irq0override, 1);
+ fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());
smbios_table = smbios_get_table(&smbios_len);
if (smbios_table)
diff --git a/kvm-all.c b/kvm-all.c
index e91bb46..b06ed7d 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1272,6 +1272,11 @@ int kvm_has_gsi_routing(void)
return kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING);
}
+int kvm_allows_irq0_override(void)
+{
+ return !kvm_enabled() || !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
+}
+
void kvm_setup_guest_memory(void *start, size_t size)
{
if (!kvm_has_sync_mmu()) {
diff --git a/kvm-stub.c b/kvm-stub.c
index 06064b9..6c2b06b 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -78,6 +78,11 @@ int kvm_has_many_ioeventfds(void)
return 0;
}
+int kvm_allows_irq0_override(void)
+{
+ return 1;
+}
+
void kvm_setup_guest_memory(void *start, size_t size)
{
}
diff --git a/kvm.h b/kvm.h
index 0d6c453..a3c87af 100644
--- a/kvm.h
+++ b/kvm.h
@@ -53,6 +53,8 @@ int kvm_has_xcrs(void);
int kvm_has_many_ioeventfds(void);
int kvm_has_gsi_routing(void);
+int kvm_allows_irq0_override(void);
+
#ifdef NEED_CPU_H
int kvm_init_vcpu(CPUState *env);
diff --git a/sysemu.h b/sysemu.h
index 3806901..6abded1 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -102,7 +102,6 @@ extern int vga_interface_type;
extern int graphic_width;
extern int graphic_height;
extern int graphic_depth;
-extern uint8_t irq0override;
extern DisplayType display_type;
extern const char *keyboard_layout;
extern int win2k_install_hack;
diff --git a/vl.c b/vl.c
index d925424..f77e687 100644
--- a/vl.c
+++ b/vl.c
@@ -218,7 +218,6 @@ int no_reboot = 0;
int no_shutdown = 0;
int cursor_hide = 1;
int graphic_rotate = 0;
-uint8_t irq0override = 1;
const char *watchdog;
QEMUOptionRom option_rom[MAX_OPTION_ROMS];
int nb_option_roms;
--
1.7.3.4
- [Qemu-devel] [PATCH v6 00/18] uq/master: Introduce basic irqchip support, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 10/18] ioapic: Drop post-load irr initialization, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 08/18] i8259: Completely privatize PicState, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 09/18] i8259: Factor out base class for KVM reuse, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 02/18] kvm: Move kvmclock into hw/kvm folder, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 03/18] apic: Stop timer on reset, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 13/18] kvm: Introduce core services for in-kernel irqchip support, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 07/18] apic: Open-code timer save/restore, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 14/18] kvm: x86: Establish IRQ0 override control,
Jan Kiszka <=
- [Qemu-devel] [PATCH v6 12/18] memory: Introduce memory_region_init_reservation, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 17/18] kvm: x86: Add user space part for in-kernel IOAPIC, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 05/18] apic: Introduce apic_report_irq_delivered, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 04/18] apic: Inject external NMI events via LINT1, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 01/18] msi: Generalize msix_supported to msi_supported, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 16/18] kvm: x86: Add user space part for in-kernel i8259, Jan Kiszka, 2012/01/13
- [Qemu-devel] [PATCH v6 18/18] kvm: Arm in-kernel irqchip support, Jan Kiszka, 2012/01/13