From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkGul-0003O4-2D for qemu-devel@nongnu.org; Tue, 13 May 2014 13:55:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkGud-0003ut-Gf for qemu-devel@nongnu.org; Tue, 13 May 2014 13:54:54 -0400 Message-ID: <53725C5F.7040801@suse.de> Date: Tue, 13 May 2014 19:54:39 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> <1399473780-20374-5-git-send-email-marcel.a@redhat.com> In-Reply-To: <1399473780-20374-5-git-send-email-marcel.a@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/4] hw/machine: qemu machine opts as properties to QemuMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , qemu-devel@nongnu.org Cc: mst@redhat.com, aik@ozlabs.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, jcmvbkbc@gmail.com, edgar.iglesias@gmail.com, gxt@mprc.pku.edu.cn, peter.chubb@nicta.com.au, proljc@gmail.com, agraf@suse.de, scottwood@freescale.com, borntraeger@de.ibm.com, hpoussin@reactos.org, aliguori@amazon.com, lersek@redhat.com, mdroth@linux.vnet.ibm.com, chouteau@adacore.com, jan.kiszka@web.de, stefanha@redhat.com, cornelia.huck@de.ibm.com, peter.crosthwaite@xilinx.com, mark.langsdorf@calxeda.com, armbru@redhat.com, michael@walle.cc, qemu-ppc@nongnu.org, pbonzini@redhat.com, aurelien@aurel32.net Am 07.05.2014 16:43, schrieb Marcel Apfelbaum: > Make machine's QemuOpts QOM properties of machine. The properties > are automatically filled in. This opens the possiblity to create > opts per machine rather than global. >=20 > Signed-off-by: Marcel Apfelbaum > --- > hw/core/machine.c | 256 ++++++++++++++++++++++++++++++++++++++++++++= ++++++++ > include/hw/boards.h | 6 +- > vl.c | 9 +- > 3 files changed, 265 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d3ffef7..fff8317 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -11,6 +11,260 @@ > */ > =20 > #include "hw/boards.h" > +#include "qapi/visitor.h" > + > +static char *machine_get_accel(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); Contrary to 1/4, you here use the overly verbose "machine_state". > + return g_strdup(machine_state->accel); > +} > + > +static void machine_set_accel(Object *obj, const char *value, Error **= errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->accel =3D g_strdup(value); > +} > + > +static bool machine_get_kernel_irqchip(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return machine_state->kernel_irqchip; > +} > + > +static void machine_set_kernel_irqchip(Object *obj, bool value, Error = **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->kernel_irqchip =3D value; > +} > + > +static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v, > + void *opaque, const char *name, > + Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + int64_t value =3D machine_state->kvm_shadow_mem; > + > + visit_type_int(v, &value, name, errp); > +} > + > +static void machine_set_kvm_shadow_mem(Object *obj, Visitor *v, > + void *opaque, const char *name, > + Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + Error *error =3D NULL; > + int64_t value; > + > + visit_type_int(v, &value, name, &error); > + if (error) { > + error_propagate(errp, error); > + return; > + } > + > + machine_state->kvm_shadow_mem =3D value; > +} > + > +static char *machine_get_kernel(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->kernel_filename); > +} > + > +static void machine_set_kernel(Object *obj, const char *value, Error *= *errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->kernel_filename =3D g_strdup(value); > +} > + > +static char *machine_get_initrd(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->initrd_filename); > +} > + > +static void machine_set_initrd(Object *obj, const char *value, Error *= *errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->initrd_filename =3D g_strdup(value); > +} > + > +static char *machine_get_append(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->kernel_cmdline); > +} > + > +static void machine_set_append(Object *obj, const char *value, Error *= *errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->kernel_cmdline =3D g_strdup(value); > +} > + > +static char *machine_get_dtb(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->dtb); > +} > + > +static void machine_set_dtb(Object *obj, const char *value, Error **er= rp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->dtb =3D g_strdup(value); > +} > + > +static char *machine_get_dumpdtb(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->dumpdtb); > +} > + > +static void machine_set_dumpdtb(Object *obj, const char *value, Error = **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->dumpdtb =3D g_strdup(value); > +} > + > +static void machine_get_phandle_start(Object *obj, Visitor *v, > + void *opaque, const char *name, > + Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + int64_t value =3D machine_state->phandle_start; > + > + visit_type_int(v, &value, name, errp); > +} > + > +static void machine_set_phandle_start(Object *obj, Visitor *v, > + void *opaque, const char *name, > + Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + Error *error =3D NULL; > + int64_t value; > + > + visit_type_int(v, &value, name, &error); > + if (error) { > + error_propagate(errp, error); > + return; > + } > + > + machine_state->phandle_start =3D value; > +} > + > +static char *machine_get_dt_compatible(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->dt_compatible); > +} > + > +static void machine_set_dt_compatible(Object *obj, const char *value, = Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->dt_compatible =3D g_strdup(value); > +} > + > +static bool machine_get_dump_guest_core(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return machine_state->dump_guest_core; > +} > + > +static void machine_set_dump_guest_core(Object *obj, bool value, Error= **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->dump_guest_core =3D value; > +} > + > +static bool machine_get_mem_merge(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return machine_state->mem_merge; > +} > + > +static void machine_set_mem_merge(Object *obj, bool value, Error **err= p) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->mem_merge =3D value; > +} > + > +static bool machine_get_usb(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return machine_state->usb; > +} > + > +static void machine_set_usb(Object *obj, bool value, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->usb =3D value; > +} > + > +static char *machine_get_firmware(Object *obj, Error **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + return g_strdup(machine_state->firmware); > +} > + > +static void machine_set_firmware(Object *obj, const char *value, Error= **errp) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + machine_state->firmware =3D g_strdup(value); > +} Naming aside, this all looks good up to here. > + > +static void machine_initfn(Object *obj) > +{ > + object_property_add_str(obj, "accel", > + machine_get_accel, machine_set_accel, NULL= ); > + object_property_add_bool(obj, "kernel_irqchip", "kernel-irqchip" > + machine_get_kernel_irqchip, > + machine_set_kernel_irqchip, > + NULL); > + object_property_add(obj, "kvm_shadow_mem", "int", "kvm-shadow-mem" > + machine_get_kvm_shadow_mem, > + machine_set_kvm_shadow_mem, > + NULL, NULL, NULL); > + object_property_add_str(obj, "kernel", > + machine_get_kernel, machine_set_kernel, NU= LL); > + object_property_add_str(obj, "initrd", > + machine_get_initrd, machine_set_initrd, NU= LL); > + object_property_add_str(obj, "append", > + machine_get_append, machine_set_append, NU= LL); > + object_property_add_str(obj, "dtb", > + machine_get_dtb, machine_set_dtb, NULL); > + object_property_add_str(obj, "dumpdtb", > + machine_get_dumpdtb, machine_set_dumpdtb, = NULL); > + object_property_add(obj, "phandle_start", "int", "phandle-start" > + machine_get_phandle_start, > + machine_set_phandle_start, > + NULL, NULL, NULL); > + object_property_add_str(obj, "dt_compatible", "dt-compatible" QOM conventions require dashes rather than underscores. We faced the same issue with -cpu legacy options, and the safest solution probably is to replace patch 3/4 and its usage below with a machine-specific function that converts from underscore to dash before setting the propert= y. > + machine_get_dt_compatible, > + machine_set_dt_compatible, > + NULL); > + object_property_add_bool(obj, "dump-guest-core", > + machine_get_dump_guest_core, > + machine_set_dump_guest_core, > + NULL); > + object_property_add_bool(obj, "mem-merge", > + machine_get_mem_merge, machine_set_mem_me= rge, NULL); > + object_property_add_bool(obj, "usb", machine_get_usb, machine_set_= usb, NULL); > + object_property_add_str(obj, "firmware", > + machine_get_firmware, machine_set_firmware= , NULL); > +} > + > +static void qemu_machine_finalize(Object *obj) > +{ > + MachineState *machine_state =3D MACHINE(obj); > + > + g_free(machine_state->accel); > + g_free(machine_state->kernel_filename); > + g_free(machine_state->initrd_filename); > + g_free(machine_state->kernel_cmdline); > + g_free(machine_state->dtb); > + g_free(machine_state->dumpdtb); > + g_free(machine_state->dt_compatible); > + g_free(machine_state->firmware); > +} > =20 > static const TypeInfo machine_info =3D { > .name =3D TYPE_MACHINE, > @@ -18,6 +272,8 @@ static const TypeInfo machine_info =3D { > .abstract =3D true, > .class_size =3D sizeof(MachineClass), > .instance_size =3D sizeof(MachineState), > + .instance_init =3D machine_initfn, > + .instance_finalize =3D qemu_machine_finalize, Do we need an .instance_post_init to apply -global property defaults? > }; > =20 > static void machine_register_types(void) > diff --git a/include/hw/boards.h b/include/hw/boards.h > index eba0574..69664a5 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -114,9 +114,9 @@ struct MachineState { > const MachineClass *machine; > ram_addr_t ram_size; > const char *boot_order; > - const char *kernel_filename; > - const char *kernel_cmdline; > - const char *initrd_filename; > + char *kernel_filename; > + char *kernel_cmdline; > + char *initrd_filename; > const char *cpu_model; > }; > =20 > diff --git a/vl.c b/vl.c > index 6ec6c1a..e92871c 100644 > --- a/vl.c > +++ b/vl.c > @@ -4216,6 +4216,12 @@ int main(int argc, char **argv, char **envp) > exit(0); > } > =20 > + machine_opts =3D qemu_get_machine_opts(); > + if (qemu_opt_foreach(machine_opts, object_set_property, current_ma= chine, 1) < 0) { > + object_unref(OBJECT(current_machine)); > + exit(1); > + } > + > configure_accelerator(machine_class); > =20 > if (qtest_chrdev) { > @@ -4426,9 +4432,6 @@ int main(int argc, char **argv, char **envp) > current_machine->machine =3D machine_class; > current_machine->ram_size =3D ram_size; > current_machine->boot_order =3D boot_order; > - current_machine->kernel_filename =3D kernel_filename; > - current_machine->kernel_cmdline =3D kernel_cmdline; > - current_machine->initrd_filename =3D initrd_filename; So these three are the only fields set from -machine itself? > current_machine->cpu_model =3D cpu_model; > =20 > machine_class->init(current_machine); Regards, 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