From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzVKr-0001Ur-FH for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzVKp-0007aG-2p for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:17 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:36278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzVKo-0007Zq-So for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:15 -0400 From: Markus Armbruster Date: Wed, 17 Jul 2013 19:16:08 +0200 Message-Id: <1374081369-1511-7-git-send-email-armbru@redhat.com> In-Reply-To: <1374081369-1511-1-git-send-email-armbru@redhat.com> References: <1374081369-1511-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 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: aliguori@us.ibm.com, lersek@redhat.com, ehabkost@redhat.com 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 --- vl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 45b4c52..9387662 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.7.11.7