[Xen-devel] [PATCH v2 4/4] libxenstat: qmp_read fix and cleanup

[Wei Liu <wei.liu2@xxxxxxxxxx>]

The second argument of poll(2) is the number of file descriptors. POLLIN
is defined as 1 so it happens to work. Also reduce the size of array to
one as there is only one file descriptor.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Charles Arnold <carnold@xxxxxxxx>
---
 tools/xenstat/libxenstat/src/xenstat_qmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c 
b/tools/xenstat/libxenstat/src/xenstat_qmp.c
index 8d91fef..5e261af 100644
--- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
+++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
@@ -289,13 +289,13 @@ static size_t qmp_write(int qfd, char *cmd, size_t 
cmd_len)
 static int qmp_read(int qfd, unsigned char **qstats)
 {
        unsigned char buf[1024], *ptr;
-       struct pollfd pfd[2];
+       struct pollfd pfd[1];
        int n, qsize = 0;
 
        *qstats = NULL;
        pfd[0].fd = qfd;
        pfd[0].events = POLLIN;
-       while ((n = poll(pfd, POLLIN, 10)) > 0) {
+       while ((n = poll(pfd, 1, 10)) > 0) {
                if (pfd[0].revents & POLLIN) {
                        if ((n = read(qfd, buf, sizeof(buf))) < 0) {
                                free(*qstats);
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel