diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-23 18:29:47 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-23 18:29:47 +0000 |
| commit | fc1f79f71ca79ba6be95af9b0c844902b09566a5 (patch) | |
| tree | c44e97dc1efbed39bd314264d28a290463643260 /hw | |
| parent | 00ea18d19e3ed4acc1b4b92a733d34a04a5fb5af (diff) | |
| download | qemu-fc1f79f71ca79ba6be95af9b0c844902b09566a5.tar.gz | |
Use a more natural order
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7234 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xen_console.c | 2 | ||||
| -rw-r--r-- | hw/xen_disk.c | 4 | ||||
| -rw-r--r-- | hw/xen_domainbuild.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/xen_console.c b/hw/xen_console.c index 27f809df6a..4280000c56 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -189,7 +189,7 @@ static int con_init(struct XenDevice *xendev) free(dom); type = xenstore_read_str(con->console, "type"); - if (!type || 0 != strcmp(type, "ioemu")) { + if (!type || strcmp(type, "ioemu" != 0)) { xen_be_printf(xendev, 1, "not for me (type=%s)\n", type); return -1; } diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 527f84b3e5..784cc047e2 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -179,7 +179,7 @@ static int ioreq_parse(struct ioreq *ioreq) switch (ioreq->req.operation) { case BLKIF_OP_READ: ioreq->prot = PROT_WRITE; /* to memory */ - if (BLKIF_OP_READ != ioreq->req.operation && blkdev->mode[0] != 'w') { + if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') { xen_be_printf(&blkdev->xendev, 0, "error: write req for ro device\n"); goto err; } @@ -513,7 +513,7 @@ static void blk_handle_requests(struct XenBlkDev *blkdev) if (use_aio) blk_send_response_all(blkdev); - while ((rc != rp)) { + while (rc != rp) { /* pull request from ring */ if (RING_REQUEST_CONS_OVERFLOW(&blkdev->rings.common, rc)) break; diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c index 21710ebf17..20d731ded4 100644 --- a/hw/xen_domainbuild.c +++ b/hw/xen_domainbuild.c @@ -137,7 +137,7 @@ static void xen_domain_poll(void *opaque) int rc; rc = xc_domain_getinfo(xen_xc, xen_domid, 1, &info); - if ((1 != rc) || (info.domid != xen_domid)) { + if ((rc != 1) || (info.domid != xen_domid)) { qemu_log("xen: domain %d is gone\n", xen_domid); goto quit; } @@ -186,7 +186,7 @@ static void xen_domain_watcher(void) rc = read(fd[0], &byte, 1); switch (rc) { case -1: - if (EINTR == errno) + if (errno == EINTR) continue; qemu_log("%s: Huh? read error: %s\n", __FUNCTION__, strerror(errno)); qemu_running = 0; |