diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-23 01:51:57 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:04 +0200 |
| commit | a0595d9eb85c64e00d03c4d696bb1028e99dfcbc (patch) | |
| tree | 071d31eae6de5301efaeb2fbb757dc6a796ceefc | |
| parent | 4bd7466166b8c1b612c7f01a124b24ab2a0ace14 (diff) | |
| download | qemu-a0595d9eb85c64e00d03c4d696bb1028e99dfcbc.tar.gz | |
xen_machine_pv: Use cpu_x86_init() to obtain X86CPU
Needed for moving halted field to CPUState.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
| -rw-r--r-- | hw/xen_machine_pv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 7eee770eea..4b72aa7557 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -36,6 +36,7 @@ static void xen_init_pv(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { + X86CPU *cpu; CPUX86State *env; DriveInfo *dinfo; int i; @@ -48,7 +49,8 @@ static void xen_init_pv(ram_addr_t ram_size, cpu_model = "qemu32"; #endif } - env = cpu_init(cpu_model); + cpu = cpu_x86_init(cpu_model); + env = &cpu->env; env->halted = 1; /* Initialize backend core & drivers */ |