From: Eric Blake <eblake@redhat.com>
Date: Wed, 28 Jul 2010 23:12:16 +0000 (-0600)
Subject: xen: fix logic bug
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=08ae41e930227c5f40467efdd375a588fb686305;p=libvirt.git

xen: fix logic bug

The recent switch to enable -Wlogical-op paid off again.
gcc 4.5.0 (rawhide) is smarter than 4.4.4 (Fedora 13).

* src/xen/xend_internal.c (xenDaemonAttachDeviceFlags)
(xenDaemonUpdateDeviceFlags, xenDaemonDetachDeviceFlags): Use
correct operator.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index fad5ce8dff..311775a6f9 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3888,7 +3888,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml,
     } else {
         /* Only live config can be changed if xendConfigVersion < 3 */
         if (priv->xendConfigVersion < 3 &&
-            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT ||
+            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT &&
              flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) {
             virXendError(VIR_ERR_OPERATION_INVALID, "%s",
                          _("Xend version does not support modifying "
@@ -4027,7 +4027,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
     } else {
         /* Only live config can be changed if xendConfigVersion < 3 */
         if (priv->xendConfigVersion < 3 &&
-            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT ||
+            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT &&
              flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) {
             virXendError(VIR_ERR_OPERATION_INVALID, "%s",
                          _("Xend version does not support modifying "
@@ -4138,7 +4138,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml,
     } else {
         /* Only live config can be changed if xendConfigVersion < 3 */
         if (priv->xendConfigVersion < 3 &&
-            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT ||
+            (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT &&
              flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) {
             virXendError(VIR_ERR_OPERATION_INVALID, "%s",
                          _("Xend version does not support modifying "