Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* RAMBlock vs. MemoryRegion cleanups from Fam
* mru_section optimization from Fam
* memory.txt improvements from Peter and Xiaoqiang
* i8257 fix from Hervé
* -daemonize fix
* Cleanups and small fixes from Alex, Praneith, Wei
# gpg: Signature made Mon 07 Mar 2016 17:08:59 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream:
scsi-bus: Remove tape command from scsi_req_xfer
kvm/irqchip: use bitmap utility for gsi tracking
MAINTAINERS: Add entry for include/sysemu/kvm*.h
doc/memory.txt: correct description of MemoryRegionOps fields
doc/memory.txt: correct a logic error
icount: possible options for sleep are on or off
exec: Introduce AddressSpaceDispatch.mru_section
exec: Factor out section_covers_addr
exec: Pass RAMBlock pointer to qemu_ram_free
memory: Drop MemoryRegion.ram_addr
memory: Implement memory_region_get_ram_addr with mr->ram_block
memory: Move assignment to ram_block to memory_region_init_*
exec: Return RAMBlock pointer from allocating functions
i8257: fix Terminal Count status
log: do not log if QEMU is daemonized but without -D
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- cpus.c 2 additions, 2 deletionscpus.c
- cputlb.c 2 additions, 2 deletionscputlb.c
- docs/memory.txt 6 additions, 5 deletionsdocs/memory.txt
- exec.c 57 additions, 50 deletionsexec.c
- hw/dma/i8257.c 4 additions, 0 deletionshw/dma/i8257.c
- hw/misc/ivshmem.c 6 additions, 3 deletionshw/misc/ivshmem.c
- hw/scsi/scsi-bus.c 0 additions, 1 deletionhw/scsi/scsi-bus.c
- include/exec/memory.h 1 addition, 8 deletionsinclude/exec/memory.h
- include/exec/ram_addr.h 12 additions, 12 deletionsinclude/exec/ram_addr.h
- kvm-all.c 12 additions, 25 deletionskvm-all.c
- memory.c 32 additions, 24 deletionsmemory.c
- qemu-options.hx 3 additions, 3 deletionsqemu-options.hx
- scripts/dump-guest-memory.py 1 addition, 1 deletionscripts/dump-guest-memory.py
- util/log.c 5 additions, 2 deletionsutil/log.c
Loading
Please register or sign in to comment