1. 22 7月, 2016 12 次提交
  2. 21 7月, 2016 21 次提交
  3. 19 7月, 2016 7 次提交
    • P
      disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers · 5d321734
      Peter Maydell 提交于
      disas/bfd.h defines ATTRIBUTE_UNUSED, but unfortunately the
      ALSA system headers also define this macro, which means that
      you can get a compilation failure if building with ALSA and
      any files happen to include the alsa headers before bfd.h
      rather than the other way around.
      
      This is unfortunate namespace pollution by the ALSA headers but
      we can work around it. Add an #ifndef guard to bfd.h and remove
      the unnecessary extra definition in disas/arm.c to fix this.
      Reported-by: NBALATON Zoltan <balaton@eik.bme.hu>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 1468937076-21503-1-git-send-email-peter.maydell@linaro.org
      5d321734
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · a3b34377
      Peter Maydell 提交于
      * two old patches from prospective GSoC students
      * i386 -kernel device tree support
      * Coverity fix
      * memory usage improvement from Peter
      * checkpatch fix
      * g_path_get_dirname cleanup
      * caching of block status for iSCSI
      
      # gpg: Signature made Tue 19 Jul 2016 07:43:41 BST
      # gpg:                using RSA key 0xBFFBD25F78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # 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:
        target-i386: Remove redundant HF_SOFTMMU_MASK
        block/iscsi: allow caching of the allocation map
        block/iscsi: fix rounding in iscsi_allocationmap_set
        Move README to markdown
        cpu-exec: Move down some declarations in cpu_exec()
        exec: avoid realloc in phys_map_node_reserve
        checkpatch: consider git extended headers valid patches
        megasas: remove useless check for cmd->frame
        compiler: never omit assertions if using a static analysis tool
        hw/i386: add device tree support
        Changed malloc to g_malloc, free to g_free in bsd-user/qemu.h
        use g_path_get_dirname instead of dirname
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a3b34377
    • P
      Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160718-1' into staging · db3e07db
      Peter Maydell 提交于
      Make IRC a little less noisy
      
      # gpg: Signature made Mon 18 Jul 2016 16:42:57 BST
      # gpg:                using RSA key 0xFBD0DB095A9E2A44
      # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
      # Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44
      
      * remotes/stsquad/tags/pull-travis-20160718-1:
        .travis.yml: Disable IRC build status updates from forks
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      db3e07db
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160719-1' into staging · 1df8ffb2
      Peter Maydell 提交于
      vnc: bugfixes for -rc0
      
      # gpg: Signature made Tue 19 Jul 2016 08:27:05 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-vnc-20160719-1:
        vnc-tight: fix regression with libxenstore
        vnc-enc-tight: fix off-by-one bug
        vnc: make sure we finish disconnect
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1df8ffb2
    • P
      Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' into staging · 68ab919f
      Peter Maydell 提交于
      Update OpenBIOS images
      
      # gpg: Signature made Tue 19 Jul 2016 07:42:30 BST
      # gpg:                using RSA key 0x5BC2C56FAE0F321F
      # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
      # Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F
      
      * remotes/mcayland/tags/qemu-openbios-signed:
        Update OpenBIOS images to e79bca6 built from submodule.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      68ab919f
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · d25321f2
      Peter Maydell 提交于
      # gpg: Signature made Tue 19 Jul 2016 03:33:40 BST
      # gpg:                using RSA key 0xEF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        e1000e: fix building without CONFIG_VMXNET3_PCI
        MAINTAINERS: release Scott from being a rocker maintainer
        tap: fix memory leak on failure to create a multiqueue tap device
        net: fix incorrect argument to iov_to_buf
        net: fix incorrect access to pointer
        e1000e: fix incorrect access to pointer
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d25321f2
    • P
      Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging · ad31cd4c
      Peter Maydell 提交于
      # gpg: Signature made Mon 18 Jul 2016 23:53:15 BST
      # gpg:                using RSA key 0x7DEF8106AAFC390E
      # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
      # Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
      #      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
      
      * remotes/jnsnow/tags/ide-pull-request:
        block: ignore flush requests when storage is clean
        tests: in IDE and AHCI tests perform DMA write before flushing
        ide: set retry_unit for PIO and FLUSH requests
        ide: refactor retry_unit set and clear into separate function
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ad31cd4c