summaryrefslogtreecommitdiffstats
path: root/include/exec/memory.h
diff options
context:
space:
mode:
authorStefan Hajnoczi2016-11-18 12:05:48 +0100
committerStefan Hajnoczi2016-11-18 12:05:48 +0100
commit363effe28b188460f8a0b075b841fdca1b2043d4 (patch)
treee61845188742ff93e0d16226947b63fe9ca1d290 /include/exec/memory.h
parentpc: fix FW_CFG_NB_CPUS to account for -device added CPUs (diff)
parentqapi-schema: clarify 'colo' state for MigrationStatus (diff)
downloadqemu-363effe28b188460f8a0b075b841fdca1b2043d4.tar.gz
qemu-363effe28b188460f8a0b075b841fdca1b2043d4.tar.xz
qemu-363effe28b188460f8a0b075b841fdca1b2043d4.zip
Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging
# gpg: Signature made Thu 17 Nov 2016 10:18:58 AM GMT # gpg: using RSA key 0xF30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" # gpg: aka "Laurent Vivier <laurent@vivier.eu>" # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * vivier/tags/trivial-patches-pull-request: qapi-schema: clarify 'colo' state for MigrationStatus Message-id: 1479378016-19022-1-git-send-email-laurent@vivier.eu Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions