From patchwork Thu Nov 7 13:12:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 289327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9880E2C00A0 for ; Fri, 8 Nov 2013 00:20:34 +1100 (EST) Received: from localhost ([::1]:40268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePVg-0004x1-Kn for incoming@patchwork.ozlabs.org; Thu, 07 Nov 2013 08:20:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePUD-0003M7-U0 for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:19:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VePU8-0007w8-Vz for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:19:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePU8-0007vz-Nm for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:18:56 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA7DCsNG008046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Nov 2013 08:12:55 -0500 Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rA7DCrMh010942; Thu, 7 Nov 2013 08:12:53 -0500 From: Stefan Hajnoczi To: Date: Thu, 7 Nov 2013 14:12:08 +0100 Message-Id: <1383829964-32364-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Stefan Hajnoczi , Anthony Liguori Subject: [Qemu-devel] [PULL for-1.7 00/36] Block patches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org All bug fixes with one exception: Jeff Cody's VHDX write support. The patches have been on the list and reviewed for a long time. They are self-contained and do not touch anything outside VHDX. They missed the soft freeze only because KVM Forum, so I feel they can be added at no risk. The following changes since commit 964668b03d26f0b5baa5e5aff0c966f4fcb76e9e: Update version for 1.7.0-rc0 release (2013-11-06 21:49:39 -0800) are available in the git repository at: git://github.com/stefanha/qemu.git block for you to fetch changes up to e78835b722eb26f5a56370166e99b69e9751ea2a: block: vhdx qemu-iotest - log replay of data sector (2013-11-07 13:58:59 +0100) ---------------------------------------------------------------- Andreas Tobler (1): block/raw-posix: fix FreeBSD compilation Fam Zheng (1): qapi: Fix comment for create-type to match code. Jeff Cody (26): block: qemu-iotests, add quotes to $TEST_IMG usage io pattern tests block: qemu-iotests, fix _make_test_img() to work with spaced pathnames block: qemu-iotests, add quotes to $TEST_IMG.base usage in 017 block: qemu-iotests, add quotes to $TEST_IMG usage in 019 block: qemu-iotests, removes duplicate double quotes in 039 block: qemu-iotests, add quotes to $TEST_IMG usage for 051 block: qemu-iotests, add quotes to $TEST_IMG usage in 061 block: vhdx - minor comments and typo correction. block: vhdx - add header update capability. block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header. block: vhdx - log support struct and defines block: vhdx - break endian translation functions out block: vhdx - update log guid in header, and first write tracker block: vhdx code movement - move vhdx_close() above vhdx_open() block: vhdx - log parsing, replay, and flush support block: vhdx - add region overlap detection for image files block: vhdx - add log write support block: vhdx write support block: vhdx - remove BAT file offset bit shifting block: vhdx - move more endian translations to vhdx-endian.c block: vhdx - break out code operations to functions block: vhdx - fix comment typos in header, fix incorrect struct fields block: vhdx - add .bdrv_create() support block: vhdx - update _make_test_img() to filter out vhdx options block: qemu-iotests for vhdx, add write test support block: vhdx qemu-iotest - log replay of data sector Max Reitz (2): qemu-iotests: Filter out actual image size in 067 block: Save errno before error_setg_errno Peter Lieven (1): block/vpc: fix virtual size for images created with disk2vhd Stefan Hajnoczi (5): blockdev: fix drive_init() opts and bs_opts leaks libqtest: rename qmp() to qmp_discard_response() libqtest: add qmp(fmt, ...) -> QDict* function blockdev-test: add test case for drive_add duplicate IDs qdev-monitor-test: add device_add leak test cases block.c | 2 +- block/Makefile.objs | 2 +- block/raw-posix.c | 3 +- block/vhdx-endian.c | 216 ++++ block/vhdx-log.c | 1010 ++++++++++++++++ block/vhdx.c | 1220 +++++++++++++++++--- block/vhdx.h | 178 ++- block/vpc.c | 9 + blockdev.c | 27 +- configure | 24 + qapi-schema.json | 2 +- tests/Makefile | 4 + tests/blockdev-test.c | 59 + tests/boot-order-test.c | 4 +- tests/fdc-test.c | 15 +- tests/ide-test.c | 10 +- tests/libqtest.c | 72 +- tests/libqtest.h | 51 +- tests/qdev-monitor-test.c | 81 ++ tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/019 | 6 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/051 | 8 +- tests/qemu-iotests/061 | 6 +- tests/qemu-iotests/064 | 11 + tests/qemu-iotests/064.out | 14 + tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/067.out | 10 +- tests/qemu-iotests/070 | 67 ++ tests/qemu-iotests/070.out | 8 + tests/qemu-iotests/common | 1 - tests/qemu-iotests/common.pattern | 12 +- tests/qemu-iotests/common.rc | 18 +- tests/qemu-iotests/group | 1 + .../sample_images/iotest-dirtylog-10G-4M.vhdx.bz2 | Bin 0 -> 4490 bytes 35 files changed, 2896 insertions(+), 261 deletions(-) create mode 100644 block/vhdx-endian.c create mode 100644 block/vhdx-log.c create mode 100644 tests/blockdev-test.c create mode 100644 tests/qdev-monitor-test.c create mode 100755 tests/qemu-iotests/070 create mode 100644 tests/qemu-iotests/070.out create mode 100644 tests/qemu-iotests/sample_images/iotest-dirtylog-10G-4M.vhdx.bz2