[{"id":1769122,"web_url":"http://patchwork.ozlabs.org/comment/1769122/","msgid":"<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>","list_archive_url":null,"date":"2017-09-15T11:57:40","subject":"Re: [Qemu-devel] [PATCH RFC 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons as well","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 15.09.2017 12:14, 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> some old machines.\n> \n> Create the s390 phb if we need it for compat reasons, even if\n> we don't provide the zpci facility.\n> \n> Fixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\n> Signed-off-by: Cornelia Huck \n> ---\n> hw/s390x/s390-virtio-ccw.c | 6 +++++-\n> include/hw/s390x/s390-virtio-ccw.h | 1 +\n> 2 files changed, 6 insertions(+), 1 deletion(-)\n> \n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index 0471407187..7e3148eb4a 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> @@ -288,7 +290,7 @@ static void ccw_init(MachineState *machine)\n> machine->initrd_filename, \"s390-ccw.img\",\n> \"s390-netboot.img\", true);\n> \n> - if (s390_has_feat(S390_FEAT_ZPCI)) {\n> + if (s390_has_feat(S390_FEAT_ZPCI) || get_machine_class()->pci_compat) {\n> DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);\n> object_property_add_child(qdev_get_machine(),\n> TYPE_S390_PCI_HOST_BRIDGE,\n> @@ -429,6 +431,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)\n> s390mc->cpu_model_allowed = true;\n> s390mc->css_migration_enabled = true;\n> s390mc->gs_allowed = true;\n> + s390mc->pci_compat = false;\n> mc->init = ccw_init;\n> mc->reset = s390_machine_reset;\n> mc->hot_add_cpu = s390_hot_add_cpu;\n> @@ -784,6 +787,7 @@ static void ccw_machine_2_7_class_options(MachineClass *mc)\n> S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);\n> \n> s390mc->cpu_model_allowed = false;\n> + s390mc->pci_compat = pci_available;\n> ccw_machine_2_8_class_options(mc);\n> SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7);\n> }\n> diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h\n> index a9a90c2022..9978c89e90 100644\n> --- a/include/hw/s390x/s390-virtio-ccw.h\n> +++ b/include/hw/s390x/s390-virtio-ccw.h\n> @@ -41,6 +41,7 @@ typedef struct S390CcwMachineClass {\n> bool cpu_model_allowed;\n> bool css_migration_enabled;\n> bool gs_allowed;\n> + bool pci_compat;\n> } S390CcwMachineClass;\n> \n> /* runtime-instrumentation allowed by the machine */\n> \n\nAs an alternative, simply\n\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex 0f28ebd162..0f22efc3b6 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n return true;\n }\n }\n+ if (feat == S390_FEAT_ZPCI)\n+ return true;\n #endif\n return 0;\n }\n\n\n(this is also the way we handle other features without cpu model support\n-especially if cpu model support is disabled for older machines)","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 3xtv8J3d4Vz9t2h\n\tfor ;\n\tFri, 15 Sep 2017 21:59:26 +1000 (AEST)","from localhost ([::1]:52710 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dspHH-0004wc-I4\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 07:59:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41323)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dspFj-00048K-0W\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:57:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dspFf-0006gT-Td\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:57:47 -0400","from mx1.redhat.com ([209.132.183.28]:48942)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dspFf-0006g9-Lv\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:57:43 -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 A1EBC83F40;\n\tFri, 15 Sep 2017 11:57:42 +0000 (UTC)","from [10.36.117.187] (ovpn-117-187.ams2.redhat.com [10.36.117.187])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E4AD36B6CD;\n\tFri, 15 Sep 2017 11:57:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A1EBC83F40","To":"Cornelia Huck , qemu-devel@nongnu.org","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>","Date":"Fri, 15 Sep 2017 13:57:40 +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":"<20170915101406.27823-2-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\tFri, 15 Sep 2017 11:57:42 +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 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, 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":1769172,"web_url":"http://patchwork.ozlabs.org/comment/1769172/","msgid":"<20170915150705.359a5356.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-15T13:07:05","subject":"Re: [Qemu-devel] [PATCH RFC 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 Fri, 15 Sep 2017 13:57:40 +0200\nDavid Hildenbrand wrote:\n\n> As an alternative, simply\n> \n> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> index 0f28ebd162..0f22efc3b6 100644\n> --- a/target/s390x/cpu_models.c\n> +++ b/target/s390x/cpu_models.c\n> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n> return true;\n> }\n> }\n> + if (feat == S390_FEAT_ZPCI)\n> + return true;\n\nMove that out of the CONFIG_KVM #ifdef?\n\n(Also, we still have the issue with pci support :/ - depend on\npci_available?)\n\n> #endif\n> return 0;\n> }\n> \n> \n> (this is also the way we handle other features without cpu model support\n> -especially if cpu model support is disabled for older machines)\n\nNow that you mention cpu models (which are disabled on old machines),\nthe failure starts to look plausible :)","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 3xtwg55mqmz9sRm\n\tfor ;\n\tFri, 15 Sep 2017 23:07:44 +1000 (AEST)","from localhost ([::1]:53319 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsqLN-0006in-LS\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:07:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39540)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsqL0-0006iU-Pc\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:07:19 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsqKw-0006K5-Ov\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:07:18 -0400","from mx1.redhat.com ([209.132.183.28]:60366)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsqKw-0006Jb-IR\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:07:14 -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 B93CD81DFC;\n\tFri, 15 Sep 2017 13:07:12 +0000 (UTC)","from gondolin (ovpn-117-60.ams2.redhat.com [10.36.117.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 53E56757D6;\n\tFri, 15 Sep 2017 13:07:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B93CD81DFC","Date":"Fri, 15 Sep 2017 15:07:05 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170915150705.359a5356.cohuck@redhat.com>","In-Reply-To":"<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>\n\t<37791e7b-c096-3e88-4121-4f1739615367@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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 15 Sep 2017 13:07:12 +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 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, 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":1769174,"web_url":"http://patchwork.ozlabs.org/comment/1769174/","msgid":"","list_archive_url":null,"date":"2017-09-15T13:09:02","subject":"Re: [Qemu-devel] [PATCH RFC 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons as well","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 15.09.2017 15:07, Cornelia Huck wrote:\n> On Fri, 15 Sep 2017 13:57:40 +0200\n> David Hildenbrand wrote:\n> \n>> As an alternative, simply\n>>\n>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n>> index 0f28ebd162..0f22efc3b6 100644\n>> --- a/target/s390x/cpu_models.c\n>> +++ b/target/s390x/cpu_models.c\n>> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n>> return true;\n>> }\n>> }\n>> + if (feat == S390_FEAT_ZPCI)\n>> + return true;\n> \n> Move that out of the CONFIG_KVM #ifdef?\n> \n\nShould not make a difference I think, cpu models are not shielded off\nfor TCG I think (maybe we should fix that, but doesn't look that easy -\nthey have no host model which would allow cpu->model = NULL).\n\n> (Also, we still have the issue with pci support :/ - depend on\n> pci_available?)\n\nhm ....\n\n> \n>> #endif\n>> return 0;\n>> }\n>>\n>>\n>> (this is also the way we handle other features without cpu model support\n>> -especially if cpu model support is disabled for older machines)\n> \n> Now that you mention cpu models (which are disabled on old machines),\n> the failure starts to look plausible :)\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-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 3xtwjK2xxHz9sRm\n\tfor ;\n\tFri, 15 Sep 2017 23:09:41 +1000 (AEST)","from localhost ([::1]:53328 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsqNH-0007dl-GF\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:09:39 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40122)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsqMn-0007cp-S5\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:09:10 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsqMj-0007dk-Pp\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:09:09 -0400","from mx1.redhat.com ([209.132.183.28]:16080)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsqMj-0007dc-Iy\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:09:05 -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 A0A84C047B6D;\n\tFri, 15 Sep 2017 13:09:04 +0000 (UTC)","from [10.36.117.187] (ovpn-117-187.ams2.redhat.com [10.36.117.187])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id DC7E0702FE;\n\tFri, 15 Sep 2017 13:09:02 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A0A84C047B6D","To":"Cornelia Huck ","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>\n\t<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>\n\t<20170915150705.359a5356.cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"","Date":"Fri, 15 Sep 2017 15:09:02 +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":"<20170915150705.359a5356.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.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 15 Sep 2017 13:09:04 +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 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, 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":1769180,"web_url":"http://patchwork.ozlabs.org/comment/1769180/","msgid":"<20170915152229.3a955efa.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-15T13:22:29","subject":"Re: [Qemu-devel] [PATCH RFC 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 Fri, 15 Sep 2017 15:09:02 +0200\nDavid Hildenbrand wrote:\n\n> On 15.09.2017 15:07, Cornelia Huck wrote:\n> > On Fri, 15 Sep 2017 13:57:40 +0200\n> > David Hildenbrand wrote:\n> > \n> >> As an alternative, simply\n> >>\n> >> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> >> index 0f28ebd162..0f22efc3b6 100644\n> >> --- a/target/s390x/cpu_models.c\n> >> +++ b/target/s390x/cpu_models.c\n> >> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n> >> return true;\n> >> }\n> >> }\n> >> + if (feat == S390_FEAT_ZPCI)\n> >> + return true; \n> > \n> > Move that out of the CONFIG_KVM #ifdef?\n> > \n> \n> Should not make a difference I think, cpu models are not shielded off\n> for TCG I think (maybe we should fix that, but doesn't look that easy -\n> they have no host model which would allow cpu->model = NULL).\n\nIt just looks odd to have it inside the define...\n\n> \n> > (Also, we still have the issue with pci support :/ - depend on\n> > pci_available?) \n> \n> hm ....\n\nShould we maybe disallow compat machines if CONFIG_PCI is off, and\nthink about something for the 2.11 machine? Otherwise, I cannot see\nthat end well :/\n\nBut I'll just draw up a v2 for now.","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=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 3xtx0z2592z9sRm\n\tfor ;\n\tFri, 15 Sep 2017 23:23:15 +1000 (AEST)","from localhost ([::1]:53390 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsqaP-0000eh-D7\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:23:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44292)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsqZv-0000df-Ot\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:22:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsqZs-0007XW-Gi\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:22:43 -0400","from mx1.redhat.com ([209.132.183.28]:16694)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsqZs-0007XJ-9w\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:22:40 -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 3ACD98553C;\n\tFri, 15 Sep 2017 13:22:39 +0000 (UTC)","from gondolin (ovpn-117-60.ams2.redhat.com [10.36.117.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5AD697049D;\n\tFri, 15 Sep 2017 13:22:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3ACD98553C","Date":"Fri, 15 Sep 2017 15:22:29 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170915152229.3a955efa.cohuck@redhat.com>","In-Reply-To":"","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>\n\t<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>\n\t<20170915150705.359a5356.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.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 15 Sep 2017 13:22:39 +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 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, 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":1769195,"web_url":"http://patchwork.ozlabs.org/comment/1769195/","msgid":"<17bff893-985b-96eb-8677-0a32a918b607@redhat.com>","list_archive_url":null,"date":"2017-09-15T13:37:54","subject":"Re: [Qemu-devel] [PATCH RFC 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons as well","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 15.09.2017 15:22, Cornelia Huck wrote:\n> On Fri, 15 Sep 2017 15:09:02 +0200\n> David Hildenbrand wrote:\n> \n>> On 15.09.2017 15:07, Cornelia Huck wrote:\n>>> On Fri, 15 Sep 2017 13:57:40 +0200\n>>> David Hildenbrand wrote:\n>>> \n>>>> As an alternative, simply\n>>>>\n>>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n>>>> index 0f28ebd162..0f22efc3b6 100644\n>>>> --- a/target/s390x/cpu_models.c\n>>>> +++ b/target/s390x/cpu_models.c\n>>>> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n>>>> return true;\n>>>> }\n>>>> }\n>>>> + if (feat == S390_FEAT_ZPCI)\n>>>> + return true; \n>>>\n>>> Move that out of the CONFIG_KVM #ifdef?\n>>> \n>>\n>> Should not make a difference I think, cpu models are not shielded off\n>> for TCG I think (maybe we should fix that, but doesn't look that easy -\n>> they have no host model which would allow cpu->model = NULL).\n> \n> It just looks odd to have it inside the define...\n\nsure, you can then also just move it into kvm_enable() next to the other\nones.\n\n> \n>>\n>>> (Also, we still have the issue with pci support :/ - depend on\n>>> pci_available?) \n>>\n>> hm ....\n> \n> Should we maybe disallow compat machines if CONFIG_PCI is off, and\n> think about something for the 2.11 machine? Otherwise, I cannot see\n> that end well :/\n\nIf they required PCI, than that is the only way to do it.\n\n> \n> But I'll just draw up a v2 for now.\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=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 3xtxLV74s9z9sRm\n\tfor ;\n\tFri, 15 Sep 2017 23:38:26 +1000 (AEST)","from localhost ([::1]:53430 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsqp7-0007jv-4i\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:38:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48095)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsqoj-0007je-Co\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:38:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsqog-00015b-Bb\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:38:01 -0400","from mx1.redhat.com ([209.132.183.28]:43380)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsqog-00014x-4t\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:37:58 -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 245ADC058EAE;\n\tFri, 15 Sep 2017 13:37:57 +0000 (UTC)","from [10.36.117.187] (ovpn-117-187.ams2.redhat.com [10.36.117.187])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 634216DA8B;\n\tFri, 15 Sep 2017 13:37:55 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 245ADC058EAE","To":"Cornelia Huck ","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>\n\t<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>\n\t<20170915150705.359a5356.cohuck@redhat.com>\n\t\n\t<20170915152229.3a955efa.cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<17bff893-985b-96eb-8677-0a32a918b607@redhat.com>","Date":"Fri, 15 Sep 2017 15:37:54 +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":"<20170915152229.3a955efa.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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tFri, 15 Sep 2017 13:37:57 +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 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, 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":1769216,"web_url":"http://patchwork.ozlabs.org/comment/1769216/","msgid":"","list_archive_url":null,"date":"2017-09-15T14:16:46","subject":"Re: [Qemu-devel] [PATCH RFC 1/1] s390x/ccw: create s390 phb for\n\tcompat reasons as well","submitter":{"id":68297,"url":"http://patchwork.ozlabs.org/api/people/68297/","name":"Halil Pasic","email":"pasic@linux.vnet.ibm.com"},"content":"On 09/15/2017 03:37 PM, David Hildenbrand wrote:\n> On 15.09.2017 15:22, Cornelia Huck wrote:\n>> On Fri, 15 Sep 2017 15:09:02 +0200\n>> David Hildenbrand wrote:\n>>\n>>> On 15.09.2017 15:07, Cornelia Huck wrote:\n>>>> On Fri, 15 Sep 2017 13:57:40 +0200\n>>>> David Hildenbrand wrote:\n>>>> \n>>>>> As an alternative, simply\n>>>>>\n>>>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n>>>>> index 0f28ebd162..0f22efc3b6 100644\n>>>>> --- a/target/s390x/cpu_models.c\n>>>>> +++ b/target/s390x/cpu_models.c\n>>>>> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat)\n>>>>> return true;\n>>>>> }\n>>>>> }\n>>>>> + if (feat == S390_FEAT_ZPCI)\n>>>>> + return true; \n>>>>\n>>>> Move that out of the CONFIG_KVM #ifdef?\n>>>> \n>>>\n>>> Should not make a difference I think, cpu models are not shielded off\n>>> for TCG I think (maybe we should fix that, but doesn't look that easy -\n>>> they have no host model which would allow cpu->model = NULL).\n>>\n>> It just looks odd to have it inside the define...\n> \n> sure, you can then also just move it into kvm_enable() next to the other\n> ones.\n> \n>>\n>>>\n>>>> (Also, we still have the issue with pci support :/ - depend on\n>>>> pci_available?) \n>>>\n>>> hm ....\n>>\n>> Should we maybe disallow compat machines if CONFIG_PCI is off, and\n>> think about something for the 2.11 machine? Otherwise, I cannot see\n>> that end well :/\n> \n> If they required PCI, than that is the only way to do it.\n> \n>>\n>> But I'll just draw up a v2 for now.\n>>\n\nSorry for not contributing anything here. I don't have the whole\nthing in my head, so I can't quite follow without digging into this.\n\nI don't think I will be able to join today -- maybe I could have a\nlook next week .\n\nHalil \n\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=)","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 3xtyCT6R9mz9s7m\n\tfor ;\n\tSat, 16 Sep 2017 00:17:23 +1000 (AEST)","from localhost ([::1]:53551 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsrQl-0001NQ-3Y\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 10:17:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58676)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsrQQ-0001IC-No\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 10:16:59 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsrQL-00033s-P0\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 10:16:58 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51642)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsrQL-00033E-GF\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 10:16:53 -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\tv8FEG9Ht142728\n\tfor ; Fri, 15 Sep 2017 10:16:51 -0400","from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d0drygnqh-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 15 Sep 2017 10:16:51 -0400","from localhost\n\tby e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tFri, 15 Sep 2017 15:16:48 +0100","from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196)\n\tby e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tFri, 15 Sep 2017 15:16:47 +0100","from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com\n\t[9.149.105.62])\n\tby b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8FEGkqI20119678; Fri, 15 Sep 2017 14:16:46 GMT","from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6AF5BAE04D;\n\tFri, 15 Sep 2017 15:11:47 +0100 (BST)","from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id F06DFAE045;\n\tFri, 15 Sep 2017 15:11:46 +0100 (BST)","from oc3836556865.ibm.com (unknown [9.152.224.207])\n\tby d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP;\n\tFri, 15 Sep 2017 15:11:46 +0100 (BST)"],"To":"David Hildenbrand , Cornelia Huck ","References":"<20170915101406.27823-1-cohuck@redhat.com>\n\t<20170915101406.27823-2-cohuck@redhat.com>\n\t<37791e7b-c096-3e88-4121-4f1739615367@redhat.com>\n\t<20170915150705.359a5356.cohuck@redhat.com>\n\t\n\t<20170915152229.3a955efa.cohuck@redhat.com>\n\t<17bff893-985b-96eb-8677-0a32a918b607@redhat.com>","From":"Halil Pasic ","Date":"Fri, 15 Sep 2017 16:16:46 +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":"<17bff893-985b-96eb-8677-0a32a918b607@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-TM-AS-GCONF":"00","x-cbid":"17091514-0012-0000-0000-0000057950DE","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091514-0013-0000-0000-000018F27769","Message-Id":"","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-15_05:, , 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-1709150209","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 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, pmorel@linux.vnet.ibm.com, \n\tqemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]