1. 28 1月, 2015 9 次提交
  2. 27 1月, 2015 28 次提交
  3. 26 1月, 2015 3 次提交
    • P
      Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging · 074092d0
      Peter Maydell 提交于
      * remotes/sstabellini/xen-2015-01-26:
        fix QEMU build on Xen/ARM
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      074092d0
    • S
      fix QEMU build on Xen/ARM · d01a5a3f
      Stefano Stabellini 提交于
      xen_get_vmport_regs_pfn should take a xen_pfn_t argument, not an
      unsigned long argument (in fact xen_pfn_t is defined as uint64_t on
      ARM).
      
      Also use xc_hvm_param_get instead of the deprecated xc_get_hvm_param.
      Signed-off-by: NStefano Stabellini <stefano.stabellini@eu.citrix.com>
      Reviewed-by: NDon Slutz <dslutz@verizon.com>
      d01a5a3f
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 0c28d0d0
      Peter Maydell 提交于
      - Many fixes from the floor as usual
      - New "edu" device (v1->v2: fix 32-bit compilation)
      - Disabling HLE and RTM on Haswell & Broadwell
      - kvm_stat updates
      - Added --enable-modules to Travis, in preparation for switching
        the default
      
      # gpg: Signature made Mon 26 Jan 2015 11:44:40 GMT using RSA key ID 78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * remotes/bonzini/tags/for-upstream:
        kvm_stat: Add RESET support for perf event ioctl
        target-i386: Disable HLE and RTM on Haswell & Broadwell
        sparse: Fix build with sparse on .S files
        exec: fix madvise of NULL pointer
        .travis.yml: Add "--enable-modules"
        apic: do not dereference pointer before it is checked for NULL
        kvm_stat: Print errno when syscall to perf_event_open() fails
        kvm_stat: Update exit reasons to the latest defintion
        kvm_stat: Add aarch64 support
        hw: misc, add educational driver
        vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*
        qemu-timer: introduce timer_deinit
        qemu-timer: add timer_init and timer_init_ns/us/ms
        target-i386: make xmm_regs 512-bit wide
        target-i386: use vmstate_offset_sub_array for AVX registers
        tests/multiboot: Add test for modules
        multiboot: Fix offset of bootloader name
        tests/multiboot: Update reference output
        pc: fix KVM features in pc-1.3 and earlier machine types
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      0c28d0d0