← 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/apic_common.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/apic_common.c
43
43
        trace_cpu_get_apic_base((uint64_t)s->apicbase);
44
44
        return s->apicbase;
45
45
    } else {
46
 
        trace_cpu_get_apic_base(0);
47
 
        return 0;
 
46
        trace_cpu_get_apic_base(MSR_IA32_APICBASE_BSP);
 
47
        return MSR_IA32_APICBASE_BSP;
48
48
    }
49
49
}
50
50
 
201
201
    s->timer_expiry = -1;
202
202
}
203
203
 
 
204
void apic_designate_bsp(DeviceState *d)
 
205
{
 
206
    if (d == NULL) {
 
207
        return;
 
208
    }
 
209
 
 
210
    APICCommonState *s = APIC_COMMON(d);
 
211
    s->apicbase |= MSR_IA32_APICBASE_BSP;
 
212
}
 
213
 
204
214
static void apic_reset_common(DeviceState *d)
205
215
{
206
216
    APICCommonState *s = DO_UPCAST(APICCommonState, busdev.qdev, d);
207
217
    APICCommonClass *info = APIC_COMMON_GET_CLASS(s);
208
218
    bool bsp;
209
219
 
210
 
    bsp = cpu_is_bsp(s->cpu_env);
 
220
    bsp = cpu_is_bsp(x86_env_get_cpu(s->cpu_env));
211
221
    s->apicbase = 0xfee00000 |
212
222
        (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;
213
223