Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1271090406 -3600
# Node ID c031244c190eec90f1d072dc3028fe874d56153d
# Parent df34011884a3bcf54b7ac4548a3a5bb9dd295845
libxl: libxl_domain_restore: Put fd back to blocking mode

libxl_domain_restore calls, indirectly, xc_domain_restore. The
latter, when doing a live migration, sets the fd from blocking mode
(which it must be on entry, or things go wrong) to nonblocking mode
and leaves it this way. Arguably this is a bug in libxc, but to avoid
disrupting any callers we fix it in libxl.

So libxl_domain_restore now puts the fd back into blocking mode
before returning.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
tools/libxl/libxl.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletion(-)

diff -r df34011884a3 -r c031244c190e tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Mon Apr 12 17:39:29 2010 +0100
+++ b/tools/libxl/libxl.c Mon Apr 12 17:40:06 2010 +0100
@@ -221,7 +221,7 @@ int libxl_domain_restore(struct libxl_ct
libxl_device_model_info *dm_info)
{
char **vments = NULL, **localents = NULL;
- int i, ret;
+ int i, ret, esave, flags;

ret = build_pre(ctx, domid, info, state);
if (ret) goto out;
@@ -259,6 +259,19 @@ int libxl_domain_restore(struct libxl_ct
else
dm_info->saved_state = NULL;
out:
+ esave = errno;
+
+ flags = fcntl(fd, F_GETFL);
+ if (flags == -1) {
+ XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "unable to get flags on restore fd");
+ } else {
+ flags &= ~O_NONBLOCK;
+ if (fcntl(fd, F_SETFL, flags) == -1)
+ XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "unable to put restore fd"
+ " back to blocking mode");
+ }
+
+ errno = esave;
return ret;
}


_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog