From 49ad09bae351fde6491b11a6cd359582bf2e06c0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Nov 2015 13:35:26 -0500
Subject: [PATCH] launch: direct: aarch64: Add gic-version=host to -M option.

On ARM machines with vGICv3, we need to use the extra -M
parameter gic-version=3 (or gic-version=2 for the old vGIC).

qemu can detect this feature for us if we pass gic-version=host,
so add that to the -M option.  Unfortunately we cannot detect if
qemu itself supports this parameter, but this change only affects
aarch64.

Thanks: Wei Huang
---
 src/launch-direct.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/launch-direct.c b/src/launch-direct.c
index 29ec359c2..559a032c9 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
@@ -388,12 +388,18 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
     ADD_CMDLINE (
 #ifdef MACHINE_TYPE
                  MACHINE_TYPE ","
+#endif
+#ifdef __aarch64__
+		 "gic-version=host,"
 #endif
                  "accel=kvm:tcg");
   else
     ADD_CMDLINE (
 #ifdef MACHINE_TYPE
                  MACHINE_TYPE ","
+#endif
+#ifdef __aarch64__
+		 "gic-version=host,"
 #endif
                  "accel=tcg");