summaryrefslogtreecommitdiffstats
path: root/include/exec/memory.h
diff options
context:
space:
mode:
authorPeter Maydell2020-09-23 16:11:38 +0200
committerPeter Maydell2020-09-23 16:11:38 +0200
commitc122bca9cd7b986be4d473240a4fec6315b7a2c2 (patch)
treeffe93494e45ab1ae727044b578f7019edbe0481c /include/exec/memory.h
parentMerge remote-tracking branch 'remotes/kraxel/tags/input-20200921-pull-request... (diff)
parentqemu-img: Support bitmap --merge into backing image (diff)
downloadqemu-c122bca9cd7b986be4d473240a4fec6315b7a2c2.tar.gz
qemu-c122bca9cd7b986be4d473240a4fec6315b7a2c2.tar.xz
qemu-c122bca9cd7b986be4d473240a4fec6315b7a2c2.zip
Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-09-21' into staging
bitmaps patches for 2020-09-21 - Eric Blake: Improve 'qemu-img bitmap --merge' by not opening backing images # gpg: Signature made Tue 22 Sep 2020 01:58:31 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-bitmaps-2020-09-21: qemu-img: Support bitmap --merge into backing image Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions