Received: from eggs.gnu.org ([2001:4830:134:3::10]:44345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKsXy-0007eq-EU for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:55:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKsXr-0006H3-DY for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:54:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKsXr-0006Gw-5t for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:54:51 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19HsoRc023088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 12:54:50 -0500 Date: Mon, 9 Feb 2015 17:54:48 +0000 From: Stefan Hajnoczi Message-ID: <20150209175448.GA18767@stefanha-thinkpad.redhat.com> References: <1423256778-3340-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gBBFr7Ir9EOA20Yy" Content-Disposition: inline In-Reply-To: <1423256778-3340-1-git-send-email-mreitz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 0/3] nbd: Drop BDS backpointer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , Paolo Bonzini , qemu-devel@nongnu.org --gBBFr7Ir9EOA20Yy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 06, 2015 at 04:06:15PM -0500, Max Reitz wrote: > Right now, bdrv_swap() on NBD BDSs results in a segmentation fault > pretty much all of the time. This series fixes this. >=20 > Note that this is not a common case, as bdrv_swap() is generally only > performed on root BDSs (there are exceptions, though) and NBD BDSs > normally have a format BDS above them. However, due to misconfiguration > (or maybe it is not even a misconfiguration, but just a strange > configuration) these cases may indeed occur. >=20 > I took the second patch in this series from my other series > "block: Rework bdrv_close_all()" (which has 21 patches itself and > depends on 64 other patches, so making this series rely on that one > probably would not have been a very good idea). >=20 >=20 > v2: > - Rename all functions which now take a BlockDriverState * instead of an > NbdClientSession * from nbd_client_session_* to nbd_client_* [Paolo] > - Rename nbd_client_close() in nbd.c to client_close() and make it > static; otherwise, it would conflict with the "new" nbd_client_close() > in block/nbd-client.c >=20 >=20 > git-backport-diff against v1: >=20 > Key: > [----] : patches are identical > [####] : number of functional differences between upstream/downstream pat= ch > [down] : patch is downstream-only > The flags [FC] indicate (F)unctional and (C)ontextual differences, respec= tively >=20 > 001/3:[0089] [FC] 'nbd: Drop BDS backpointer' > 002/3:[----] [--] 'iotests: Add "wait" functionality to _cleanup_qemu' > 003/3:[----] [--] 'iotests: Add test for drive-mirror with NBD target' >=20 >=20 > Max Reitz (3): > nbd: Drop BDS backpointer > iotests: Add "wait" functionality to _cleanup_qemu > iotests: Add test for drive-mirror with NBD target >=20 > block/nbd-client.c | 101 +++++++++++++++++++++--------------= ------ > block/nbd-client.h | 34 +++++++------- > block/nbd.c | 37 ++++++--------- > include/block/nbd.h | 1 - > nbd.c | 8 ++-- > tests/qemu-iotests/094 | 81 +++++++++++++++++++++++++++++++++ > tests/qemu-iotests/094.out | 11 +++++ > tests/qemu-iotests/common.qemu | 12 ++++- > tests/qemu-iotests/group | 1 + > 9 files changed, 191 insertions(+), 95 deletions(-) > create mode 100755 tests/qemu-iotests/094 > create mode 100644 tests/qemu-iotests/094.out >=20 > --=20 > 2.1.0 >=20 Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan --gBBFr7Ir9EOA20Yy Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJU2PRoAAoJEJykq7OBq3PIAIwH/ippxX2cjRlnqn1GpqBVSaBj RnQFmM3uHW9HdcFkTPbRimw9XD80C9xcy5fonlNDKOguP8LQn5emUSTq/Re3YAmO zGR0V87lIa+e9Lj9atM+OnMbSLYu2rC2sxxCQFN8W4cOwNvjV13DC2Jd0fB4eVdm SXGdnmoc3Nyb0RR6IKNdK6GgtwnQjjTsghYYMRkqzRksi28X+h95tBPCJJnGenZh tZrscwunRwLOrGQ/uaARJUIxWqiDrohO2LIS0fw/xknx4+V5T9O+H54ZzKPQCoHC UU3e0l0PNJBNXEBkMrIi/OHwdulp7SSNCUEMoLLzoh2OJZ1bzRxWUT+OkGY8dyg= =ft+I -----END PGP SIGNATURE----- --gBBFr7Ir9EOA20Yy--