diff mbox

[6/7] vl: Set current_machine early

Message ID 1374081369-1511-7-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster July 17, 2013, 5:16 p.m. UTC 
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 <armbru@redhat.com>
---
 vl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Eric Blake July 17, 2013, 7:23 p.m. UTC | #1 
On 07/17/2013 11:16 AM, Markus Armbruster wrote:
> 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 <armbru@redhat.com>
> ---
>  vl.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

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)