[{"id":1764520,"web_url":"http://patchwork.ozlabs.org/comment/1764520/","msgid":"<3f858041-2cc1-7beb-78bc-d43c3b42b6ab@redhat.com>","list_archive_url":null,"date":"2017-09-07T06:04:17","subject":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.h","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 04.09.2017 17:43, David Hildenbrand wrote:\n> We can also drop the extern. Fix up includes.\n> \n> Signed-off-by: David Hildenbrand \n> ---\n> include/hw/s390x/s390-virtio-ccw.h | 3 +++\n> target/s390x/cpu.h | 2 --\n> target/s390x/diag.c | 1 +\n> target/s390x/interrupt.c | 3 +++\n> 4 files changed, 7 insertions(+), 2 deletions(-)\n> \n> diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h\n> index 41a9d2862b..42f2ccdb43 100644\n> --- a/include/hw/s390x/s390-virtio-ccw.h\n> +++ b/include/hw/s390x/s390-virtio-ccw.h\n> @@ -56,4 +56,7 @@ bool gs_allowed(void);\n> */\n> bool css_migration_enabled(void);\n> \n> +S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n> +void subsystem_reset(void);\n> +\n> #endif\n> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\n> index 2343f2f1f7..6c0abb9894 100644\n> --- a/target/s390x/cpu.h\n> +++ b/target/s390x/cpu.h\n> @@ -720,8 +720,6 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,\n> \n> \n> /* outside of target/s390x/ */\n> -S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n> -extern void subsystem_reset(void);\n> int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);\n> \n> #endif\n> diff --git a/target/s390x/diag.c b/target/s390x/diag.c\n> index e6b5e6de37..82a623948d 100644\n> --- a/target/s390x/diag.c\n> +++ b/target/s390x/diag.c\n> @@ -20,6 +20,7 @@\n> #include \"hw/watchdog/wdt_diag288.h\"\n> #include \"sysemu/cpus.h\"\n> #include \"hw/s390x/ipl.h\"\n> +#include \"hw/s390x/s390-virtio-ccw.h\"\n> \n> static int modified_clear_reset(S390CPU *cpu)\n> {\n> diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c\n> index 058e219fe5..9aa6b89301 100644\n> --- a/target/s390x/interrupt.c\n> +++ b/target/s390x/interrupt.c\n> @@ -15,6 +15,9 @@\n> #include \"exec/exec-all.h\"\n> #include \"sysemu/kvm.h\"\n> #include \"hw/s390x/ioinst.h\"\n> +#if !defined(CONFIG_USER_ONLY)\n> +#include \"hw/s390x/s390-virtio-ccw.h\"\n> +#endif\n> \n> /* Ensure to exit the TB after this call! */\n> void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)\n> \n\nIf I listen to my gut feeling, I still think we should rather move\ns390_cpu_addr2state() to cpu.c instead. It does not sound as it's really\nspecific to the virtio-ccw machine... Just my 0.02 €\n\n Thomas","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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=thuth@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 3xnqgB3bxZz9sRY\n\tfor ;\n\tThu, 7 Sep 2017 16:05:09 +1000 (AEST)","from localhost ([::1]:38942 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dppw2-0006of-Oa\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 02:05:06 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40576)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dppvR-0006ki-Ub\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 02:04:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dppvM-00062s-4Y\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 02:04:28 -0400","from mx1.redhat.com ([209.132.183.28]:44112)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dppvL-00062c-Sr\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 02:04:24 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 D0EE9356C0;\n\tThu, 7 Sep 2017 06:04:22 +0000 (UTC)","from [10.36.116.66] (ovpn-116-66.ams2.redhat.com [10.36.116.66])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id B298A18A60;\n\tThu, 7 Sep 2017 06:04:18 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D0EE9356C0","To":"David Hildenbrand , qemu-devel@nongnu.org","References":"<20170904154316.4148-1-david@redhat.com>\n\t<20170904154316.4148-8-david@redhat.com>","From":"Thomas Huth ","Message-ID":"<3f858041-2cc1-7beb-78bc-d43c3b42b6ab@redhat.com>","Date":"Thu, 7 Sep 2017 08:04:17 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170904154316.4148-8-david@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 07 Sep 2017 06:04:23 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","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":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.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":"borntraeger@de.ibm.com, cohuck@redhat.com,\n\tRichard Henderson ,\n\tAlexander Graf , Eduardo Habkost ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1764703,"web_url":"http://patchwork.ozlabs.org/comment/1764703/","msgid":"<09ff8ae8-3ad2-7dd3-16d9-0528c1ee665a@redhat.com>","list_archive_url":null,"date":"2017-09-07T12:46:44","subject":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.h","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":">> +++ b/target/s390x/interrupt.c\n>> @@ -15,6 +15,9 @@\n>> #include \"exec/exec-all.h\"\n>> #include \"sysemu/kvm.h\"\n>> #include \"hw/s390x/ioinst.h\"\n>> +#if !defined(CONFIG_USER_ONLY)\n>> +#include \"hw/s390x/s390-virtio-ccw.h\"\n>> +#endif\n>> \n>> /* Ensure to exit the TB after this call! */\n>> void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)\n>>\n> \n> If I listen to my gut feeling, I still think we should rather move\n> s390_cpu_addr2state() to cpu.c instead. It does not sound as it's really\n> specific to the virtio-ccw machine... Just my 0.02 €\n> \n\nI prefer to leave it as is for now, so just a header cleanup. E.g. with\npatch 18 we could implement it directly using ms->possible_cpus.\n\n> Thomas","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 3xp0bD5MD8z9s9Y\n\tfor ;\n\tThu, 7 Sep 2017 22:47:19 +1000 (AEST)","from localhost ([::1]:40330 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpwDE-0001rR-Te\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 08:47:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43263)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpwCs-0001oq-4a\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 08:46:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpwCn-0003Yn-LZ\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 08:46:54 -0400","from mx1.redhat.com ([209.132.183.28]:59470)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpwCn-0003Y4-FQ\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 08:46:49 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 2407A7F7B9;\n\tThu, 7 Sep 2017 12:46:48 +0000 (UTC)","from [10.36.116.130] (ovpn-116-130.ams2.redhat.com [10.36.116.130])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5634B6062B;\n\tThu, 7 Sep 2017 12:46:45 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2407A7F7B9","To":"Thomas Huth , qemu-devel@nongnu.org","References":"<20170904154316.4148-1-david@redhat.com>\n\t<20170904154316.4148-8-david@redhat.com>\n\t<3f858041-2cc1-7beb-78bc-d43c3b42b6ab@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<09ff8ae8-3ad2-7dd3-16d9-0528c1ee665a@redhat.com>","Date":"Thu, 7 Sep 2017 14:46:44 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<3f858041-2cc1-7beb-78bc-d43c3b42b6ab@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tThu, 07 Sep 2017 12:46:48 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","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":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.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":"borntraeger@de.ibm.com, cohuck@redhat.com,\n\tRichard Henderson ,\n\tAlexander Graf , Eduardo Habkost ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1764722,"web_url":"http://patchwork.ozlabs.org/comment/1764722/","msgid":"<20170907152337.02f7aec8.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-07T13:23:37","subject":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.h","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Thu, 7 Sep 2017 14:46:44 +0200\nDavid Hildenbrand wrote:\n\n> >> +++ b/target/s390x/interrupt.c\n> >> @@ -15,6 +15,9 @@\n> >> #include \"exec/exec-all.h\"\n> >> #include \"sysemu/kvm.h\"\n> >> #include \"hw/s390x/ioinst.h\"\n> >> +#if !defined(CONFIG_USER_ONLY)\n> >> +#include \"hw/s390x/s390-virtio-ccw.h\"\n> >> +#endif\n> >> \n> >> /* Ensure to exit the TB after this call! */\n> >> void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)\n> >> \n> > \n> > If I listen to my gut feeling, I still think we should rather move\n> > s390_cpu_addr2state() to cpu.c instead. It does not sound as it's really\n> > specific to the virtio-ccw machine... Just my 0.02 €\n> > \n> \n> I prefer to leave it as is for now, so just a header cleanup. E.g. with\n> patch 18 we could implement it directly using ms->possible_cpus.\n\nIf you do that, would you also get rid of the conditional include above?","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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@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 3xp1QC3MGYz9sPk\n\tfor ;\n\tThu, 7 Sep 2017 23:24:35 +1000 (AEST)","from localhost ([::1]:40477 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpwnJ-0007Hy-J8\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 09:24:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54700)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpwmf-0007Es-Vf\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:23:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpwmW-00054w-Km\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:23:53 -0400","from mx1.redhat.com ([209.132.183.28]:55546)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpwmW-00054N-F5\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:23:44 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 8305CC04B329;\n\tThu, 7 Sep 2017 13:23:43 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5312018B1C;\n\tThu, 7 Sep 2017 13:23:39 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8305CC04B329","Date":"Thu, 7 Sep 2017 15:23:37 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170907152337.02f7aec8.cohuck@redhat.com>","In-Reply-To":"<09ff8ae8-3ad2-7dd3-16d9-0528c1ee665a@redhat.com>","References":"<20170904154316.4148-1-david@redhat.com>\n\t<20170904154316.4148-8-david@redhat.com>\n\t<3f858041-2cc1-7beb-78bc-d43c3b42b6ab@redhat.com>\n\t<09ff8ae8-3ad2-7dd3-16d9-0528c1ee665a@redhat.com>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"quoted-printable","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tThu, 07 Sep 2017 13:23:43 +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":"Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function\n\tdeclarations to s390-virtio-ccw.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":"Thomas Huth , Eduardo Habkost ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]