exec-migration: handle EINTR in popen_get_buffer()
Sometimes, upon interrupt, fread returns with no data, and the (incoming exec) migration fails. Fix by retrying on such a case. Signed-off-by: Uri Lublin <uril@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
d084eab6f8
commit
8a67ec4d84
9
savevm.c
9
savevm.c
|
@ -215,7 +215,14 @@ static int popen_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int s
|
||||||
static int popen_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
|
static int popen_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
|
||||||
{
|
{
|
||||||
QEMUFilePopen *s = opaque;
|
QEMUFilePopen *s = opaque;
|
||||||
return fread(buf, 1, size, s->popen_file);
|
FILE *fp = s->popen_file;
|
||||||
|
int bytes;
|
||||||
|
|
||||||
|
do {
|
||||||
|
clearerr(fp);
|
||||||
|
bytes = fread(buf, 1, size, fp);
|
||||||
|
} while ((bytes == 0) && ferror(fp) && (errno == EINTR));
|
||||||
|
return bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int popen_close(void *opaque)
|
static int popen_close(void *opaque)
|
||||||
|
|
Loading…
Reference in a new issue