From patchwork Sun Mar 2 13:07:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 325566 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 897D52C00C2 for ; Mon, 3 Mar 2014 00:07:38 +1100 (EST) Received: from localhost ([::1]:35373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK67D-0002GI-R1 for incoming@patchwork.ozlabs.org; Sun, 02 Mar 2014 08:07:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK66r-0002GD-LH for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WK66l-0000gt-LL for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK66l-0000ga-DN for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:07 -0500 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 s22D71BZ032628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 2 Mar 2014 08:07:01 -0500 Received: from localhost.tlv.redhat.com (dhcp-4-195.tlv.redhat.com [10.35.4.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s22D6puc012367; Sun, 2 Mar 2014 08:06:56 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Sun, 2 Mar 2014 15:07:04 +0200 Message-Id: <1393765632-2753-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1393765632-2753-1-git-send-email-marcel.a@redhat.com> References: <1393765632-2753-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: peter.maydell@linaro.org, blauwirbel@gmail.com, mdroth@linux.vnet.ibm.com, mst@redhat.com, armbru@redhat.com, mtosatti@redhat.com, agraf@suse.de, ehabkost@redhat.com, lcapitulino@redhat.com, peter.crosthwaite@petalogix.com, quintela@redhat.com, imammedo@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, scottwood@freescale.com, edgar.iglesias@gmail.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH RFC V2 1/9] hw/core: introduced qemu machine as QOM object 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 The main functionality change is to convert QEMUMachine into QemuMachineClass and QEMUMachineInitArgs into QemuMachineState, instance of QemuMachineClass. As a first step, in order to make possible an incremental developement, both QEMUMachine and QEMUMachineInitArgs are being embeded into the new types. Signed-off-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin --- hw/core/Makefile.objs | 2 +- hw/core/machine.c | 38 +++++++++++++++++++++++++++++++++++++ include/hw/boards.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 hw/core/machine.c diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 9e324be..f80c13c 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -11,4 +11,4 @@ common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o - +common-obj-$(CONFIG_SOFTMMU) += machine.o diff --git a/hw/core/machine.c b/hw/core/machine.c new file mode 100644 index 0000000..2c6e1a3 --- /dev/null +++ b/hw/core/machine.c @@ -0,0 +1,38 @@ +/* + * QEMU Machine + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Marcel Apfelbaum + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "hw/boards.h" + +static void qemu_machine_initfn(Object *obj) +{ +} + +static void qemu_machine_class_init(ObjectClass *oc, void *data) +{ +} + +static const TypeInfo qemu_machine_info = { + .name = TYPE_QEMU_MACHINE, + .parent = TYPE_OBJECT, + .abstract = true, + .class_size = sizeof(QemuMachineClass), + .class_init = qemu_machine_class_init, + .instance_size = sizeof(QemuMachineState), + .instance_init = qemu_machine_initfn, +}; + +static void register_types(void) +{ + type_register_static(&qemu_machine_info); +} + +type_init(register_types); diff --git a/include/hw/boards.h b/include/hw/boards.h index 2151460..7b4708d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -5,6 +5,7 @@ #include "sysemu/blockdev.h" #include "hw/qdev.h" +#include "qom/object.h" typedef struct QEMUMachine QEMUMachine; @@ -53,4 +54,55 @@ QEMUMachine *find_default_machine(void); extern QEMUMachine *current_machine; +#define TYPE_QEMU_MACHINE "machine" +#define QEMU_MACHINE(obj) \ + OBJECT_CHECK(QemuMachineState, (obj), TYPE_QEMU_MACHINE) +#define QEMU_MACHINE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(QemuMachineClass, (obj), TYPE_QEMU_MACHINE) +#define QEMU_MACHINE_CLASS(klass) \ + OBJECT_CLASS_CHECK(QemuMachineClass, (klass), TYPE_QEMU_MACHINE) + +typedef struct QemuMachineState QemuMachineState; +typedef struct QemuMachineClass QemuMachineClass; + +/** + * @QemuMachineClass + * + * @parent_class: opaque parent class container + */ +struct QemuMachineClass { + ObjectClass parent_class; + + QEMUMachine *qemu_machine; +}; + +/** + * @QemuMachineState + * + * @parent: opaque parent object container + */ +struct QemuMachineState { + /* private */ + 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; +}; + #endif