diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-22 13:26:23 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-22 13:26:23 -0500 |
commit | f526f3c315d7c3ff7b7db39ae3a49f91d3a9986b (patch) | |
tree | dd24e41606c7bd9b53513571ed3b7864d71d237c /exec.c | |
parent | d3e2efc5b540c4e99ed5bcc0db3b1158ef52af43 (diff) | |
parent | aa723c23147e93fef8475bd80fd29e633378c34d (diff) | |
download | qemu-f526f3c315d7c3ff7b7db39ae3a49f91d3a9986b.zip qemu-f526f3c315d7c3ff7b7db39ae3a49f91d3a9986b.tar.gz qemu-f526f3c315d7c3ff7b7db39ae3a49f91d3a9986b.tar.bz2 |
Merge remote-tracking branch 'quintela/migration-next-20121017' into staging
* quintela/migration-next-20121017: (41 commits)
cpus: create qemu_in_vcpu_thread()
savevm: make qemu_file_put_notify() return errors
savevm: un-export qemu_file_set_error()
block-migration: handle errors with the return codes correctly
block-migration: Switch meaning of return value
block-migration: make flush_blks() return errors
buffered_file: buffered_put_buffer() don't need to set last_error
savevm: Only qemu_fflush() can generate errors
savevm: make qemu_fill_buffer() be consistent
savevm: unexport qemu_ftell()
savevm: unfold qemu_fclose_internal()
savevm: make qemu_fflush() return an error code
savevm: Remove qemu_fseek()
virtio-net: use qemu_get_buffer() in a temp buffer
savevm: unexport qemu_fflush
migration: make migrate_fd_wait_for_unfreeze() return errors
buffered_file: make buffered_flush return the error code
buffered_file: callers of buffered_flush() already check for errors
buffered_file: We can access directly to bandwidth_limit
buffered_file: unfold migrate_fd_close
...
Diffstat (limited to 'exec.c')
-rw-r--r-- | exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2449,7 +2449,7 @@ static ram_addr_t find_ram_offset(ram_addr_t size) return offset; } -static ram_addr_t last_ram_offset(void) +ram_addr_t last_ram_offset(void) { RAMBlock *block; ram_addr_t last = 0; |