From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WST1N-00019p-K7 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 11:12:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WST1H-0006E4-3r for qemu-devel@nongnu.org; Tue, 25 Mar 2014 11:12:09 -0400 From: Marcel Apfelbaum Date: Tue, 25 Mar 2014 15:46:50 +0200 Message-Id: <1395755214-8957-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1395755214-8957-1-git-send-email-marcel.a@redhat.com> References: <1395755214-8957-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH 1/5] hw/boards.h: add QEMUMachine's fields to MachineClass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, famz@redhat.com, stefanha@redhat.com, kvm@vger.kernel.org, mst@redhat.com, alex@alex.org.uk, armbru@redhat.com, stefano.stabellini@eu.citrix.com, agraf@suse.de, lcapitulino@redhat.com, qemu-ppc@nongnu.org, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net In order to eliminate the QEMUMachine indirection, add its fields directly to MachineClass. Do not remove yet qemu_machine field because it is in use already by sparpr. Signed-off-by: Marcel Apfelbaum --- include/hw/boards.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index dd2c70d..7cf1f07 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -78,6 +78,29 @@ struct MachineClass { /*< public >*/ QEMUMachine *qemu_machine; + const char *name; + const char *alias; + const char *desc; + + void (*init)(QEMUMachineInitArgs *args); + void (*reset)(void); + void (*hot_add_cpu)(const int64_t id, Error **errp); + int (*kvm_type)(const char *arg); + + BlockInterfaceType block_default_type; + int max_cpus; + unsigned int no_serial:1, + no_parallel:1, + use_virtcon:1, + use_sclp:1, + no_floppy:1, + no_cdrom:1, + no_sdcard:1; + int is_default; + const char *default_machine_opts; + const char *default_boot_order; + GlobalProperty *compat_props; + const char *hw_version; }; /** -- 1.8.3.1