[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386 |
Date: |
Tue, 3 Feb 2015 17:39: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>
---
Change v2:
* Move it to include/hw/i386 instead of hw/i386
---
{target-i386 => include/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 => include/hw/i386}/topology.h (97%)
diff --git a/target-i386/topology.h b/include/hw/i386/topology.h
similarity index 97%
rename from target-i386/topology.h
rename to include/hw/i386/topology.h
index 07a6c5f..9c6f3a9 100644
--- a/target-i386/topology.h
+++ b/include/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 3a9b32e..c45c9b1 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 db5b3c3..85ac501 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -235,8 +235,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)
{
--
2.1.0
- [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 2/9] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 5/9] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 9/9] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 6/9] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize, Eduardo Habkost, 2015/02/03
- Re: [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Paolo Bonzini, 2015/02/04