From patchwork Wed May 7 14:43:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 346675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB93B1401F0 for ; Thu, 8 May 2014 00:45:18 +1000 (EST) Received: from localhost ([::1]:41748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi35w-0005KL-U6 for incoming@patchwork.ozlabs.org; Wed, 07 May 2014 10:45:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi35T-0004WF-Dw for qemu-devel@nongnu.org; Wed, 07 May 2014 10:44:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi35N-0008LC-6q for qemu-devel@nongnu.org; Wed, 07 May 2014 10:44:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi35M-0008Ks-UC; Wed, 07 May 2014 10:44:41 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s47EiAHY020704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 May 2014 10:44:10 -0400 Received: from localhost.localdomain.com (vpn1-7-56.ams2.redhat.com [10.36.7.56]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s47EgmTh032294; Wed, 7 May 2014 10:43:57 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Wed, 7 May 2014 17:43:00 +0300 Message-Id: <1399473780-20374-5-git-send-email-marcel.a@redhat.com> In-Reply-To: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> References: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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, proljc@gmail.com, agraf@suse.de, lersek@redhat.com, scottwood@freescale.com, borntraeger@de.ibm.com, hpoussin@reactos.org, aliguori@amazon.com, mdroth@linux.vnet.ibm.com, chouteau@adacore.com, jan.kiszka@web.de, stefanha@redhat.com, pbonzini@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, peter.chubb@nicta.com.au, afaerber@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 4/4] hw/machine: qemu machine opts as properties to QemuMachineState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. 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(-) 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 @@ */ #include "hw/boards.h" +#include "qapi/visitor.h" + +static char *machine_get_accel(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->accel); +} + +static void machine_set_accel(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->accel = g_strdup(value); +} + +static bool machine_get_kernel_irqchip(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return machine_state->kernel_irqchip; +} + +static void machine_set_kernel_irqchip(Object *obj, bool value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->kernel_irqchip = value; +} + +static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v, + void *opaque, const char *name, + Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + int64_t value = 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 = MACHINE(obj); + Error *error = NULL; + int64_t value; + + visit_type_int(v, &value, name, &error); + if (error) { + error_propagate(errp, error); + return; + } + + machine_state->kvm_shadow_mem = value; +} + +static char *machine_get_kernel(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->kernel_filename); +} + +static void machine_set_kernel(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->kernel_filename = g_strdup(value); +} + +static char *machine_get_initrd(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->initrd_filename); +} + +static void machine_set_initrd(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->initrd_filename = g_strdup(value); +} + +static char *machine_get_append(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->kernel_cmdline); +} + +static void machine_set_append(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->kernel_cmdline = g_strdup(value); +} + +static char *machine_get_dtb(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->dtb); +} + +static void machine_set_dtb(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->dtb = g_strdup(value); +} + +static char *machine_get_dumpdtb(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->dumpdtb); +} + +static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->dumpdtb = g_strdup(value); +} + +static void machine_get_phandle_start(Object *obj, Visitor *v, + void *opaque, const char *name, + Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + int64_t value = 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 = MACHINE(obj); + Error *error = NULL; + int64_t value; + + visit_type_int(v, &value, name, &error); + if (error) { + error_propagate(errp, error); + return; + } + + machine_state->phandle_start = value; +} + +static char *machine_get_dt_compatible(Object *obj, Error **errp) +{ + MachineState *machine_state = 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 = MACHINE(obj); + machine_state->dt_compatible = g_strdup(value); +} + +static bool machine_get_dump_guest_core(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return machine_state->dump_guest_core; +} + +static void machine_set_dump_guest_core(Object *obj, bool value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->dump_guest_core = value; +} + +static bool machine_get_mem_merge(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return machine_state->mem_merge; +} + +static void machine_set_mem_merge(Object *obj, bool value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->mem_merge = value; +} + +static bool machine_get_usb(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return machine_state->usb; +} + +static void machine_set_usb(Object *obj, bool value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->usb = value; +} + +static char *machine_get_firmware(Object *obj, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + return g_strdup(machine_state->firmware); +} + +static void machine_set_firmware(Object *obj, const char *value, Error **errp) +{ + MachineState *machine_state = MACHINE(obj); + machine_state->firmware = g_strdup(value); +} + +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", + machine_get_kernel_irqchip, + machine_set_kernel_irqchip, + NULL); + object_property_add(obj, "kvm_shadow_mem", "int", + 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, NULL); + object_property_add_str(obj, "initrd", + machine_get_initrd, machine_set_initrd, NULL); + object_property_add_str(obj, "append", + machine_get_append, machine_set_append, NULL); + 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", + machine_get_phandle_start, + machine_set_phandle_start, + NULL, NULL, NULL); + object_property_add_str(obj, "dt_compatible", + 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_merge, 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 = 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); +} static const TypeInfo machine_info = { .name = TYPE_MACHINE, @@ -18,6 +272,8 @@ static const TypeInfo machine_info = { .abstract = true, .class_size = sizeof(MachineClass), .instance_size = sizeof(MachineState), + .instance_init = machine_initfn, + .instance_finalize = qemu_machine_finalize, }; 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; }; 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); } + machine_opts = qemu_get_machine_opts(); + if (qemu_opt_foreach(machine_opts, object_set_property, current_machine, 1) < 0) { + object_unref(OBJECT(current_machine)); + exit(1); + } + configure_accelerator(machine_class); if (qtest_chrdev) { @@ -4426,9 +4432,6 @@ int main(int argc, char **argv, char **envp) current_machine->machine = machine_class; current_machine->ram_size = ram_size; current_machine->boot_order = boot_order; - current_machine->kernel_filename = kernel_filename; - current_machine->kernel_cmdline = kernel_cmdline; - current_machine->initrd_filename = initrd_filename; current_machine->cpu_model = cpu_model; machine_class->init(current_machine);