On Wed, May 1, 2013 at 12:52 PM, Guido Trotter <[email protected]> wrote:
> Newer versions of kvm (from 1.4) don't support -nographic with > -daemonize. When -display exists, use -display none instead. > > This fixes Issue 389. > > Signed-off-by: Guido Trotter <[email protected]> > --- > lib/hypervisor/hv_kvm.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py > index d0f5a00..cc64d8b 100644 > --- a/lib/hypervisor/hv_kvm.py > +++ b/lib/hypervisor/hv_kvm.py > @@ -548,6 +548,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): > _ENABLE_KVM_RE = re.compile(r"^-enable-kvm\s", re.M) > _DISABLE_KVM_RE = re.compile(r"^-disable-kvm\s", re.M) > _NETDEV_RE = re.compile(r"^-netdev\s", re.M) > + _DISPLAY_RE = re.compile(r"^-display\s", re.M) > _NEW_VIRTIO_RE = re.compile(r"^name \"%s\"" % _VIRTIO_NET_PCI, re.M) > # match -drive.*boot=on|off on different lines, but in between accept > only > # dashes not preceeded by a new line (which would mean another option > @@ -1324,7 +1325,10 @@ class KVMHypervisor(hv_base.BaseHypervisor): > kvm_cmd.extend(["-spice", spice_arg]) > > else: > - kvm_cmd.extend(["-nographic"]) > + if self._DISPLAY_RE.search(kvmhelp): > + kvm_cmd.extend(["-display", "none"]) > + else: > + kvm_cmd.extend(["-nographic"]) > Maybe add a quick comment that this is required for 1.4. > > if hvp[constants.HV_USE_LOCALTIME]: > kvm_cmd.extend(["-localtime"]) > -- > 1.7.10.4 > > Otherwise LGTM, thanks, Thomas -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Katherine Stephens
