From: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Date: Thu, 15 Oct 2015 09:12:20 +0000 (+0800)
Subject: Fix conficts with HACKING doc
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c3d4eb124cb9a29e56ce181fd17ec09d70bc8d05;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Fix conficts with HACKING doc

Don't compare a bool variable against the literal, "true".

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index aed82ad28..f7ccb7574 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -3416,7 +3416,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
                break;
 
                case DATATYPE_BOOLEAN:
-                   if (item->u.boolean == true)
+                   if (item->u.boolean)
                        virBufferAddLit(buf, "true");
                    else
                        virBufferAddLit(buf, "false");
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index f331e22e9..f05d4a868 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -1403,7 +1403,7 @@ virNWFilterDHCPSnoopThread(void *req0)
     }
 
     /* let creator know how well we initialized */
-    if (error == true || !threadkey || tmp < 0 || !worker ||
+    if (error || !threadkey || tmp < 0 || !worker ||
         ifindex != req->ifindex)
         req->threadStatus = THREAD_STATUS_FAIL;
     else
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 7a2afd634..c24477ca5 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3293,7 +3293,7 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
         goto cleanup;
     }
 
-    if (bootDisk == true) {
+    if (bootDisk) {
         pret = PrlVmDev_GetIndex(sdkdisk, &devIndex);
         prlsdkCheckRetGoto(pret, cleanup);
 
@@ -3551,7 +3551,7 @@ prlsdkDoApplyConfig(virConnectPtr conn,
     for (i = 0; i < def->ndisks; i++) {
         bool bootDisk = false;
 
-        if (needBoot == true &&
+        if (needBoot &&
             def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
 
             needBoot = false;