From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9H15-0005iJ-NB for qemu-devel@nongnu.org; Mon, 21 Jul 2014 13:04:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X9H0s-000139-UA for qemu-devel@nongnu.org; Mon, 21 Jul 2014 13:04:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45179 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9H0s-00012i-Ms for qemu-devel@nongnu.org; Mon, 21 Jul 2014 13:04:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 21 Jul 2014 19:04:31 +0200 Message-Id: <1405962271-18557-2-git-send-email-afaerber@suse.de> In-Reply-To: <1405962271-18557-1-git-send-email-afaerber@suse.de> References: <1405962271-18557-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/1] machine: Replace underscores in machine's property names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Marcel Apfelbaum From: Marcel Apfelbaum Replaced '_' with '-' to comply with QOM guidelines. Made the conversion from command line to QMP in vl.c. Signed-off-by: Marcel Apfelbaum Acked-by: Michael S. Tsirkin Signed-off-by: Andreas F=C3=A4rber --- hw/core/machine.c | 8 ++++---- vl.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index cbba679..7a66c57 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -239,11 +239,11 @@ 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", + object_property_add_bool(obj, "kernel-irqchip", machine_get_kernel_irqchip, machine_set_kernel_irqchip, NULL); - object_property_add(obj, "kvm_shadow_mem", "int", + object_property_add(obj, "kvm-shadow-mem", "int", machine_get_kvm_shadow_mem, machine_set_kvm_shadow_mem, NULL, NULL, NULL); @@ -257,11 +257,11 @@ static void machine_initfn(Object *obj) machine_get_dtb, machine_set_dtb, NULL); object_property_add_str(obj, "dumpdtb", machine_get_dumpdtb, machine_set_dumpdtb, NU= LL); - object_property_add(obj, "phandle_start", "int", + object_property_add(obj, "phandle-start", "int", machine_get_phandle_start, machine_set_phandle_start, NULL, NULL, NULL); - object_property_add_str(obj, "dt_compatible", + object_property_add_str(obj, "dt-compatible", machine_get_dt_compatible, machine_set_dt_compatible, NULL); diff --git a/vl.c b/vl.c index 6abedcf..fe451aa 100644 --- a/vl.c +++ b/vl.c @@ -2823,15 +2823,25 @@ static int object_set_property(const char *name, = const char *value, void *opaque Object *obj =3D OBJECT(opaque); StringInputVisitor *siv; Error *local_err =3D NULL; + char *c, *qom_name; =20 if (strcmp(name, "qom-type") =3D=3D 0 || strcmp(name, "id") =3D=3D 0= || strcmp(name, "type") =3D=3D 0) { return 0; } =20 + qom_name =3D g_strdup(name); + c =3D qom_name; + while (*c++) { + if (*c =3D=3D '_') { + *c =3D '-'; + } + } + siv =3D string_input_visitor_new(value); - object_property_set(obj, string_input_get_visitor(siv), name, &local= _err); + object_property_set(obj, string_input_get_visitor(siv), qom_name, &l= ocal_err); string_input_visitor_cleanup(siv); + g_free(qom_name); =20 if (local_err) { qerror_report_err(local_err); --=20 1.8.4.5