Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/809733/?format=api
{ "id": 809733, "url": "http://patchwork.ozlabs.org/api/patches/809733/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170904154316.4148-20-david@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": "<20170904154316.4148-20-david@redhat.com>", "list_archive_url": null, "date": "2017-09-04T15:43:16", "name": "[v2,19/19] s390x: get rid of cpu_s390x_create()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c27333a72ee6f200a93f17713ae4e0adf5a8af7e", "submitter": { "id": 70402, "url": "http://patchwork.ozlabs.org/api/people/70402/?format=api", "name": "David Hildenbrand", "email": "david@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170904154316.4148-20-david@redhat.com/mbox/", "series": [ { "id": 1412, "url": "http://patchwork.ozlabs.org/api/series/1412/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1412", "date": "2017-09-04T15:42:57", "name": "s390x cleanups and CPU hotplug via device_add", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/1412/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809733/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809733/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.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 3xmDgt3LdDz9s7C\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Sep 2017 01:45:14 +1000 (AEST)", "from localhost ([::1]:54497 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 1dotYm-00054N-EP\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 11:45:12 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:37991)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dotXx-0004xg-RT\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:26 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dotXs-0001Sp-VQ\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:21 -0400", "from mx1.redhat.com ([209.132.183.28]:54698)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1dotXs-0001S5-Nj\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:16 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 B829BB0AA7;\n\tMon, 4 Sep 2017 15:44:15 +0000 (UTC)", "from t460s.redhat.com (ovpn-116-139.ams2.redhat.com\n\t[10.36.116.139])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id ACC8FBF672;\n\tMon, 4 Sep 2017 15:44:11 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com B829BB0AA7", "From": "David Hildenbrand <david@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 4 Sep 2017 17:43:16 +0200", "Message-Id": "<20170904154316.4148-20-david@redhat.com>", "In-Reply-To": "<20170904154316.4148-1-david@redhat.com>", "References": "<20170904154316.4148-1-david@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 04 Sep 2017 15:44:15 +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": "[Qemu-devel] [PATCH v2 19/19] s390x: get rid of cpu_s390x_create()", "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, Eduardo Habkost <ehabkost@redhat.com>, david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson <richard.henderson@linaro.org>, \n\tAlexander Graf <agraf@suse.de>, borntraeger@de.ibm.com", "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": "Now that there is only one user of cpu_s390x_create() left, make cpu\ncreation looks like on x86.\n- Perform the model/properties split and checks in s390_init_cpus()\n- Parse features only once without having to remember if already parsed\n- Pass only the typename to s390x_new_cpu()\n- Use the typename of an existing CPU for hotplug via cpu-add\n\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n hw/s390x/s390-virtio-ccw.c | 29 +++++++++++++++++++++++++++--\n target/s390x/cpu.h | 2 +-\n target/s390x/helper.c | 45 ++-------------------------------------------\n target/s390x/internal.h | 1 -\n 4 files changed, 30 insertions(+), 47 deletions(-)", "diff": "diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 458615252c..8bd063377c 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -69,6 +69,10 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n static void s390_init_cpus(MachineState *machine)\n {\n MachineClass *mc = MACHINE_GET_CLASS(machine);\n+ const char *typename;\n+ gchar **model_pieces;\n+ ObjectClass *oc;\n+ CPUClass *cc;\n int i;\n \n if (machine->cpu_model == NULL) {\n@@ -84,8 +88,25 @@ static void s390_init_cpus(MachineState *machine)\n /* initialize possible_cpus */\n mc->possible_cpu_arch_ids(machine);\n \n+ model_pieces = g_strsplit(machine->cpu_model, \",\", 2);\n+ if (!model_pieces[0]) {\n+ error_report(\"Invalid/empty CPU model name\");\n+ exit(1);\n+ }\n+\n+ oc = cpu_class_by_name(TYPE_S390_CPU, model_pieces[0]);\n+ if (!oc) {\n+ error_report(\"Unable to find CPU definition: %s\", model_pieces[0]);\n+ exit(1);\n+ }\n+ typename = object_class_get_name(oc);\n+ cc = CPU_CLASS(oc);\n+ /* after parsing, properties will be applied to all *typename* instances */\n+ cc->parse_features(typename, model_pieces[1], &error_fatal);\n+ g_strfreev(model_pieces);\n+\n for (i = 0; i < smp_cpus; i++) {\n- s390x_new_cpu(machine->cpu_model, i, &error_fatal);\n+ s390x_new_cpu(typename, i, &error_fatal);\n }\n }\n \n@@ -396,8 +417,12 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,\n static void s390_hot_add_cpu(const int64_t id, Error **errp)\n {\n MachineState *machine = MACHINE(qdev_get_machine());\n+ ObjectClass *oc;\n+\n+ g_assert(machine->possible_cpus->cpus[0].cpu);\n+ oc = OBJECT_CLASS(CPU_GET_CLASS(machine->possible_cpus->cpus[0].cpu));\n \n- s390x_new_cpu(machine->cpu_model, id, errp);\n+ s390x_new_cpu(object_class_get_name(oc), id, errp);\n }\n \n static void s390_nmi(NMIState *n, int cpu_index, Error **errp)\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 878b6cc83e..4c639240de 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -690,7 +690,7 @@ const char *s390_default_cpu_model_name(void);\n \n /* helper.c */\n #define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model)\n-S390CPU *s390x_new_cpu(const char *cpu_model, uint32_t core_id, Error **errp);\n+S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp);\n /* you can call this signal handler from your SIGBUS and SIGSEGV\n signal handlers to inform the virtual CPU of exceptions. non zero\n is returned if the signal was handled by the virtual CPU. */\ndiff --git a/target/s390x/helper.c b/target/s390x/helper.c\nindex dfb24ef5b2..97adbcc86d 100644\n--- a/target/s390x/helper.c\n+++ b/target/s390x/helper.c\n@@ -68,52 +68,11 @@ void s390x_cpu_timer(void *opaque)\n }\n #endif\n \n-S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp)\n+S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp)\n {\n- static bool features_parsed;\n- char *name, *features;\n- const char *typename;\n- ObjectClass *oc;\n- CPUClass *cc;\n-\n- name = g_strdup(cpu_model);\n- features = strchr(name, ',');\n- if (features) {\n- features[0] = 0;\n- features++;\n- }\n-\n- oc = cpu_class_by_name(TYPE_S390_CPU, name);\n- if (!oc) {\n- error_setg(errp, \"Unknown CPU definition \\'%s\\'\", name);\n- g_free(name);\n- return NULL;\n- }\n- typename = object_class_get_name(oc);\n-\n- if (!features_parsed) {\n- features_parsed = true;\n- cc = CPU_CLASS(oc);\n- cc->parse_features(typename, features, errp);\n- }\n- g_free(name);\n-\n- if (*errp) {\n- return NULL;\n- }\n- return S390_CPU(CPU(object_new(typename)));\n-}\n-\n-S390CPU *s390x_new_cpu(const char *cpu_model, uint32_t core_id, Error **errp)\n-{\n- S390CPU *cpu;\n+ S390CPU *cpu = S390_CPU(object_new(typename));\n Error *err = NULL;\n \n- cpu = cpu_s390x_create(cpu_model, &err);\n- if (err != NULL) {\n- goto out;\n- }\n-\n object_property_set_int(OBJECT(cpu), core_id, \"core-id\", &err);\n if (err != NULL) {\n goto out;\ndiff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex b4d3583b24..bc8f83129a 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -337,7 +337,6 @@ uint64_t get_psw_mask(CPUS390XState *env);\n void s390_cpu_recompute_watchpoints(CPUState *cs);\n void s390x_tod_timer(void *opaque);\n void s390x_cpu_timer(void *opaque);\n-S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp);\n void do_restart_interrupt(CPUS390XState *env);\n #ifndef CONFIG_USER_ONLY\n LowCore *cpu_map_lowcore(CPUS390XState *env);\n", "prefixes": [ "v2", "19/19" ] }