ia64/xen-unstable

changeset 14619:4c5ea17290fe

Merge with xen-ia64-unstable.hg
author kfraser@localhost.localdomain
date Wed Mar 28 10:41:53 2007 +0100 (2007-03-28)
parents 0b2794d3320f 9c1367368ee3
children f9d23364567a
files
line diff
     1.1 --- a/tools/ioemu/Makefile.target	Wed Mar 28 10:38:41 2007 +0100
     1.2 +++ b/tools/ioemu/Makefile.target	Wed Mar 28 10:41:53 2007 +0100
     1.3 @@ -193,10 +193,6 @@ ifdef CONFIG_SOLARIS
     1.4  LIBS+=-lsocket -lnsl -lresolv
     1.5  endif
     1.6  
     1.7 -ifeq ($(debug),y)
     1.8 -CFLAGS += -DQEMU_VNC_MONITOR_EXPORT
     1.9 -endif
    1.10 -
    1.11  # profiling code
    1.12  ifdef TARGET_GPROF
    1.13  LDFLAGS+=-p
     2.1 --- a/tools/ioemu/vl.c	Wed Mar 28 10:38:41 2007 +0100
     2.2 +++ b/tools/ioemu/vl.c	Wed Mar 28 10:41:53 2007 +0100
     2.3 @@ -6109,10 +6109,9 @@ int main(int argc, char **argv)
     2.4  #endif /* !CONFIG_DM */
     2.5      cyls = heads = secs = 0;
     2.6      translation = BIOS_ATA_TRANSLATION_AUTO;
     2.7 -    pstrcpy(monitor_device, sizeof(monitor_device), "vc");
     2.8 -
     2.9 -    pstrcpy(serial_devices[0], sizeof(serial_devices[0]), "vc");
    2.10 -    for(i = 1; i < MAX_SERIAL_PORTS; i++)
    2.11 +    pstrcpy(monitor_device, sizeof(monitor_device), "null");
    2.12 +
    2.13 +    for(i = 0; i < MAX_SERIAL_PORTS; i++)
    2.14          serial_devices[i][0] = '\0';
    2.15      serial_device_index = 0;
    2.16  
     3.1 --- a/tools/ioemu/vnc.c	Wed Mar 28 10:38:41 2007 +0100
     3.2 +++ b/tools/ioemu/vnc.c	Wed Mar 28 10:41:53 2007 +0100
     3.3 @@ -113,10 +113,8 @@ struct VncState
     3.4      int visible_w;
     3.5      int visible_h;
     3.6  
     3.7 -#ifdef QEMU_VNC_MONITOR_EXPORT
     3.8      int ctl_keys;               /* Ctrl+Alt starts calibration */
     3.9      int shift_keys;             /* Shift / CapsLock keys */
    3.10 -#endif
    3.11      int numlock;
    3.12  };
    3.13  
    3.14 @@ -897,7 +895,6 @@ static void do_key_event(VncState *vs, i
    3.15  	    kbd_put_keycode(keycode & 0x7f);
    3.16  	else
    3.17  	    kbd_put_keycode(keycode | 0x80);
    3.18 -#ifdef QEMU_VNC_MONITOR_EXPORT
    3.19      } else if (down) {
    3.20  	int qemu_keysym = 0;
    3.21  
    3.22 @@ -925,10 +922,8 @@ static void do_key_event(VncState *vs, i
    3.23  	}
    3.24  	if (qemu_keysym != 0)
    3.25  	    kbd_put_keysym(qemu_keysym);
    3.26 -#endif
    3.27      }
    3.28  
    3.29 -#ifdef QEMU_VNC_MONITOR_EXPORT
    3.30      if (down) {
    3.31  	switch (sym) {
    3.32  	case XK_Control_L:
    3.33 @@ -981,10 +976,6 @@ static void do_key_event(VncState *vs, i
    3.34  	    break;
    3.35  	}
    3.36      }
    3.37 -#else
    3.38 -    if (!down && sym == XK_Num_Lock)
    3.39 -        vs->numlock = !vs->numlock;
    3.40 -#endif
    3.41  }
    3.42  
    3.43  static void key_event(VncState *vs, int down, uint32_t sym)