summary refs log tree commit diff stats
path: root/hw/xen_disk.c
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-23 18:29:47 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-23 18:29:47 +0000
commitfc1f79f71ca79ba6be95af9b0c844902b09566a5 (patch)
treec44e97dc1efbed39bd314264d28a290463643260 /hw/xen_disk.c
parent00ea18d19e3ed4acc1b4b92a733d34a04a5fb5af (diff)
downloadfocaccia-qemu-fc1f79f71ca79ba6be95af9b0c844902b09566a5.tar.gz
focaccia-qemu-fc1f79f71ca79ba6be95af9b0c844902b09566a5.zip
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/xen_disk.c')
-rw-r--r--hw/xen_disk.c4
1 files changed, 2 insertions, 2 deletions
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;