From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Md3Qk-00018w-Vv
	for qemu-devel@nongnu.org; Mon, 17 Aug 2009 10:43:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Md3Qf-000172-L0
	for qemu-devel@nongnu.org; Mon, 17 Aug 2009 10:43:25 -0400
Received: from [199.232.76.173] (port=39565 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Md3Qf-00016x-Bu
	for qemu-devel@nongnu.org; Mon, 17 Aug 2009 10:43:21 -0400
Received: from mail.gmx.net ([213.165.64.20]:34849)
	by monty-python.gnu.org with smtp (Exim 4.60)
	(envelope-from <Reimar.Doeffinger@gmx.de>) id 1Md3Qe-0003HA-Nr
	for qemu-devel@nongnu.org; Mon, 17 Aug 2009 10:43:21 -0400
Date: Mon, 17 Aug 2009 16:43:16 +0200
From: Reimar =?iso-8859-1?Q?D=F6ffinger?= <Reimar.Doeffinger@gmx.de>
Message-ID: <20090817144316.GA31191@1und1.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="k+w/mQv8wyuph6w0"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH] enable vmmouse on x86_64
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

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>

--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename="x86_64_vmmouse.diff"

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

--k+w/mQv8wyuph6w0--