From patchwork Thu Jan 30 14:47:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 315377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82DF92C00A5 for ; Fri, 31 Jan 2014 01:48:25 +1100 (EST) Received: from localhost ([::1]:50597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8sul-00067I-4z for incoming@patchwork.ozlabs.org; Thu, 30 Jan 2014 09:48:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8suB-00053D-FS for qemu-devel@nongnu.org; Thu, 30 Jan 2014 09:47:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8su5-0004yP-27 for qemu-devel@nongnu.org; Thu, 30 Jan 2014 09:47:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8su4-0004yG-QO for qemu-devel@nongnu.org; Thu, 30 Jan 2014 09:47:40 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0UElbS0005301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Jan 2014 09:47:37 -0500 Received: from localhost.localdomain.com (vpn-201-167.tlv.redhat.com [10.35.201.167]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s0UElKUe015983; Thu, 30 Jan 2014 09:47:34 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 30 Jan 2014 16:47:24 +0200 Message-Id: <1391093245-14277-5-git-send-email-marcel.a@redhat.com> In-Reply-To: <1391093245-14277-1-git-send-email-marcel.a@redhat.com> References: <1391093245-14277-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, mst@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, blauwirbel@gmail.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH RFC 4/5] hw/machine: add 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 It is cleaner to query current_machine's properties than accessing QemuOpts from the code. Signed-off-by: Marcel Apfelbaum --- hw/core/machine.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/boards.h | 15 ++++ 2 files changed, 266 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 2c6e1a3..2ad12ad 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -11,15 +11,265 @@ */ #include "hw/boards.h" +#include "qapi/visitor.h" + +static char *machine_get_accel(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->accel); +} + +static void machine_set_accel(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->accel = g_strdup(value); +} + +static bool machine_get_kernel_irqchip(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return machine_state->kernel_irqchip; +} + +static void machine_set_kernel_irqchip(Object *obj, bool value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->kernel); +} + +static void machine_set_kernel(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->kernel = g_strdup(value); +} + +static char *machine_get_initrd(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->initrd); +} + +static void machine_set_initrd(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->initrd = g_strdup(value); +} + +static char *machine_get_append(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->append); +} + +static void machine_set_append(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->append = g_strdup(value); +} + +static char *machine_get_dtb(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->dtb); +} + +static void machine_set_dtb(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->dtb = g_strdup(value); +} + +static char *machine_get_dumpdtb(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->dumpdtb); +} + +static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_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) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->dt_compatible); +} + +static void machine_set_dt_compatible(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->dt_compatible = g_strdup(value); +} + +static bool machine_get_dump_guest_core(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return machine_state->dump_guest_core; +} + +static void machine_set_dump_guest_core(Object *obj, bool value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->dump_guest_core = value; +} + +static bool machine_get_mem_merge(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return machine_state->mem_merge; +} + +static void machine_set_mem_merge(Object *obj, bool value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->mem_merge = value; +} + +static bool machine_get_usb(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return machine_state->usb; +} + +static void machine_set_usb(Object *obj, bool value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->usb = value; +} + +static char *machine_get_firmware(Object *obj, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + return g_strdup(machine_state->firmware); +} + +static void machine_set_firmware(Object *obj, const char *value, Error **errp) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + machine_state->firmware = g_strdup(value); +} static void qemu_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_class_init(ObjectClass *oc, void *data) { } +static void qemu_machine_finalize(Object *obj) +{ + QemuMachineState *machine_state = QEMU_MACHINE(obj); + + g_free(machine_state->accel); + g_free(machine_state->kernel); + g_free(machine_state->initrd); + g_free(machine_state->append); + g_free(machine_state->dtb); + g_free(machine_state->dumpdtb); + g_free(machine_state->dt_compatible); + g_free(machine_state->firmware); +} + static const TypeInfo qemu_machine_info = { .name = TYPE_QEMU_MACHINE, .parent = TYPE_OBJECT, @@ -28,6 +278,7 @@ static const TypeInfo qemu_machine_info = { .class_init = qemu_machine_class_init, .instance_size = sizeof(QemuMachineState), .instance_init = qemu_machine_initfn, + .instance_finalize = qemu_machine_finalize, }; static void register_types(void) diff --git a/include/hw/boards.h b/include/hw/boards.h index 3cd48fe..51bcaba 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -86,6 +86,21 @@ struct QemuMachineState { Object parent; /* public */ + char *accel; + bool kernel_irqchip; + int kvm_shadow_mem; + char *kernel; + char *initrd; + char *append; + char *dtb; + char *dumpdtb; + int phandle_start; + char *dt_compatible; + bool dump_guest_core; + bool mem_merge; + bool usb; + char *firmware; + QEMUMachineInitArgs *init_args; };