From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0GHz-00087v-Mw for qemu-devel@nongnu.org; Thu, 26 Jun 2014 16:29:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0GHs-0003eq-O0 for qemu-devel@nongnu.org; Thu, 26 Jun 2014 16:28:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0GHs-0003ej-FB for qemu-devel@nongnu.org; Thu, 26 Jun 2014 16:28:52 -0400 Message-ID: <53AC7D58.1080709@redhat.com> Date: Thu, 26 Jun 2014 22:06:48 +0200 From: Max Reitz MIME-Version: 1.0 References: <1403809762-4858-1-git-send-email-mreitz@redhat.com> <1403809762-4858-2-git-send-email-mreitz@redhat.com> <53AC789B.8000807@redhat.com> <53AC7C2E.6060400@redhat.com> In-Reply-To: <53AC7C2E.6060400@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/2] block: Do not prematurely remove "filename" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , Stefan Hajnoczi On 26.06.2014 22:01, Max Reitz wrote: > On 26.06.2014 21:46, Eric Blake wrote: >> On 06/26/2014 01:09 PM, Max Reitz wrote: >>> If "filename" is removed from the options QDict before entering >>> bdrv_open_common(), it cannot be stored in the BDS. Therefore, wait >>> until it has been copied there and remove it from the options only >>> afterwards. >>> >>> This fixes "filename" in the BDS being empty for block drivers which do >>> not need the filename because they have parsed it already (e.g. NBD). >>> >>> Signed-off-by: Max Reitz >>> --- >>> block.c | 24 +++++++++++++++++------- >>> 1 file changed, 17 insertions(+), 7 deletions(-) >>> >> How does this play with Kevin's bdrv_open cleanups? >> https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg06173.html > > To be honest, I hoped to get this series merged before Kevin's, > because I guessed adapting his series to this would be easier than the > other way round. ;-) > > I guess there will be some conflicts but nothing unfixable (and the > concept will stay the same), as he still leaves bdrv_open_common() intact. Hm, now that I'm seeing Kevin merged his series already, I'll see to fix eventual conflicts myself. Max