From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVx-0002CJ-Fn for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:42:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1nVr-0002Xe-9S for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:42:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVr-0002XX-17 for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:55 -0500 From: Eduardo Habkost Date: Fri, 19 Dec 2014 00:41:23 -0200 Message-Id: <1418956884-24022-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> References: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini 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 --- {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 -#include "topology.h" +#include "hw/i386/topology.h" static void test_topo_bits(void) { -- 1.9.3