diff options
author | Anthony PERARD <anthony.perard@citrix.com> | 2012-02-20 17:53:33 +0000 |
---|---|---|
committer | Anthony PERARD <anthony.perard@citrix.com> | 2012-02-20 17:53:33 +0000 |
commit | abc94ef0f260ad9eb527addd6672014dbdee5e76 (patch) | |
tree | fadbecb135154feff3a0459790f2c6a2a7a74099 | |
parent | 636171218e1aba94fbf62a36b2dbcf06f8922db5 (diff) | |
download | xen-abc94ef0f260ad9eb527addd6672014dbdee5e76.tar.gz xen-abc94ef0f260ad9eb527addd6672014dbdee5e76.tar.bz2 xen-abc94ef0f260ad9eb527addd6672014dbdee5e76.zip |
libxl_qmp: Handle unexpected end-of-socket
When read() return 0, the current code just tries again. But this
leads to an infinite loop if QEMU died too soon.
Also, retry select if a signal was caught.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | tools/libxl/libxl_qmp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index e0642e31b5..a974afecff 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -390,13 +390,16 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "timeout"); return -1; } else if (ret < 0) { + if (errno == EINTR) + continue; LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Select error"); return -1; } rd = read(qmp->qmp_fd, qmp->buffer, QMP_RECEIVE_BUFFER_SIZE); if (rd == 0) { - continue; + LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Unexpected end of socket"); + return -1; } else if (rd < 0) { LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error"); return rd; |