From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfxRN-0005vM-Fr for qemu-devel@nongnu.org; Tue, 04 Dec 2012 13:42:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfxRH-0001R0-IX for qemu-devel@nongnu.org; Tue, 04 Dec 2012 13:41:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:37316 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfxRH-0001Qv-92 for qemu-devel@nongnu.org; Tue, 04 Dec 2012 13:41:51 -0500 Message-ID: <50BE43EB.6000700@suse.de> Date: Tue, 04 Dec 2012 19:41:47 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1354645978-17362-1-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354645978-17362-1-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] finally kill cpudef config section support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Igor Mammedov , qemu-devel@nongnu.org, Paolo Bonzini 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. >=20 > 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. >=20 > Signed-off-by: Eduardo Habkost 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, n= o? Andreas > --- > qemu-config.c | 49 ------------------------------------------------- > 1 file changed, 49 deletions(-) >=20 > 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 =3D { > }, > }; > =20 > -static QemuOptsList qemu_cpudef_opts =3D { > - .name =3D "cpudef", > - .head =3D QTAILQ_HEAD_INITIALIZER(qemu_cpudef_opts.head), > - .desc =3D { > - { > - .name =3D "name", > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "level", > - .type =3D QEMU_OPT_NUMBER, > - },{ > - .name =3D "vendor", > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "family", > - .type =3D QEMU_OPT_NUMBER, > - },{ > - .name =3D "model", > - .type =3D QEMU_OPT_NUMBER, > - },{ > - .name =3D "stepping", > - .type =3D QEMU_OPT_NUMBER, > - },{ > - .name =3D "feature_edx", /* cpuid 0000_0001.edx */ > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "feature_ecx", /* cpuid 0000_0001.ecx */ > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "extfeature_edx", /* cpuid 8000_0001.edx */ > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "extfeature_ecx", /* cpuid 8000_0001.ecx */ > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "xlevel", > - .type =3D QEMU_OPT_NUMBER, > - },{ > - .name =3D "model_id", > - .type =3D QEMU_OPT_STRING, > - },{ > - .name =3D "vendor_override", > - .type =3D QEMU_OPT_NUMBER, > - }, > - { /* end of list */ } > - }, > -}; > - > QemuOptsList qemu_spice_opts =3D { > .name =3D "spice", > .head =3D QTAILQ_HEAD_INITIALIZER(qemu_spice_opts.head), > @@ -700,7 +652,6 @@ static QemuOptsList *vm_config_groups[32] =3D { > &qemu_rtc_opts, > &qemu_global_opts, > &qemu_mon_opts, > - &qemu_cpudef_opts, > &qemu_trace_opts, > &qemu_option_rom_opts, > &qemu_machine_opts, >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg