clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-07 06:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Remove unnecessary S_ISBLK check

Browse Source 
Let's do it in blkdev__probe.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2015-06-01 16:39:44 +01:00
committed by Will Deacon
parent 063e87a008
commit 441767fea8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
disk/core.c
+8 -4
View File
@@ -34,18 +34,22 @@ struct disk_image *disk_image__open(const char *filename, bool readonly)
if (stat(filename, &st) < 0)
return NULL;
if (S_ISBLK(st.st_mode))
return blkdev__probe(filename, &st);
/* blk device ?*/
disk = blkdev__probe(filename, &st);
if (disk)
return disk;
fd = open(filename, readonly ? O_RDONLY : O_RDWR);
if (fd < 0)
return NULL;
disk = qcow_probe(fd, readonly);
/* qcow image ?*/
disk = qcow_probe(fd, readonly);
if (disk)
return disk;
disk = raw_image__probe(fd, &st, readonly);
/* raw image ?*/
disk = raw_image__probe(fd, &st, readonly);
if (disk)
return disk;