[Pkg-libvirt-commits] [libvirt] 09/10: vbox: fix a bug in _machineStateInactive

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9-7
in repository libvirt.

commit f6ffda7a887e4e9b7055ffe617e386bdb6af9f1d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Dec 24 10:08:58 2014 +0100

    vbox: fix a bug in _machineStateInactive
    
    Closes: #770202
---
 debian/patches/series                              |  1 +
 .../vbox-fix-a-bug-in-_machineStateInactive.patch  | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 024df0d..3cb2c9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ security/CVE-2014-8136-qemu-migration-Unlock-vm-on-failed-ACL.patch
 upstream/qemu-Fix-crash-in-tunnelled-migration.patch
 lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch
 lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch
+upstream/vbox-fix-a-bug-in-_machineStateInactive.patch
diff --git a/debian/patches/upstream/vbox-fix-a-bug-in-_machineStateInactive.patch b/debian/patches/upstream/vbox-fix-a-bug-in-_machineStateInactive.patch
new file mode 100644
index 0000000..7f0305c
--- /dev/null
+++ b/debian/patches/upstream/vbox-fix-a-bug-in-_machineStateInactive.patch
@@ -0,0 +1,28 @@
+From: Yohan BELLEGUIC <yohan.belleguic at diateam.net>
+Date: Wed, 19 Nov 2014 09:53:15 +0100
+Subject: vbox: fix a bug in _machineStateInactive
+
+This function returned non-inactive domains instead of active
+domains.  This broke virConnectNumOfDefinedDomains() and
+virConnectListDefinedDomains() functions.
+
+Closes: #770202
+---
+ src/vbox/vbox_tmpl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
+index e5d6d66..c42e186 100644
+--- a/src/vbox/vbox_tmpl.c
++++ b/src/vbox/vbox_tmpl.c
+@@ -6081,8 +6081,8 @@ static bool _machineStateOnline(PRUint32 state)
+ 
+ static bool _machineStateInactive(PRUint32 state)
+ {
+-    return ((state > MachineState_FirstOnline) &&
+-            (state < MachineState_LastOnline));
++    return ((state < MachineState_FirstOnline) ||
++            (state > MachineState_LastOnline));
+ }
+ 
+ static bool _machineStateNotStart(PRUint32 state)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git