« Previous | Next » 

Revision df2921d3

IDdf2921d326d0903ff684759ac8508f87396b7018

Added by Avi Kivity over 12 years ago

Merge remote-tracking branch 'upstream' into memory/batch

  • upstream: (87 commits)
    target-alpha: Fix compilation errors for 32 bit hosts
    target-alpha: Add high-resolution access to wall clock and an alarm.
    target-alpha: Implement HALT IPR.
    target-alpha: Implement WAIT IPR.
    target-alpha: Add CLIPPER emulation.
    target-alpha: Add custom PALcode image for CLIPPER emulation.
    target-alpha: Honor icount for RPCC instruction.
    tcg/s390: Remove unused tcg_out_addi()
    tcg/ia64: Remove unused tcg_out_addi()
    ARM: fix segfault
    ppc64: Fix linker script
    pseries: Implement set-time-of-day RTAS function
    pseries: Refactor spapr irq allocation
    PPC: Clean up BookE timer code
    PPC: booke timers
    KVM: PPC: Use HIOR setting for -M pseries with PR KVM
    KVM: Update kernel headers
    KVM: Update kernel headers
    PPC: Fix heathrow PIC to use little endian MMIO
    PPC: Fix via-cuda memory registration
    ...

Conflicts:
hw/milkymist-uart.c
hw/ppce500_mpc8544ds.c

Signed-off-by: Avi Kivity <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted