Patchwork enable vmmouse on x86_64

login
register
mail settings
Submitter Reimar Döffinger
Date Aug. 17, 2009, 2:43 p.m.
Message ID <20090817144316.GA31191@1und1.de>
Download mbox | patch
Permalink /patch/31520/
State Superseded
Headers show

Comments

Reimar Döffinger - Aug. 17, 2009, 2:43 p.m.
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 <Reimar.Doeffinger@gmx.de>
Kevin Wolf - Aug. 17, 2009, 3:02 p.m.
Reimar Döffinger schrieb:
> 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 <Reimar.Doeffinger@gmx.de>

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

Kevin
Reimar Döffinger - Aug. 17, 2009, 3:35 p.m.
On Mon, Aug 17, 2009 at 05:02:37PM +0200, Kevin Wolf wrote:
> Reimar Döffinger schrieb:
> > 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 <Reimar.Doeffinger@gmx.de>
> 
> 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.
Reimar Döffinger - Aug. 17, 2009, 3:38 p.m.
On Mon, Aug 17, 2009 at 05:23:32PM +0200, Juan Quintela wrote:
> > 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 <Reimar.Doeffinger@gmx.de>
> 
> Have you tested before this patch?

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

> 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 :-)

Patch

diff --git a/hw/pckbd.c b/hw/pckbd.c
index bb4cc0e..132973d 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -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);