[Qemu-devel] [7234] Use a more natural order

[Blue Swirl]

Revision: 7234
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7234
Author:   blueswir1
Date:     2009-04-23 18:29:47 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
Use a more natural order

Modified Paths:
--------------
    trunk/hw/xen_console.c
    trunk/hw/xen_disk.c
    trunk/hw/xen_domainbuild.c

Modified: trunk/hw/xen_console.c
===================================================================
--- trunk/hw/xen_console.c      2009-04-23 13:16:56 UTC (rev 7233)
+++ trunk/hw/xen_console.c      2009-04-23 18:29:47 UTC (rev 7234)
@@ -189,7 +189,7 @@
     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;
     }

Modified: trunk/hw/xen_disk.c
===================================================================
--- trunk/hw/xen_disk.c 2009-04-23 13:16:56 UTC (rev 7233)
+++ trunk/hw/xen_disk.c 2009-04-23 18:29:47 UTC (rev 7234)
@@ -179,7 +179,7 @@
     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 @@
 
     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;

Modified: trunk/hw/xen_domainbuild.c
===================================================================
--- trunk/hw/xen_domainbuild.c  2009-04-23 13:16:56 UTC (rev 7233)
+++ trunk/hw/xen_domainbuild.c  2009-04-23 18:29:47 UTC (rev 7234)
@@ -137,7 +137,7 @@
     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 @@
         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;