kvm tools: Do not use 'inline' for disk_image__flush

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c
index 6894b177a73c66f164abb123cb02071a26448409..f3dd0bb34cac43f5aa51b3845d541d3897623a5c 100644 (file)
--- 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 82884fbb2b0c09cfaec7aaef95632f7384bc80fe..ac394e8026b366fc57b937ad859b316fc36a7f1f 100644 (file)
--- 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);