summaryrefslogtreecommitdiffstats
path: root/trace/control-internal.h
diff options
context:
space:
mode:
authorPeter Maydell2018-02-08 11:16:59 +0100
committerPeter Maydell2018-02-08 11:16:59 +0100
commitb256b89c63c12e902645dd55e7b5362f60574742 (patch)
treef81e2794e18359d956eed6072b2b9375b32fefd2 /trace/control-internal.h
parentMerge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging (diff)
parenthbitmap: fix missing restore count when finish deserialization (diff)
downloadqemu-b256b89c63c12e902645dd55e7b5362f60574742.tar.gz
qemu-b256b89c63c12e902645dd55e7b5362f60574742.tar.xz
qemu-b256b89c63c12e902645dd55e7b5362f60574742.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
# gpg: Signature made Wed 07 Feb 2018 17:00:12 GMT # gpg: using RSA key 7DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" # Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB # Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E * remotes/jnsnow/tags/bitmaps-pull-request: hbitmap: fix missing restore count when finish deserialization Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/control-internal.h')
0 files changed, 0 insertions, 0 deletions