File 0072-sev-Fix-build-for-non-x86-hosts.patch of Package qemu

Overview Repositories Revisions Requests Users Attributes Meta

File 0072-sev-Fix-build-for-non-x86-hosts.patch of Package qemu (Revision aca1518358f67f001ded96dc90440876)

Currently displaying revision aca1518358f67f001ded96dc90440876 , Show latest

From 5c1a357744cfd2917705907bc3d50efd1184b7d9 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 7 Feb 2018 14:01:55 -0700
Subject: [PATCH] sev: Fix build for non-x86 hosts

I imagine the upstream code will still change in a way to not
require this work around, but for now this works.
Also bypass the test for query-sev-launch-measure qmp command test,
since it causes the qemu-testsuite package to fail to build.

[BR: FATE#322124]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 accel/kvm/sev.c  | 4 ++++
 tests/qmp-test.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/accel/kvm/sev.c b/accel/kvm/sev.c
index b149f4ae64..0e48d1f249 100644
--- a/accel/kvm/sev.c
+++ b/accel/kvm/sev.c
@@ -322,7 +322,11 @@ sev_get_host_cbitpos(void)
 {
     uint32_t ebx;
 
+#ifdef TARGET_X86_64
     host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL);
+#else
+    ebx = 0;
+#endif
 
     return ebx & 0x3f;
 }
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index c5a5c10b41..2b2d9b2a4a 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -200,6 +200,7 @@ static bool query_is_blacklisted(const char *cmd)
         "query-gic-capabilities", /* arm */
         /* Success depends on target-specific build configuration: */
         "query-pci",              /* CONFIG_PCI */
+	"query-sev-launch-measure", /* not fully cooked yet */
         NULL
     };
     int i;

Places

File 0072-sev-Fix-build-for-non-x86-hosts.patch of Package qemu (Revision aca1518358f67f001ded96dc90440876)

Places