From nobody Tue Feb 10 02:01:45 2026 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.zohomail.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 1501056969410178.30755288149498; Wed, 26 Jul 2017 01:16:09 -0700 (PDT) Received: from localhost ([::1]:36681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHUG-0002Mp-0W for importer@patchew.org; Wed, 26 Jul 2017 04:16:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHSl-0001QY-Rj for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daHSk-0007ID-1i for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:35 -0400 Received: from [59.151.112.132] (port=30802 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHSj-0007El-LG for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:33 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jul 2017 16:14:25 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 0A528402BB97; Wed, 26 Jul 2017 16:14:25 +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; Wed, 26 Jul 2017 16:14:23 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="21833391" From: Mao Zhongyi To: Date: Wed, 26 Jul 2017 16:13:34 +0800 Message-ID: <8f6ed7f3f793bad355074ebd97b4f4ac5190a787.1501052660.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.4 MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 0A528402BB97.ACC8A 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 v6 3/4] 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, armbru@redhat.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 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. After the patch, effect like this: $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=3Dqemu-rocker qemu-system-x86_64: -device rocker,name=3Dqemu-rocker: name too long; p= lease shorten to at most 9 chars Cc: jasowang@redhat.com Cc: jiri@resnulli.us Cc: armbru@redhat.com Cc: f4bug@amsat.org Signed-off-by: Mao Zhongyi Reviewed-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/rocker/rocker.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 9a538a9..bb38cba 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1236,20 +1236,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 @@ -1285,7 +1283,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 } }; @@ -1303,10 +1301,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, + "invalid argument requested world %s does not exist", r->world_name); - err =3D -EINVAL; goto err_world_type_by_name; } =20 @@ -1326,7 +1323,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; } @@ -1338,7 +1335,7 @@ static int pci_rocker_init(PCIDevice *dev) } =20 if (rocker_find(r->name)) { - err =3D -EEXIST; + error_setg(errp, "%s already exists", r->name); goto err_duplicate; } =20 @@ -1352,10 +1349,9 @@ 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, + "name too long; please shorten to at most %d chars", MAX_ROCKER_NAME_LEN); - err =3D -EINVAL; goto err_name_too_long; } =20 @@ -1413,7 +1409,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 QLIST_INSERT_HEAD(&rockers, r, next); =20 - return 0; + return; =20 err_name_too_long: err_duplicate: @@ -1427,7 +1423,6 @@ err_world_type_by_name: world_free(r->worlds[i]); } } - return err; } =20 static void pci_rocker_uninit(PCIDevice *dev) @@ -1512,7 +1507,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.4