# HG changeset patch
# User Brendan Cully <brendan@xxxxxxxxx>
# Date 1282238652 -3600
# Node ID f68726cdf357f8948700a56e96d4c10e3131bce2
# Parent aab4938edd9c61f00c68d28daf477014a8d0a2a1
libxc: remus: unbreak after 21488:dd6bbdc42033
The aforementioned patch missed several calls to read_exact, causing spurious
timeouts under Remus.
Also add a couple of additional error reports to rdexact.
Signed-off-by: Brendan Cully <brendan@xxxxxxxxx>
Reviewed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxc/xc_domain_restore.c | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff -r aab4938edd9c -r f68726cdf357 tools/libxc/xc_domain_restore.c
--- a/tools/libxc/xc_domain_restore.c Thu Aug 19 18:15:44 2010 +0100
+++ b/tools/libxc/xc_domain_restore.c Thu Aug 19 18:24:12 2010 +0100
@@ -77,10 +77,14 @@ static ssize_t rdexact(struct xc_interfa
len = read(fd, buf + offset, size - offset);
if ( (len == -1) && ((errno == EINTR) || (errno == EAGAIN)) )
continue;
- if ( len == 0 )
+ if ( len == 0 ) {
+ ERROR("0-length read");
errno = 0;
- if ( len <= 0 )
+ }
+ if ( len <= 0 ) {
+ ERROR("read_exact_timed failed (read rc: %d, errno: %d)", len,
errno);
return -1;
+ }
offset += len;
}
@@ -694,8 +698,8 @@ static int pagebuf_get_one(xc_interface
return pagebuf_get_one(xch, ctx, buf, fd, dom);
} else if (count == -3) {
/* Skip padding 4 bytes then read the EPT identity PT location. */
- if ( read_exact(fd, &buf->identpt, sizeof(uint32_t)) ||
- read_exact(fd, &buf->identpt, sizeof(uint64_t)) )
+ if ( RDEXACT(fd, &buf->identpt, sizeof(uint32_t)) ||
+ RDEXACT(fd, &buf->identpt, sizeof(uint64_t)) )
{
PERROR("error read the address of the EPT identity map");
return -1;
@@ -704,8 +708,8 @@ static int pagebuf_get_one(xc_interface
return pagebuf_get_one(xch, ctx, buf, fd, dom);
} else if ( count == -4 ) {
/* Skip padding 4 bytes then read the vm86 TSS location. */
- if ( read_exact(fd, &buf->vm86_tss, sizeof(uint32_t)) ||
- read_exact(fd, &buf->vm86_tss, sizeof(uint64_t)) )
+ if ( RDEXACT(fd, &buf->vm86_tss, sizeof(uint32_t)) ||
+ RDEXACT(fd, &buf->vm86_tss, sizeof(uint64_t)) )
{
PERROR("error read the address of the vm86 TSS");
return -1;
@@ -729,10 +733,10 @@ static int pagebuf_get_one(xc_interface
} else if ( count == -7 ) {
uint32_t tsc_mode, khz, incarn;
uint64_t nsec;
- if ( read_exact(fd, &tsc_mode, sizeof(uint32_t)) ||
- read_exact(fd, &nsec, sizeof(uint64_t)) ||
- read_exact(fd, &khz, sizeof(uint32_t)) ||
- read_exact(fd, &incarn, sizeof(uint32_t)) ||
+ if ( RDEXACT(fd, &tsc_mode, sizeof(uint32_t)) ||
+ RDEXACT(fd, &nsec, sizeof(uint64_t)) ||
+ RDEXACT(fd, &khz, sizeof(uint32_t)) ||
+ RDEXACT(fd, &incarn, sizeof(uint32_t)) ||
xc_domain_set_tsc_info(xch, dom, tsc_mode, nsec, khz, incarn) ) {
PERROR("error reading/restoring tsc info");
return -1;
@@ -740,8 +744,8 @@ static int pagebuf_get_one(xc_interface
return pagebuf_get_one(xch, ctx, buf, fd, dom);
} else if (count == -8 ) {
/* Skip padding 4 bytes then read the console pfn location. */
- if ( read_exact(fd, &buf->console_pfn, sizeof(uint32_t)) ||
- read_exact(fd, &buf->console_pfn, sizeof(uint64_t)) )
+ if ( RDEXACT(fd, &buf->console_pfn, sizeof(uint32_t)) ||
+ RDEXACT(fd, &buf->console_pfn, sizeof(uint64_t)) )
{
PERROR("error read the address of the console pfn");
return -1;
@@ -768,7 +772,7 @@ static int pagebuf_get_one(xc_interface
}
buf->pfn_types = ptmp;
}
- if ( read_exact(fd, buf->pfn_types + oldcount, count *
sizeof(*(buf->pfn_types)))) {
+ if ( RDEXACT(fd, buf->pfn_types + oldcount, count *
sizeof(*(buf->pfn_types)))) {
PERROR("Error when reading region pfn types");
return -1;
}
@@ -795,7 +799,7 @@ static int pagebuf_get_one(xc_interface
}
buf->pages = ptmp;
}
- if ( read_exact(fd, buf->pages + oldcount * PAGE_SIZE, countpages *
PAGE_SIZE) ) {
+ if ( RDEXACT(fd, buf->pages + oldcount * PAGE_SIZE, countpages *
PAGE_SIZE) ) {
PERROR("Error when reading pages");
return -1;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home