From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1vfU-0002qA-1F for qemu-devel@nongnu.org; Fri, 19 Dec 2014 06:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1vfN-0004Px-Gf for qemu-devel@nongnu.org; Fri, 19 Dec 2014 06:24:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1vfN-0004Po-9L for qemu-devel@nongnu.org; Fri, 19 Dec 2014 06:24:17 -0500 Message-ID: <54940AD5.1040301@redhat.com> Date: Fri, 19 Dec 2014 12:24:05 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> <1418956884-24022-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418956884-24022-8-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [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: Eduardo Habkost , qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov On 19/12/2014 03:41, Eduardo Habkost wrote: > 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 Please use include/hw/i386/topology.h (the toplevel build and source directories should not be part of the #include path, so it's a bug that this works). Paolo > --- > {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) > { >