From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lx3gG-0005rl-Cr for qemu-devel@nongnu.org; Thu, 23 Apr 2009 14:29:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lx3gF-0005rI-IA for qemu-devel@nongnu.org; Thu, 23 Apr 2009 14:29:51 -0400 Received: from [199.232.76.173] (port=39120 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lx3gF-0005rD-CI for qemu-devel@nongnu.org; Thu, 23 Apr 2009 14:29:51 -0400 Received: from savannah.gnu.org ([199.232.41.3]:38653 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lx3gE-0007pT-7W for qemu-devel@nongnu.org; Thu, 23 Apr 2009 14:29:51 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Lx3gB-0002ks-Ru for qemu-devel@nongnu.org; Thu, 23 Apr 2009 18:29:47 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Lx3gB-0002ko-Iq for qemu-devel@nongnu.org; Thu, 23 Apr 2009 18:29:47 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Thu, 23 Apr 2009 18:29:47 +0000 Subject: [Qemu-devel] [7234] Use a more natural order List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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;