From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tWR-0007Fe-FB for qemu-devel@nongnu.org; Mon, 23 May 2016 13:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4tWL-0005OC-A8 for qemu-devel@nongnu.org; Mon, 23 May 2016 13:20:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tWL-0005O8-3w for qemu-devel@nongnu.org; Mon, 23 May 2016 13:20:01 -0400 From: Amit Shah Date: Mon, 23 May 2016 22:49:42 +0530 Message-Id: Subject: [Qemu-devel] [PULL 0/5] migration fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: gkurz@linux.vnet.ibm.com, Markus Armbruster , jjherne@linux.vnet.ibm.com, Peter Maydell Cc: qemu list , Juan Quintela , "Dr. David Alan Gilbert" , Amit Shah The following changes since commit 65603e2fc18b48e6e55a3dd693669413141694ec: tci: do not include exec/exec-all.h (2016-05-20 15:07:46 +0100) are available in the git repository at: https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-2.7-1 for you to fetch changes up to fe904ea8242cbae2d7e69c052c754b8f5f1ba1d6: migration: regain control of images when migration fails to complete (2016-05-23 22:19:36 +0530) ---------------------------------------------------------------- migration fixes: - ensure src block devices continue fine after a failed migration - fail on migration blockers; helps 9p savevm/loadvm - move autoconverge commands out of experimental state - move the migration-specific qjson in migration/ ---------------------------------------------------------------- Greg Kurz (2): savevm: fail if migration blockers are present migration: regain control of images when migration fails to complete Jason J. Herne (1): migration: Promote improved autoconverge commands out of experimental state Markus Armbruster (2): migration: Move qjson.[ch] to migration/ migration/qjson: Drop gratuitous use of QOM Makefile.objs | 1 - hmp.c | 28 ++++----- include/migration/migration.h | 1 + include/migration/qjson.h | 29 ++++++++++ include/migration/vmstate.h | 2 +- include/qjson.h | 29 ---------- migration/Makefile.objs | 1 + migration/migration.c | 94 ++++++++++++++++++------------ migration/qjson.c | 113 ++++++++++++++++++++++++++++++++++++ migration/ram.c | 4 +- migration/savevm.c | 4 +- migration/vmstate.c | 1 - qapi-schema.json | 54 +++++++++--------- qjson.c | 129 ------------------------------------------ qmp-commands.hx | 22 +++---- tests/Makefile | 2 +- 16 files changed, 260 insertions(+), 254 deletions(-) create mode 100644 include/migration/qjson.h delete mode 100644 include/qjson.h create mode 100644 migration/qjson.c delete mode 100644 qjson.c -- 2.5.5