From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0F39-0004gZ-9d for qemu-devel@nongnu.org; Thu, 26 Jun 2014 15:09:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0F33-0002qt-6P for qemu-devel@nongnu.org; Thu, 26 Jun 2014 15:09:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0F32-0002qk-UE for qemu-devel@nongnu.org; Thu, 26 Jun 2014 15:09:29 -0400 From: Max Reitz Date: Thu, 26 Jun 2014 21:09:20 +0200 Message-Id: <1403809762-4858-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 0/2] block: Fix unset "filename" for certain drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz For some protocol block drivers, the "filename" attribute in their BDSs is unset due to bdrv_file_open() removing it from the options QDict before bdrv_open_common() is able to copy it into the BDS. Fix this by not removing it until until bdrv_open_common() has indeed copied it. v2: - Patch 1: Only remove "filename" from the QDict if it has been parsed before; this prevents removal of the entry if it is given for some driver which supports neither parsing not filenames at all (such as all non-protocol drivers) which would then break test 051 [Stefan] - Patch 2: Fixed the headline of the test output git-backport-diff against v1: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/2:[0014] [FC] 'block: Do not prematurely remove "filename"' 002/2:[0002] [FC] 'iotests: Add test for set "filename" for NBD' Max Reitz (2): block: Do not prematurely remove "filename" iotests: Add test for set "filename" for NBD block.c | 24 +++++++++++----- tests/qemu-iotests/097 | 72 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/097.out | 13 +++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 103 insertions(+), 7 deletions(-) create mode 100755 tests/qemu-iotests/097 create mode 100644 tests/qemu-iotests/097.out -- 2.0.0