[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topolog
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h |
Date: |
Fri, 19 Dec 2014 00:41:23 -0200 |
This will allow the PC code to use the header, and lets us eliminate the
QEMU_INCLUDES hack inside tests/Makefile.
Signed-off-by: Eduardo Habkost <address@hidden>
---
{target-i386 => hw/i386}/topology.h | 6 +++---
target-i386/cpu.c | 2 +-
tests/Makefile | 2 --
tests/test-x86-cpuid.c | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
rename {target-i386 => hw/i386}/topology.h (97%)
diff --git a/target-i386/topology.h b/hw/i386/topology.h
similarity index 97%
rename from target-i386/topology.h
rename to hw/i386/topology.h
index 07a6c5f..9c6f3a9 100644
--- a/target-i386/topology.h
+++ b/hw/i386/topology.h
@@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TARGET_I386_TOPOLOGY_H
-#define TARGET_I386_TOPOLOGY_H
+#ifndef HW_I386_TOPOLOGY_H
+#define HW_I386_TOPOLOGY_H
/* This file implements the APIC-ID-based CPU topology enumeration logic,
* documented at the following document:
@@ -131,4 +131,4 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned
nr_cores,
return apicid_from_topo_ids(nr_cores, nr_threads, pkg_id, core_id, smt_id);
}
-#endif /* TARGET_I386_TOPOLOGY_H */
+#endif /* HW_I386_TOPOLOGY_H */
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 4b6e19b..d8cd7c9 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -25,7 +25,7 @@
#include "sysemu/kvm.h"
#include "sysemu/cpus.h"
#include "kvm_i386.h"
-#include "topology.h"
+#include "hw/i386/topology.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/tests/Makefile b/tests/Makefile
index e4ddb6a..bdc7cc5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -232,8 +232,6 @@ $(test-obj-y): QEMU_INCLUDES += -Itests
QEMU_CFLAGS += -I$(SRC_PATH)/tests
qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o
-tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386
-
tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a
tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a
tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a
diff --git a/tests/test-x86-cpuid.c b/tests/test-x86-cpuid.c
index 8d9f96a..6cd20d4 100644
--- a/tests/test-x86-cpuid.c
+++ b/tests/test-x86-cpuid.c
@@ -24,7 +24,7 @@
#include <glib.h>
-#include "topology.h"
+#include "hw/i386/topology.h"
static void test_topo_bits(void)
{
--
1.9.3
- [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), (continued)
- [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 3/8] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 6/8] target-i386: Don't set APIC ID on instance_init, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 2/8] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 8/8] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2014/12/18