Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1197473/?format=api
{ "id": 1197473, "url": "http://patchwork.ozlabs.org/api/patches/1197473/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-18-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-18-clg@kaod.org>", "list_archive_url": null, "date": "2019-11-19T14:12:11", "name": "[17/17] aspeed: Change the \"nic\" property definition", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7cbfa69e1f204dc66cd1931f2589745f3c8aafc7", "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-18-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/1197473/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1197473/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 47HSdm68t4z9sPf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Nov 2019 01:20:12 +1100 (AEDT)", "from localhost ([::1]:46000 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 1iX4MT-0004Pm-Mz\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Nov 2019 09:20:09 -0500", "from eggs.gnu.org ([2001:470:142:3::10]:42359)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <clg@kaod.org>) id 1iX4HD-00085p-LL\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:46 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <clg@kaod.org>) id 1iX4HC-00068H-3p\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:43 -0500", "from 9.mo5.mail-out.ovh.net ([178.32.96.204]:37906)\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 1iX4HB-00067P-DD\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:41 -0500", "from player795.ha.ovh.net (unknown [10.108.54.119])\n\tby mo5.mail-out.ovh.net (Postfix) with ESMTP id 1F09E25ABEE\n\tfor <qemu-devel@nongnu.org>; Tue, 19 Nov 2019 15:14:40 +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 4A546C18B22A;\n\tTue, 19 Nov 2019 14:14:32 +0000 (UTC)" ], "From": "=?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org>", "To": "Peter Maydell <peter.maydell@linaro.org>", "Subject": "[PATCH 17/17] aspeed: Change the \"nic\" property definition", "Date": "Tue, 19 Nov 2019 15:12:11 +0100", "Message-Id": "<20191119141211.25716-18-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": "17928830118870682385", "X-VR-SPAMSTATE": "OK", "X-VR-SPAMSCORE": "-100", "X-VR-SPAMCAUSE": "gggruggvucftvghtrhhoucdtuddrgedufedrudegkedgiedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpudelhedrvdduvddrvdelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejleehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpeej", "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.96.204", "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 MII model has a link pointing to its associated FTGMAC100\nNIC in the machine.\n\nChange the \"nic\" 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 | 5 ++---\n hw/net/ftgmac100.c | 19 +++++++++----------\n 2 files changed, 11 insertions(+), 13 deletions(-)", "diff": "diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c\nindex 810fd7de0c06..be88005dab8f 100644\n--- a/hw/arm/aspeed_ast2600.c\n+++ b/hw/arm/aspeed_ast2600.c\n@@ -183,9 +183,6 @@ static void aspeed_soc_ast2600_init(Object *obj)\n \n sysbus_init_child_obj(obj, \"mii[*]\", &s->mii[i], sizeof(s->mii[i]),\n TYPE_ASPEED_MII);\n- object_property_add_const_link(OBJECT(&s->mii[i]), \"nic\",\n- OBJECT(&s->ftgmac100[i]),\n- &error_abort);\n }\n \n sysbus_init_child_obj(obj, \"xdma\", OBJECT(&s->xdma), sizeof(s->xdma),\n@@ -441,6 +438,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)\n sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0,\n aspeed_soc_get_irq(s, ASPEED_ETH1 + i));\n \n+ object_property_set_link(OBJECT(&s->mii[i]), OBJECT(&s->ftgmac100[i]),\n+ \"nic\", &error_abort);\n object_property_set_bool(OBJECT(&s->mii[i]), true, \"realized\",\n &err);\n if (err) {\ndiff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c\nindex eb8b441461a1..86ac25894a89 100644\n--- a/hw/net/ftgmac100.c\n+++ b/hw/net/ftgmac100.c\n@@ -1204,17 +1204,8 @@ static void aspeed_mii_realize(DeviceState *dev, Error **errp)\n {\n AspeedMiiState *s = ASPEED_MII(dev);\n SysBusDevice *sbd = SYS_BUS_DEVICE(dev);\n- Object *obj;\n- Error *local_err = NULL;\n \n- obj = object_property_get_link(OBJECT(dev), \"nic\", &local_err);\n- if (!obj) {\n- error_propagate(errp, local_err);\n- error_prepend(errp, \"required link 'nic' not found: \");\n- return;\n- }\n-\n- s->nic = FTGMAC100(obj);\n+ assert(s->nic);\n \n memory_region_init_io(&s->iomem, OBJECT(dev), &aspeed_mii_ops, s,\n TYPE_ASPEED_MII, 0x8);\n@@ -1231,6 +1222,13 @@ static const VMStateDescription vmstate_aspeed_mii = {\n VMSTATE_END_OF_LIST()\n }\n };\n+\n+static Property aspeed_mii_properties[] = {\n+ DEFINE_PROP_LINK(\"nic\", AspeedMiiState, nic, TYPE_FTGMAC100,\n+ FTGMAC100State *),\n+ DEFINE_PROP_END_OF_LIST(),\n+};\n+\n static void aspeed_mii_class_init(ObjectClass *klass, void *data)\n {\n DeviceClass *dc = DEVICE_CLASS(klass);\n@@ -1239,6 +1237,7 @@ static void aspeed_mii_class_init(ObjectClass *klass, void *data)\n dc->reset = aspeed_mii_reset;\n dc->realize = aspeed_mii_realize;\n dc->desc = \"Aspeed MII controller\";\n+ dc->props = aspeed_mii_properties;\n }\n \n static const TypeInfo aspeed_mii_info = {\n", "prefixes": [ "17/17" ] }