Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1197485/?format=api
{ "id": 1197485, "url": "http://patchwork.ozlabs.org/api/patches/1197485/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-17-clg@kaod.org/", "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": "<20191119141211.25716-17-clg@kaod.org>", "list_archive_url": null, "date": "2019-11-19T14:12:10", "name": "[16/17] aspeed: Change the \"scu\" property definition", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0a8e047b0381a95a2c327168c62d9476705a4306", "submitter": { "id": 68548, "url": "http://patchwork.ozlabs.org/api/people/68548/?format=api", "name": "Cédric Le Goater", "email": "clg@kaod.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-17-clg@kaod.org/mbox/", "series": [ { "id": 143789, "url": "http://patchwork.ozlabs.org/api/series/143789/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=143789", "date": "2019-11-19T14:11:54", "name": "aspeed: extensions and fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/143789/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1197485/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1197485/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=nongnu.org (client-ip=209.51.188.17;\n\thelo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=kaod.org" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 47HSqx4ZHkz9sPf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Nov 2019 01:29:01 +1100 (AEDT)", "from localhost ([::1]:46094 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1iX4V1-0006Tt-6l\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Nov 2019 09:28:59 -0500", "from eggs.gnu.org ([2001:470:142:3::10]:42315)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <clg@kaod.org>) id 1iX4H7-0007wC-Lx\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:39 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <clg@kaod.org>) id 1iX4H5-00060O-1G\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:37 -0500", "from 20.mo6.mail-out.ovh.net ([178.32.124.17]:60066)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <clg@kaod.org>) id 1iX4H4-0005xP-Nz\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:34 -0500", "from player795.ha.ovh.net (unknown [10.108.57.23])\n\tby mo6.mail-out.ovh.net (Postfix) with ESMTP id 4E8641EB4E0\n\tfor <qemu-devel@nongnu.org>; Tue, 19 Nov 2019 15:14:32 +0100 (CET)", "from kaod.org (deibp9eh1--blueice1n4.emea.ibm.com [195.212.29.166])\n\t(Authenticated sender: clg@kaod.org)\n\tby player795.ha.ovh.net (Postfix) with ESMTPSA id 65B1FC18B173;\n\tTue, 19 Nov 2019 14:14:24 +0000 (UTC)" ], "From": "=?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org>", "To": "Peter Maydell <peter.maydell@linaro.org>", "Subject": "[PATCH 16/17] aspeed: Change the \"scu\" property definition", "Date": "Tue, 19 Nov 2019 15:12:10 +0100", "Message-Id": "<20191119141211.25716-17-clg@kaod.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20191119141211.25716-1-clg@kaod.org>", "References": "<20191119141211.25716-1-clg@kaod.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Ovh-Tracer-Id": "17926578319576369937", "X-VR-SPAMSTATE": "OK", "X-VR-SPAMSCORE": "-100", "X-VR-SPAMCAUSE": "gggruggvucftvghtrhhoucdtuddrgedufedrudegkedgiedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpudelhedrvdduvddrvdelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejleehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpeel", "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": "178.32.124.17", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.23", "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": "<https://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": "Andrew Jeffery <andrew@aj.id.au>, Greg Kurz <groug@kaod.org>,\n\tqemu-devel@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_?=\n\t=?utf-8?q?Goater?= <clg@kaod.org>, Joel Stanley <joel@jms.id.au>", "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": "The Aspeed Watchdog and Timer models have a link pointing to the SCU\ncontroller model of the machine.\n\nChange the \"scu\" property definition so that it explicitly sets the\npointer. The property isn't optional : not being able to set the link\nis a bug and QEMU should rather abort than exit in this case.\n\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\nReviewed-by: Greg Kurz <groug@kaod.org>\nReviewed-by: Joel Stanley <joel@jms.id.au>\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\n---\n hw/arm/aspeed_ast2600.c | 8 ++++----\n hw/arm/aspeed_soc.c | 8 ++++----\n hw/timer/aspeed_timer.c | 17 +++++++++--------\n hw/watchdog/wdt_aspeed.c | 17 ++++++++---------\n 4 files changed, 25 insertions(+), 25 deletions(-)", "diff": "diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c\nindex 0881eb25983e..810fd7de0c06 100644\n--- a/hw/arm/aspeed_ast2600.c\n+++ b/hw/arm/aspeed_ast2600.c\n@@ -146,8 +146,6 @@ static void aspeed_soc_ast2600_init(Object *obj)\n snprintf(typename, sizeof(typename), \"aspeed.timer-%s\", socname);\n sysbus_init_child_obj(obj, \"timerctrl\", OBJECT(&s->timerctrl),\n sizeof(s->timerctrl), typename);\n- object_property_add_const_link(OBJECT(&s->timerctrl), \"scu\",\n- OBJECT(&s->scu), &error_abort);\n \n snprintf(typename, sizeof(typename), \"aspeed.i2c-%s\", socname);\n sysbus_init_child_obj(obj, \"i2c\", OBJECT(&s->i2c), sizeof(s->i2c),\n@@ -177,8 +175,6 @@ static void aspeed_soc_ast2600_init(Object *obj)\n snprintf(typename, sizeof(typename), \"aspeed.wdt-%s\", socname);\n sysbus_init_child_obj(obj, \"wdt[*]\", OBJECT(&s->wdt[i]),\n sizeof(s->wdt[i]), typename);\n- object_property_add_const_link(OBJECT(&s->wdt[i]), \"scu\",\n- OBJECT(&s->scu), &error_abort);\n }\n \n for (i = 0; i < sc->macs_num; i++) {\n@@ -323,6 +319,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)\n aspeed_soc_get_irq(s, ASPEED_RTC));\n \n /* Timer */\n+ object_property_set_link(OBJECT(&s->timerctrl),\n+ OBJECT(&s->scu), \"scu\", &error_abort);\n object_property_set_bool(OBJECT(&s->timerctrl), true, \"realized\", &err);\n if (err) {\n error_propagate(errp, err);\n@@ -415,6 +413,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)\n for (i = 0; i < sc->wdts_num; i++) {\n AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]);\n \n+ object_property_set_link(OBJECT(&s->wdt[i]),\n+ OBJECT(&s->scu), \"scu\", &error_abort);\n object_property_set_bool(OBJECT(&s->wdt[i]), true, \"realized\", &err);\n if (err) {\n error_propagate(errp, err);\ndiff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c\nindex b01c97744196..a6237e594017 100644\n--- a/hw/arm/aspeed_soc.c\n+++ b/hw/arm/aspeed_soc.c\n@@ -163,8 +163,6 @@ static void aspeed_soc_init(Object *obj)\n snprintf(typename, sizeof(typename), \"aspeed.timer-%s\", socname);\n sysbus_init_child_obj(obj, \"timerctrl\", OBJECT(&s->timerctrl),\n sizeof(s->timerctrl), typename);\n- object_property_add_const_link(OBJECT(&s->timerctrl), \"scu\",\n- OBJECT(&s->scu), &error_abort);\n \n snprintf(typename, sizeof(typename), \"aspeed.i2c-%s\", socname);\n sysbus_init_child_obj(obj, \"i2c\", OBJECT(&s->i2c), sizeof(s->i2c),\n@@ -194,8 +192,6 @@ static void aspeed_soc_init(Object *obj)\n snprintf(typename, sizeof(typename), \"aspeed.wdt-%s\", socname);\n sysbus_init_child_obj(obj, \"wdt[*]\", OBJECT(&s->wdt[i]),\n sizeof(s->wdt[i]), typename);\n- object_property_add_const_link(OBJECT(&s->wdt[i]), \"scu\",\n- OBJECT(&s->scu), &error_abort);\n }\n \n for (i = 0; i < sc->macs_num; i++) {\n@@ -291,6 +287,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)\n aspeed_soc_get_irq(s, ASPEED_RTC));\n \n /* Timer */\n+ object_property_set_link(OBJECT(&s->timerctrl),\n+ OBJECT(&s->scu), \"scu\", &error_abort);\n object_property_set_bool(OBJECT(&s->timerctrl), true, \"realized\", &err);\n if (err) {\n error_propagate(errp, err);\n@@ -376,6 +374,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)\n for (i = 0; i < sc->wdts_num; i++) {\n AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]);\n \n+ object_property_set_link(OBJECT(&s->wdt[i]),\n+ OBJECT(&s->scu), \"scu\", &error_abort);\n object_property_set_bool(OBJECT(&s->wdt[i]), true, \"realized\", &err);\n if (err) {\n error_propagate(errp, err);\ndiff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c\nindex bcce2192a92a..a8c38cc1189b 100644\n--- a/hw/timer/aspeed_timer.c\n+++ b/hw/timer/aspeed_timer.c\n@@ -19,6 +19,7 @@\n #include \"qemu/timer.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n+#include \"hw/qdev-properties.h\"\n #include \"trace.h\"\n \n #define TIMER_NR_REGS 4\n@@ -603,15 +604,8 @@ static void aspeed_timer_realize(DeviceState *dev, Error **errp)\n int i;\n SysBusDevice *sbd = SYS_BUS_DEVICE(dev);\n AspeedTimerCtrlState *s = ASPEED_TIMER(dev);\n- Object *obj;\n- Error *err = NULL;\n \n- obj = object_property_get_link(OBJECT(dev), \"scu\", &err);\n- if (!obj) {\n- error_propagate_prepend(errp, err, \"required link 'scu' not found: \");\n- return;\n- }\n- s->scu = ASPEED_SCU(obj);\n+ assert(s->scu);\n \n for (i = 0; i < ASPEED_TIMER_NR_TIMERS; i++) {\n aspeed_init_one_timer(s, i);\n@@ -677,6 +671,12 @@ static const VMStateDescription vmstate_aspeed_timer_state = {\n }\n };\n \n+static Property aspeed_timer_properties[] = {\n+ DEFINE_PROP_LINK(\"scu\", AspeedTimerCtrlState, scu, TYPE_ASPEED_SCU,\n+ AspeedSCUState *),\n+ DEFINE_PROP_END_OF_LIST(),\n+};\n+\n static void timer_class_init(ObjectClass *klass, void *data)\n {\n DeviceClass *dc = DEVICE_CLASS(klass);\n@@ -685,6 +685,7 @@ static void timer_class_init(ObjectClass *klass, void *data)\n dc->reset = aspeed_timer_reset;\n dc->desc = \"ASPEED Timer\";\n dc->vmsd = &vmstate_aspeed_timer_state;\n+ dc->props = aspeed_timer_properties;\n }\n \n static const TypeInfo aspeed_timer_info = {\ndiff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c\nindex 122aa8daaadf..f50dab922e0f 100644\n--- a/hw/watchdog/wdt_aspeed.c\n+++ b/hw/watchdog/wdt_aspeed.c\n@@ -241,16 +241,8 @@ static void aspeed_wdt_realize(DeviceState *dev, Error **errp)\n {\n SysBusDevice *sbd = SYS_BUS_DEVICE(dev);\n AspeedWDTState *s = ASPEED_WDT(dev);\n- Error *err = NULL;\n- Object *obj;\n \n- obj = object_property_get_link(OBJECT(dev), \"scu\", &err);\n- if (!obj) {\n- error_propagate(errp, err);\n- error_prepend(errp, \"required link 'scu' not found: \");\n- return;\n- }\n- s->scu = ASPEED_SCU(obj);\n+ assert(s->scu);\n \n s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, aspeed_wdt_timer_expired, dev);\n \n@@ -264,6 +256,12 @@ static void aspeed_wdt_realize(DeviceState *dev, Error **errp)\n sysbus_init_mmio(sbd, &s->iomem);\n }\n \n+static Property aspeed_wdt_properties[] = {\n+ DEFINE_PROP_LINK(\"scu\", AspeedWDTState, scu, TYPE_ASPEED_SCU,\n+ AspeedSCUState *),\n+ DEFINE_PROP_END_OF_LIST(),\n+};\n+\n static void aspeed_wdt_class_init(ObjectClass *klass, void *data)\n {\n DeviceClass *dc = DEVICE_CLASS(klass);\n@@ -273,6 +271,7 @@ static void aspeed_wdt_class_init(ObjectClass *klass, void *data)\n dc->reset = aspeed_wdt_reset;\n set_bit(DEVICE_CATEGORY_MISC, dc->categories);\n dc->vmsd = &vmstate_aspeed_wdt;\n+ dc->props = aspeed_wdt_properties;\n }\n \n static const TypeInfo aspeed_wdt_info = {\n", "prefixes": [ "16/17" ] }