diff options
author | Anthony PERARD <anthony.perard@citrix.com> | 2011-05-03 17:06:54 +0100 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2011-05-08 10:10:00 +0200 |
commit | 1611977c3d8fdbdac6090cbd1f5555cee4aed6d9 (patch) | |
tree | f5e1f49754b7d3734ce87ed51f482c2a195f0b57 /hw/pc.c | |
parent | 29d3ccde82a0d782b81da39342fb3e3bcf547537 (diff) | |
download | qemu-1611977c3d8fdbdac6090cbd1f5555cee4aed6d9.zip qemu-1611977c3d8fdbdac6090cbd1f5555cee4aed6d9.tar.gz qemu-1611977c3d8fdbdac6090cbd1f5555cee4aed6d9.tar.bz2 |
pc, Disable vmport initialisation with Xen.
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 <anthony.perard@citrix.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/pc.c')
-rw-r--r-- | hw/pc.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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); |