[{"id":1769909,"web_url":"http://patchwork.ozlabs.org/comment/1769909/","msgid":"<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>","list_archive_url":null,"date":"2017-09-18T07:33:23","subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons as well","submitter":{"id":590,"url":"http://patchwork.ozlabs.org/api/people/590/","name":"Christian Borntraeger","email":"borntraeger@de.ibm.com"},"content":"On 09/15/2017 06:39 PM, 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.\n> \n> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> Signed-off-by: Cornelia Huck \n> ---\n> hw/s390x/s390-virtio-ccw.c | 2 ++\n> target/s390x/cpu_models.c | 3 +++\n> 2 files changed, 5 insertions(+)\n> \n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index 0471407187..907abc7a32 100644\n> --- a/hw/s390x/s390-virtio-ccw.c\n> +++ b/hw/s390x/s390-virtio-ccw.c\n> @@ -269,6 +269,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n> }\n> }\n> \n> +static S390CcwMachineClass *get_machine_class(void);\n> +\n> static void ccw_init(MachineState *machine)\n> {\n> int ret;\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\nShouldnt that be depend on the machine being 2.7? I mean unless I misread \nthe context of this patch, you hard enable the PCI facility bit for all \nmachines and make all s390_has_feat(S390_FEAT_ZPCI) useless?\n\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 3xwd6l2474z9ryQ\n\tfor ;\n\tMon, 18 Sep 2017 17:34:07 +1000 (AEST)","from localhost ([::1]:35044 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtqZB-0004EW-Eh\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 03:34:05 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55775)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtqYh-0004Cs-0m\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:33:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtqYd-0005FM-UB\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:33:35 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:59798)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtqYd-0005Ey-Lo\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:33:31 -0400","from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8I7TaRn055557\n\tfor ; Mon, 18 Sep 2017 03:33:30 -0400","from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d29qc8d7s-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 18 Sep 2017 03:33:29 -0400","from localhost\n\tby e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 18 Sep 2017 08:33:27 +0100","from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)\n\tby e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tMon, 18 Sep 2017 08:33:24 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8I7XORd21692560; Mon, 18 Sep 2017 07:33:24 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 54EC452041;\n\tMon, 18 Sep 2017 07:28:25 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.66])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 122EA5203F; \n\tMon, 18 Sep 2017 07:28:24 +0100 (BST)"],"To":"Cornelia Huck , qemu-devel@nongnu.org","References":"<20170915163952.32147-1-cohuck@redhat.com>\n\t<20170915163952.32147-2-cohuck@redhat.com>","From":"Christian Borntraeger ","Date":"Mon, 18 Sep 2017 09:33:23 +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":"<20170915163952.32147-2-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":"17091807-0040-0000-0000-000003DAAB45","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091807-0041-0000-0000-000025DBD519","Message-Id":"<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-18_01:, , 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-1709180107","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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":1769927,"web_url":"http://patchwork.ozlabs.org/comment/1769927/","msgid":"<396c3d9d-644a-c946-3099-aba94f0571e8@de.ibm.com>","list_archive_url":null,"date":"2017-09-18T07:47:00","subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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 09:33 AM, Christian Borntraeger wrote:\n> \n> \n> On 09/15/2017 06:39 PM, 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.\n>>\n>> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n>> Signed-off-by: Cornelia Huck \n>> ---\n>> hw/s390x/s390-virtio-ccw.c | 2 ++\n>> target/s390x/cpu_models.c | 3 +++\n>> 2 files changed, 5 insertions(+)\n>>\n>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n>> index 0471407187..907abc7a32 100644\n>> --- a/hw/s390x/s390-virtio-ccw.c\n>> +++ b/hw/s390x/s390-virtio-ccw.c\n>> @@ -269,6 +269,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n>> }\n>> }\n>>\n>> +static S390CcwMachineClass *get_machine_class(void);\n>> +\n>> static void ccw_init(MachineState *machine)\n>> {\n>> int ret;\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> \n> Shouldnt that be depend on the machine being 2.7? I mean unless I misread \n> the context of this patch, you hard enable the PCI facility bit for all \n> machines and make all s390_has_feat(S390_FEAT_ZPCI) useless?\n> \n\nSorry, I had to lookup again the original code. So this is inside !cpu->model. \nYes makes sense then.","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 3xwdQQ5jRJz9s3w\n\tfor ;\n\tMon, 18 Sep 2017 17:47:42 +1000 (AEST)","from localhost ([::1]:35099 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtqmK-0001Z0-U4\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 03:47:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59024)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtqlr-0001Xt-5o\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:47:12 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtqlo-00015G-3O\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:47:11 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51123)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtqln-000151-Qi\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:47:08 -0400","from pps.filterd (m0098393.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8I7hg8i055908\n\tfor ; Mon, 18 Sep 2017 03:47:06 -0400","from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d26g496t0-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 18 Sep 2017 03:47:06 -0400","from localhost\n\tby e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 18 Sep 2017 08:47:04 +0100","from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tMon, 18 Sep 2017 08:47:01 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8I7l01218481248; Mon, 18 Sep 2017 07:47:00 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id E2D3D5204B;\n\tMon, 18 Sep 2017 07:42:01 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.66])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 98B1952043; \n\tMon, 18 Sep 2017 07:42:01 +0100 (BST)"],"From":"Christian Borntraeger ","To":"Cornelia Huck , qemu-devel@nongnu.org","References":"<20170915163952.32147-1-cohuck@redhat.com>\n\t<20170915163952.32147-2-cohuck@redhat.com>\n\t<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>","Date":"Mon, 18 Sep 2017 09:47:00 +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":"<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-TM-AS-GCONF":"00","x-cbid":"17091807-0020-0000-0000-000003B8ABCD","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091807-0021-0000-0000-0000424A40B1","Message-Id":"<396c3d9d-644a-c946-3099-aba94f0571e8@de.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-18_01:, , 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-1709180110","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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":1769932,"web_url":"http://patchwork.ozlabs.org/comment/1769932/","msgid":"<20170918094847.47480dc8.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-18T07:48:47","subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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 09:33:23 +0200\nChristian Borntraeger wrote:\n\n> On 09/15/2017 06:39 PM, 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.\n> > \n> > Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> > Signed-off-by: Cornelia Huck \n> > ---\n> > hw/s390x/s390-virtio-ccw.c | 2 ++\n> > target/s390x/cpu_models.c | 3 +++\n> > 2 files changed, 5 insertions(+)\n> > \n> > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> > index 0471407187..907abc7a32 100644\n> > --- a/hw/s390x/s390-virtio-ccw.c\n> > +++ b/hw/s390x/s390-virtio-ccw.c\n> > @@ -269,6 +269,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n> > }\n> > }\n> > \n> > +static S390CcwMachineClass *get_machine_class(void);\n> > +\n> > static void ccw_init(MachineState *machine)\n> > {\n> > int ret;\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> \n> Shouldnt that be depend on the machine being 2.7? I mean unless I misread \n> the context of this patch, you hard enable the PCI facility bit for all \n> machines and make all s390_has_feat(S390_FEAT_ZPCI) useless?\n\nThat's for machines without cpu model, which implies 2.7 or earlier, no?\n\n> \n> \n> > return 0;\n> > }\n> > return test_bit(feat, cpu->model->features);\n> > \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=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xwdTx3Lw7z9s3w\n\tfor ;\n\tMon, 18 Sep 2017 17:50:45 +1000 (AEST)","from localhost ([::1]:35115 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtqpH-0003fE-KM\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 03:50:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59441)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtqnb-0002oj-RM\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:49:01 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtqnY-0001tk-PG\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:48:59 -0400","from mx1.redhat.com ([209.132.183.28]:35702)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtqnY-0001tJ-J7\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 03:48:56 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 F286EC0587D9;\n\tMon, 18 Sep 2017 07:48:54 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D208B5D9CB;\n\tMon, 18 Sep 2017 07:48:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F286EC0587D9","Date":"Mon, 18 Sep 2017 09:48:47 +0200","From":"Cornelia Huck ","To":"Christian Borntraeger ","Message-ID":"<20170918094847.47480dc8.cohuck@redhat.com>","In-Reply-To":"<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>","References":"<20170915163952.32147-1-cohuck@redhat.com>\n\t<20170915163952.32147-2-cohuck@redhat.com>\n\t<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tMon, 18 Sep 2017 07:48:55 +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 RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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":1769947,"web_url":"http://patchwork.ozlabs.org/comment/1769947/","msgid":"<20170918100756.75eec02d.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-18T08:07:56","subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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 09:47:00 +0200\nChristian Borntraeger wrote:\n\n> On 09/18/2017 09:33 AM, Christian Borntraeger wrote:\n> > \n> > \n> > On 09/15/2017 06:39 PM, 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.\n> >>\n> >> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> >> Signed-off-by: Cornelia Huck \n> >> ---\n> >> hw/s390x/s390-virtio-ccw.c | 2 ++\n> >> target/s390x/cpu_models.c | 3 +++\n> >> 2 files changed, 5 insertions(+)\n> >>\n> >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> >> index 0471407187..907abc7a32 100644\n> >> --- a/hw/s390x/s390-virtio-ccw.c\n> >> +++ b/hw/s390x/s390-virtio-ccw.c\n> >> @@ -269,6 +269,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n> >> }\n> >> }\n> >>\n> >> +static S390CcwMachineClass *get_machine_class(void);\n> >> +\n> >> static void ccw_init(MachineState *machine)\n> >> {\n> >> int ret;\n\nThis hunk is from the previous version and should not be in there...\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> > \n> > Shouldnt that be depend on the machine being 2.7? I mean unless I misread \n> > the context of this patch, you hard enable the PCI facility bit for all \n> > machines and make all s390_has_feat(S390_FEAT_ZPCI) useless?\n> > \n> \n> Sorry, I had to lookup again the original code. So this is inside !cpu->model. \n> Yes makes sense then.\n\nYes, this is hard to figure out from the context alone.","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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3xwdtb6Xh2z9s3w\n\tfor ;\n\tMon, 18 Sep 2017 18:08:38 +1000 (AEST)","from localhost ([::1]:35166 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtr6a-0001AR-Ao\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 04:08:36 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35185)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtr68-00019g-LV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:08:13 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtr63-0001cq-Nk\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:08:08 -0400","from mx1.redhat.com ([209.132.183.28]:50916)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtr63-0001cR-F3\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:08:03 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 76B2581DEC;\n\tMon, 18 Sep 2017 08:08:02 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 229305D9CB;\n\tMon, 18 Sep 2017 08:07:58 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 76B2581DEC","Date":"Mon, 18 Sep 2017 10:07:56 +0200","From":"Cornelia Huck ","To":"Christian Borntraeger ","Message-ID":"<20170918100756.75eec02d.cohuck@redhat.com>","In-Reply-To":"<396c3d9d-644a-c946-3099-aba94f0571e8@de.ibm.com>","References":"<20170915163952.32147-1-cohuck@redhat.com>\n\t<20170915163952.32147-2-cohuck@redhat.com>\n\t<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>\n\t<396c3d9d-644a-c946-3099-aba94f0571e8@de.ibm.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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tMon, 18 Sep 2017 08:08:02 +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 RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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":1769980,"web_url":"http://patchwork.ozlabs.org/comment/1769980/","msgid":"","list_archive_url":null,"date":"2017-09-18T08:35:52","subject":"Re: [Qemu-devel] [PATCH RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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:07 AM, Cornelia Huck wrote:\n> On Mon, 18 Sep 2017 09:47:00 +0200\n> Christian Borntraeger wrote:\n> \n>> On 09/18/2017 09:33 AM, Christian Borntraeger wrote:\n>>>\n>>>\n>>> On 09/15/2017 06:39 PM, 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.\n>>>>\n>>>> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n>>>> Signed-off-by: Cornelia Huck \n>>>> ---\n>>>> hw/s390x/s390-virtio-ccw.c | 2 ++\n>>>> target/s390x/cpu_models.c | 3 +++\n>>>> 2 files changed, 5 insertions(+)\n>>>>\n>>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n>>>> index 0471407187..907abc7a32 100644\n>>>> --- a/hw/s390x/s390-virtio-ccw.c\n>>>> +++ b/hw/s390x/s390-virtio-ccw.c\n>>>> @@ -269,6 +269,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n>>>> }\n>>>> }\n>>>>\n>>>> +static S390CcwMachineClass *get_machine_class(void);\n>>>> +\n>>>> static void ccw_init(MachineState *machine)\n>>>> {\n>>>> int ret;\n> \n> This hunk is from the previous version and should not be in there...\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>>>\n>>> Shouldnt that be depend on the machine being 2.7? I mean unless I misread \n>>> the context of this patch, you hard enable the PCI facility bit for all \n>>> machines and make all s390_has_feat(S390_FEAT_ZPCI) useless?\n>>> \n>>\n>> Sorry, I had to lookup again the original code. So this is inside !cpu->model. \n>> Yes makes sense then.\n> \n> Yes, this is hard to figure out from the context alone.\n\nSo with an improved patch description (explain the fix better)\n\nAcked-by: Christian Borntraeger ","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 3xwfVl0RW9z9rxm\n\tfor ;\n\tMon, 18 Sep 2017 18:36:29 +1000 (AEST)","from localhost ([::1]:35243 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtrXX-0000Z6-6x\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 04:36:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41223)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtrX8-0000Yg-8D\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:36:08 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtrX4-0001lw-Rs\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:36:02 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59406\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 1dtrX4-0001fw-Lm\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 04:35:58 -0400","from pps.filterd (m0098421.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8I8YQ9H128296\n\tfor ; Mon, 18 Sep 2017 04:35:57 -0400","from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d2990vcjn-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 18 Sep 2017 04:35:57 -0400","from localhost\n\tby e06smtp10.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:35:55 +0100","from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195)\n\tby e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tMon, 18 Sep 2017 09:35:53 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8I8ZqhE28770372; Mon, 18 Sep 2017 08:35:52 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id C0A4E52041;\n\tMon, 18 Sep 2017 08:30:53 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.66])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7AFCE5203F; \n\tMon, 18 Sep 2017 08:30:53 +0100 (BST)"],"To":"Cornelia Huck ","References":"<20170915163952.32147-1-cohuck@redhat.com>\n\t<20170915163952.32147-2-cohuck@redhat.com>\n\t<987d04c6-dc24-e11b-3904-303058058c3b@de.ibm.com>\n\t<396c3d9d-644a-c946-3099-aba94f0571e8@de.ibm.com>\n\t<20170918100756.75eec02d.cohuck@redhat.com>","From":"Christian Borntraeger ","Date":"Mon, 18 Sep 2017 10:35:52 +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":"<20170918100756.75eec02d.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-0040-0000-0000-000003DAB000","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091808-0041-0000-0000-000025DBDA15","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-1709180122","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 RFC v2 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons 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"}}]