Am 04.12.2012 19:32, schrieb Eduardo Habkost:
> The external CPU models were removed on QEMU 1.2, and the support for
> the "cpudef" config sections was documented as deprecated, but the
> actual removal of the config section was pending.
>
> Now that QEMU 1.3 was released, we can finally kill the support for
> cpudef config sections, and support only the built-in CPU models from
> target-i386/cpu.c.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
This looks okay so far, but I'm guessing this was based on another
branch of yours? If we apply this right now, we would also want to
remove the #ifdef'ed cpudef_init() or so function invoking the parsing, no?
Andreas
> ---
> qemu-config.c | 49 -------------------------------------------------
> 1 file changed, 49 deletions(-)
>
> diff --git a/qemu-config.c b/qemu-config.c
> index 10d1ba4..aa78fb9 100644
> --- a/qemu-config.c
> +++ b/qemu-config.c
> @@ -417,54 +417,6 @@ static QemuOptsList qemu_trace_opts = {
> },
> };
>
> -static QemuOptsList qemu_cpudef_opts = {
> - .name = "cpudef",
> - .head = QTAILQ_HEAD_INITIALIZER(qemu_cpudef_opts.head),
> - .desc = {
> - {
> - .name = "name",
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "level",
> - .type = QEMU_OPT_NUMBER,
> - },{
> - .name = "vendor",
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "family",
> - .type = QEMU_OPT_NUMBER,
> - },{
> - .name = "model",
> - .type = QEMU_OPT_NUMBER,
> - },{
> - .name = "stepping",
> - .type = QEMU_OPT_NUMBER,
> - },{
> - .name = "feature_edx", /* cpuid 0000_0001.edx */
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "feature_ecx", /* cpuid 0000_0001.ecx */
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "extfeature_edx", /* cpuid 8000_0001.edx */
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "extfeature_ecx", /* cpuid 8000_0001.ecx */
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "xlevel",
> - .type = QEMU_OPT_NUMBER,
> - },{
> - .name = "model_id",
> - .type = QEMU_OPT_STRING,
> - },{
> - .name = "vendor_override",
> - .type = QEMU_OPT_NUMBER,
> - },
> - { /* end of list */ }
> - },
> -};
> -
> QemuOptsList qemu_spice_opts = {
> .name = "spice",
> .head = QTAILQ_HEAD_INITIALIZER(qemu_spice_opts.head),
> @@ -700,7 +652,6 @@ static QemuOptsList *vm_config_groups[32] = {
> &qemu_rtc_opts,
> &qemu_global_opts,
> &qemu_mon_opts,
> - &qemu_cpudef_opts,
> &qemu_trace_opts,
> &qemu_option_rom_opts,
> &qemu_machine_opts,
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
