From mboxrd@z Thu Jan 1 00:00:00 1970 From: Asias He Subject: [PATCH 12/14] kvm tools: Do not use 'inline' for disk_image__flush Date: Wed, 18 May 2011 16:19:13 +0800 Message-ID: <1305706755-2816-12-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 S1755466Ab1ERIXr (ORCPT ); Wed, 18 May 2011 04:23:47 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so601787pzk.19 for ; Wed, 18 May 2011 01:23:47 -0700 (PDT) In-Reply-To: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Asias He --- tools/kvm/disk/core.c | 8 ++++++++ tools/kvm/include/kvm/disk-image.h | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c index 6894b17..f3dd0bb 100644 --- a/tools/kvm/disk/core.c +++ b/tools/kvm/disk/core.c @@ -59,6 +59,14 @@ struct disk_image *disk_image__open(const char *filename, bool readonly) return NULL; } +int disk_image__flush(struct disk_image *disk) +{ + if (disk->ops->flush) + return disk->ops->flush(disk); + + return fsync(disk->fd); +} + int disk_image__close(struct disk_image *disk) { /* If there was no disk image then there's nothing to do: */ diff --git a/tools/kvm/include/kvm/disk-image.h b/tools/kvm/include/kvm/disk-image.h index 82884fb..ac394e8 100644 --- a/tools/kvm/include/kvm/disk-image.h +++ b/tools/kvm/include/kvm/disk-image.h @@ -53,17 +53,10 @@ struct disk_image { struct disk_image *disk_image__open(const char *filename, bool readonly); struct disk_image *disk_image__new(int fd, u64 size, struct disk_image_operations *ops, int mmap); int disk_image__close(struct disk_image *disk); - +int disk_image__flush(struct disk_image *disk); ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount); ssize_t disk_image__write(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount); -static inline int disk_image__flush(struct disk_image *disk) -{ - if (disk->ops->flush) - return disk->ops->flush(disk); - return fsync(disk->fd); -} - struct disk_image *raw_image__probe(int fd, struct stat *st, bool readonly); struct disk_image *blkdev__probe(const char *filename, struct stat *st); -- 1.7.5.1