From patchwork Mon Jun 23 08:35:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 362687 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 25D5B14007F for ; Mon, 23 Jun 2014 18:36:29 +1000 (EST) Received: from localhost ([::1]:51813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wyzjn-0004oX-AA for incoming@patchwork.ozlabs.org; Mon, 23 Jun 2014 04:36:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyzjO-0004X9-Nq for qemu-devel@nongnu.org; Mon, 23 Jun 2014 04:36:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WyzjF-0000av-Nu for qemu-devel@nongnu.org; Mon, 23 Jun 2014 04:36:02 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:44529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyzjF-0000al-H6 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 04:35:53 -0400 Received: by mail-wi0-f170.google.com with SMTP id cc10so3748371wib.5 for ; Mon, 23 Jun 2014 01:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=4v5MjIi2hWghmrxV4nC3NJ+/ap9QuZx2XdvECU8Tub0=; b=sKO3pZHxODwvAfBw/kMxJfChfmSLcKQ3brPL8z3Th4qgtJDOxJv8Tz3vPlLg/g5dIl NlMg5oSkRiy1HC+m6tUtgajtzJ7PQ3SrCjUvhGQ+SqKzh78XgoIqOWv5q7VwLqkLYh8+ 6d8AZR4tEzBHQKUIJlWLhfgDYMupYTbyuT/MWDZMBilaAF/T4nyPtUTrWB9Jbbe5pvYE wxv8nDf4ImKfYFl9RrbOnsc7lyDcql3HN5AuaAWbZX09BQwFC22oEEng9telZYPhZqY+ MJQic2fc2GNFOpGR59IoZ3N+ux/uPszeAywgJmIj/wTe9le2h+fWRihtLOakoRF3RL5R cc/Q== X-Received: by 10.194.178.7 with SMTP id cu7mr10359313wjc.54.1403512552528; Mon, 23 Jun 2014 01:35:52 -0700 (PDT) Received: from localhost (061238043003.ctinets.com. [61.238.43.3]) by mx.google.com with ESMTPSA id hb8sm22878555wib.12.2014.06.23.01.35.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2014 01:35:51 -0700 (PDT) Date: Mon, 23 Jun 2014 16:35:44 +0800 From: Stefan Hajnoczi To: Max Reitz Message-ID: <20140623083544.GA10862@stefanha-thinkpad.redhat.com> References: <1403043250-28472-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1403043250-28472-1-git-send-email-mreitz@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22a Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: Re: [Qemu-devel] [PATCH 0/2] block: Fix unset "filename" for certain drivers 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 On Wed, Jun 18, 2014 at 12:14:08AM +0200, Max Reitz wrote: > 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. > > > Max Reitz (2): > block: Do not prematurely remove "filename" > iotests: Add test for set "filename" for NBD > > block.c | 12 ++++++-- > tests/qemu-iotests/097 | 72 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/097.out | 13 +++++++++ > tests/qemu-iotests/group | 1 + > 4 files changed, 95 insertions(+), 3 deletions(-) > create mode 100755 tests/qemu-iotests/097 > create mode 100644 tests/qemu-iotests/097.out Please check qemu-iotests 051. Dropping from block queue for now. 051 5s ... - output mismatch (see 051.out.bad) --- 051.out 2014-06-20 15:12:57.034266987 +0800 +++ 051.out.bad 2014-06-23 16:34:37.880591037 +0800 @@ -237,7 +237,8 @@ (qemu) quit Testing: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2 -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used by device '' doesn't support the option 'filename' +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit