From 19ff90a9c5270d9b903f14f6fefce1edcf6dd6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 16 Jan 2020 10:51:35 +0000
Subject: [PATCH] util: add a virArchFromHost() impl for Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of relying on GNULIb's uname() impl, directly use the
Windows API for determining CPU architecture.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/util/virarch.c | 52 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/util/virarch.c b/src/util/virarch.c
index b132e178c3..f088b6b676 100644
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
 
-#include <sys/utsname.h>
+#ifdef WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#else
+# include <sys/utsname.h>
+#endif
 
 #include "virlog.h"
 #include "virarch.h"
@@ -154,6 +159,50 @@ virArch virArchFromString(const char *archstr)
  * uname 'machine' field, since this will canonicalize
  * architecture names like 'amd64' into 'x86_64'.
  */
+#ifdef WIN32
+
+/*
+ * Missing in ming64 headers 6.0.0, but defined as '12' in:
+ *
+ * https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info
+ */
+# ifndef PROCESSOR_ARCHITECTURE_ARM64
+#  define PROCESSOR_ARCHITECTURE_ARM64 12
+# endif
+
+virArch virArchFromHost(void)
+{
+    SYSTEM_INFO info;
+
+    GetSystemInfo(&info);
+
+    switch (info.wProcessorArchitecture) {
+    case PROCESSOR_ARCHITECTURE_AMD64:
+        return VIR_ARCH_X86_64;
+    case PROCESSOR_ARCHITECTURE_IA64:
+        return VIR_ARCH_ITANIUM;
+    case PROCESSOR_ARCHITECTURE_INTEL:
+    case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
+        return VIR_ARCH_I686;
+    case PROCESSOR_ARCHITECTURE_MIPS:
+        return VIR_ARCH_MIPS;
+    case PROCESSOR_ARCHITECTURE_ALPHA:
+        return VIR_ARCH_ALPHA;
+    case PROCESSOR_ARCHITECTURE_PPC:
+        return VIR_ARCH_PPC;
+    case PROCESSOR_ARCHITECTURE_SHX:
+        return VIR_ARCH_SH4;
+    case PROCESSOR_ARCHITECTURE_ARM:
+        return VIR_ARCH_ARMV7L;
+    case PROCESSOR_ARCHITECTURE_ARM64:
+        return VIR_ARCH_AARCH64;
+    default:
+        VIR_WARN("Unknown host arch '%d', report to libvir-list@redhat.com",
+                 info.wProcessorArchitecture);
+        return VIR_ARCH_NONE;
+    }
+}
+#else /* !WIN32 */
 virArch virArchFromHost(void)
 {
     struct utsname ut;
@@ -184,3 +233,4 @@ virArch virArchFromHost(void)
 
     return arch;
 }
+#endif /* !WIN32 */
-- 
GitLab