1. 15 10月, 2011 14 次提交
  2. 12 10月, 2011 2 次提交
  3. 10 10月, 2011 3 次提交
  4. 09 10月, 2011 4 次提交
    • M
      Restore consistent formatting · 8acbc9b2
      malc 提交于
      Signed-off-by: Nmalc <av1474@comtv.ru>
      8acbc9b2
    • A
      Merge remote-tracking branch 'upstream' into memory/batch · df2921d3
      Avi Kivity 提交于
      * 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: NAvi Kivity <avi@redhat.com>
      df2921d3
    • S
      target-alpha: Fix compilation errors for 32 bit hosts · 02d6516c
      Stefan Weil 提交于
      On i386, these errors were reported:
      
      qemu/hw/alpha_dp264.c: In function ‘clipper_init’:
      qemu/hw/alpha_dp264.c:158: error: integer constant is too large for ‘unsigned long’ type
      
      qemu/hw/alpha_typhoon.c: In function ‘typhoon_init’:
      qemu/hw/alpha_typhoon.c:737: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:741: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:745: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:749: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:757: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:767: error: integer constant is too large for ‘long’ type
      qemu/hw/alpha_typhoon.c:772: error: integer constant is too large for ‘long’ type
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      02d6516c
    • B
      Merge branch 'axp-system-7' of git://repo.or.cz/qemu/rth · 9a7242f7
      Blue Swirl 提交于
      * 'axp-system-7' of git://repo.or.cz/qemu/rth:
        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.
      9a7242f7
  5. 08 10月, 2011 12 次提交
  6. 06 10月, 2011 5 次提交
    • A
      ppc64: Fix linker script · 7c0a3409
      Andreas Färber 提交于
      Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:
      
        LINK  ppc64-linux-user/qemu-ppc64
      /usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error
      collect2: ld gab 1 als Ende-Status zurück
      make[1]: *** [qemu-ppc64] Fehler 1
      make: *** [subdir-ppc64-linux-user] Fehler 2
      
      Fix by removing a leftover line in the ppc64 linker script.
      
      Cc: Gerd Hoffmann <kraxel@redhat.com>
      Cc: Blue Swirl <blauwirbel@gmail.com>
      Signed-off-by: NAndreas Färber <afaerber@suse.de>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      7c0a3409
    • B
      pseries: Implement set-time-of-day RTAS function · ac26f8c3
      Breno Leitao 提交于
      Currently there is no implementation for set-time-of-day rtas function,
      which causes the following warning "setting the clock failed (-1)" on
      the guest.
      
      This patch just creates this function, get the timedate diff and store in
      the papr environment, so that the correct value will be returned by
      get-time-of-day.
      
      In order to try it, just adjust the hardware time, run hwclock --systohc,
      so that, on when the system runs hwclock --hctosys, the value is correctly
      adjusted, i.e. the host time plus the timediff.
      Signed-off-by: NBreno Leitao <brenohl@br.ibm.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      ac26f8c3
    • D
      pseries: Refactor spapr irq allocation · e6c866d4
      David Gibson 提交于
      Paulo Bonzini changed the original spapr code, which manually assigned irq
      numbers for each virtual device, to allocate them automatically from the
      device initialization. That allowed spapr virtual devices to be constructed
      with -device, which is a good start.  However, the way that patch worked
      doesn't extend nicely for the future when we want to support devices other
      than sPAPR VIO devices (e.g. virtio and PCI).
      
      This patch rearranges the irq allocation to be global across the sPAPR
      environment, so it can be used by other bus types as well.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      e6c866d4
    • A
      PPC: Clean up BookE timer code · 44427c40
      Alexander Graf 提交于
      The BookE timer code had some written-but-not-read variables. Get rid
      of them.
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      44427c40
    • F
      PPC: booke timers · ddd1055b
      Fabien Chouteau 提交于
      While working on the emulation of the freescale p2010 (e500v2) I realized that
      there's no implementation of booke's timers features. Currently mpc8544 uses
      ppc_emb (ppc_emb_timers_init) which is close but not exactly like booke (for
      example booke uses different SPR).
      Signed-off-by: NFabien Chouteau <chouteau@adacore.com>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      ddd1055b