Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807789/?format=api
{ "id": 807789, "url": "http://patchwork.ozlabs.org/api/patches/807789/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-38-cohuck@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-38-cohuck@redhat.com>", "list_archive_url": null, "date": "2017-08-30T16:52:45", "name": "[PULL,37/44] target/s390x: move a couple of functions to cpu.c", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a441e8d2e96aa018ec59fb09d1b07de68e948c33", "submitter": { "id": 71914, "url": "http://patchwork.ozlabs.org/api/people/71914/?format=api", "name": "Cornelia Huck", "email": "cohuck@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-38-cohuck@redhat.com/mbox/", "series": [ { "id": 656, "url": "http://patchwork.ozlabs.org/api/series/656/?format=api", "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/807789/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807789/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-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 3xjCKD6tW6z9sN7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 03:33:36 +1000 (AEST)", "from localhost ([::1]:51809 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 1dn6ru-0004ce-KX\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:33:34 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:57783)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6HQ-00047w-9r\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 1dn6HM-00064G-Hc\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:52 -0400", "from mx1.redhat.com ([209.132.183.28]:40084)\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 1dn6HM-00063d-6i\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:48 -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 0E3235F795;\n\tWed, 30 Aug 2017 16:55:47 +0000 (UTC)", "from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 7724587CAA;\n\tWed, 30 Aug 2017 16:55:44 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 0E3235F795", "From": "Cornelia Huck <cohuck@redhat.com>", "To": "peter.maydell@linaro.org", "Date": "Wed, 30 Aug 2017 18:52:45 +0200", "Message-Id": "<20170830165252.13421-38-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.39]);\n\tWed, 30 Aug 2017 16:55:47 +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 37/44] target/s390x: move a couple of functions\n\tto cpu.c", "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\nPrepare to move more stuff (especially KVM related) from cpu.h to\ninternal.h.\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-16-david@redhat.com>\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n target/s390x/cpu.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++\n target/s390x/cpu.h | 89 ++++++------------------------------------------------\n 2 files changed, 89 insertions(+), 79 deletions(-)", "diff": "diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex dadd383d90..90e2db7b1f 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -392,6 +392,85 @@ unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)\n \n return s390_count_running_cpus();\n }\n+\n+int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_get_clock(tod_high, tod_low);\n+ }\n+ /* Fixme TCG */\n+ *tod_high = 0;\n+ *tod_low = 0;\n+ return 0;\n+}\n+\n+int s390_set_clock(uint8_t *tod_high, uint64_t *tod_low)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_set_clock(tod_high, tod_low);\n+ }\n+ /* Fixme TCG */\n+ return 0;\n+}\n+\n+int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_set_mem_limit(new_limit, hw_limit);\n+ }\n+ return 0;\n+}\n+\n+void s390_cmma_reset(void)\n+{\n+ if (kvm_enabled()) {\n+ kvm_s390_cmma_reset();\n+ }\n+}\n+\n+int s390_cpu_restart(S390CPU *cpu)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_cpu_restart(cpu);\n+ }\n+ return -ENOSYS;\n+}\n+\n+int s390_get_memslot_count(void)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_get_memslot_count();\n+ } else {\n+ return MAX_AVAIL_SLOTS;\n+ }\n+}\n+\n+int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,\n+ int vq, bool assign)\n+{\n+ if (kvm_enabled()) {\n+ return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);\n+ } else {\n+ return 0;\n+ }\n+}\n+\n+void s390_crypto_reset(void)\n+{\n+ if (kvm_enabled()) {\n+ kvm_s390_crypto_reset();\n+ }\n+}\n+\n+bool s390_get_squash_mcss(void)\n+{\n+ if (object_property_get_bool(OBJECT(qdev_get_machine()), \"s390-squash-mcss\",\n+ NULL)) {\n+ return true;\n+ }\n+\n+ return false;\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 af941f8e51..a2cefb7a0c 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -439,25 +439,8 @@ static inline void kvm_s390_access_exception(S390CPU *cpu, uint16_t code,\n }\n #endif\n \n-static inline int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_get_clock(tod_high, tod_low);\n- }\n- /* Fixme TCG */\n- *tod_high = 0;\n- *tod_low = 0;\n- return 0;\n-}\n-\n-static inline int s390_set_clock(uint8_t *tod_high, uint64_t *tod_low)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_set_clock(tod_high, tod_low);\n- }\n- /* Fixme TCG */\n- return 0;\n-}\n+int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);\n+int s390_set_clock(uint8_t *tod_high, uint64_t *tod_low);\n \n S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu);\n@@ -805,69 +788,17 @@ static inline void kvm_s390_crypto_reset(void)\n }\n #endif\n \n-static inline int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_set_mem_limit(new_limit, hw_limit);\n- }\n- return 0;\n-}\n-\n-static inline void s390_cmma_reset(void)\n-{\n- if (kvm_enabled()) {\n- kvm_s390_cmma_reset();\n- }\n-}\n-\n-static inline int s390_cpu_restart(S390CPU *cpu)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_cpu_restart(cpu);\n- }\n- return -ENOSYS;\n-}\n-\n-static inline int s390_get_memslot_count(void)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_get_memslot_count();\n- } else {\n- return MAX_AVAIL_SLOTS;\n- }\n-}\n-\n+int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);\n+void s390_cmma_reset(void);\n+int s390_cpu_restart(S390CPU *cpu);\n+int s390_get_memslot_count(void);\n void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,\n uint32_t io_int_parm, uint32_t io_int_word);\n void s390_crw_mchk(void);\n-\n-static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,\n- uint32_t sch_id, int vq,\n- bool assign)\n-{\n- if (kvm_enabled()) {\n- return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);\n- } else {\n- return 0;\n- }\n-}\n-\n-static inline void s390_crypto_reset(void)\n-{\n- if (kvm_enabled()) {\n- kvm_s390_crypto_reset();\n- }\n-}\n-\n-static inline bool s390_get_squash_mcss(void)\n-{\n- if (object_property_get_bool(OBJECT(qdev_get_machine()), \"s390-squash-mcss\",\n- NULL)) {\n- return true;\n- }\n-\n- return false;\n-}\n+int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,\n+ int vq, bool assign);\n+void s390_crypto_reset(void);\n+bool s390_get_squash_mcss(void);\n \n /* machine check interruption code */\n \n", "prefixes": [ "PULL", "37/44" ] }