From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuALR-0001fo-Ve for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:46:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuALQ-00018p-QR for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:46:17 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39438 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuALQ-00018l-Gh for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:46:16 -0400 Message-ID: <50107732.6080802@suse.de> Date: Thu, 26 Jul 2012 00:46:10 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1343240323-7402-1-git-send-email-ehabkost@redhat.com> <1343240323-7402-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343240323-7402-3-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [QEMU PATCH 2/3] per-machine-type CPU model alias system List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: libvir-list@redhat.com, Jiri Denemark , qemu-devel@nongnu.org, Gleb Natapov Am 25.07.2012 20:18, schrieb Eduardo Habkost: > This allow QEMUMachine structs to contain a list of CPU model aliases, > used to keep command-line compatibility with older machine types, while > making CPU model fixes available on newer machine types. >=20 > Signed-off-by: Eduardo Habkost > --- > hw/boards.h | 6 ++++++ > vl.c | 14 ++++++++++++++ > 2 files changed, 20 insertions(+) >=20 > diff --git a/hw/boards.h b/hw/boards.h > index f20f5ab..ad48399 100644 > --- a/hw/boards.h > +++ b/hw/boards.h > @@ -12,6 +12,11 @@ typedef void QEMUMachineInitFunc(ram_addr_t ram_size= , > const char *initrd_filename, > const char *cpu_model); > =20 > + > +typedef struct CPUModelAlias { > + const char *alias, *cpu_model; > +} CPUModelAlias; > + > typedef struct QEMUMachine { > const char *name; > const char *alias; > @@ -27,6 +32,7 @@ typedef struct QEMUMachine { > no_sdcard:1; > int is_default; > const char *default_machine_opts; > + struct CPUModelAlias *cpu_aliases; > GlobalProperty *compat_props; > struct QEMUMachine *next; > const char *hw_version; > diff --git a/vl.c b/vl.c > index 34cc145..cd87e06 100644 > --- a/vl.c > +++ b/vl.c > @@ -1209,6 +1209,19 @@ QEMUMachine *find_default_machine(void) > return NULL; > } > =20 > +static const char *qemu_machine_resolve_cpu_model(QEMUMachine *m, > + const char *cpu_mode= l) > +{ > + if (cpu_model && m->cpu_aliases) { > + CPUModelAlias *a; > + for (a =3D m->cpu_aliases; a->alias; a++) { > + if (!strcmp(cpu_model, a->alias)) > + return a->cpu_model; > + } > + } > + return cpu_model; > +} > + > void qemu_machine_init(QEMUMachine *machine, > ram_addr_t ram_size, > const char *boot_devices, > @@ -1217,6 +1230,7 @@ void qemu_machine_init(QEMUMachine *machine, > const char *initrd_filename, > const char *cpu_model) > { > + cpu_model =3D qemu_machine_resolve_cpu_model(machine, cpu_model); > machine->init(ram_size, boot_devices, > kernel_filename, kernel_cmdline, initrd_filename, cp= u_model); > } >=20 If the model is specified with -M by user or libvirt, then all seems fine, but renaming default CPUs like qemu64 et al. (as done for non-default ones in the next patch) would break machines' cpu_init() call. That's a fairly common use case for non-x86 machines. The alternative would be to incept closer to object_new(), i.e. call an alias resolution helper from the various cpu_*_init() functions. Please keep me cc'ed. Thanks, Andreas --=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