Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  LUNodeAdd: Verify version in Prereq
  Fix LV status parsing to accept newer LVM
  Bump version for 2.5.0~rc6 release
  Revert "Stop acquiring BGL for LUXI queries"
  LUClusterVerifyConfig: Share BGL, acquire all locks in shared mode
  KVM: don't add -nographic using spice
  Stop acquiring BGL for LUXI queries
  Fix type error in LUInstanceChangeGroup

Conflicts:
	lib/hypervisor/hv_kvm.py
	  - trivial, keep both changes

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc lib/cmdlib.py
Simple merge

diff --cc lib/hypervisor/hv_kvm.py
index 9b341b7,69b0126..c2ae771
--- 1/lib/hypervisor/hv_kvm.py
--- 2/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@@ -1063,9 -765,9 +1060,12 @@@ class KVMHypervisor(hv_base.BaseHypervi
        logging.info("KVM: SPICE will listen on port %s", instance.network_port)
        kvm_cmd.extend(["-spice", spice_arg])
  
 +      # Tell kvm to use the paravirtualized graphic card, optimized for SPICE
 +      kvm_cmd.extend(["-vga", "qxl"])
 +
+     else:
+       kvm_cmd.extend(["-nographic"])
+ 
      if hvp[constants.HV_USE_LOCALTIME]:
        kvm_cmd.extend(["-localtime"])