openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-i386: Move topology.h to include/hw/i386 

This will allow the PC code to use the header, and lets us eliminate the
QEMU_INCLUDES hack inside tests/Makefile.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2014-12-18 23:41:06 -02:00
parent 08e1a1e5a1
commit 8a3f75b39d
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-i386/topology.h → include/hw/i386/topology.h
View File

@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef TARGET_I386_TOPOLOGY_H #ifndef HW_I386_TOPOLOGY_H
#define TARGET_I386_TOPOLOGY_H #define HW_I386_TOPOLOGY_H
/* This file implements the APIC-ID-based CPU topology enumeration logic, /* This file implements the APIC-ID-based CPU topology enumeration logic,
* documented at the following document: * 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); 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 */

2
target-i386/cpu.c
View File

@ -25,7 +25,7 @@
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "kvm_i386.h" #include "kvm_i386.h"
#include "topology.h" #include "hw/i386/topology.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"

2
tests/Makefile
View File

@ -239,8 +239,6 @@ $(test-obj-y): QEMU_INCLUDES += -Itests
QEMU_CFLAGS += -I$(SRC_PATH)/tests QEMU_CFLAGS += -I$(SRC_PATH)/tests
qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o 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-qint$(EXESUF): tests/check-qint.o libqemuutil.a
tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a
tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a

2
tests/test-x86-cpuid.c
View File

@ -24,7 +24,7 @@
#include <glib.h> #include <glib.h>
#include "topology.h" #include "hw/i386/topology.h"
static void test_topo_bits(void) static void test_topo_bits(void)
{ {