From patchwork Fri May 14 17:10:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 52639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EC83EB7E59 for ; Sat, 15 May 2010 03:28:17 +1000 (EST) Received: from localhost ([127.0.0.1]:45560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCygH-0002YV-U4 for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 13:28:14 -0400 Received: from [140.186.70.92] (port=41242 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCyQG-0000T3-IP for qemu-devel@nongnu.org; Fri, 14 May 2010 13:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCyQD-0001sN-Rf for qemu-devel@nongnu.org; Fri, 14 May 2010 13:11:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35707) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCyQD-0001ry-2v for qemu-devel@nongnu.org; Fri, 14 May 2010 13:11:37 -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 o4EHBZR5028674 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 May 2010 13:11:35 -0400 Received: from localhost.localdomain (vpn1-7-82.ams2.redhat.com [10.36.7.82]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4EHBFWd004751; Fri, 14 May 2010 13:11:33 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 14 May 2010 19:10:43 +0200 Message-Id: <1273857055-26715-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1273857055-26715-1-git-send-email-kwolf@redhat.com> References: <1273857055-26715-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 09/21] block: Fix protocol detection for Windows devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We can't assume the file protocol for Windows devices, they need the same detection as other files for which an explicit protocol is not specified. Signed-off-by: Kevin Wolf --- block.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 6345599..977d01f 100644 --- a/block.c +++ b/block.c @@ -287,16 +287,18 @@ static BlockDriver *find_protocol(const char *filename) char protocol[128]; int len; const char *p; + int is_drive; /* TODO Drivers without bdrv_file_open must be specified explicitly */ #ifdef _WIN32 - if (is_windows_drive(filename) || - is_windows_drive_prefix(filename)) - return bdrv_find_format("file"); + is_drive = is_windows_drive(filename) || + is_windows_drive_prefix(filename); +#else + is_drive = 0; #endif p = strchr(filename, ':'); - if (!p) { + if (!p || is_drive) { drv1 = find_hdev_driver(filename); if (!drv1) { drv1 = bdrv_find_format("file");