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 From: Kevin Wolf 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> Subject: [Qemu-devel] [PATCH 09/21] block: Fix protocol detection for Windows devices List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@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"); -- 1.6.6.1