Diff for /qemu/console.h between versions 1.1.1.9 and 1.1.1.10

version 1.1.1.9, 2018/04/24 19:17:18 version 1.1.1.10, 2018/04/24 19:34:30
Line 4 Line 4
 #include "qemu-char.h"  #include "qemu-char.h"
 #include "qdict.h"  #include "qdict.h"
 #include "notify.h"  #include "notify.h"
 #include "qerror.h"  
 #include "monitor.h"  #include "monitor.h"
   #include "trace.h"
   
 /* keyboard/mouse support */  /* keyboard/mouse support */
   
Line 74  struct MouseTransformInfo { Line 74  struct MouseTransformInfo {
     int a[7];      int a[7];
 };  };
   
 void do_info_mice_print(Monitor *mon, const QObject *data);  
 void do_info_mice(Monitor *mon, QObject **ret_data);  
 void do_mouse_set(Monitor *mon, const QDict *qdict);  void do_mouse_set(Monitor *mon, const QDict *qdict);
   
 /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx  /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
Line 205  static inline DisplaySurface* qemu_creat Line 203  static inline DisplaySurface* qemu_creat
   
 static inline DisplaySurface* qemu_resize_displaysurface(DisplayState *ds, int width, int height)  static inline DisplaySurface* qemu_resize_displaysurface(DisplayState *ds, int width, int height)
 {  {
       trace_displaysurface_resize(ds, ds->surface, width, height);
     return ds->allocator->resize_displaysurface(ds->surface, width, height);      return ds->allocator->resize_displaysurface(ds->surface, width, height);
 }  }
   
 static inline void qemu_free_displaysurface(DisplayState *ds)  static inline void qemu_free_displaysurface(DisplayState *ds)
 {  {
       trace_displaysurface_free(ds, ds->surface);
     ds->allocator->free_displaysurface(ds->surface);      ds->allocator->free_displaysurface(ds->surface);
 }  }
   
Line 343  static inline void console_write_ch(cons Line 343  static inline void console_write_ch(cons
   
 typedef void (*vga_hw_update_ptr)(void *);  typedef void (*vga_hw_update_ptr)(void *);
 typedef void (*vga_hw_invalidate_ptr)(void *);  typedef void (*vga_hw_invalidate_ptr)(void *);
 typedef void (*vga_hw_screen_dump_ptr)(void *, const char *);  typedef void (*vga_hw_screen_dump_ptr)(void *, const char *, bool cswitch);
 typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *);  typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *);
   
 DisplayState *graphic_console_init(vga_hw_update_ptr update,  DisplayState *graphic_console_init(vga_hw_update_ptr update,
Line 359  void vga_hw_text_update(console_ch_t *ch Line 359  void vga_hw_text_update(console_ch_t *ch
   
 int is_graphic_console(void);  int is_graphic_console(void);
 int is_fixedsize_console(void);  int is_fixedsize_console(void);
 int text_console_init(QemuOpts *opts, CharDriverState **_chr);  CharDriverState *text_console_init(QemuOpts *opts);
 void text_consoles_set_display(DisplayState *ds);  void text_consoles_set_display(DisplayState *ds);
 void console_select(unsigned int index);  void console_select(unsigned int index);
 void console_color_init(DisplayState *ds);  void console_color_init(DisplayState *ds);
Line 386  int vnc_display_pw_expire(DisplayState * Line 386  int vnc_display_pw_expire(DisplayState *
 #else  #else
 static inline int vnc_display_password(DisplayState *ds, const char *password)  static inline int vnc_display_password(DisplayState *ds, const char *password)
 {  {
     qerror_report(QERR_FEATURE_DISABLED, "vnc");  
     return -ENODEV;      return -ENODEV;
 }  }
 static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)  static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)
 {  {
     qerror_report(QERR_FEATURE_DISABLED, "vnc");  
     return -ENODEV;      return -ENODEV;
 };  };
 #endif  #endif

Removed from v.1.1.1.9  
changed lines
  Added in v.1.1.1.10


unix.superglobalmegacorp.com