From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VblWQ-0000OB-UU for qemu-devel@nongnu.org; Thu, 31 Oct 2013 02:14:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VblWI-0002Qn-Sn for qemu-devel@nongnu.org; Thu, 31 Oct 2013 02:14:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VblWI-0002Q1-KE for qemu-devel@nongnu.org; Thu, 31 Oct 2013 02:14:14 -0400 Date: Thu, 31 Oct 2013 08:17:04 +0200 From: "Michael S. Tsirkin" Message-ID: <20131031061704.GB8106@redhat.com> References: <1383137800-2990-1-git-send-email-armbru@redhat.com> <1383137800-2990-2-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1383137800-2990-2-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 1/2] hw: Pass QEMUMachine to its init() method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: armbru@redhat.com Cc: ehabkost@redhat.com, qemu-devel@nongnu.org, aliguori@amazon.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de On Wed, Oct 30, 2013 at 01:56:39PM +0100, armbru@redhat.com wrote: > From: Markus Armbruster > > Put it in QEMUMachineInitArgs, so I don't have to touch every board. > > Signed-off-by: Markus Armbruster Reviewed-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" > > +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); > > typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp); > > -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; > +}; > > int qemu_register_machine(QEMUMachine *m); > QEMUMachine *find_default_machine(void); > diff --git a/vl.c b/vl.c > index b42ac67..63338e4 100644 > --- a/vl.c > +++ b/vl.c > @@ -4236,7 +4236,8 @@ int main(int argc, char **argv, char **envp) > > qdev_machine_init(); > > - QEMUMachineInitArgs args = { .ram_size = ram_size, > + QEMUMachineInitArgs args = { .machine = machine, > + .ram_size = ram_size, > .boot_order = boot_order, > .kernel_filename = kernel_filename, > .kernel_cmdline = kernel_cmdline, > -- > 1.8.1.4 >