diff --git a/Makefile b/Makefile index d96c8158..388e8f00 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=qemu-server -PKGREL=15 +PKGREL=16 DESTDIR= PREFIX=/usr diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index e1a4cfd2..897439cf 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -287,7 +287,7 @@ EODESC tdf => { optional => 1, type => 'boolean', - description => "Enable/disable time drift fix.", + description => "Enable/disable time drift fix. This is ignored for kvm versions newer that 1.0 (not needed anymore).", default => 1, }, localtime => { @@ -2021,7 +2021,8 @@ sub config_to_command { # time drift fix my $tdf = defined($conf->{tdf}) ? $conf->{tdf} : $defaults->{tdf}; - push @$cmd, '-tdf' if $tdf; + # ignore - no longer supported by newer kvm + # push @$cmd, '-tdf' if $tdf; my $nokvm = defined($conf->{kvm}) && $conf->{kvm} == 0 ? 1 : 0; diff --git a/changelog.Debian b/changelog.Debian index 5d3e3937..f7c7b110 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +qemu-server (2.0-16) unstable; urgency=low + + * ignore -tdf (avoid kvm warning) - this is no longer needed + + -- Proxmox Support Team Mon, 13 Feb 2012 11:18:01 +0100 + qemu-server (2.0-15) unstable; urgency=low * online migration fix: close tunnel later, wait for connection close