[Pkg-libvirt-commits] [libguestfs] 115/233: launch: direct: Stop using deprecated -no-kvm-pit-reinjection if qemu is new enough (RHBZ#1053847).

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit e8c10670213076b10bad2d0aac181637acd150b0
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Jan 23 13:31:11 2014 +0000

    launch: direct: Stop using deprecated -no-kvm-pit-reinjection if qemu is new enough (RHBZ#1053847).
---
 src/launch-direct.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/launch-direct.c b/src/launch-direct.c
index 6eaee63..c091732 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
@@ -491,7 +491,14 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
    */
   ADD_CMDLINE ("-no-hpet");
 #endif
-  ADD_CMDLINE ("-no-kvm-pit-reinjection");
+  if (data->qemu_version_major < 1 ||
+      (data->qemu_version_major == 1 && data->qemu_version_minor <= 2))
+    ADD_CMDLINE ("-no-kvm-pit-reinjection");
+  else {
+    /* New non-deprecated way, added in qemu >= 1.3. */
+    ADD_CMDLINE ("-global");
+    ADD_CMDLINE ("kvm-pit.lost_tick_policy=discard");
+  }
 
   ADD_CMDLINE ("-kernel");
   ADD_CMDLINE (kernel);

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