From patchwork Tue Mar 25 14:53:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 333660 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 D1546140095 for ; Wed, 26 Mar 2014 05:39:18 +1100 (EST) Received: from localhost ([::1]:43588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWFo-0005q8-Qn for incoming@patchwork.ozlabs.org; Tue, 25 Mar 2014 14:39:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWEs-00054a-9Y for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:38:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSWEm-0000wp-4M for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:38:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWEZ-0000ti-QZ; Tue, 25 Mar 2014 14:37:59 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2PIbiPd003383 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Mar 2014 14:37:46 -0400 Received: from localhost.tlv.redhat.com (dhcp-4-195.tlv.redhat.com [10.35.4.195]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2PErPac026360; Tue, 25 Mar 2014 10:53:31 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Tue, 25 Mar 2014 16:53:48 +0200 Message-Id: <1395759232-10316-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> References: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [PATCH 1/5] hw/boards.h: add QEMUMachine's fields to MachineClass 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 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; }; /**