diff options
| author | Peter Maydell | 2016-02-05 15:20:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-05 15:20:46 +0100 |
| commit | ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6 (patch) | |
| tree | 1ed2c16f95bcc6d5268afde9ca2a8321930b47a6 /include/exec | |
| parent | all: Clean up includes (diff) | |
| parent | migration: fix bad string passed to error_report() (diff) | |
| download | qemu-ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6.tar.gz qemu-ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6.tar.xz qemu-ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6.zip | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-2' into staging
Migration pull req.
Small fixes, nothing major.
# gpg: Signature made Fri 05 Feb 2016 13:51:30 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/migration-for-2.6-2:
migration: fix bad string passed to error_report()
static checker: e1000-82540em got aliased to e1000
migration: remove useless code.
qmp-commands.hx: Document the missing options for migration capability commands
qmp-commands.hx: Fix the missing options for migration parameters commands
migration/ram: Fix some helper functions' parameter to use PageSearchStatus
savevm: Split load vm state function qemu_loadvm_state
migration: rename 'file' in MigrationState to 'to_dst_file'
ram: Split host_from_stream_offset() into two helper functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/ram_addr.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index ef1489da77..606e277092 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -38,10 +38,14 @@ struct RAMBlock { int fd; }; +static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset) +{ + return (b && b->host && offset < b->used_length) ? true : false; +} + static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset) { - assert(offset < block->used_length); - assert(block->host); + assert(offset_in_ramblock(block, offset)); return (char *)block->host + offset; } |