[Pkg-libvirt-commits] [libguestfs] 29/61: aarch64: This has no working hpet emulation, like ARM 32 bit.

[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 219c2ddf1b186f2afeda698e0d93ba6b1559eaf8
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 24 17:33:51 2014 -0500

    aarch64: This has no working hpet emulation, like ARM 32 bit.
---
 src/launch-direct.c  | 2 +-
 src/launch-libvirt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/launch-direct.c b/src/launch-direct.c
index 0f6e2fc..9b4ccaa 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
@@ -469,7 +469,7 @@ 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(__powerpc__)
+#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".
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index e0049eb..b8575ce 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -1032,7 +1032,7 @@ construct_libvirt_xml_cpu (guestfs_h *g,
     /* libvirt has a bug (RHBZ#1066145) where it adds the -no-hpet
      * flag on ARM & ppc64.
      */
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc__)
     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