From d4e1b7034a91f96be7fe4019e7149ee3d92a6532 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:05:54 -0200
Subject: [PATCH 07/16] We need current machine defined sooner

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <78ae69983aad5b30f7ad35eccef8e3171bb9ae7e.1261501421.git.quintela@redhat.com>
Patchwork-id: 5893
O-Subject: [PATCH 02/11] We need current machine defined sooner
Bugzilla: 541731
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Dor Laor <dlaor@redhat.com>
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>

We need current_machine defined before the 1st call to register_savevm

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/vl.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/vl.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index ca6cd53..25197f1 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -5971,6 +5971,7 @@ int main(int argc, char **argv, char **envp)
             }
         }
     }
+    current_machine = machine;
 
 #ifdef CONFIG_QXL
     if(using_qxl) {
@@ -6389,8 +6390,6 @@ int main(int argc, char **argv, char **envp)
     machine->init(ram_size, vga_ram_size, boot_devices, ds,
                   kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
 
-    current_machine = machine;
-
     /* Set KVM's vcpu state to qemu's initial CPUState. */
     if (kvm_enabled()) {
         int ret;
-- 
1.6.3.rc4.29.g8146