[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V15 07/18] pc, Disable vmport initialisation with Xe
From: |
anthony.perard |
Subject: |
[Qemu-devel] [PATCH V15 07/18] pc, Disable vmport initialisation with Xen. |
Date: |
Thu, 5 May 2011 11:58:22 +0100 |
From: Anthony PERARD <address@hidden>
This is because there is not synchronisation of the vcpu register
between Xen and QEMU, so vmport can't work properly.
This patch introduces no_vmport parameter to pc_basic_device_init.
Signed-off-by: Anthony PERARD <address@hidden>
---
hw/pc.c | 11 ++++++++---
hw/pc.h | 3 ++-
hw/pc_piix.c | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index ebdf3b0..8106197 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1082,7 +1082,8 @@ static void cpu_request_exit(void *opaque, int irq, int
level)
}
void pc_basic_device_init(qemu_irq *isa_irq,
- ISADevice **rtc_state)
+ ISADevice **rtc_state,
+ bool no_vmport)
{
int i;
DriveInfo *fd[MAX_FD];
@@ -1127,8 +1128,12 @@ void pc_basic_device_init(qemu_irq *isa_irq,
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042 = isa_create_simple("i8042");
i8042_setup_a20_line(i8042, &a20_line[0]);
- vmport_init();
- vmmouse = isa_try_create("vmmouse");
+ if (!no_vmport) {
+ vmport_init();
+ vmmouse = isa_try_create("vmmouse");
+ } else {
+ vmmouse = NULL;
+ }
if (vmmouse) {
qdev_prop_set_ptr(&vmmouse->qdev, "ps2_mouse", i8042);
qdev_init_nofail(&vmmouse->qdev);
diff --git a/hw/pc.h b/hw/pc.h
index b7ee7f8..6d5730b 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -137,7 +137,8 @@ void pc_memory_init(const char *kernel_filename,
qemu_irq *pc_allocate_cpu_irq(void);
void pc_vga_init(PCIBus *pci_bus);
void pc_basic_device_init(qemu_irq *isa_irq,
- ISADevice **rtc_state);
+ ISADevice **rtc_state,
+ bool no_vmport);
void pc_init_ne2k_isa(NICInfo *nd);
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
const char *boot_device,
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index aba3d58..e814f00 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -133,7 +133,7 @@ static void pc_init1(ram_addr_t ram_size,
pc_vga_init(pci_enabled? pci_bus: NULL);
/* init basic PC hardware */
- pc_basic_device_init(isa_irq, &rtc_state);
+ pc_basic_device_init(isa_irq, &rtc_state, xen_enabled());
for(i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];
--
1.7.2.5
- [Qemu-devel] [PATCH V15 00/18] Xen device model support, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 02/18] xen: Make Xen build once., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 03/18] xen: Support new libxc calls from xen unstable., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 04/18] xen: Add initialisation of Xen, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 05/18] pc_memory_init: Move memory calculation to the caller., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 01/18] xen: Replace some tab-indents with spaces (clean-up)., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 06/18] xen: Add xenfv machine, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 07/18] pc, Disable vmport initialisation with Xen.,
anthony.perard <=
- [Qemu-devel] [PATCH V15 08/18] piix_pci: Introduces Xen specific call for irq., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 09/18] xen: Introduce Xen Interrupt Controller, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 11/18] xen: Adds a cap to the number of map cache entries., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 10/18] xen: Introduce the Xen mapcache, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 12/18] Introduce qemu_put_ram_ptr, anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 13/18] configure: Always use 64bits target physical addresses with xen enabled., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 14/18] pci: Use of qemu_put_ram_ptr in pci_add_option_rom., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 15/18] vl.c: Introduce getter for shutdown_requested and reset_requested., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 17/18] xen: Set running state in xenstore., anthony.perard, 2011/05/05
- [Qemu-devel] [PATCH V15 16/18] xen: Initialize event channels and io rings, anthony.perard, 2011/05/05