From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAJvT-00030X-Rl for qemu-devel@nongnu.org; Fri, 16 Aug 2013 09:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAJvK-0005RQ-OD for qemu-devel@nongnu.org; Fri, 16 Aug 2013 09:18:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAJvK-0005R1-Gc for qemu-devel@nongnu.org; Fri, 16 Aug 2013 09:18:38 -0400 From: armbru@redhat.com Date: Fri, 16 Aug 2013 15:18:33 +0200 Message-Id: <1376659114-6630-7-git-send-email-armbru@redhat.com> In-Reply-To: <1376659114-6630-1-git-send-email-armbru@redhat.com> References: <1376659114-6630-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/7] vl: Set current_machine early List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, aliguori@us.ibm.com, ehabkost@redhat.com From: Markus Armbruster I'd like to access QEMUMachine from a QEMUMachine init() method, which is currently not possible. Instead of passing it as an argument, I simply set current_machine earlier. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- vl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vl.c b/vl.c index ba3084c..258e164 100644 --- a/vl.c +++ b/vl.c @@ -3897,6 +3897,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "No machine found.\n"); exit(1); } + current_machine = machine; if (machine->hw_version) { qemu_set_version(machine->hw_version); @@ -4325,8 +4326,6 @@ int main(int argc, char **argv, char **envp) set_numa_modes(); - current_machine = machine; - /* init USB devices */ if (usb_enabled(false)) { if (foreach_device_config(DEV_USB, usb_parse) < 0) -- 1.8.1.4