From f5698ff9a5226bb2921712c87343786462c0bc89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Date: Tue, 3 Jul 2018 19:48:36 -0400
Subject: [PATCH] x86/cpu: Use definitions from qemu/units.h

Backports commit 6a4e0614c3e2ca01ac030e9c486c77d4d7225021 from qemu
---
 qemu/target/i386/cpu.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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