← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to target-ppc/kvm.c

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-ppc/kvm.c
44
44
 
45
45
int kvm_arch_init_vcpu(CPUState *cenv)
46
46
{
47
 
    return 0;
 
47
    int ret = 0;
 
48
    struct kvm_sregs sregs;
 
49
 
 
50
    sregs.pvr = cenv->spr[SPR_PVR];
 
51
    ret = kvm_vcpu_ioctl(cenv, KVM_SET_SREGS, &sregs);
 
52
 
 
53
    return ret;
48
54
}
49
55
 
50
56
int kvm_arch_put_registers(CPUState *env)
118
124
    return 0;
119
125
}
120
126
 
 
127
#if defined(TARGET_PPCEMB)
 
128
#define PPC_INPUT_INT PPC40x_INPUT_INT
 
129
#elif defined(TARGET_PPC64)
 
130
#define PPC_INPUT_INT PPC970_INPUT_INT
 
131
#else
 
132
#define PPC_INPUT_INT PPC6xx_INPUT_INT
 
133
#endif
 
134
 
121
135
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
122
136
{
123
137
    int r;
127
141
     * interrupt, reset, etc) in PPC-specific env->irq_input_state. */
128
142
    if (run->ready_for_interrupt_injection &&
129
143
        (env->interrupt_request & CPU_INTERRUPT_HARD) &&
130
 
        (env->irq_input_state & (1<<PPC40x_INPUT_INT)))
 
144
        (env->irq_input_state & (1<<PPC_INPUT_INT)))
131
145
    {
132
146
        /* For now KVM disregards the 'irq' argument. However, in the
133
147
         * future KVM could cache it in-kernel to avoid a heavyweight exit