Revision fc5469d8

b/qerror.c
46 46 
    },
47 47 
    {
48 48 
        .error_fmt = QERR_DEVICE_ENCRYPTED,
49 
        .desc      = "The %(device) is encrypted",
49 
        .desc      = "Device '%(device)' is encrypted",
50 50 
    },
51 51 
    {
52 52 
        .error_fmt = QERR_DEVICE_LOCKED,
53 
        .desc      = "Device %(device) is locked",
53 
        .desc      = "Device '%(device)' is locked",
54 54 
    },
55 55 
    {
56 56 
        .error_fmt = QERR_DEVICE_NOT_ACTIVE,
57 
        .desc      = "The %(device) device has not been activated by the guest",
57 
        .desc      = "Device '%(device)' has not been activated by the guest",
58 58 
    },
59 59 
    {
60 60 
        .error_fmt = QERR_DEVICE_NOT_FOUND,
61 
        .desc      = "The %(device) device has not been found",
61 
        .desc      = "Device '%(device)' not found",
62 62 
    },
63 63 
    {
64 64 
        .error_fmt = QERR_DEVICE_NOT_REMOVABLE,
65 
        .desc      = "Device %(device) is not removable",
65 
        .desc      = "Device '%(device)' is not removable",
66 66 
    },
67 67 
    {
68 68 
        .error_fmt = QERR_FD_NOT_FOUND,
69 
        .desc      = "Failed to find file descriptor named %(name)",
69 
        .desc      = "File descriptor named '%(name)' not found",
70 70 
    },
71 71 
    {
72 72 
        .error_fmt = QERR_FD_NOT_SUPPLIED,
73 73 
        .desc      = "No file descriptor supplied via SCM_RIGHTS",
74 74 
    },
75 75 
    {
76 
        .error_fmt = QERR_OPEN_FILE_FAILED,
77 
        .desc      = "Could not open '%(filename)'",
78 
    },
79 
    {
80 76 
        .error_fmt = QERR_INVALID_BLOCK_FORMAT,
81 
        .desc      = "Invalid block format %(name)",
77 
        .desc      = "Invalid block format '%(name)'",
82 78 
    },
83 79 
    {
84 80 
        .error_fmt = QERR_INVALID_PARAMETER,
85 
        .desc      = "Invalid parameter %(name)",
81 
        .desc      = "Invalid parameter '%(name)'",
86 82 
    },
87 83 
    {
88 84 
        .error_fmt = QERR_INVALID_PARAMETER_TYPE,
......
90 86 
    },
91 87 
    {
92 88 
        .error_fmt = QERR_INVALID_PASSWORD,
93 
        .desc      = "The entered password is invalid",
89 
        .desc      = "Password incorrect",
94 90 
    },
95 91 
    {
96 92 
        .error_fmt = QERR_JSON_PARSING,
......
102 98 
    },
103 99 
    {
104 100 
        .error_fmt = QERR_MISSING_PARAMETER,
105 
        .desc      = "Parameter %(name) is missing",
101 
        .desc      = "Parameter '%(name)' is missing",
102 
    },
103 
    {
104 
        .error_fmt = QERR_OPEN_FILE_FAILED,
105 
        .desc      = "Could not open '%(filename)'",
106 106 
    },
107 107 
    {
108 108 
        .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,
b/qerror.h
48 48 
#define QERR_DEVICE_ENCRYPTED \
49 49 
    "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }"
50 50 

  		





  51
  
  
    
#define QERR_DEVICE_LOCKED                                      \


  		





  
  51
  
    
#define QERR_DEVICE_LOCKED \


  		





  52
  52
  
    
    "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"


  		





  53
  53
  
    

  		





  54
  54
  
    
#define QERR_DEVICE_NOT_ACTIVE \


  		





  ......




  66
  66
  
    
#define QERR_FD_NOT_SUPPLIED \


  		





  67
  67
  
    
    "{ 'class': 'FdNotSupplied', 'data': {} }"


  		





  68
  68
  
    

  		





  69
  
  
    
#define QERR_OPEN_FILE_FAILED \


  		





  70
  
  
    
    "{ 'class': 'OpenFileFailed', 'data': { 'filename': %s } }"


  		





  71
  
  
    

  		





  72
  69
  
    
#define QERR_INVALID_BLOCK_FORMAT \


  		





  73
  70
  
    
    "{ 'class': 'InvalidBlockFormat', 'data': { 'name': %s } }"


  		





  74
  71
  
    

  		





  ......




  90
  87
  
    
#define QERR_MISSING_PARAMETER \


  		





  91
  88
  
    
    "{ 'class': 'MissingParameter', 'data': { 'name': %s } }"


  		





  92
  89
  
    

  		





  
  90
  
    
#define QERR_OPEN_FILE_FAILED \


  		





  
  91
  
    
    "{ 'class': 'OpenFileFailed', 'data': { 'filename': %s } }"


  		





  
  92
  
    

  		





  93
  93
  
    
#define QERR_QMP_BAD_INPUT_OBJECT \


  		





  94
  94
  
    
    "{ 'class': 'QMPBadInputObject', 'data': { 'expected': %s } }"


  		





  95
  95
  
    

  		





  96
  96
  
    
#define QERR_SET_PASSWD_FAILED \


  		





  97
  97
  
    
    "{ 'class': 'SetPasswdFailed', 'data': {} }"


  		





  98
  98
  
    

  		





  99
  
  
    
#define QERR_UNDEFINED_ERROR \


  		





  100
  
  
    
    "{ 'class': 'UndefinedError', 'data': {} }"


  		





  101
  
  
    

  		





  102
  99
  
    
#define QERR_TOO_MANY_FILES \


  		





  103
  100
  
    
    "{ 'class': 'TooManyFiles', 'data': {} }"


  		





  104
  101
  
    

  		





  
  102
  
    
#define QERR_UNDEFINED_ERROR \


  		





  
  103
  
    
    "{ 'class': 'UndefinedError', 'data': {} }"


  		





  
  104
  
    

  		





  105
  105
  
    
#define QERR_VNC_SERVER_FAILED \


  		





  106
  106
  
    
    "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }"


  		





  107
  107
  
    

  		












Also available in:
  Unified diff