enable vmmouse on x86_64

PATCH In review Reimar Döffinger 2 participants 4 messages Aug 17, 2009 1 message not in the archive

Share & tools

Reimar Döffinger

author

2009-08-17 14:43 UTC #0 lore raw

PATCH 1/1 enable vmmouse on x86_64

Hello,
I see no reason why vmmouse should be disabled on x86_64, I guess this was just forgotten - attached trivial patch changes it.

Signed-off-by Reimar Döffinger <[email protected]>

hw/pckbd.c +3 -3

index bb4cc0e..132973d 100644
@@ -378,7 +378,7 @@ void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base)
 
     s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
     s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
-#ifdef TARGET_I386
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     vmmouse_init(s->mouse);
 #endif
     qemu_register_reset(kbd_reset, s);

@@ -435,7 +435,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
 
     s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
     s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
-#ifdef TARGET_I386
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     vmmouse_init(s->mouse);
 #endif
     qemu_register_reset(kbd_reset, s);

@@ -462,7 +462,7 @@ static void i8042_initfn(ISADevice *dev)
 
     s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
     s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
-#ifdef TARGET_I386
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     vmmouse_init(s->mouse);
 #endif
     qemu_register_reset(kbd_reset, s);

Kevin Wolf

2009-08-17 15:03 UTC #1 lore raw

Quoted 5 lines · Reimar Döffinger

Hello,
I see no reason why vmmouse should be disabled on x86_64, I guess this was just forgotten - attached trivial patch changes it.
Signed-off-by Reimar Döffinger <[email protected]>

Are you sure this is needed? If I'm not mistaken, TARGET_I386 is set for x86_64 as well.

Kevin

Reimar Döffinger

author

2009-08-17 15:35 UTC #2 lore raw

Quoted 9 lines · Kevin Wolf

Quoted 5 lines · Reimar Döffinger
Hello,
I see no reason why vmmouse should be disabled on x86_64, I guess this was just forgotten - attached trivial patch changes it.
Signed-off-by Reimar Döffinger <[email protected]>
Are you sure this is needed? If I'm not mistaken, TARGET_I386 is set for x86_64 as well.

Yes, you are right, sorry. Please disregard this one.

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reimar Döffinger

author

2009-08-17 15:38 UTC #4 lore raw

Quoted 7 lines · Juan Quintela

Quoted 5 lines
Hello,
I see no reason why vmmouse should be disabled on x86_64, I guess this was just forgotten - attached trivial patch changes it.
Signed-off-by Reimar Döffinger <[email protected]>
Have you tested before this patch?

Yes, I had, but the KVM issue came in-between, drawing me to false conclusions.

Quoted 3 lines

in x86_64, both are defined:
TARGET_I386 and TARGET_X86_64.

hw/pci-hotplug.c hw/hpet_emul.h hw/mc146818rtc.c
also aren't aware of it, which gave me some more reason to be confused :-)