Am 15.02.2013 14:06, schrieb Igor Mammedov: > From: Andreas Färber <afaer...@suse.de> > > In order to instantiate a CPU subtype we will need to know which type, > so move the cpu_model splitting into cpu_x86_init(). > > Parameters need to be set on the X86CPU instance, so move > cpu_x86_parse_featurestr() into cpu_x86_init() as well. > > This leaves cpu_x86_register() operating on the model name only. > > Signed-off-by: Andreas Färber <afaer...@suse.de> > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > --- > v5: > * get error to report from cpu_x86_register() > v4: > * consolidate resource cleanup in when leaving cpu_x86_init(), > to avoid clean code duplication. > * remove unnecessary error message from hw/pc.c
This version still has the flaw of printing an x86-specific error message in the model-not-found NULL return case, leading to duplicate error messages for qemu-i386 / qemu-x86_64. But I think the progress towards x86 hotplug outweighs that nit, and adding #ifdef TARGET_I386 to linux-user and bsd-user seemed unnecessarily ugly to me. Fixing this (or q35?) can be done as follow-up. Thanks, applied to qom-cpu: https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
