[Xen-changelog] [xen-unstable] Merge with xen-ia64-unstable.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1175074913 -3600
# Node ID 4c5ea17290fe4157d657d46d220f47a1a9ed8256
# Parent  0b2794d3320f2d618540faa403e5d03c617c7b7d
# Parent  9c1367368ee320abe1a2ed4184708377bd773d94
Merge with xen-ia64-unstable.hg
---
 tools/ioemu/Makefile.target |    4 ----
 tools/ioemu/vl.c            |    7 +++----
 tools/ioemu/vnc.c           |   13 ++-----------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff -r 0b2794d3320f -r 4c5ea17290fe tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target       Wed Mar 28 10:38:41 2007 +0100
+++ b/tools/ioemu/Makefile.target       Wed Mar 28 10:41:53 2007 +0100
@@ -193,10 +193,6 @@ LIBS+=-lsocket -lnsl -lresolv
 LIBS+=-lsocket -lnsl -lresolv
 endif
 
-ifeq ($(debug),y)
-CFLAGS += -DQEMU_VNC_MONITOR_EXPORT
-endif
-
 # profiling code
 ifdef TARGET_GPROF
 LDFLAGS+=-p
diff -r 0b2794d3320f -r 4c5ea17290fe tools/ioemu/vl.c
--- a/tools/ioemu/vl.c  Wed Mar 28 10:38:41 2007 +0100
+++ b/tools/ioemu/vl.c  Wed Mar 28 10:41:53 2007 +0100
@@ -6109,10 +6109,9 @@ int main(int argc, char **argv)
 #endif /* !CONFIG_DM */
     cyls = heads = secs = 0;
     translation = BIOS_ATA_TRANSLATION_AUTO;
-    pstrcpy(monitor_device, sizeof(monitor_device), "vc");
-
-    pstrcpy(serial_devices[0], sizeof(serial_devices[0]), "vc");
-    for(i = 1; i < MAX_SERIAL_PORTS; i++)
+    pstrcpy(monitor_device, sizeof(monitor_device), "null");
+
+    for(i = 0; i < MAX_SERIAL_PORTS; i++)
         serial_devices[i][0] = '\0';
     serial_device_index = 0;
 
diff -r 0b2794d3320f -r 4c5ea17290fe tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c Wed Mar 28 10:38:41 2007 +0100
+++ b/tools/ioemu/vnc.c Wed Mar 28 10:41:53 2007 +0100
@@ -113,10 +113,8 @@ struct VncState
     int visible_w;
     int visible_h;
 
-#ifdef QEMU_VNC_MONITOR_EXPORT
     int ctl_keys;               /* Ctrl+Alt starts calibration */
     int shift_keys;             /* Shift / CapsLock keys */
-#endif
     int numlock;
 };
 
@@ -897,7 +895,6 @@ static void do_key_event(VncState *vs, i
            kbd_put_keycode(keycode & 0x7f);
        else
            kbd_put_keycode(keycode | 0x80);
-#ifdef QEMU_VNC_MONITOR_EXPORT
     } else if (down) {
        int qemu_keysym = 0;
 
@@ -925,10 +922,8 @@ static void do_key_event(VncState *vs, i
        }
        if (qemu_keysym != 0)
            kbd_put_keysym(qemu_keysym);
-#endif
-    }
-
-#ifdef QEMU_VNC_MONITOR_EXPORT
+    }
+
     if (down) {
        switch (sym) {
        case XK_Control_L:
@@ -981,10 +976,6 @@ static void do_key_event(VncState *vs, i
            break;
        }
     }
-#else
-    if (!down && sym == XK_Num_Lock)
-        vs->numlock = !vs->numlock;
-#endif
 }
 
 static void key_event(VncState *vs, int down, uint32_t sym)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog