[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping |
Date: |
Tue, 22 Oct 2013 11:25:35 +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.
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 56b8643..b102275 100644
--- a/savevm.c
+++ b/savevm.c
@@ -668,7 +668,8 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t
block_offset,
int ret = f->ops->save_page(f, f->opaque, block_offset,
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
- Re: [Qemu-devel] [PATCH 04/17] qmp-command.hx: add missing docs for migration capabilites, (continued)
- [Qemu-devel] [PATCH 05/17] migration-local: add QEMUFileLocal with socket based QEMUFile, Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 06/17] migration-local: introduce qemu_fopen_socket_local(), Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 07/17] migration-local: add send_pipefd(), Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 08/17] migration-local: add recv_pipefd(), Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 09/17] migration-local: override before_ram_iterate to send pipefd, Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit, Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping,
Lei Li <=
- [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load, Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local, Lei Li, 2013/10/21
- [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE, Lei Li, 2013/10/21