]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 10 Jan 2015 21:02:23 +0000 (21:02 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 10 Jan 2015 21:02:23 +0000 (21:02 +0000)
commitaaf03019175949eda5087329448b8a0033b89479
tree5e83271283bc2c67171c5ffd8e50e1ee4b977711
parent97052d64e4fb934bcf25f4a6b42dc06f6ecbf9eb
parenta1666142db623365b2e7619f01c1cbb72d62b514
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc: resizeable ROM blocks

This makes ROM blocks resizeable.  This infrastructure is required for other
functionality we have queued.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 08 Jan 2015 11:19:24 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  acpi-build: make ROMs RAM blocks resizeable
  memory: API to allocate resizeable RAM MR
  arch_init: support resizing on incoming migration
  exec: qemu_ram_alloc_resizeable, qemu_ram_resize
  exec: split length -> used_length/max_length
  exec: cpu_physical_memory_set/clear_dirty_range
  memory: add memory_region_set_size

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
exec.c
hw/core/loader.c
include/exec/cpu-all.h
include/hw/loader.h