{"id":813446,"url":"http://patchwork.ozlabs.org/api/patches/813446/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913132417.24384-8-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170913132417.24384-8-david@redhat.com>","list_archive_url":null,"date":"2017-09-13T13:24:02","name":"[v5,07/22] target/s390x: move some s390x typedefs to cpu-qom.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9289a5f016a89179e899075cca1992be6f433a81","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913132417.24384-8-david@redhat.com/mbox/","series":[{"id":2916,"url":"http://patchwork.ozlabs.org/api/series/2916/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2916","date":"2017-09-13T13:23:55","name":"s390x cleanups and CPU hotplug via device_add","version":5,"mbox":"http://patchwork.ozlabs.org/series/2916/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813446/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813446/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsjNc4Q4tz9sNV\n\tfor ;\n\tWed, 13 Sep 2017 23:36:00 +1000 (AEST)","from localhost ([::1]:42572 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds7pe-0007Xl-Ii\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 09:35:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39080)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds7fI-0005Pz-24\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds7fB-0002n6-NT\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:13 -0400","from mx1.redhat.com ([209.132.183.28]:47268)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds7fB-0002lX-EJ\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:09 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 77E487EA84;\n\tWed, 13 Sep 2017 13:25:08 +0000 (UTC)","from t460s.redhat.com (ovpn-116-21.ams2.redhat.com [10.36.116.21])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B802569FB6;\n\tWed, 13 Sep 2017 13:25:04 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 77E487EA84","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 15:24:02 +0200","Message-Id":"<20170913132417.24384-8-david@redhat.com>","In-Reply-To":"<20170913132417.24384-1-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 13 Sep 2017 13:25:08 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v5 07/22] target/s390x: move some s390x\n\ttypedefs to cpu-qom.h","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost , david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson ,\n\tAlexander Graf ,\n\tMarkus Armbruster , borntraeger@de.ibm.com,\n\tIgor Mammedov , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This allows us to drop inclusion of cpu_models.h in cpu-qom.h, and\nprepares for using cpu-qom.h as a s390 specific version of typedefs.h\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/cpu-qom.h | 5 ++++-\n target/s390x/cpu.h | 5 +++--\n target/s390x/cpu_models.h | 8 ++++----\n 3 files changed, 11 insertions(+), 7 deletions(-)","diff":"diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h\nindex 4e936e7788..2435cd8390 100644\n--- a/target/s390x/cpu-qom.h\n+++ b/target/s390x/cpu-qom.h\n@@ -21,7 +21,6 @@\n #define QEMU_S390_CPU_QOM_H\n \n #include \"qom/cpu.h\"\n-#include \"cpu_models.h\"\n \n #define TYPE_S390_CPU \"s390-cpu\"\n \n@@ -32,6 +31,9 @@\n #define S390_CPU_GET_CLASS(obj) \\\n OBJECT_GET_CLASS(S390CPUClass, (obj), TYPE_S390_CPU)\n \n+typedef struct S390CPUModel S390CPUModel;\n+typedef struct S390CPUDef S390CPUDef;\n+\n /**\n * S390CPUClass:\n * @parent_realize: The parent class' realize handler.\n@@ -62,5 +64,6 @@ typedef struct S390CPUClass {\n } S390CPUClass;\n \n typedef struct S390CPU S390CPU;\n+typedef struct CPUS390XState CPUS390XState;\n \n #endif\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 372f7d8885..4a0a59dfbc 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -25,6 +25,7 @@\n \n #include \"qemu-common.h\"\n #include \"cpu-qom.h\"\n+#include \"cpu_models.h\"\n \n #define TARGET_LONG_BITS 64\n \n@@ -80,7 +81,7 @@ typedef struct MchkQueue {\n uint16_t type;\n } MchkQueue;\n \n-typedef struct CPUS390XState {\n+struct CPUS390XState {\n uint64_t regs[16]; /* GP registers */\n /*\n * The floating point registers are part of the vector registers.\n@@ -174,7 +175,7 @@ typedef struct CPUS390XState {\n /* currently processed sigp order */\n uint8_t sigp_order;\n \n-} CPUS390XState;\n+};\n \n static inline CPU_DoubleU *get_freg(CPUS390XState *cs, int nr)\n {\ndiff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h\nindex c0bee15d7a..4c6dee1871 100644\n--- a/target/s390x/cpu_models.h\n+++ b/target/s390x/cpu_models.h\n@@ -17,7 +17,7 @@\n #include \"qom/cpu.h\"\n \n /* static CPU definition */\n-typedef struct S390CPUDef {\n+struct S390CPUDef {\n const char *name; /* name exposed to the user */\n const char *desc; /* description exposed to the user */\n uint8_t gen; /* hw generation identification */\n@@ -37,10 +37,10 @@ typedef struct S390CPUDef {\n S390FeatBitmap full_feat;\n /* used to init full_feat from generated data */\n S390FeatInit full_init;\n-} S390CPUDef;\n+};\n \n /* CPU model based on a CPU definition */\n-typedef struct S390CPUModel {\n+struct S390CPUModel {\n const S390CPUDef *def;\n S390FeatBitmap features;\n /* values copied from the \"host\" model, can change during migration */\n@@ -48,7 +48,7 @@ typedef struct S390CPUModel {\n uint32_t cpu_id; /* CPU id */\n uint8_t cpu_id_format; /* CPU id format bit */\n uint8_t cpu_ver; /* CPU version, usually \"ff\" for kvm */\n-} S390CPUModel;\n+};\n \n /*\n * CPU ID\n","prefixes":["v5","07/22"]}