From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzFt-00072o-8N for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOzFk-00020v-5Z for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:29 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:55991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzFj-00020K-Fl for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:20 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2013 05:46:15 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 3B064394004D for ; Thu, 26 Sep 2013 05:45:57 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8Q0IXJr41222214 for ; Thu, 26 Sep 2013 05:48:33 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8Q0GCTd028320 for ; Thu, 26 Sep 2013 05:46:12 +0530 From: Wenchao Xia Date: Thu, 26 Sep 2013 08:16:01 +0800 Message-Id: <1380154568-5339-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V3 0/7] export internal snapshot by qemu-nbd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Wenchao Xia , stefanha@gmail.com This series allow user to read internal snapshot's contents without qemu-img convert. V2: Address Stefan's comments: 02: add 'fall through' comments in the case statement. 03: add doc about the difference of internal snapshot and backing chain snapshot, which is used in previous '--snapshot' parameter. Other: 01,04: rebased on upstream with conflict resolved. v3: Address Paolo's comments: 02: add parameter "-l snapshot_id_or_name", rename options snapshot-load to load-snapshot, use QemuOpts. 03: rename snapshot-load to load-snapshot. 04: related change to test both -l and -L case. 05-07: add similar parameter for qemu-img convert. Other: 01: foldered original snapshot logic into function bdrv_snapshot_load_tmp_by_id_or_name(), since multiple caller present in this version. Refined error message from ", reason: %s" to ": %s". 02: Refined error message from ", reason: %s" to ": %s". 03: Rename PARAM to SNAPSHOT_PARAM. Wenchao Xia (7): 1 snapshot: distinguish id and name in load_tmp 2 qemu-nbd: support internal snapshot export 3 qemu-nbd: add doc for internal snapshot export 4 qemu-iotests: add 058 internal snapshot export with qemu-nbd case 5 qemu-img: add -L for snapshot in convert 6 qemu-img: add doc for param -L in convert 7 qemu-iotests: add test for snapshot in qemu-img convert block/qcow2-snapshot.c | 16 +++++- block/qcow2.h | 5 ++- block/snapshot.c | 76 +++++++++++++++++++++++++++- include/block/block_int.h | 4 +- include/block/snapshot.h | 13 ++++- qemu-img-cmds.hx | 2 +- qemu-img.c | 32 +++++++++--- qemu-img.texi | 7 ++- qemu-nbd.c | 46 ++++++++++++++++- qemu-nbd.texi | 11 ++++- tests/qemu-iotests/058 | 121 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/058.out | 44 ++++++++++++++++ tests/qemu-iotests/check | 1 + tests/qemu-iotests/group | 1 + 14 files changed, 359 insertions(+), 20 deletions(-) create mode 100755 tests/qemu-iotests/058 create mode 100644 tests/qemu-iotests/058.out