qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose
@ 2018-02-06 16:30 Ross Lagerwall
  2018-02-07 16:27 ` Dr. David Alan Gilbert
  2018-02-14 10:22 ` Dr. David Alan Gilbert
  0 siblings, 2 replies; 3+ messages in thread
From: Ross Lagerwall @ 2018-02-06 16:30 UTC (permalink / raw)
  To: Juan Quintela, Dr. David Alan Gilbert; +Cc: qemu-devel, Ross Lagerwall

QEMUFile uses buffered IO so when writing small amounts (such as the Xen
device state file), the actual write call and any errors that may occur
only happen as part of qemu_fclose(). Therefore, report IO errors when
saving the device state under Xen by checking the return value of
qemu_fclose().

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
---
 migration/savevm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/migration/savevm.c b/migration/savevm.c
index b7908f6..4b9d5be 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2267,8 +2267,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live,
     qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");
     f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));
     ret = qemu_save_device_state(f);
-    qemu_fclose(f);
-    if (ret < 0) {
+    if (ret < 0 || qemu_fclose(f) < 0) {
         error_setg(errp, QERR_IO_ERROR);
     } else {
         /* libxl calls the QMP command "stop" before calling
-- 
2.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose
  2018-02-06 16:30 [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose Ross Lagerwall
@ 2018-02-07 16:27 ` Dr. David Alan Gilbert
  2018-02-14 10:22 ` Dr. David Alan Gilbert
  1 sibling, 0 replies; 3+ messages in thread
From: Dr. David Alan Gilbert @ 2018-02-07 16:27 UTC (permalink / raw)
  To: Ross Lagerwall; +Cc: Juan Quintela, qemu-devel

* Ross Lagerwall (ross.lagerwall@citrix.com) wrote:
> QEMUFile uses buffered IO so when writing small amounts (such as the Xen
> device state file), the actual write call and any errors that may occur
> only happen as part of qemu_fclose(). Therefore, report IO errors when
> saving the device state under Xen by checking the return value of
> qemu_fclose().
> 
> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/savevm.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/migration/savevm.c b/migration/savevm.c
> index b7908f6..4b9d5be 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2267,8 +2267,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live,
>      qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");
>      f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));
>      ret = qemu_save_device_state(f);
> -    qemu_fclose(f);
> -    if (ret < 0) {
> +    if (ret < 0 || qemu_fclose(f) < 0) {
>          error_setg(errp, QERR_IO_ERROR);
>      } else {
>          /* libxl calls the QMP command "stop" before calling
> -- 
> 2.9.5
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose
  2018-02-06 16:30 [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose Ross Lagerwall
  2018-02-07 16:27 ` Dr. David Alan Gilbert
@ 2018-02-14 10:22 ` Dr. David Alan Gilbert
  1 sibling, 0 replies; 3+ messages in thread
From: Dr. David Alan Gilbert @ 2018-02-14 10:22 UTC (permalink / raw)
  To: Ross Lagerwall; +Cc: Juan Quintela, qemu-devel

* Ross Lagerwall (ross.lagerwall@citrix.com) wrote:
> QEMUFile uses buffered IO so when writing small amounts (such as the Xen
> device state file), the actual write call and any errors that may occur
> only happen as part of qemu_fclose(). Therefore, report IO errors when
> saving the device state under Xen by checking the return value of
> qemu_fclose().
> 
> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

Queued.

> ---
>  migration/savevm.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/migration/savevm.c b/migration/savevm.c
> index b7908f6..4b9d5be 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2267,8 +2267,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live,
>      qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");
>      f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));
>      ret = qemu_save_device_state(f);
> -    qemu_fclose(f);
> -    if (ret < 0) {
> +    if (ret < 0 || qemu_fclose(f) < 0) {
>          error_setg(errp, QERR_IO_ERROR);
>      } else {
>          /* libxl calls the QMP command "stop" before calling
> -- 
> 2.9.5
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-02-14 10:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-06 16:30 [Qemu-devel] [PATCH] migration/xen: Check return value of qemu_fclose Ross Lagerwall
2018-02-07 16:27 ` Dr. David Alan Gilbert
2018-02-14 10:22 ` Dr. David Alan Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).