[{"id":1769993,"web_url":"http://patchwork.ozlabs.org/comment/1769993/","msgid":"","list_archive_url":null,"date":"2017-09-18T08:58:47","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":590,"url":"http://patchwork.ozlabs.org/api/people/590/","name":"Christian Borntraeger","email":"borntraeger@de.ibm.com"},"content":"On 09/18/2017 10:55 AM, Cornelia Huck wrote:\n> d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n> registering the s390 pci host bridge conditional on presense\n> of the zpci facility bit. Sadly, that breaks migration from\n> machines that did not use the cpu model (2.7 and previous).\n> \n> Create the s390 phb for pre-cpu model machines as well: We can\n> tweak s390_has_feat() to always indicate the zpci facility bit\n> when no cpu model is available (on 2.7 and previous compat machines).\n\nLooks better now. Thanks\n> \n> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> Acked-by: Christian Borntraeger \n> Signed-off-by: Cornelia Huck \n> ---\n> \n> v2->v3:\n> - no longer RFC (I tested a bit more)\n> - removed unrelated hunk\n> - more verbose patch description\n> \n> I'll wait a bit for more acks/reviews and will probably send a pull\n> request for s390x tomorrow or so before the amount of queued patches\n> gets out of hand...\n\nI have a small amount of patches pending, but then I got sick last week\nso I still have to sort out things. Lets do the pull request and we can\nthen queue the other patches after they have received proper review.\n\n> \n> ---\n> target/s390x/cpu_models.c | 3 +++\n> 1 file changed, 3 insertions(+)\n> \n> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> index c295e641e6..5169379db5 100644\n> --- a/target/s390x/cpu_models.c\n> +++ b/target/s390x/cpu_models.c\n> @@ -196,6 +196,9 @@ bool s390_has_feat(S390Feat feat)\n> }\n> }\n> #endif\n> + if (feat == S390_FEAT_ZPCI) {\n> + return true;\n> + }\n> return 0;\n> }\n> return test_bit(feat, cpu->model->features);\n>","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=)","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 3xwg1157KGz9s7c\n\tfor ;\n\tMon, 18 Sep 2017 18:59:17 +1000 (AEST)","from localhost ([::1]:35322 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtrtb-0007M5-Tn\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 04:59:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46569)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtrtJ-0007Lv-Bg\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:58:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtrtG-0003ty-Ag\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:58:57 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:36950\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtrtG-0003tu-49\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:58:54 -0400","from pps.filterd (m0098419.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8I8sDNa104305\n\tfor ; Mon, 18 Sep 2017 04:58:53 -0400","from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2d27strxrd-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 18 Sep 2017 04:58:52 -0400","from localhost\n\tby e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 18 Sep 2017 09:58:51 +0100","from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196)\n\tby e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tMon, 18 Sep 2017 09:58:48 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8I8wlYS18153616; Mon, 18 Sep 2017 08:58:47 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 01BBB52045;\n\tMon, 18 Sep 2017 08:53:49 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.66])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id A77E452041; \n\tMon, 18 Sep 2017 08:53:48 +0100 (BST)"],"To":"Cornelia Huck , qemu-devel@nongnu.org","References":"<20170918085542.13265-1-cohuck@redhat.com>","From":"Christian Borntraeger ","Date":"Mon, 18 Sep 2017 10:58:47 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.0","MIME-Version":"1.0","In-Reply-To":"<20170918085542.13265-1-cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-TM-AS-GCONF":"00","x-cbid":"17091808-0016-0000-0000-000004EDB33C","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091808-0017-0000-0000-00002827DFD4","Message-Id":"","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-18_02:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709180127","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, david@redhat.com,\n\tpmorel@linux.vnet.ibm.com, agraf@suse.de, pasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1769996,"web_url":"http://patchwork.ozlabs.org/comment/1769996/","msgid":"<20170918110656.0e1ec9f3.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-18T09:06:56","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Mon, 18 Sep 2017 10:58:47 +0200\nChristian Borntraeger wrote:\n\n> On 09/18/2017 10:55 AM, Cornelia Huck wrote:\n> > d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n> > registering the s390 pci host bridge conditional on presense\n> > of the zpci facility bit. Sadly, that breaks migration from\n> > machines that did not use the cpu model (2.7 and previous).\n> > \n> > Create the s390 phb for pre-cpu model machines as well: We can\n> > tweak s390_has_feat() to always indicate the zpci facility bit\n> > when no cpu model is available (on 2.7 and previous compat machines). \n> \n> Looks better now. Thanks\n> > \n> > Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> > Acked-by: Christian Borntraeger \n> > Signed-off-by: Cornelia Huck \n> > ---\n> > \n> > v2->v3:\n> > - no longer RFC (I tested a bit more)\n> > - removed unrelated hunk\n> > - more verbose patch description\n> > \n> > I'll wait a bit for more acks/reviews and will probably send a pull\n> > request for s390x tomorrow or so before the amount of queued patches\n> > gets out of hand... \n> \n> I have a small amount of patches pending, but then I got sick last week\n> so I still have to sort out things. Lets do the pull request and we can\n> then queue the other patches after they have received proper review.\n\nSounds like a plan.","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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xwgBc5VXDz9s7c\n\tfor ;\n\tMon, 18 Sep 2017 19:07:35 +1000 (AEST)","from localhost ([::1]:35353 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dts1d-0001Qh-0X\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 05:07:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48979)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dts1C-0001QJ-Ky\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:07:10 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dts16-000771-UE\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:07:06 -0400","from mx1.redhat.com ([209.132.183.28]:58708)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dts16-00076F-OX\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:07:00 -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 8B247883B6;\n\tMon, 18 Sep 2017 09:06:59 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0DA8E5CC05;\n\tMon, 18 Sep 2017 09:06:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8B247883B6","Date":"Mon, 18 Sep 2017 11:06:56 +0200","From":"Cornelia Huck ","To":"Christian Borntraeger ","Message-ID":"<20170918110656.0e1ec9f3.cohuck@redhat.com>","In-Reply-To":"","References":"<20170918085542.13265-1-cohuck@redhat.com>\n\t","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","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.26]);\n\tMon, 18 Sep 2017 09:06:59 +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 v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, david@redhat.com,\n\tpmorel@linux.vnet.ibm.com, qemu-devel@nongnu.org, agraf@suse.de,\n\tpasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770107,"web_url":"http://patchwork.ozlabs.org/comment/1770107/","msgid":"<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>","list_archive_url":null,"date":"2017-09-18T12:03:20","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 18.09.2017 10:55, Cornelia Huck wrote:\n> d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n> registering the s390 pci host bridge conditional on presense\n> of the zpci facility bit. Sadly, that breaks migration from\n> machines that did not use the cpu model (2.7 and previous).\n> \n> Create the s390 phb for pre-cpu model machines as well: We can\n> tweak s390_has_feat() to always indicate the zpci facility bit\n> when no cpu model is available (on 2.7 and previous compat machines).\n> \n> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> Acked-by: Christian Borntraeger \n> Signed-off-by: Cornelia Huck \n> ---\n> \n> v2->v3:\n> - no longer RFC (I tested a bit more)\n> - removed unrelated hunk\n> - more verbose patch description\n> \n> I'll wait a bit for more acks/reviews and will probably send a pull\n> request for s390x tomorrow or so before the amount of queued patches\n> gets out of hand...\n> \n> ---\n> target/s390x/cpu_models.c | 3 +++\n> 1 file changed, 3 insertions(+)\n> \n> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> index c295e641e6..5169379db5 100644\n> --- a/target/s390x/cpu_models.c\n> +++ b/target/s390x/cpu_models.c\n> @@ -196,6 +196,9 @@ bool s390_has_feat(S390Feat feat)\n> }\n> }\n> #endif\n> + if (feat == S390_FEAT_ZPCI) {\n> + return true;\n> + }\n> return 0;\n> }\n> return test_bit(feat, cpu->model->features);\n> \n\n1. cpu->model will always be set for QEMU, so you can move that into the\nifdef, next do the other checks. You can even send a cleanup to remove\nthe if (kvm_enabled()) check.\n\n2. \"return pci_available\" ?","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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xwl6R468Gz9s78\n\tfor ;\n\tMon, 18 Sep 2017 22:04:15 +1000 (AEST)","from localhost ([::1]:36194 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtumb-0002Wo-K9\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 08:04:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49443)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtult-0002SZ-4Z\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:03:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtulp-0001gr-6T\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:03:29 -0400","from mx1.redhat.com ([209.132.183.28]:33130)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtulp-0001fY-1l\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:03:25 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 59F807F755;\n\tMon, 18 Sep 2017 12:03:23 +0000 (UTC)","from [10.36.118.72] (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4BF5B5D760;\n\tMon, 18 Sep 2017 12:03:21 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 59F807F755","To":"Cornelia Huck , qemu-devel@nongnu.org","References":"<20170918085542.13265-1-cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>","Date":"Mon, 18 Sep 2017 14:03:20 +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":"<20170918085542.13265-1-cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tMon, 18 Sep 2017 12:03:23 +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 v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, pmorel@linux.vnet.ibm.com, \n\tagraf@suse.de, borntraeger@de.ibm.com, pasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770116,"web_url":"http://patchwork.ozlabs.org/comment/1770116/","msgid":"<20170918141127.17b669a7.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-18T12:11:27","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Mon, 18 Sep 2017 14:03:20 +0200\nDavid Hildenbrand wrote:\n\n> On 18.09.2017 10:55, Cornelia Huck wrote:\n> > d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n> > registering the s390 pci host bridge conditional on presense\n> > of the zpci facility bit. Sadly, that breaks migration from\n> > machines that did not use the cpu model (2.7 and previous).\n> > \n> > Create the s390 phb for pre-cpu model machines as well: We can\n> > tweak s390_has_feat() to always indicate the zpci facility bit\n> > when no cpu model is available (on 2.7 and previous compat machines).\n> > \n> > Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> > Acked-by: Christian Borntraeger \n> > Signed-off-by: Cornelia Huck \n> > ---\n> > \n> > v2->v3:\n> > - no longer RFC (I tested a bit more)\n> > - removed unrelated hunk\n> > - more verbose patch description\n> > \n> > I'll wait a bit for more acks/reviews and will probably send a pull\n> > request for s390x tomorrow or so before the amount of queued patches\n> > gets out of hand...\n> > \n> > ---\n> > target/s390x/cpu_models.c | 3 +++\n> > 1 file changed, 3 insertions(+)\n> > \n> > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> > index c295e641e6..5169379db5 100644\n> > --- a/target/s390x/cpu_models.c\n> > +++ b/target/s390x/cpu_models.c\n> > @@ -196,6 +196,9 @@ bool s390_has_feat(S390Feat feat)\n> > }\n> > }\n> > #endif\n> > + if (feat == S390_FEAT_ZPCI) {\n> > + return true;\n> > + }\n> > return 0;\n> > }\n> > return test_bit(feat, cpu->model->features);\n> > \n> \n> 1. cpu->model will always be set for QEMU, so you can move that into the\n> ifdef, next do the other checks. You can even send a cleanup to remove\n> the if (kvm_enabled()) check.\n\nI prefer it the way it is now. There's nothing kvm specific about that\nbit, and cpu->model always being set is not really obvious.\n\n> \n> 2. \"return pci_available\" ?\n\nI thought about that as well. I think, however, that a better way is\njust to disable compat machines that rely on pci being available.\n\nAs you can turn off pci only manually, I'd like to defer this and first\nget this out of the door, as it fixes an existing problem.","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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xwlHb2zB5z9s7M\n\tfor ;\n\tMon, 18 Sep 2017 22:12:11 +1000 (AEST)","from localhost ([::1]:36225 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtuuH-00065u-G5\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 08:12:09 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52083)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtutm-00063L-QE\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:11:39 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtuti-0006RH-QA\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:11:38 -0400","from mx1.redhat.com ([209.132.183.28]:60660)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtuti-0006Qp-Ip\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:11:34 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 A64E2149BD;\n\tMon, 18 Sep 2017 12:11:33 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 307375C670;\n\tMon, 18 Sep 2017 12:11:30 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A64E2149BD","Date":"Mon, 18 Sep 2017 14:11:27 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170918141127.17b669a7.cohuck@redhat.com>","In-Reply-To":"<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>","References":"<20170918085542.13265-1-cohuck@redhat.com>\n\t<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tMon, 18 Sep 2017 12:11:33 +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 v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, pmorel@linux.vnet.ibm.com, \n\tqemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com,\n\tpasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770117,"web_url":"http://patchwork.ozlabs.org/comment/1770117/","msgid":"<2e19455c-2af8-dad4-febb-c65e1e7d7a3c@redhat.com>","list_archive_url":null,"date":"2017-09-18T12:13:07","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 18.09.2017 14:11, Cornelia Huck wrote:\n> On Mon, 18 Sep 2017 14:03:20 +0200\n> David Hildenbrand wrote:\n> \n>> On 18.09.2017 10:55, Cornelia Huck wrote:\n>>> d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n>>> registering the s390 pci host bridge conditional on presense\n>>> of the zpci facility bit. Sadly, that breaks migration from\n>>> machines that did not use the cpu model (2.7 and previous).\n>>>\n>>> Create the s390 phb for pre-cpu model machines as well: We can\n>>> tweak s390_has_feat() to always indicate the zpci facility bit\n>>> when no cpu model is available (on 2.7 and previous compat machines).\n>>>\n>>> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n>>> Acked-by: Christian Borntraeger \n>>> Signed-off-by: Cornelia Huck \n>>> ---\n>>>\n>>> v2->v3:\n>>> - no longer RFC (I tested a bit more)\n>>> - removed unrelated hunk\n>>> - more verbose patch description\n>>>\n>>> I'll wait a bit for more acks/reviews and will probably send a pull\n>>> request for s390x tomorrow or so before the amount of queued patches\n>>> gets out of hand...\n>>>\n>>> ---\n>>> target/s390x/cpu_models.c | 3 +++\n>>> 1 file changed, 3 insertions(+)\n>>>\n>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n>>> index c295e641e6..5169379db5 100644\n>>> --- a/target/s390x/cpu_models.c\n>>> +++ b/target/s390x/cpu_models.c\n>>> @@ -196,6 +196,9 @@ bool s390_has_feat(S390Feat feat)\n>>> }\n>>> }\n>>> #endif\n>>> + if (feat == S390_FEAT_ZPCI) {\n>>> + return true;\n>>> + }\n>>> return 0;\n>>> }\n>>> return test_bit(feat, cpu->model->features);\n>>> \n>>\n>> 1. cpu->model will always be set for QEMU, so you can move that into the\n>> ifdef, next do the other checks. You can even send a cleanup to remove\n>> the if (kvm_enabled()) check.\n> \n> I prefer it the way it is now. There's nothing kvm specific about that\n> bit, and cpu->model always being set is not really obvious.\n> \n\nI's already kvm specific as this can never happen with TCG :)\n\nBut whatever you prefer. This is good enough to fix the problem.","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=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 3xwlKG279rz9s78\n\tfor ;\n\tMon, 18 Sep 2017 22:13:38 +1000 (AEST)","from localhost ([::1]:36228 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtuvg-0007Iy-EW\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 08:13:36 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52560)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtuvL-0007HD-4v\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:13:16 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtuvH-0007ZS-KE\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:13:15 -0400","from mx1.redhat.com ([209.132.183.28]:54260)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtuvH-0007Yo-Da\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:13:11 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 7A91CC04B938;\n\tMon, 18 Sep 2017 12:13:10 +0000 (UTC)","from [10.36.118.72] (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C99F05D6A6;\n\tMon, 18 Sep 2017 12:13:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7A91CC04B938","To":"Cornelia Huck ","References":"<20170918085542.13265-1-cohuck@redhat.com>\n\t<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>\n\t<20170918141127.17b669a7.cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<2e19455c-2af8-dad4-febb-c65e1e7d7a3c@redhat.com>","Date":"Mon, 18 Sep 2017 14:13:07 +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":"<20170918141127.17b669a7.cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tMon, 18 Sep 2017 12:13:10 +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 v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, pmorel@linux.vnet.ibm.com, \n\tqemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com,\n\tpasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770120,"web_url":"http://patchwork.ozlabs.org/comment/1770120/","msgid":"<20170918141629.31de16de.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-18T12:16:29","subject":"Re: [Qemu-devel] [PATCH v3] s390x/ccw: create s390 phb for compat\n\treasons as well","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Mon, 18 Sep 2017 14:13:07 +0200\nDavid Hildenbrand wrote:\n\n> On 18.09.2017 14:11, Cornelia Huck wrote:\n> > On Mon, 18 Sep 2017 14:03:20 +0200\n> > David Hildenbrand wrote:\n> > \n> >> On 18.09.2017 10:55, Cornelia Huck wrote: \n> >>> d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\n> >>> registering the s390 pci host bridge conditional on presense\n> >>> of the zpci facility bit. Sadly, that breaks migration from\n> >>> machines that did not use the cpu model (2.7 and previous).\n> >>>\n> >>> Create the s390 phb for pre-cpu model machines as well: We can\n> >>> tweak s390_has_feat() to always indicate the zpci facility bit\n> >>> when no cpu model is available (on 2.7 and previous compat machines).\n> >>>\n> >>> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> >>> Acked-by: Christian Borntraeger \n> >>> Signed-off-by: Cornelia Huck \n> >>> ---\n> >>>\n> >>> v2->v3:\n> >>> - no longer RFC (I tested a bit more)\n> >>> - removed unrelated hunk\n> >>> - more verbose patch description\n> >>>\n> >>> I'll wait a bit for more acks/reviews and will probably send a pull\n> >>> request for s390x tomorrow or so before the amount of queued patches\n> >>> gets out of hand...\n> >>>\n> >>> ---\n> >>> target/s390x/cpu_models.c | 3 +++\n> >>> 1 file changed, 3 insertions(+)\n> >>>\n> >>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> >>> index c295e641e6..5169379db5 100644\n> >>> --- a/target/s390x/cpu_models.c\n> >>> +++ b/target/s390x/cpu_models.c\n> >>> @@ -196,6 +196,9 @@ bool s390_has_feat(S390Feat feat)\n> >>> }\n> >>> }\n> >>> #endif\n> >>> + if (feat == S390_FEAT_ZPCI) {\n> >>> + return true;\n> >>> + }\n> >>> return 0;\n> >>> }\n> >>> return test_bit(feat, cpu->model->features);\n> >>> \n> >>\n> >> 1. cpu->model will always be set for QEMU, so you can move that into the\n> >> ifdef, next do the other checks. You can even send a cleanup to remove\n> >> the if (kvm_enabled()) check. \n> > \n> > I prefer it the way it is now. There's nothing kvm specific about that\n> > bit, and cpu->model always being set is not really obvious.\n> > \n> \n> I's already kvm specific as this can never happen with TCG :)\n> \n> But whatever you prefer. This is good enough to fix the problem.\n\nSure, we can revisit that one later. I plan to send a pull request\ntomorrow.","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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xwlPG56x5z9s7c\n\tfor ;\n\tMon, 18 Sep 2017 22:17:05 +1000 (AEST)","from localhost ([::1]:36241 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtuz1-0000qO-Mn\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 08:17:03 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53632)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtuyh-0000pq-P2\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:16:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtuyb-0000jf-M9\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:16:43 -0400","from mx1.redhat.com ([209.132.183.28]:55502)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtuyb-0000iV-DV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:16:37 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 46C2D7F341;\n\tMon, 18 Sep 2017 12:16:36 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6B6A05C670;\n\tMon, 18 Sep 2017 12:16:31 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 46C2D7F341","Date":"Mon, 18 Sep 2017 14:16:29 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170918141629.31de16de.cohuck@redhat.com>","In-Reply-To":"<2e19455c-2af8-dad4-febb-c65e1e7d7a3c@redhat.com>","References":"<20170918085542.13265-1-cohuck@redhat.com>\n\t<33493193-b9fc-e76f-f30e-c23d68e34289@redhat.com>\n\t<20170918141127.17b669a7.cohuck@redhat.com>\n\t<2e19455c-2af8-dad4-febb-c65e1e7d7a3c@redhat.com>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tMon, 18 Sep 2017 12:16:36 +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 v3] s390x/ccw: create s390 phb for compat\n\treasons as well","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":"thuth@redhat.com, zyimin@linux.vnet.ibm.com, pmorel@linux.vnet.ibm.com, \n\tqemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com,\n\tpasic@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]