From 541601edc46cfc32a6e7385571f122099dca0f5b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 25 Feb 2018 22:17:16 -0500
Subject: [PATCH] util: Move qemu-log to utils

---
 msvc/unicorn/unicorn/unicorn.vcxproj                       | 2 +-
 msvc/unicorn/unicorn/unicorn.vcxproj.filters               | 6 +++---
 msvc/unicorn/unicorn_static/unicorn_static.vcxproj         | 2 +-
 msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters | 6 +++---
 qemu/Makefile.objs                                         | 1 -
 qemu/util/Makefile.objs                                    | 1 +
 qemu/{qemu-log.c => util/log.c}                            | 0
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename qemu/{qemu-log.c => util/log.c} (100%)

diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj b/msvc/unicorn/unicorn/unicorn.vcxproj
index 68f2536e..4e32f3dd 100644
--- a/msvc/unicorn/unicorn/unicorn.vcxproj
+++ b/msvc/unicorn/unicorn/unicorn.vcxproj
@@ -204,7 +204,6 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
     <ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c" />
     <ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c" />
     <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" />
-    <ClCompile Include="..\..\..\qemu\qemu-log.c" />
     <ClCompile Include="..\..\..\qemu\qemu-timer.c" />
     <ClCompile Include="..\..\..\qemu\qobject\qbool.c" />
     <ClCompile Include="..\..\..\qemu\qobject\qdict.c" />
@@ -227,6 +226,7 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
     <ClCompile Include="..\..\..\qemu\util\error.c" />
     <ClCompile Include="..\..\..\qemu\util\getauxval.c" />
     <ClCompile Include="..\..\..\qemu\util\host-utils.c" />
+    <ClCompile Include="..\..\..\qemu\util\log.c" />
     <ClCompile Include="..\..\..\qemu\util\module.c" />
     <ClCompile Include="..\..\..\qemu\util\oslib-win32.c" />
     <ClCompile Include="..\..\..\qemu\util\qemu-error.c" />
diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj.filters b/msvc/unicorn/unicorn/unicorn.vcxproj.filters
index a72cba7f..a0da23fa 100644
--- a/msvc/unicorn/unicorn/unicorn.vcxproj.filters
+++ b/msvc/unicorn/unicorn/unicorn.vcxproj.filters
@@ -11,9 +11,6 @@
     <ClCompile Include="..\..\..\qemu\glib_compat.c">
       <Filter>qemu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\qemu-log.c">
-      <Filter>qemu</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\qemu\qemu-timer.c">
       <Filter>qemu</Filter>
     </ClCompile>
@@ -44,6 +41,9 @@
     <ClCompile Include="..\..\..\qemu\util\host-utils.c">
       <Filter>qemu\util</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\qemu\util\log.c">
+      <Filter>qemu\util</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\qemu\util\module.c">
       <Filter>qemu\util</Filter>
     </ClCompile>
diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
index 2091b138..b3f80110 100644
--- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
+++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
@@ -32,7 +32,6 @@
     <ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c" />
     <ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c" />
     <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" />
-    <ClCompile Include="..\..\..\qemu\qemu-log.c" />
     <ClCompile Include="..\..\..\qemu\qemu-timer.c" />
     <ClCompile Include="..\..\..\qemu\qobject\qbool.c" />
     <ClCompile Include="..\..\..\qemu\qobject\qdict.c" />
@@ -55,6 +54,7 @@
     <ClCompile Include="..\..\..\qemu\util\error.c" />
     <ClCompile Include="..\..\..\qemu\util\getauxval.c" />
     <ClCompile Include="..\..\..\qemu\util\host-utils.c" />
+    <ClCompile Include="..\..\..\qemu\util\log.c" />
     <ClCompile Include="..\..\..\qemu\util\module.c" />
     <ClCompile Include="..\..\..\qemu\util\oslib-win32.c" />
     <ClCompile Include="..\..\..\qemu\util\qemu-error.c" />
diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
index f7e1d747..e6a4a1d3 100644
--- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
+++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
@@ -81,9 +81,6 @@
     <ClCompile Include="..\..\..\qemu\glib_compat.c">
       <Filter>qemu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\qemu-log.c">
-      <Filter>qemu</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\qemu\qemu-timer.c">
       <Filter>qemu</Filter>
     </ClCompile>
@@ -177,6 +174,9 @@
     <ClCompile Include="..\..\..\qemu\util\host-utils.c">
       <Filter>qemu\util</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\qemu\util\log.c">
+      <Filter>qemu</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\qemu\util\module.c">
       <Filter>qemu\util</Filter>
     </ClCompile>
diff --git a/qemu/Makefile.objs b/qemu/Makefile.objs
index f4e3193b..b78a4daa 100644
--- a/qemu/Makefile.objs
+++ b/qemu/Makefile.objs
@@ -28,7 +28,6 @@ endif
 
 #######################################################################
 # Target-independent parts used in system and user emulation
-common-obj-y += qemu-log.o
 common-obj-y += tcg-runtime.o
 common-obj-y += hw/
 common-obj-y += qom/
diff --git a/qemu/util/Makefile.objs b/qemu/util/Makefile.objs
index de61e5f1..f2571884 100644
--- a/qemu/util/Makefile.objs
+++ b/qemu/util/Makefile.objs
@@ -8,4 +8,5 @@ util-obj-y += error.o
 util-obj-y += crc32c.o
 util-obj-y += host-utils.o
 util-obj-y += getauxval.o
+util-obj-y += log.o
 util-obj-y += range.o
diff --git a/qemu/qemu-log.c b/qemu/util/log.c
similarity index 100%
rename from qemu/qemu-log.c
rename to qemu/util/log.c