Revision f79f2bfc hw/qdev-properties.c

b/hw/qdev-properties.c
989 989 
    switch (ret) {
990 990 
    case -EEXIST:
991 991 
        error_set(errp, QERR_PROPERTY_VALUE_IN_USE,
992 
                  qdev_get_info(dev)->name, prop->name, value);
992 
                  object_get_typename(OBJECT(dev)), prop->name, value);
993 993 
        break;
994 994 
    default:
995 995 
    case -EINVAL:
996 996 
        error_set(errp, QERR_PROPERTY_VALUE_BAD,
997 
                  qdev_get_info(dev)->name, prop->name, value);
997 
                  object_get_typename(OBJECT(dev)), prop->name, value);
998 998 
        break;
999 999 
    case -ENOENT:
1000 1000 
        error_set(errp, QERR_PROPERTY_VALUE_NOT_FOUND,
1001 
                  qdev_get_info(dev)->name, prop->name, value);
1001 
                  object_get_typename(OBJECT(dev)), prop->name, value);
1002 1002 
        break;
1003 1003 
    case 0:
1004 1004 
        break;
......
1018 1018 
     * removed along with it.
1019 1019 
     */
1020 1020 
    if (!prop || !prop->info->parse) {
1021 
        qerror_report(QERR_PROPERTY_NOT_FOUND, qdev_get_info(dev)->name, name);
1021 
        qerror_report(QERR_PROPERTY_NOT_FOUND, object_get_typename(OBJECT(dev)), name);
1022 1022 
        return -1;
1023 1023 
    }
1024 1024 
    ret = prop->info->parse(dev, prop, value);
......
1039 1039 
    prop = qdev_prop_find(dev, name);
1040 1040 
    if (!prop) {
1041 1041 
        fprintf(stderr, "%s: property \"%s.%s\" not found\n",
1042 
                __FUNCTION__, qdev_get_info(dev)->name, name);
1042 
                __FUNCTION__, object_get_typename(OBJECT(dev)), name);
1043 1043 
        abort();
1044 1044 
    }
1045 1045 
    if (prop->info->type != type) {
1046 1046 
        fprintf(stderr, "%s: property \"%s.%s\" type mismatch\n",
1047 
                __FUNCTION__, qdev_get_info(dev)->name, name);
1047 
                __FUNCTION__, object_get_typename(OBJECT(dev)), name);
1048 1048 
        abort();
1049 1049 
    }
1050 1050 
    qdev_prop_cpy(dev, prop, src);
......
1093 1093 
    if (res < 0) {
1094 1094 
        error_report("Can't attach drive %s to %s.%s: %s",
1095 1095 
                     bdrv_get_device_name(value),
1096 
                     dev->id ? dev->id : qdev_get_info(dev)->name,
1096 
                     dev->id ? dev->id : object_get_typename(OBJECT(dev)),
1097 1097 
                     name, strerror(-res));
1098 1098 
        return -1;
1099 1099 
    }
......
1165 1165 
    GlobalProperty *prop;
1166 1166 

  		





  1167
  1167
  
    
    QTAILQ_FOREACH(prop, &global_props, next) {


  		





  1168
  
  
    
        if (strcmp(qdev_get_info(dev)->name, prop->driver) != 0 &&


  		





  
  1168
  
    
        if (strcmp(object_get_typename(OBJECT(dev)), prop->driver) != 0 &&


  		





  1169
  1169
  
    
            strcmp(qdev_get_info(dev)->bus_info->name, prop->driver) != 0) {


  		





  1170
  1170
  
    
            continue;


  		





  1171
  1171
  
    
        }


  		












Also available in:
  Unified diff