From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59123 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJVpW-0003s8-5B for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJVpL-0001Je-VW for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:04:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61161) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJVpL-0001JR-PQ for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:04:35 -0400 From: Glauber Costa Date: Tue, 1 Jun 2010 13:56:15 -0400 Message-Id: <1275414976-18258-2-git-send-email-glommer@redhat.com> In-Reply-To: <1275414976-18258-1-git-send-email-glommer@redhat.com> References: <1275414976-18258-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/2] early set current_machine List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com this way, the machine_init function itself can know which machine is current in use, not only the late init code. Signed-off-by: Glauber Costa --- vl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 96838f8..7a8b20b 100644 --- a/vl.c +++ b/vl.c @@ -5824,6 +5824,9 @@ int main(int argc, char **argv, char **envp) if (machine->compat_props) { qdev_prop_register_compat(machine->compat_props); } + + current_machine = machine; + machine->init(ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model); @@ -5841,8 +5844,6 @@ int main(int argc, char **argv, char **envp) } } - current_machine = machine; - /* init USB devices */ if (usb_enabled) { if (foreach_device_config(DEV_USB, usb_parse) < 0) -- 1.6.2.2