{"id":807785,"url":"http://patchwork.ozlabs.org/api/patches/807785/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-39-cohuck@redhat.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":"<20170830165252.13421-39-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:46","name":"[PULL,38/44] s390x: avoid calling kvm_ functions outside of target/s390x/","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dd40ee3ede42ffd3f3a1be1f9d8763f3e158eb93","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-39-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807785/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807785/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","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 3xjCG30NpVz9sN5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 03:30:49 +1000 (AEST)","from localhost ([::1]:51791 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dn6pC-0002Od-T3\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:30:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57785)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6HQ-00047z-Ai\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:53 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6HO-00067I-OA\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:52 -0400","from mx1.redhat.com ([209.132.183.28]:12545)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <cohuck@redhat.com>) id 1dn6HO-00066n-HO\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:50 -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 6AE847EA96;\n\tWed, 30 Aug 2017 16:55:49 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id F294B87FB8;\n\tWed, 30 Aug 2017 16:55:48 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6AE847EA96","From":"Cornelia Huck <cohuck@redhat.com>","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:46 +0200","Message-Id":"<20170830165252.13421-39-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","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.28]);\n\tWed, 30 Aug 2017 16:55:49 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions\n\toutside of target/s390x/","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck <cohuck@redhat.com>,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: David Hildenbrand <david@redhat.com>\n\nLet's just introduce an helper.\n\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nReviewed-by: Thomas Huth <thuth@redhat.com>\nReviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\nSigned-off-by: David Hildenbrand <david@redhat.com>\nMessage-Id: <20170818114353.13455-17-david@redhat.com>\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n hw/s390x/s390-virtio-ccw.c | 4 +---\n target/s390x/cpu.c         | 7 +++++++\n target/s390x/cpu.h         | 1 +\n 3 files changed, 9 insertions(+), 3 deletions(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 42f0edac36..dd504dd5ae 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -144,9 +144,7 @@ static void ccw_init(MachineState *machine)\n     /* register hypercalls */\n     virtio_ccw_register_hcalls();\n \n-    if (kvm_enabled()) {\n-        kvm_s390_enable_css_support(s390_cpu_addr2state(0));\n-    }\n+    s390_enable_css_support(s390_cpu_addr2state(0));\n     /*\n      * Non mcss-e enabled guests only see the devices from the default\n      * css, which is determined by the value of the squash_mcss property.\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex 90e2db7b1f..c538a95850 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -471,6 +471,13 @@ bool s390_get_squash_mcss(void)\n \n     return false;\n }\n+\n+void s390_enable_css_support(S390CPU *cpu)\n+{\n+    if (kvm_enabled()) {\n+        kvm_s390_enable_css_support(cpu);\n+    }\n+}\n #endif\n \n static gchar *s390_gdb_arch_name(CPUState *cs)\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex a2cefb7a0c..77b29774cc 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -404,6 +404,7 @@ int cpu_s390x_signal_handler(int host_signum, void *pinfo,\n \n #ifndef CONFIG_USER_ONLY\n \n+void s390_enable_css_support(S390CPU *cpu);\n int s390_virtio_hypercall(CPUS390XState *env);\n \n #ifdef CONFIG_KVM\n","prefixes":["PULL","38/44"]}