kvm tools: Close the disk images after the guest shuts down

Signed-off-by: Prasad Joshi <prasadjoshi124@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 37ae5c921e2191a68669bc00b3086d9d7a3a6ce6..f2b482a570c9e05106bb61bb8560fe4d22314af1 100644 (file)
--- a/tools/kvm/disk/core.c
+++ b/tools/kvm/disk/core.c
@@ -115,6 +115,14 @@ int disk_image__close(struct disk_image *disk)
        return 0;
 }
 
+void disk_image__close_all(struct disk_image **disks, int count)
+{
+       while (count)
+               disk_image__close(disks[--count]);
+
+       free(disks);
+}
+
 /*
  * Fill iov with disk data, starting from sector 'sector'.
  * Return amount of bytes read.

diff --git a/tools/kvm/include/kvm/disk-image.h b/tools/kvm/include/kvm/disk-image.h
index bf2bfa9b022717576002d21de0dbed73d206e94d..1363fe11d0b7085bd013fe785c4b1a0acb771e1f 100644 (file)
--- a/tools/kvm/include/kvm/disk-image.h
+++ b/tools/kvm/include/kvm/disk-image.h
@@ -55,6 +55,7 @@ struct disk_image *disk_image__open(const char *filename, bool readonly);
 struct disk_image **disk_image__open_all(const char **filenames, bool *readonly, int count);
 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);
+void disk_image__close_all(struct disk_image **disks, int count);
 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);

diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index bd7691fbb8e01779de9a1dda5f91f9bbd9688e09..8cd003b69a9ac269c3eeee8d5ef312650a4f0f9f 100644 (file)
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -617,6 +617,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
                        exit_code = 1;
        }
 
+       disk_image__close_all(kvm->disks, image_count);
        kvm__delete(kvm);
 
        if (!exit_code)