Skip to content
  • Peter Maydell's avatar
    460b6c8e
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 460b6c8e
    Peter Maydell authored
    * Speed up AddressSpaceDispatch creation (Alexey)
    * Fix kvm.c assert (David)
    * Memory fixes and further speedup (me)
    * Persistent reservation manager infrastructure (me)
    * virtio-serial: add enable_backend callback (Pavel)
    * chardev GMainContext fixes (Peter)
    
    # gpg: Signature made Fri 22 Sep 2017 20:07:33 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: (32 commits)
      chardev: remove context in chr_update_read_handler
      chardev: use per-dev context for io_add_watch_poll
      chardev: add Chardev.gcontext field
      chardev: new qemu_chr_be_update_read_handlers()
      scsi: add persistent reservation manager using qemu-pr-helper
      scsi: add multipath support to qemu-pr-helper
      scsi: build qemu-pr-helper
      scsi, file-posix: add support for persistent reservation management
      memory: Share special empty FlatView
      memory: seek FlatView sharing candidates among children subregions
      memory: trace FlatView creation and destruction
      memory: Create FlatView directly
      memory: Get rid of address_space_init_shareable
      memory: Rework "info mtree" to print flat views and dispatch trees
      memory: Do not allocate FlatView in address_space_init
      memory: Share FlatView's and dispatch trees between address spaces
      memory: Move address_space_update_ioeventfds
      memory: Alloc dispatch tree where topology is generared
      memory: Store physical root MR in FlatView
      memory: Rename mem_begin/mem_commit/mem_add helpers
      ...
    
    # Conflicts:
    #	configure
    460b6c8e
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
    Peter Maydell authored
    * Speed up AddressSpaceDispatch creation (Alexey)
    * Fix kvm.c assert (David)
    * Memory fixes and further speedup (me)
    * Persistent reservation manager infrastructure (me)
    * virtio-serial: add enable_backend callback (Pavel)
    * chardev GMainContext fixes (Peter)
    
    # gpg: Signature made Fri 22 Sep 2017 20:07:33 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: (32 commits)
      chardev: remove context in chr_update_read_handler
      chardev: use per-dev context for io_add_watch_poll
      chardev: add Chardev.gcontext field
      chardev: new qemu_chr_be_update_read_handlers()
      scsi: add persistent reservation manager using qemu-pr-helper
      scsi: add multipath support to qemu-pr-helper
      scsi: build qemu-pr-helper
      scsi, file-posix: add support for persistent reservation management
      memory: Share special empty FlatView
      memory: seek FlatView sharing candidates among children subregions
      memory: trace FlatView creation and destruction
      memory: Create FlatView directly
      memory: Get rid of address_space_init_shareable
      memory: Rework "info mtree" to print flat views and dispatch trees
      memory: Do not allocate FlatView in address_space_init
      memory: Share FlatView's and dispatch trees between address spaces
      memory: Move address_space_update_ioeventfds
      memory: Alloc dispatch tree where topology is generared
      memory: Store physical root MR in FlatView
      memory: Rename mem_begin/mem_commit/mem_add helpers
      ...
    
    # Conflicts:
    #	configure
Loading