diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-14 13:44:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-14 13:44:06 +0100 |
| commit | 190c93c98283e75e1a9e01babd1ec14624cb6204 (patch) | |
| tree | 076088bb5b665d34db5920a1c3ca03071ae59289 /include/sysemu | |
| parent | 9358450e98ed4a5350df4754863d116ff2e6186c (diff) | |
| parent | 2aece63c8a9d2c3a8ff41d2febc4cdeff2633331 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* SCSI scanner support
* fixes to qemu-char and net exit
* FreeBSD fixes
* Other small bugfixes
# gpg: Signature made Wed 13 Jul 2016 12:30:11 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
hostmem: detect host backend memory is being used properly
hostmem: fix QEMU crash by 'info memdev'
char: do not use atexit cleanup handler
net: do not use atexit for cleanup
slirp: use exit notifier for slirp_smb_cleanup
tap: use an exit notifier to call down_script
util: Fix MIN_NON_ZERO
qemu-sockets: use qapi_free_SocketAddress in cleanup
disas: avoid including everything in headers compiled from C++
json-streamer: fix double-free on exiting during a parse
main-loop: check return value before using pointer
Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD.
scsi-bus: Use longer sense buffer with scanners
scsi-bus: Add SCSI scanner support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/char.h | 7 | ||||
| -rw-r--r-- | include/sysemu/hostmem.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 57df10aa00..0ea9eacc40 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -152,6 +152,13 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void qemu_chr_disconnect(CharDriverState *chr); /** + * @qemu_chr_cleanup: + * + * Delete all chardevs (when leaving qemu) + */ +void qemu_chr_cleanup(void); + +/** * @qemu_chr_new_noreplay: * * Create a new character backend from a URI. diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 9bc2e70d81..678232af40 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -54,7 +54,7 @@ struct HostMemoryBackend { /* protected */ uint64_t size; bool merge, dump; - bool prealloc, force_prealloc; + bool prealloc, force_prealloc, is_mapped; DECLARE_BITMAP(host_nodes, MAX_NODES + 1); HostMemPolicy policy; @@ -64,4 +64,6 @@ struct HostMemoryBackend { MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp); +void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped); +bool host_memory_backend_is_mapped(HostMemoryBackend *backend); #endif |