[PATCH] aarch64: launch: Only pass gic-version=host when KVM is likely to be enabled.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1339977 --- src/launch-direct.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/launch-direct.c b/src/launch-direct.c index 20f6471..6450d7e 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -382,9 +382,12 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) MACHINE_TYPE "," #endif #ifdef __aarch64__ - "gic-version=host," + "%s" /* gic-version */ #endif "accel=%s", +#ifdef __aarch64__ + has_kvm && !force_tcg ? "gic-version=host," : "", +#endif !force_tcg ? "kvm:tcg" : "tcg"); cpu_model = guestfs_int_get_cpu_model (has_kvm && !force_tcg); -- 2.7.4
On Thursday 26 May 2016 15:57:03 Richard W.M. Jones wrote:
See: https://bugzilla.redhat.com/show_bug.cgi?id=1339977 ---
LGTM. -- Pino Toscano
participants (2)
-
Pino Toscano -
Richard W.M. Jones