← Back to branch summary

~fboudra/qemu-linaro/new-upstream-release-1.2.0-2012.09-0ubuntu1

« back to all changes in this revision

Viewing changes to hw/xen_machine_pv.c

  • Committer: Fathi Boudra
  • Author(s): Fathi Boudra
  • Date: 2012-08-21 06:47:11 UTC
  • mfrom: (0.1.16)
  • Revision ID: fathi.boudra@linaro.org-20120821064711-7yxmubp2v8a44xce
Tags: 1.1.50-2012.08-0ubuntu1
https://launchpad.net/bugs/1030588
https://launchpad.net/bugs/1030594
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control: 
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xen_machine_pv.c
36
36
                        const char *initrd_filename,
37
37
                        const char *cpu_model)
38
38
{
39
 
    CPUState *env;
 
39
    X86CPU *cpu;
 
40
    CPUX86State *env;
40
41
    DriveInfo *dinfo;
41
42
    int i;
42
43
 
48
49
        cpu_model = "qemu32";
49
50
#endif
50
51
    }
51
 
    env = cpu_init(cpu_model);
 
52
    cpu = cpu_x86_init(cpu_model);
 
53
    env = &cpu->env;
52
54
    env->halted = 1;
53
55
 
54
56
    /* Initialize backend core & drivers */