diff mbox

[v2,2/4] kvm tools: Close the disk images after the guest shuts down

Message ID 1305903760-7804-2-git-send-email-prasadjoshi124@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Prasad Joshi May 20, 2011, 3:02 p.m. UTC 
Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
---
 tools/kvm/disk/core.c              |    8 ++++++++
 tools/kvm/include/kvm/disk-image.h |    1 +
 tools/kvm/kvm-run.c                |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)

Comments

Sasha Levin May 20, 2011, 3:29 p.m. UTC | #1 
On Fri, 2011-05-20 at 16:02 +0100, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
> ---
>  tools/kvm/disk/core.c              |    8 ++++++++
>  tools/kvm/include/kvm/disk-image.h |    1 +
>  tools/kvm/kvm-run.c                |    1 +
>  3 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c
> index c53944f..155c95e 100644
> --- a/tools/kvm/disk/core.c
> +++ b/tools/kvm/disk/core.c
> @@ -114,6 +114,14 @@ int disk_image__close(struct disk_image *disk)
>  	return 0;
>  }
>  
> +void disk_image__close_all(struct disk_image **disks, int count)
> +{

It's worth adding a small 'if (count > 0)' since this function is
currently called unconditionally.
No one assures we'll always have a default image.

> +	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 bf2bfa9..1363fe1 100644
> --- 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 e16caac..9bfe8fe 100644
> --- a/tools/kvm/kvm-run.c
> +++ b/tools/kvm/kvm-run.c
> @@ -615,6 +615,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)
diff mbox

Patch

diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c
index c53944f..155c95e 100644
--- a/tools/kvm/disk/core.c
+++ b/tools/kvm/disk/core.c
@@ -114,6 +114,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 bf2bfa9..1363fe1 100644
--- 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 e16caac..9bfe8fe 100644
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -615,6 +615,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)