From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqoUW-0003bG-35 for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:26:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqoUR-00006X-7i for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:26:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqoUQ-00006J-VB for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:26:31 -0500 Date: Wed, 11 Dec 2013 20:30:09 +0200 From: "Michael S. Tsirkin" Message-ID: <1386786509-29966-1-git-send-email-mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/28] hw: Pass QEMUMachine to its init() method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Markus Armbruster , Eduardo Habkost , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= From: Markus Armbruster Put it in QEMUMachineInitArgs, so I don't have to touch every board. Reviewed-by: Andreas F=E4rber Reviewed-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Markus Armbruster Signed-off-by: Michael S. Tsirkin --- include/hw/boards.h | 7 +++++-- vl.c | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5a7ae9f..2151460 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,7 +6,10 @@ #include "sysemu/blockdev.h" #include "hw/qdev.h" =20 +typedef struct QEMUMachine QEMUMachine; + typedef struct QEMUMachineInitArgs { + const QEMUMachine *machine; ram_addr_t ram_size; const char *boot_order; const char *kernel_filename; @@ -21,7 +24,7 @@ typedef void QEMUMachineResetFunc(void); =20 typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp); =20 -typedef struct QEMUMachine { +struct QEMUMachine { const char *name; const char *alias; const char *desc; @@ -43,7 +46,7 @@ typedef struct QEMUMachine { GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; -} QEMUMachine; +}; =20 int qemu_register_machine(QEMUMachine *m); QEMUMachine *find_default_machine(void); diff --git a/vl.c b/vl.c index b0399de..29e566f 100644 --- a/vl.c +++ b/vl.c @@ -4239,7 +4239,8 @@ int main(int argc, char **argv, char **envp) =20 qdev_machine_init(); =20 - QEMUMachineInitArgs args =3D { .ram_size =3D ram_size, + QEMUMachineInitArgs args =3D { .machine =3D machine, + .ram_size =3D ram_size, .boot_order =3D boot_order, .kernel_filename =3D kernel_filename, .kernel_cmdline =3D kernel_cmdline, --=20 MST