From mboxrd@z Thu Jan 1 00:00:00 1970 From: Asias He Subject: [PATCH 11/14] kvm tools: Remove unnecessary S_ISBLK check Date: Wed, 18 May 2011 16:19:12 +0800 Message-ID: <1305706755-2816-11-git-send-email-asias.hejun@gmail.com> References: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> Cc: Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi , kvm@vger.kernel.org, Asias He To: Pekka Enberg Return-path: Received: from mail-pz0-f46.google.com ([209.85.210.46]:37524 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755691Ab1ERIXl (ORCPT ); Wed, 18 May 2011 04:23:41 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so601787pzk.19 for ; Wed, 18 May 2011 01:23:41 -0700 (PDT) In-Reply-To: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Let's do it in blkdev__probe. Signed-off-by: Asias He --- tools/kvm/disk/core.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c index a0ccdc5..6894b17 100644 --- a/tools/kvm/disk/core.c +++ b/tools/kvm/disk/core.c @@ -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; -- 1.7.5.1