Hi Eduardo, Am 05.09.2012 22:41, schrieb Eduardo Habkost: > This is a small queue of patches that I consider "ready to go", that didn't > enter QEMU 1.2. > > Eduardo Habkost (5): > i386: add missing CPUID_* constants > move CPU models from cpus-x86_64.conf to C > eliminate cpus-x86_64.conf file > x86_cpudef_setup: coding style change > i386: kill cpudef config section support > > Peter Maydell (2): > target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop > ?dump > Drop cpu_list_id macro
Finished walking through these now and concur that they are ready to go! I've queued them on my qom-cpu branch (enforcing a consistent "target-i386" subject where applicable; dropping my pending field movements for now) and intend to send a pull shortly. https://github.com/afaerber/qemu-cpu/commits/qom-cpu To address Igor's setscalar() review comment, I appended this follow-up: diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7c0953f..c2e65ea 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1393,18 +1393,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) #if !defined(CONFIG_USER_ONLY) -/* interpret radix and convert from string to arbitrary scalar, - * otherwise flag failure - */ -#define setscalar(pval, str, perr) \ -{ \ - char *pend; \ - unsigned long ul; \ - \ - ul = strtoul(str, &pend, 0); \ - *str && !*pend ? (*pval = ul) : (*perr = 1); \ -} - void cpu_clear_apic_feature(CPUX86State *env) { env->cpuid_features &= ~CPUID_APIC; Thanks for helping sort these things out, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg