On 13.09.2017 16:27, Thomas Huth wrote: > On 13.09.2017 15:24, David Hildenbrand wrote: >> This allows us to drop inclusion of cpu_models.h in cpu-qom.h, and >> prepares for using cpu-qom.h as a s390 specific version of typedefs.h >> >> Signed-off-by: David Hildenbrand <da...@redhat.com> >> --- >> target/s390x/cpu-qom.h | 5 ++++- >> target/s390x/cpu.h | 5 +++-- >> target/s390x/cpu_models.h | 8 ++++---- >> 3 files changed, 11 insertions(+), 7 deletions(-) > [...] >> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h >> index 372f7d8885..4a0a59dfbc 100644 >> --- a/target/s390x/cpu.h >> +++ b/target/s390x/cpu.h >> @@ -25,6 +25,7 @@ >> >> #include "qemu-common.h" >> #include "cpu-qom.h" >> +#include "cpu_models.h" > > Do we really need to include cpu_models.h here? Looking at your changes > below, it does not seem to be necessary?
Yes, due to s390_has_feat(), and I want to avoid cleaning all the other calling places up in this patch. -- Thanks, David