Diff for /qemu/qerror.c between versions 1.1.1.5 and 1.1.1.6

version 1.1.1.5, 2018/04/24 19:16:40 version 1.1.1.6, 2018/04/24 19:33:38
Line 40  static const QType qerror_type = { Line 40  static const QType qerror_type = {
  * "running out of foo: %(foo)%%"   * "running out of foo: %(foo)%%"
  *   *
  * Please keep the entries in alphabetical order.   * Please keep the entries in alphabetical order.
  * Use "sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c | sort -c"   * Use scripts/check-qerror.sh to check.
  * to check.  
  */   */
 static const QErrorStringTable qerror_table[] = {  static const QErrorStringTable qerror_table[] = {
     {      {
           .error_fmt = QERR_ADD_CLIENT_FAILED,
           .desc      = "Could not add client",
       },
       {
           .error_fmt = QERR_AMBIGUOUS_PATH,
           .desc      = "Path '%(path)' does not uniquely identify a %(object)"
       },
       {
         .error_fmt = QERR_BAD_BUS_FOR_DEVICE,          .error_fmt = QERR_BAD_BUS_FOR_DEVICE,
         .desc      = "Device '%(device)' can't go on a %(bad_bus_type) bus",          .desc      = "Device '%(device)' can't go on a %(bad_bus_type) bus",
     },      },
     {      {
           .error_fmt = QERR_BASE_NOT_FOUND,
           .desc      = "Base '%(base)' not found",
       },
       {
         .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,          .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
         .desc      = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",          .desc      = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",
     },      },
     {      {
           .error_fmt = QERR_BUS_NO_HOTPLUG,
           .desc      = "Bus '%(bus)' does not support hotplugging",
       },
       {
         .error_fmt = QERR_BUS_NOT_FOUND,          .error_fmt = QERR_BUS_NOT_FOUND,
         .desc      = "Bus '%(bus)' not found",          .desc      = "Bus '%(bus)' not found",
     },      },
     {      {
         .error_fmt = QERR_BUS_NO_HOTPLUG,          .error_fmt = QERR_COMMAND_DISABLED,
         .desc      = "Bus '%(bus)' does not support hotplugging",          .desc      = "The command %(name) has been disabled for this instance",
     },      },
     {      {
         .error_fmt = QERR_COMMAND_NOT_FOUND,          .error_fmt = QERR_COMMAND_NOT_FOUND,
Line 69  static const QErrorStringTable qerror_ta Line 84  static const QErrorStringTable qerror_ta
         .desc      = "Device '%(device)' is encrypted",          .desc      = "Device '%(device)' is encrypted",
     },      },
     {      {
           .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,
           .desc      = "Migration is disabled when using feature '%(feature)' in device '%(device)'",
       },
       {
           .error_fmt = QERR_DEVICE_HAS_NO_MEDIUM,
           .desc      = "Device '%(device)' has no medium",
       },
       {
         .error_fmt = QERR_DEVICE_INIT_FAILED,          .error_fmt = QERR_DEVICE_INIT_FAILED,
         .desc      = "Device '%(device)' could not be initialized",          .desc      = "Device '%(device)' could not be initialized",
     },      },
Line 77  static const QErrorStringTable qerror_ta Line 100  static const QErrorStringTable qerror_ta
         .desc      = "Device '%(device)' is in use",          .desc      = "Device '%(device)' is in use",
     },      },
     {      {
         .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,          .error_fmt = QERR_DEVICE_IS_READ_ONLY,
         .desc      = "Migration is disabled when using feature '%(feature)' in device '%(device)'",          .desc      = "Device '%(device)' is read only",
     },      },
     {      {
         .error_fmt = QERR_DEVICE_LOCKED,          .error_fmt = QERR_DEVICE_LOCKED,
Line 89  static const QErrorStringTable qerror_ta Line 112  static const QErrorStringTable qerror_ta
         .desc      = "Device '%(device)' has multiple child busses",          .desc      = "Device '%(device)' has multiple child busses",
     },      },
     {      {
           .error_fmt = QERR_DEVICE_NO_BUS,
           .desc      = "Device '%(device)' has no child bus",
       },
       {
           .error_fmt = QERR_DEVICE_NO_HOTPLUG,
           .desc      = "Device '%(device)' does not support hotplugging",
       },
       {
         .error_fmt = QERR_DEVICE_NOT_ACTIVE,          .error_fmt = QERR_DEVICE_NOT_ACTIVE,
         .desc      = "Device '%(device)' has not been activated",          .desc      = "Device '%(device)' has not been activated",
     },      },
Line 105  static const QErrorStringTable qerror_ta Line 136  static const QErrorStringTable qerror_ta
         .desc      = "Device '%(device)' is not removable",          .desc      = "Device '%(device)' is not removable",
     },      },
     {      {
         .error_fmt = QERR_DEVICE_NO_BUS,  
         .desc      = "Device '%(device)' has no child bus",  
     },  
     {  
         .error_fmt = QERR_DEVICE_NO_HOTPLUG,  
         .desc      = "Device '%(device)' does not support hotplugging",  
     },  
     {  
         .error_fmt = QERR_DUPLICATE_ID,          .error_fmt = QERR_DUPLICATE_ID,
         .desc      = "Duplicate ID '%(id)' for %(object)",          .desc      = "Duplicate ID '%(id)' for %(object)",
     },      },
Line 137  static const QErrorStringTable qerror_ta Line 160  static const QErrorStringTable qerror_ta
         .desc      = "Invalid parameter '%(name)'",          .desc      = "Invalid parameter '%(name)'",
     },      },
     {      {
           .error_fmt = QERR_INVALID_PARAMETER_COMBINATION,
           .desc      = "Invalid parameter combination",
       },
       {
         .error_fmt = QERR_INVALID_PARAMETER_TYPE,          .error_fmt = QERR_INVALID_PARAMETER_TYPE,
         .desc      = "Invalid parameter type, expected: %(expected)",          .desc      = "Invalid parameter type for '%(name)', expected: %(expected)",
     },      },
     {      {
         .error_fmt = QERR_INVALID_PARAMETER_VALUE,          .error_fmt = QERR_INVALID_PARAMETER_VALUE,
Line 149  static const QErrorStringTable qerror_ta Line 176  static const QErrorStringTable qerror_ta
         .desc      = "Password incorrect",          .desc      = "Password incorrect",
     },      },
     {      {
         .error_fmt = QERR_JSON_PARSING,          .error_fmt = QERR_IO_ERROR,
         .desc      = "Invalid JSON syntax",          .desc      = "An IO error has occurred",
     },      },
     {      {
         .error_fmt = QERR_JSON_PARSE_ERROR,          .error_fmt = QERR_JSON_PARSE_ERROR,
Line 158  static const QErrorStringTable qerror_ta Line 185  static const QErrorStringTable qerror_ta
   
     },      },
     {      {
           .error_fmt = QERR_JSON_PARSING,
           .desc      = "Invalid JSON syntax",
       },
       {
         .error_fmt = QERR_KVM_MISSING_CAP,          .error_fmt = QERR_KVM_MISSING_CAP,
         .desc      = "Using KVM without %(capability), %(feature) unavailable",          .desc      = "Using KVM without %(capability), %(feature) unavailable",
     },      },
     {      {
           .error_fmt = QERR_MIGRATION_ACTIVE,
           .desc      = "There's a migration process in progress",
       },
       {
           .error_fmt = QERR_MIGRATION_NOT_SUPPORTED,
           .desc      = "State blocked by non-migratable device '%(device)'",
       },
       {
         .error_fmt = QERR_MIGRATION_EXPECTED,          .error_fmt = QERR_MIGRATION_EXPECTED,
         .desc      = "An incoming migration is expected before this command can be executed",          .desc      = "An incoming migration is expected before this command can be executed",
     },      },
Line 174  static const QErrorStringTable qerror_ta Line 213  static const QErrorStringTable qerror_ta
         .desc      = "No '%(bus)' bus found for device '%(device)'",          .desc      = "No '%(bus)' bus found for device '%(device)'",
     },      },
     {      {
           .error_fmt = QERR_NOT_SUPPORTED,
           .desc      = "Not supported",
       },
       {
         .error_fmt = QERR_OPEN_FILE_FAILED,          .error_fmt = QERR_OPEN_FILE_FAILED,
         .desc      = "Could not open '%(filename)'",          .desc      = "Could not open '%(filename)'",
     },      },
     {      {
           .error_fmt = QERR_PERMISSION_DENIED,
           .desc      = "Insufficient permission to perform this operation",
       },
       {
         .error_fmt = QERR_PROPERTY_NOT_FOUND,          .error_fmt = QERR_PROPERTY_NOT_FOUND,
         .desc      = "Property '%(device).%(property)' not found",          .desc      = "Property '%(device).%(property)' not found",
     },      },
Line 194  static const QErrorStringTable qerror_ta Line 241  static const QErrorStringTable qerror_ta
         .desc      = "Property '%(device).%(property)' can't find value '%(value)'",          .desc      = "Property '%(device).%(property)' can't find value '%(value)'",
     },      },
     {      {
           .error_fmt = QERR_PROPERTY_VALUE_NOT_POWER_OF_2,
           .desc      = "Property '%(device).%(property)' doesn't take "
                        "value '%(value)', it's not a power of 2",
       },
       {
           .error_fmt = QERR_PROPERTY_VALUE_OUT_OF_RANGE,
           .desc      = "Property '%(device).%(property)' doesn't take "
                        "value %(value) (minimum: %(min), maximum: %(max))",
       },
       {
           .error_fmt = QERR_QGA_COMMAND_FAILED,
           .desc      = "Guest agent command failed, error was '%(message)'",
       },
       {
           .error_fmt = QERR_QGA_LOGGING_FAILED,
           .desc      = "Guest agent failed to log non-optional log statement",
       },
       {
         .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,          .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,
         .desc      = "Expected '%(expected)' in QMP input",          .desc      = "Expected '%(expected)' in QMP input",
     },      },
Line 214  static const QErrorStringTable qerror_ta Line 279  static const QErrorStringTable qerror_ta
         .desc      = "Could not set password",          .desc      = "Could not set password",
     },      },
     {      {
         .error_fmt = QERR_ADD_CLIENT_FAILED,  
         .desc      = "Could not add client",  
     },  
     {  
         .error_fmt = QERR_TOO_MANY_FILES,          .error_fmt = QERR_TOO_MANY_FILES,
         .desc      = "Too many open files",          .desc      = "Too many open files",
     },      },
     {      {
         .error_fmt = QERR_UNDEFINED_ERROR,          .error_fmt = QERR_UNDEFINED_ERROR,
         .desc      = "An undefined error has ocurred",          .desc      = "An undefined error has occurred",
     },  
     {  
         .error_fmt = QERR_UNSUPPORTED,  
         .desc      = "this feature or command is not currently supported",  
     },      },
     {      {
         .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,          .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
Line 235  static const QErrorStringTable qerror_ta Line 292  static const QErrorStringTable qerror_ta
                      "supported by this qemu version: %(feature)",                       "supported by this qemu version: %(feature)",
     },      },
     {      {
           .error_fmt = QERR_UNSUPPORTED,
           .desc      = "this feature or command is not currently supported",
       },
       {
         .error_fmt = QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,          .error_fmt = QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
         .desc      = "Migration is disabled when VirtFS export path '%(path)' "          .desc      = "Migration is disabled when VirtFS export path '%(path)' "
                      "is mounted in the guest using mount_tag '%(tag)'",                       "is mounted in the guest using mount_tag '%(tag)'",
Line 244  static const QErrorStringTable qerror_ta Line 305  static const QErrorStringTable qerror_ta
         .desc      = "Could not start VNC server on %(target)",          .desc      = "Could not start VNC server on %(target)",
     },      },
     {      {
         .error_fmt = QERR_QGA_LOGGING_FAILED,          .error_fmt = QERR_SOCKET_CONNECT_IN_PROGRESS,
         .desc      = "Guest agent failed to log non-optional log statement",          .desc      = "Connection can not be completed immediately",
     },      },
     {      {
         .error_fmt = QERR_QGA_COMMAND_FAILED,          .error_fmt = QERR_SOCKET_CONNECT_FAILED,
         .desc      = "Guest agent command failed, error was '%(message)'",          .desc      = "Failed to connect to socket",
       },
       {
           .error_fmt = QERR_SOCKET_LISTEN_FAILED,
           .desc      = "Failed to set socket to listening mode",
       },
       {
           .error_fmt = QERR_SOCKET_BIND_FAILED,
           .desc      = "Failed to bind socket",
       },
       {
           .error_fmt = QERR_SOCKET_CREATE_FAILED,
           .desc      = "Failed to create socket",
     },      },
     {}      {}
 };  };
Line 532  void qerror_report_err(Error *err) Line 605  void qerror_report_err(Error *err)
     }      }
 }  }
   
   void assert_no_error(Error *err)
   {
       if (err) {
           qerror_report_err(err);
           abort();
       }
   }
   
 /**  /**
  * qobject_to_qerror(): Convert a QObject into a QError   * qobject_to_qerror(): Convert a QObject into a QError
  */   */

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


unix.superglobalmegacorp.com