From 6f98b39f69abba2f7ab3e6dfaccddaf5696e8c32 Mon Sep 17 00:00:00 2001
Message-Id: <6f98b39f69abba2f7ab3e6dfaccddaf5696e8c32.1287067706.git.jdenemar@redhat.com>
From: Eric Blake <eblake@redhat.com>
Date: Wed, 28 Jul 2010 17:12:16 -0600
Subject: [PATCH] xen: fix logic bug

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=638520

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>
(cherry picked from commit 08ae41e930227c5f40467efdd375a588fb686305)
---
 src/xen/xend_internal.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a22d32b..a586b1c 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3887,7 +3887,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 "
@@ -4026,7 +4026,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 "
@@ -4137,7 +4137,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 "
-- 
1.7.3.1