From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Mon, 25 Jun 2018 12:41:55 +0000 (-0300)
Subject: x86/cpu: Use definitions from "qemu/units.h"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6a4e0614c3e2ca01ac030e9c486c77d4d7225021;p=qemu.git

x86/cpu: Use definitions from "qemu/units.h"

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180625124238.25339-4-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index d57f3104e1..bdbd446b88 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "qemu/bitops.h"
 
@@ -65,9 +66,6 @@ struct CPUID2CacheDescriptorInfo {
     int associativity;
 };
 
-#define KiB 1024
-#define MiB (1024 * 1024)
-
 /*
  * Known CPUID 2 cache descriptors.
  * From Intel SDM Volume 2A, CPUID instruction