[Pkg-libvirt-commits] [libguestfs] 17/66: src/launch: improve the addition of the no-hpet option

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository libguestfs.

commit 561871a7b1f3f3b0e43755325021c1ee30066be4
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Tue Apr 1 18:01:19 2014 +0200

    src/launch: improve the addition of the no-hpet option
    
    Since HPET is specific to x86, we can safely add it its option only on
    x86 and x86_64 when creating the libvirt XML (no more hitting the
    launching failures due to that on other architectures).
    
    Regarding the direct qemu launch, since qemu 1.1 (which is our current
    minimum) "-ho-hpet" appears in the help only where actually supported,
    so we could just checking for it and adding it only if present. This
    should fix the architecture issues on this backend as well.
    
    (cherry picked from commit 84f646a41a7571937a7b3f71f12338dfb60776b2)
---
 src/launch-direct.c  | 12 +++---------
 src/launch-libvirt.c |  6 ++++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/launch-direct.c b/src/launch-direct.c
index 5c756b7..1460c56 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
@@ -469,15 +469,9 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
   /* These are recommended settings, see RHBZ#1053847. */
   ADD_CMDLINE ("-rtc");
   ADD_CMDLINE ("driftfix=slew");
-#if !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc__)
-  /* qemu-system-arm and qemu-system-ppc64 advertises the -no-hpet option
-   * but if you try to use it, it usefully says:
-   *   "Option no-hpet not supported for this target".
-   * Cheers qemu developers.  How many years have we been asking for
-   * capabilities?  Could be 3 or 4 years, I forget.
-   */
-  ADD_CMDLINE ("-no-hpet");
-#endif
+  if (qemu_supports (g, data, "-no-hpet")) {
+    ADD_CMDLINE ("-no-hpet");
+  }
   if (data->qemu_version_major < 1 ||
       (data->qemu_version_major == 1 && data->qemu_version_minor <= 2))
     ADD_CMDLINE ("-no-kvm-pit-reinjection");
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index e4563f8..1eb151c 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -1030,9 +1030,11 @@ construct_libvirt_xml_cpu (guestfs_h *g,
     } end_element ();
 
     /* libvirt has a bug (RHBZ#1066145) where it adds the -no-hpet
-     * flag on ARM & ppc64.
+     * flag on ARM & ppc64 (and possibly any architecture).
+     * Since hpet is specific to x86 & x86_64 anyway, just add it only
+     * for those architectures.
      */
-#if !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc__)
+#if defined(__i386__) || defined(__x86_64__)
     start_element ("timer") {
       attribute ("name", "hpet");
       attribute ("present", "no");

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