[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping |
Date: |
Mon, 2 Dec 2013 17:19:09 +0800 |
As callback save_page will always be opened by
qemu_fopen_socket_local(), and without unix_page_flipping
it will return RAM_SAVE_CONTROL_NOT_SUPP, it leads to a
wrong qemu_file_set_error() based on the current logic.
So this patch adds RAM_SAVE_CONTROL_NOT_SUPP to the check.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Lei Li <address@hidden>
---
savevm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/savevm.c b/savevm.c
index 06c1f29..137e74f 100644
--- a/savevm.c
+++ b/savevm.c
@@ -668,7 +668,8 @@ size_t ram_control_save_page(QEMUFile *f, MemoryRegion *mr,
ram_addr_t offset,
int ret = f->ops->save_page(f, f->opaque, mr, offset,
size, bytes_sent);
- if (ret != RAM_SAVE_CONTROL_DELAYED) {
+ if (ret != RAM_SAVE_CONTROL_DELAYED &&
+ ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (bytes_sent && *bytes_sent > 0) {
qemu_update_position(f, *bytes_sent);
} else if (ret < 0) {
--
1.7.7.6
- [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd(), (continued)
[Qemu-devel] [PATCH 07/17] save_page: replace block_offset with a MemoryRegion, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 08/17] migration-local: override save_page for page transmit, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping,
Lei Li <=
[Qemu-devel] [PATCH 10/17] add unix_msgfd_lookup() to callback get_buffer, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 11/17] add argument ram_addr_t to hook_ram_load, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 14/17] add new RunState RUN_STATE_MEMORY_STALE, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping, Lei Li, 2013/12/02
[Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities, Lei Li, 2013/12/02
Re: [Qemu-devel] [PATCH 0/17 v5] Localhost migration with side channel for ram, Paolo Bonzini, 2013/12/03