From: Marcel Apfelbaum Subject: [Qemu-devel] [PATCH 1/5] hw/boards.h: add QEMUMachine's fields to MachineClass Date: Tue, 25 Mar 2014 16:53:48 +0200 Message-ID: <1395759232-10316-2-git-send-email-marcel.a@redhat.com> References: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> Cc: mst@redhat.com, afaerber@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, agraf@suse.de, lcapitulino@redhat.com, aliguori@amazon.com, stefano.stabellini@eu.citrix.com, armbru@redhat.com, stefanha@redhat.com, alex@alex.org.uk, rth@twiddle.net, famz@redhat.com, qemu-ppc@nongnu.org, kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59225 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753802AbaCYSiD (ORCPT ); Tue, 25 Mar 2014 14:38:03 -0400 In-Reply-To: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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