From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54876 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OLtO7-0002X1-VT
	for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:38:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <armbru@redhat.com>) id 1OLtNy-00013g-Dr
	for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:38:11 -0400
Received: from mx1.redhat.com ([209.132.183.28]:23367)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <armbru@redhat.com>) id 1OLtNy-00013L-7c
	for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:38:10 -0400
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.13.8/8.13.8) with ESMTP id o587c8tg018523
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 8 Jun 2010 03:38:08 -0400
From: Markus Armbruster <armbru@redhat.com>
References: <m3sk5y4l1t.fsf@blackfin.pond.sub.org>
Date: Tue, 08 Jun 2010 09:38:06 +0200
In-Reply-To: <m3sk5y4l1t.fsf@blackfin.pond.sub.org> (Markus Armbruster's
	message of "Tue, 11 May 2010 15:36:46 +0200")
Message-ID: <m3ocfmrn35.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Qemu-devel] Re: [PATCH] Fix regression for "-drive file="
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>

Did this fall through the cracks?

Markus Armbruster <armbru@redhat.com> writes:

> Empty file used to create an empty drive (no media).  Since commit
> 9dfd7c7a, it's an error: "qemu: could not open disk image : No such
> file or directory".  Older versions of libvirt can choke on this.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> If this goes in, I'll prepare a patch for stable as well.
>
>  vl.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 85bcc84..78ec1b2 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1097,7 +1097,7 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque,
>      case IF_COUNT:
>          abort();
>      }
> -    if (!file) {
> +    if (!file || !*file) {
>          *fatal_error = 0;
>          return NULL;
>      }