{"id":816308,"url":"http://patchwork.ozlabs.org/api/patches/816308/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/f6da1ec7-4845-fe78-b6b8-29a71d481458@de.ibm.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2017-09-20T12:53:07","name":"block ais migration for machines <= 2.9","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"691032cfcace0f44db98f3ceabaa3c79ed477951","submitter":{"id":590,"url":"http://patchwork.ozlabs.org/api/people/590/?format=json","name":"Christian Borntraeger","email":"borntraeger@de.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/f6da1ec7-4845-fe78-b6b8-29a71d481458@de.ibm.com/mbox/","series":[{"id":4148,"url":"http://patchwork.ozlabs.org/api/series/4148/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4148","date":"2017-09-20T12:53:07","name":"block ais migration for machines <= 2.9","version":1,"mbox":"http://patchwork.ozlabs.org/series/4148/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816308/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816308/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","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 3xy3ZR20w5z9s8J\n\tfor ;\n\tThu, 21 Sep 2017 01:29:35 +1000 (AEST)","from localhost ([::1]:48862 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dugwP-0006tj-3P\n\tfor incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 11:29:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55354)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dufj9-0000NR-JX\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:11:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dufj5-00045o-JV\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:11:47 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53626)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dufj5-000452-AI\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:11:43 -0400","from pps.filterd (m0098404.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8KCqJF5069335\n\tfor ; Wed, 20 Sep 2017 08:53:14 -0400","from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d3pksrdfv-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Wed, 20 Sep 2017 08:53:14 -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\tWed, 20 Sep 2017 13:53:11 +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\tWed, 20 Sep 2017 13:53:08 +0100","from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com\n\t[9.149.105.60])\n\tby b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8KCr7qq13959320; Wed, 20 Sep 2017 12:53:07 GMT","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id A748E42042;\n\tWed, 20 Sep 2017 13:49:18 +0100 (BST)","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 61B714203F;\n\tWed, 20 Sep 2017 13:49:18 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.107])\n\tby d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP;\n\tWed, 20 Sep 2017 13:49:18 +0100 (BST)"],"From":"Christian Borntraeger ","To":"Peter Maydell ","References":"<1500028867-134709-1-git-send-email-borntraeger@de.ibm.com>\n\t<1500028867-134709-34-git-send-email-borntraeger@de.ibm.com>\n\t<5eb9a7bd-2761-bea1-738a-da7a6d3fbfcf@de.ibm.com>","Date":"Wed, 20 Sep 2017 14:53:07 +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":"<5eb9a7bd-2761-bea1-738a-da7a6d3fbfcf@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":"17092012-0040-0000-0000-000003DBAA9C","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092012-0041-0000-0000-000025DCE007","Message-Id":"","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-20_04:, , 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-1709200174","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"[Qemu-devel] block ais migration for machines <= 2.9","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Thomas Huth , Yi Min Zhao , \n\tMichael Roth ,\n\tCornelia Huck , qemu-devel ,\n\tAlexander Graf , Halil Pasic ,\n\tRichard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Something like the following seems to do the tricks.\nNeeds proper patch description, review, full test with different kernel versions.....","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 1c7af39..2ff32ba 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -212,6 +212,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->ais_allowed = true;\n mc->init = ccw_init;\n mc->reset = s390_machine_reset;\n mc->hot_add_cpu = s390_hot_add_cpu;\n@@ -305,6 +306,11 @@ bool gs_allowed(void)\n return false;\n }\n \n+bool ais_allowed(void)\n+{\n+ return get_machine_class()->ais_allowed;\n+}\n+\n static char *machine_get_loadparm(Object *obj, Error **errp)\n {\n S390CcwMachineState *ms = S390_CCW_MACHINE(obj);\n@@ -533,6 +539,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)\n S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);\n \n s390mc->gs_allowed = false;\n+ s390mc->ais_allowed = false;\n ccw_machine_2_10_class_options(mc);\n SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_9);\n s390mc->css_migration_enabled = false;\ndiff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h\nindex 41a9d28..bba8660 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 ais_allowed;\n } S390CcwMachineClass;\n \n /* runtime-instrumentation allowed by the machine */\n@@ -49,6 +50,8 @@ bool ri_allowed(void);\n bool cpu_model_allowed(void);\n /* guarded-storage allowed by the machine */\n bool gs_allowed(void);\n+/* ais allowed by the machine */\n+bool ais_allowed(void);\n \n /**\n * Returns true if (vmstate based) migration of the channel subsystem\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex c4c5791..531d474 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -309,7 +309,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n }\n \n /* Try to enable AIS facility */\n- kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);\n+ if (ais_allowed()) {\n+ kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);\n+ }\n \n qemu_mutex_init(&qemu_sigp_mutex);\n\n","prefixes":[]}