From nobody Fri May 3 20:21:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494938367508813.4830497998155; Tue, 16 May 2017 05:39:27 -0700 (PDT) Received: from localhost ([::1]:41915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAbl6-0006h1-RQ for importer@patchew.org; Tue, 16 May 2017 08:39:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAbkF-0006Av-RR for qemu-devel@nongnu.org; Tue, 16 May 2017 08:38:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAbkB-0002y8-PS for qemu-devel@nongnu.org; Tue, 16 May 2017 08:38:31 -0400 Received: from [59.151.112.132] (port=24045 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAbk9-0002vs-U4 for qemu-devel@nongnu.org; Tue, 16 May 2017 08:38:27 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 May 2017 20:38:18 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 917C047C6138; Tue, 16 May 2017 20:38:14 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 16 May 2017 20:38:13 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18916918" From: Mao Zhongyi To: Date: Tue, 16 May 2017 20:37:43 +0800 Message-ID: <22f56a33f9774a678c72dc5c0920a5c562cc6ea2.1494937835.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 917C047C6138.A0A9F X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v3] net/rocker: Convert to realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, jiri@resnulli.us, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The rocker device still implements the old PCIDeviceClass .init() instead of the new .realize(). All devices need to be converted to .realize(). .init() reports errors with fprintf() and return 0 on success, negative number on failure. Meanwhile, when -device rocker fails, it first report a specific error, then a generic one, like this: $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=3Dqemu-rocker rocker: name too long; please shorten to at most 9 chars qemu-system-x86_64: -device rocker,name=3Dqemu-rocker: Device initializ= ation failed Now, convert it to .realize() that passes errors to its callers via its errp argument. Also avoid the superfluous second error message. Cc: jiri@resnulli.us Cc: jasowang@redhat.com Cc: f4bug@amsat.org Signed-off-by: Mao Zhongyi --- hw/net/rocker/rocker.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 6e70fdd..c446cda 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1252,20 +1252,18 @@ rollback: return err; } =20 -static int rocker_msix_init(Rocker *r) +static int rocker_msix_init(Rocker *r, Error **errp) { PCIDevice *dev =3D PCI_DEVICE(r); int err; - Error *local_err =3D NULL; =20 err =3D msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports), &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET, &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET, - 0, &local_err); + 0, errp); if (err) { - error_report_err(local_err); return err; } =20 @@ -1301,7 +1299,7 @@ static World *rocker_world_type_by_name(Rocker *r, co= nst char *name) return NULL; } =20 -static int pci_rocker_init(PCIDevice *dev) +static void pci_rocker_realize(PCIDevice *dev, Error **errp) { Rocker *r =3D to_rocker(dev); const MACAddr zero =3D { .a =3D { 0, 0, 0, 0, 0, 0 } }; @@ -1315,7 +1313,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 for (i =3D 0; i < ROCKER_WORLD_TYPE_MAX; i++) { if (!r->worlds[i]) { - err =3D -ENOMEM; + error_setg(errp, "rocker: memory allocation for worlds failed"= ); goto err_world_alloc; } } @@ -1326,10 +1324,9 @@ static int pci_rocker_init(PCIDevice *dev) =20 r->world_dflt =3D rocker_world_type_by_name(r, r->world_name); if (!r->world_dflt) { - fprintf(stderr, - "rocker: requested world \"%s\" does not exist\n", + error_setg(errp, + "rocker: invalid argument, requested world %s does not exi= st", r->world_name); - err =3D -EINVAL; goto err_world_type_by_name; } =20 @@ -1349,7 +1346,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 /* MSI-X init */ =20 - err =3D rocker_msix_init(r); + err =3D rocker_msix_init(r, errp); if (err) { goto err_msix_init; } @@ -1361,7 +1358,7 @@ static int pci_rocker_init(PCIDevice *dev) } =20 if (rocker_find(r->name)) { - err =3D -EEXIST; + error_setg(errp, "rocker: %s already exists", r->name); goto err_duplicate; } =20 @@ -1375,10 +1372,10 @@ static int pci_rocker_init(PCIDevice *dev) #define ROCKER_IFNAMSIZ 16 #define MAX_ROCKER_NAME_LEN (ROCKER_IFNAMSIZ - 1 - 3 - 3) if (strlen(r->name) > MAX_ROCKER_NAME_LEN) { - fprintf(stderr, - "rocker: name too long; please shorten to at most %d chars= \n", + error_setg(errp, + "rocker: name too long; please shorten to at most %d chars= ", MAX_ROCKER_NAME_LEN); - return -EINVAL; + goto err_name_too_long; } =20 if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) =3D=3D 0) { @@ -1397,6 +1394,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 r->rings =3D g_new(DescRing *, rocker_pci_ring_count(r)); if (!r->rings) { + error_setg(errp, "rocker: memory allocation for rings failed"); goto err_rings_alloc; } =20 @@ -1410,11 +1408,11 @@ static int pci_rocker_init(PCIDevice *dev) * ..... */ =20 - err =3D -ENOMEM; for (i =3D 0; i < rocker_pci_ring_count(r); i++) { DescRing *ring =3D desc_ring_alloc(r, i); =20 if (!ring) { + error_setg(errp, "rocker: memory allocation for ring failed"); goto err_ring_alloc; } =20 @@ -1438,6 +1436,7 @@ static int pci_rocker_init(PCIDevice *dev) i, &r->fp_ports_peers[i]); =20 if (!port) { + error_setg(errp, "rocker: memory allocation for port failed"); goto err_port_alloc; } =20 @@ -1447,7 +1446,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 QLIST_INSERT_HEAD(&rockers, r, next); =20 - return 0; + return; =20 err_port_alloc: for (--i; i >=3D 0; i--) { @@ -1461,6 +1460,7 @@ err_ring_alloc: } g_free(r->rings); err_rings_alloc: +err_name_too_long: err_duplicate: rocker_msix_uninit(r); err_msix_init: @@ -1473,7 +1473,6 @@ err_world_alloc: world_free(r->worlds[i]); } } - return err; } =20 static void pci_rocker_uninit(PCIDevice *dev) @@ -1558,7 +1557,7 @@ static void rocker_class_init(ObjectClass *klass, voi= d *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->init =3D pci_rocker_init; + k->realize =3D pci_rocker_realize; k->exit =3D pci_rocker_uninit; k->vendor_id =3D PCI_VENDOR_ID_REDHAT; k->device_id =3D PCI_DEVICE_ID_REDHAT_ROCKER; --=20 2.9.3