From nobody Sun Oct 5 17:36:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608761637; cv=none; d=zohomail.com; s=zohoarc; b=Ma8D9X285OexZHsu4V1GUwpnfFqZofjl6ZLWN+TJGBoIzrH6OZ7u+SOucQng/xdUiXPfVWiZVMZksrL7OibyeJbDA9Mg1cQSMpwkVGbl9mFVvGORb6bhQk/3TUN2ue+c+0SVMgRrP7KYF749xIDeKGUeW3nwojle81aW/l9AwPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608761637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xVaB9VoDZ4sHfqfU/GsLDHq4ReoLs7LXtU7plGMJcL8=; b=e4pDiHVRQWH+/y2tWVvSQpLcT1RgtpfD0GQ0S7Lg92VvgQZ8LcOStlT0g6wHa0a+rIxpjt5r8nObX9U7F9ZzdpXfBMFo+jHt8LVNd+OlD7hu2uK1CMygZRHd1kWbZG+qIB1qe699lN+UOFmcNUV8iPDKy+EVPqEZc/0aEmdVFCw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608761637503829.8758561232107; Wed, 23 Dec 2020 14:13:57 -0800 (PST) Received: from localhost ([::1]:34062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ksCOJ-00065S-8g for importer@patchew.org; Wed, 23 Dec 2020 17:13:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksCLg-0004II-5W for qemu-devel@nongnu.org; Wed, 23 Dec 2020 17:11:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1ksCLe-0001fq-2M for qemu-devel@nongnu.org; Wed, 23 Dec 2020 17:11:11 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-8GiZpsF4Mmq6y9Fk5s5rMg-1; Wed, 23 Dec 2020 17:11:07 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3A1F107ACF5; Wed, 23 Dec 2020 22:11:06 +0000 (UTC) Received: from blue.redhat.com (ovpn-113-9.phx2.redhat.com [10.3.113.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDFE45D747; Wed, 23 Dec 2020 22:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608761469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xVaB9VoDZ4sHfqfU/GsLDHq4ReoLs7LXtU7plGMJcL8=; b=jWsq11j4hjRFg5xIBt0qKl7YkQ3CrOUUjQi6AoJujQpxDlGQklKqR9L4xhJsXCYoLPS4hZ LsJLapZ4Q7eyp9/Be6tA57RG9+QdiZgQ7DSUPAOPCs3yAlpKts3ImkRfH2o3jwmgP38SjM zYzCM9Tm6ZQzZsuQS3u7d9BepIOJTx0= X-MC-Unique: 8GiZpsF4Mmq6y9Fk5s5rMg-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH v3 2/7] rocker: Revamp fp_port_get_info Date: Wed, 23 Dec 2020 16:10:57 -0600 Message-Id: <20201223221102.390740-3-eblake@redhat.com> In-Reply-To: <20201223221102.390740-1-eblake@redhat.com> References: <20201223221102.390740-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Jiri Pirko , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of modifying the value member of a list element passed as a parameter, and open-coding the manipulation of that list, it's nicer to just return a freshly allocated value to be prepended to a list using QAPI_LIST_PREPEND. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster --- hw/net/rocker/rocker_fp.h | 2 +- hw/net/rocker/rocker.c | 8 +------- hw/net/rocker/rocker_fp.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hw/net/rocker/rocker_fp.h b/hw/net/rocker/rocker_fp.h index dbe1dd329a4b..7ff57aac0180 100644 --- a/hw/net/rocker/rocker_fp.h +++ b/hw/net/rocker/rocker_fp.h @@ -28,7 +28,7 @@ int fp_port_eg(FpPort *port, const struct iovec *iov, int= iovcnt); char *fp_port_get_name(FpPort *port); bool fp_port_get_link_up(FpPort *port); -void fp_port_get_info(FpPort *port, RockerPortList *info); +RockerPort *fp_port_get_info(FpPort *port); void fp_port_get_macaddr(FpPort *port, MACAddr *macaddr); void fp_port_set_macaddr(FpPort *port, MACAddr *macaddr); uint8_t fp_port_get_learning(FpPort *port); diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 1af1e6fa2f9b..c53a02315e54 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -127,13 +127,7 @@ RockerPortList *qmp_query_rocker_ports(const char *nam= e, Error **errp) } for (i =3D r->fp_ports - 1; i >=3D 0; i--) { - RockerPortList *info =3D g_malloc0(sizeof(*info)); - info->value =3D g_malloc0(sizeof(*info->value)); - struct fp_port *port =3D r->fp_port[i]; - - fp_port_get_info(port, info); - info->next =3D list; - list =3D info; + QAPI_LIST_PREPEND(list, fp_port_get_info(r->fp_port[i])); } return list; diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c index 4aa7da79b81d..cbeed65bd5ec 100644 --- a/hw/net/rocker/rocker_fp.c +++ b/hw/net/rocker/rocker_fp.c @@ -51,14 +51,17 @@ bool fp_port_get_link_up(FpPort *port) return !qemu_get_queue(port->nic)->link_down; } -void fp_port_get_info(FpPort *port, RockerPortList *info) +RockerPort *fp_port_get_info(FpPort *port) { - info->value->name =3D g_strdup(port->name); - info->value->enabled =3D port->enabled; - info->value->link_up =3D fp_port_get_link_up(port); - info->value->speed =3D port->speed; - info->value->duplex =3D port->duplex; - info->value->autoneg =3D port->autoneg; + RockerPort *value =3D g_malloc0(sizeof(*value)); + + value->name =3D g_strdup(port->name); + value->enabled =3D port->enabled; + value->link_up =3D fp_port_get_link_up(port); + value->speed =3D port->speed; + value->duplex =3D port->duplex; + value->autoneg =3D port->autoneg; + return value; } void fp_port_get_macaddr(FpPort *port, MACAddr *macaddr) --=20 2.29.2