Diff for /qemu/monitor.h between versions 1.1.1.5 and 1.1.1.6

version 1.1.1.5, 2018/04/24 19:17:26 version 1.1.1.6, 2018/04/24 19:34:40
Line 6 Line 6
 #include "qerror.h"  #include "qerror.h"
 #include "qdict.h"  #include "qdict.h"
 #include "block.h"  #include "block.h"
   #include "readline.h"
   
 extern Monitor *cur_mon;  extern Monitor *cur_mon;
 extern Monitor *default_mon;  extern Monitor *default_mon;
Line 35  typedef enum MonitorEvent { Line 36  typedef enum MonitorEvent {
     QEVENT_SPICE_CONNECTED,      QEVENT_SPICE_CONNECTED,
     QEVENT_SPICE_INITIALIZED,      QEVENT_SPICE_INITIALIZED,
     QEVENT_SPICE_DISCONNECTED,      QEVENT_SPICE_DISCONNECTED,
       QEVENT_BLOCK_JOB_COMPLETED,
       QEVENT_BLOCK_JOB_CANCELLED,
       QEVENT_DEVICE_TRAY_MOVED,
       QEVENT_SUSPEND,
       QEVENT_WAKEUP,
     QEVENT_MAX,      QEVENT_MAX,
 } MonitorEvent;  } MonitorEvent;
   
Line 49  void monitor_resume(Monitor *mon); Line 55  void monitor_resume(Monitor *mon);
 int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,  int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
                                 BlockDriverCompletionFunc *completion_cb,                                  BlockDriverCompletionFunc *completion_cb,
                                 void *opaque);                                  void *opaque);
   int monitor_read_block_device_key(Monitor *mon, const char *device,
                                     BlockDriverCompletionFunc *completion_cb,
                                     void *opaque);
   
 int monitor_get_fd(Monitor *mon, const char *fdname);  int monitor_get_fd(Monitor *mon, const char *fdname);
   
Line 63  int monitor_get_cpu_index(void); Line 72  int monitor_get_cpu_index(void);
 typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);  typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
   
 void monitor_set_error(Monitor *mon, QError *qerror);  void monitor_set_error(Monitor *mon, QError *qerror);
   void monitor_read_command(Monitor *mon, int show_prompt);
   ReadLineState *monitor_get_rs(Monitor *mon);
   int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
                             void *opaque);
   
   int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);
   
   int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);
   
 #endif /* !MONITOR_H */  #endif /* !MONITOR_H */

Removed from v.1.1.1.5  
changed lines
  Added in v.1.1.1.6


unix.superglobalmegacorp.com