Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / cache-utils.c

diff --git a/cache-utils.c b/cache-utils.c
index 7df1fcf..45d62c9 100644 (file)
--- a/cache-utils.c
+++ b/cache-utils.c
@@ -1,6 +1,6 @@
 #include "cache-utils.h"
 
-#if defined HOST_PPC || defined HOST_PPC64
+#if defined(_ARCH_PPC)
 struct qemu_cache_conf qemu_cache_conf = {
     .dcache_bsize = 16,
     .icache_bsize = 16
@@ -37,6 +37,7 @@ static void ppc_init_cacheline_sizes(char **envp)
 }
 
 #elif defined __APPLE__
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
@@ -46,6 +47,7 @@ static void ppc_init_cacheline_sizes(void)
     unsigned cacheline;
     int name[2] = { CTL_HW, HW_CACHELINE };
 
+    len = sizeof(cacheline);
     if (sysctl(name, 2, &cacheline, &len, NULL, 0)) {
         perror("sysctl CTL_HW HW_CACHELINE failed");
     } else {
@@ -68,4 +70,4 @@ void qemu_cache_utils_init(char **envp)
 }
 #endif
 
-#endif /* HOST_PPC || HOST_PPC64  */
+#endif /* _ARCH_PPC */