qdev: improve property error reporting.
Add a error message in case we fail to parse a qdev property. Also make qemu not abort() in case setting a global property can't be set. This used to be a clear programming error. The introduction of the -global switch changed that though, so better exit instead (after printing the new error message). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
		
							parent
							
								
									69fd02eea6
								
							
						
					
					
						commit
						9ef5c4bf81
					
				@ -500,7 +500,12 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value)
 | 
				
			|||||||
                dev->info->name, name);
 | 
					                dev->info->name, name);
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return prop->info->parse(dev, prop, value);
 | 
					    if (prop->info->parse(dev, prop, value) != 0) {
 | 
				
			||||||
 | 
					        fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n",
 | 
				
			||||||
 | 
					                dev->info->name, name, value);
 | 
				
			||||||
 | 
					        return -1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type)
 | 
					void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type)
 | 
				
			||||||
@ -619,7 +624,7 @@ void qdev_prop_set_globals(DeviceState *dev)
 | 
				
			|||||||
            continue;
 | 
					            continue;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (qdev_prop_parse(dev, prop->property, prop->value) != 0) {
 | 
					        if (qdev_prop_parse(dev, prop->property, prop->value) != 0) {
 | 
				
			||||||
            abort();
 | 
					            exit(1);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user