{"id":811285,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811285/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-5-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504836324-4871-5-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:10","name":"[PULL,04/18] net/rocker: Convert to realize()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"de7122008c15580b7648de7e565b3c1de7bdc49c","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-5-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811285/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811285/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=jasowang@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 3xpLKn2J8Tz9sDB\n\tfor ;\n\tFri, 8 Sep 2017 12:06:53 +1000 (AEST)","from localhost ([::1]:42945 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8h1-0003B0-Cc\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:06:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60775)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8g5-00036K-5q\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:05:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8g0-00024N-9R\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:05:53 -0400","from mx1.redhat.com ([209.132.183.28]:50694)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8g0-00023v-1F\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:05:48 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 F007E5D697;\n\tFri, 8 Sep 2017 02:05:46 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E2C61600C2;\n\tFri, 8 Sep 2017 02:05:42 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F007E5D697","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:10 +0800","Message-Id":"<1504836324-4871-5-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tFri, 08 Sep 2017 02:05: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 04/18] net/rocker: Convert to realize()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Mao Zhongyi , f4bug@amsat.org,\n\tjiri@resnulli.us, jasowang@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Mao Zhongyi \n\nThe rocker device still implements the old PCIDeviceClass .init()\ninstead of the new .realize(). All devices need to be converted to\n.realize().\n\n.init() reports errors with fprintf() and return 0 on success, negative\nnumber on failure. Meanwhile, when -device rocker fails, it first report\na specific error, then a generic one, like this:\n\n $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker\n rocker: name too long; please shorten to at most 9 chars\n qemu-system-x86_64: -device rocker,name=qemu-rocker: Device initialization failed\n\nNow, convert it to .realize() that passes errors to its callers via its\nerrp argument. Also avoid the superfluous second error message. After\nthe patch, effect like this:\n\n $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker\n qemu-system-x86_64: -device rocker,name=qemu-rocker: name too long; please shorten to at most 9 chars\n\nCc: jasowang@redhat.com\nCc: jiri@resnulli.us\nCc: armbru@redhat.com\nCc: f4bug@amsat.org\nSigned-off-by: Mao Zhongyi \nReviewed-by: Markus Armbruster \nReviewed-by: Philippe Mathieu-Daudé \nSigned-off-by: Jason Wang \n---\n hw/net/rocker/rocker.c | 27 +++++++++++----------------\n 1 file changed, 11 insertions(+), 16 deletions(-)","diff":"diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c\nindex 9a538a9..bb38cba 100644\n--- a/hw/net/rocker/rocker.c\n+++ b/hw/net/rocker/rocker.c\n@@ -1236,20 +1236,18 @@ rollback:\n return err;\n }\n \n-static int rocker_msix_init(Rocker *r)\n+static int rocker_msix_init(Rocker *r, Error **errp)\n {\n PCIDevice *dev = PCI_DEVICE(r);\n int err;\n- Error *local_err = NULL;\n \n err = msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports),\n &r->msix_bar,\n ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET,\n &r->msix_bar,\n ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET,\n- 0, &local_err);\n+ 0, errp);\n if (err) {\n- error_report_err(local_err);\n return err;\n }\n \n@@ -1285,7 +1283,7 @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)\n return NULL;\n }\n \n-static int pci_rocker_init(PCIDevice *dev)\n+static void pci_rocker_realize(PCIDevice *dev, Error **errp)\n {\n Rocker *r = to_rocker(dev);\n const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };\n@@ -1303,10 +1301,9 @@ static int pci_rocker_init(PCIDevice *dev)\n \n r->world_dflt = rocker_world_type_by_name(r, r->world_name);\n if (!r->world_dflt) {\n- fprintf(stderr,\n- \"rocker: requested world \\\"%s\\\" does not exist\\n\",\n+ error_setg(errp,\n+ \"invalid argument requested world %s does not exist\",\n r->world_name);\n- err = -EINVAL;\n goto err_world_type_by_name;\n }\n \n@@ -1326,7 +1323,7 @@ static int pci_rocker_init(PCIDevice *dev)\n \n /* MSI-X init */\n \n- err = rocker_msix_init(r);\n+ err = rocker_msix_init(r, errp);\n if (err) {\n goto err_msix_init;\n }\n@@ -1338,7 +1335,7 @@ static int pci_rocker_init(PCIDevice *dev)\n }\n \n if (rocker_find(r->name)) {\n- err = -EEXIST;\n+ error_setg(errp, \"%s already exists\", r->name);\n goto err_duplicate;\n }\n \n@@ -1352,10 +1349,9 @@ static int pci_rocker_init(PCIDevice *dev)\n #define ROCKER_IFNAMSIZ 16\n #define MAX_ROCKER_NAME_LEN (ROCKER_IFNAMSIZ - 1 - 3 - 3)\n if (strlen(r->name) > MAX_ROCKER_NAME_LEN) {\n- fprintf(stderr,\n- \"rocker: name too long; please shorten to at most %d chars\\n\",\n+ error_setg(errp,\n+ \"name too long; please shorten to at most %d chars\",\n MAX_ROCKER_NAME_LEN);\n- err = -EINVAL;\n goto err_name_too_long;\n }\n \n@@ -1413,7 +1409,7 @@ static int pci_rocker_init(PCIDevice *dev)\n \n QLIST_INSERT_HEAD(&rockers, r, next);\n \n- return 0;\n+ return;\n \n err_name_too_long:\n err_duplicate:\n@@ -1427,7 +1423,6 @@ err_world_type_by_name:\n world_free(r->worlds[i]);\n }\n }\n- return err;\n }\n \n static void pci_rocker_uninit(PCIDevice *dev)\n@@ -1512,7 +1507,7 @@ static void rocker_class_init(ObjectClass *klass, void *data)\n DeviceClass *dc = DEVICE_CLASS(klass);\n PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);\n \n- k->init = pci_rocker_init;\n+ k->realize = pci_rocker_realize;\n k->exit = pci_rocker_uninit;\n k->vendor_id = PCI_VENDOR_ID_REDHAT;\n k->device_id = PCI_DEVICE_ID_REDHAT_ROCKER;\n","prefixes":["PULL","04/18"]}