From: Asias He Date: Wed, 18 May 2011 08:19:13 +0000 (+0800) Subject: kvm tools: Do not use 'inline' for disk_image__flush X-Git-Tag: next-20110824~3^2~296 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96917e6f7de0939dea1d44041945876ca1acf78a;p=karo-tx-linux.git kvm tools: Do not use 'inline' for disk_image__flush Signed-off-by: Asias He Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c index 6894b177a73c..f3dd0bb34cac 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 82884fbb2b0c..ac394e8026b3 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);