Diff for /qemu/qerror.h between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2018/04/24 18:56:30 version 1.1.1.5, 2018/04/24 19:17:37
Line 15 Line 15
 #include "qdict.h"  #include "qdict.h"
 #include "qstring.h"  #include "qstring.h"
 #include "qemu-error.h"  #include "qemu-error.h"
   #include "error.h"
 #include <stdarg.h>  #include <stdarg.h>
   
 typedef struct QErrorStringTable {  typedef struct QErrorStringTable {
Line 39  QString *qerror_human(const QError *qerr Line 40  QString *qerror_human(const QError *qerr
 void qerror_print(QError *qerror);  void qerror_print(QError *qerror);
 void qerror_report_internal(const char *file, int linenr, const char *func,  void qerror_report_internal(const char *file, int linenr, const char *func,
                             const char *fmt, ...) GCC_FMT_ATTR(4, 5);                              const char *fmt, ...) GCC_FMT_ATTR(4, 5);
   void qerror_report_err(Error *err);
 QString *qerror_format(const char *fmt, QDict *error);  QString *qerror_format(const char *fmt, QDict *error);
 #define qerror_report(fmt, ...) \  #define qerror_report(fmt, ...) \
     qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__)      qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__)
Line 52  QError *qobject_to_qerror(const QObject  Line 54  QError *qobject_to_qerror(const QObject 
 #define QERR_BAD_BUS_FOR_DEVICE \  #define QERR_BAD_BUS_FOR_DEVICE \
     "{ 'class': 'BadBusForDevice', 'data': { 'device': %s, 'bad_bus_type': %s } }"      "{ 'class': 'BadBusForDevice', 'data': { 'device': %s, 'bad_bus_type': %s } }"
   
   #define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
       "{ 'class': 'BlockFormatFeatureNotSupported', 'data': { 'format': %s, 'name': %s, 'feature': %s } }"
   
 #define QERR_BUS_NOT_FOUND \  #define QERR_BUS_NOT_FOUND \
     "{ 'class': 'BusNotFound', 'data': { 'bus': %s } }"      "{ 'class': 'BusNotFound', 'data': { 'bus': %s } }"
   
Line 70  QError *qobject_to_qerror(const QObject  Line 75  QError *qobject_to_qerror(const QObject 
 #define QERR_DEVICE_IN_USE \  #define QERR_DEVICE_IN_USE \
     "{ 'class': 'DeviceInUse', 'data': { 'device': %s } }"      "{ 'class': 'DeviceInUse', 'data': { 'device': %s } }"
   
   #define QERR_DEVICE_FEATURE_BLOCKS_MIGRATION \
       "{ 'class': 'DeviceFeatureBlocksMigration', 'data': { 'device': %s, 'feature': %s } }"
   
 #define QERR_DEVICE_LOCKED \  #define QERR_DEVICE_LOCKED \
     "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"      "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"
   
Line 163  QError *qobject_to_qerror(const QObject  Line 171  QError *qobject_to_qerror(const QObject 
 #define QERR_QMP_EXTRA_MEMBER \  #define QERR_QMP_EXTRA_MEMBER \
     "{ 'class': 'QMPExtraInputObjectMember', 'data': { 'member': %s } }"      "{ 'class': 'QMPExtraInputObjectMember', 'data': { 'member': %s } }"
   
   #define QERR_RESET_REQUIRED \
       "{ 'class': 'ResetRequired', 'data': {} }"
   
 #define QERR_SET_PASSWD_FAILED \  #define QERR_SET_PASSWD_FAILED \
     "{ 'class': 'SetPasswdFailed', 'data': {} }"      "{ 'class': 'SetPasswdFailed', 'data': {} }"
   
Line 181  QError *qobject_to_qerror(const QObject  Line 192  QError *qobject_to_qerror(const QObject 
 #define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \  #define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \
     "{ 'class': 'UnknownBlockFormatFeature', 'data': { 'device': %s, 'format': %s, 'feature': %s } }"      "{ 'class': 'UnknownBlockFormatFeature', 'data': { 'device': %s, 'format': %s, 'feature': %s } }"
   
   #define QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION \
       "{ 'class': 'VirtFSFeatureBlocksMigration', 'data': { 'path': %s, 'tag': %s } }"
   
 #define QERR_VNC_SERVER_FAILED \  #define QERR_VNC_SERVER_FAILED \
     "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }"      "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }"
   

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


unix.superglobalmegacorp.com