mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
machine: Replace underscores in machine's property names
Replaced '_' with '-' to comply with QOM guidelines. Made the conversion from command line to QMP in vl.c. Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
147fc41973
commit
b0ddb8bf6b
|
@ -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, NULL);
|
||||
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);
|
||||
|
|
12
vl.c
12
vl.c
|
@ -2823,15 +2823,25 @@ static int object_set_property(const char *name, const char *value, void *opaque
|
|||
Object *obj = OBJECT(opaque);
|
||||
StringInputVisitor *siv;
|
||||
Error *local_err = NULL;
|
||||
char *c, *qom_name;
|
||||
|
||||
if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0 ||
|
||||
strcmp(name, "type") == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
qom_name = g_strdup(name);
|
||||
c = qom_name;
|
||||
while (*c++) {
|
||||
if (*c == '_') {
|
||||
*c = '-';
|
||||
}
|
||||
}
|
||||
|
||||
siv = 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, &local_err);
|
||||
string_input_visitor_cleanup(siv);
|
||||
g_free(qom_name);
|
||||
|
||||
if (local_err) {
|
||||
qerror_report_err(local_err);
|
||||
|
|
Loading…
Reference in a new issue