From nobody Sun Nov 24 01:47:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728616881; cv=none; d=zohomail.com; s=zohoarc; b=VDmpU1520aWVHI6W34JqWmD14E9Qx1h3m148lJxuHsA/SYrGAjxybae4mF5JTTK9sS+nl26tlPG3cSFxTcOoUYDEBDwOy8MopjJAWRb6erGsflqbIRPOF5o+3Gv63/9QpN5IDvjdcIaTOVZKVhD1bQi6JzAqkoDAOgtAgxDy4bM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728616881; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GMfIQhe17p2ivo5PbtzSl9PDX/c5D9ZRqiDdt6z+ru4=; b=R0pS9NaosejmkH/ZXXgO0uKJwR4iXODY4V09IJlkg497zWUhFSW3FymMbDmt0a84X7jcBO8kIRqtH80+NNGK5WTQeWX6UtAuJLAf55QMVohM+Mo5Fu803CA0V7o2Sl9ZpXrc+KRV8D+rTnlT4B2oAlm0Ss9usSqvs4+wEggPzjA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728616881695119.73822856340871; Thu, 10 Oct 2024 20:21:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sz6CL-0001pa-EA; Thu, 10 Oct 2024 23:20:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sz6CJ-0001oG-9J for qemu-devel@nongnu.org; Thu, 10 Oct 2024 23:20:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sz6CG-0002nE-SN for qemu-devel@nongnu.org; Thu, 10 Oct 2024 23:20:10 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-qyd83dGJNMuzVPau9pt3vw-1; Thu, 10 Oct 2024 23:20:04 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0141119560B0; Fri, 11 Oct 2024 03:20:04 +0000 (UTC) Received: from fedora.nay.redhat.com (unknown [10.66.57.68]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 34F191956089; Fri, 11 Oct 2024 03:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728616808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GMfIQhe17p2ivo5PbtzSl9PDX/c5D9ZRqiDdt6z+ru4=; b=NY0E3FR1GFcnlKs42gJrsORegY9GzHuLSw6ePwJnaT44uANnjLXdmfUIYRxFlnCN9I6wE6 g8XIE1PF2HRtnWS5eJsgo6sCoK1AYuO8U4UT6mGyi6U+AvUygtgngHVvwASpHFR/JyHRnt 1ExUTNOE5AvTmIrkTTXF0oVuVDbk+Io= X-MC-Unique: qyd83dGJNMuzVPau9pt3vw-1 From: Dehan Meng To: qemu-devel@nongnu.org Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com, peter.maydell@linaro.org Subject: [PATCH v2 4/4] For correcting code style: Variable declarations moved to the beginning of blocks Followed the coding style of using snake_case for variable names. And merged redundant route and networkroute variables. Date: Fri, 11 Oct 2024 11:19:37 +0800 Message-Id: <20241011031937.92216-5-demeng@redhat.com> In-Reply-To: <20241011031937.92216-1-demeng@redhat.com> References: <20241011031937.92216-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=170.10.129.124; envelope-from=demeng@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.149, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1728616882301116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dehan Meng --- qga/commands-linux.c | 116 ++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 63 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 4f0e38be81..c6cca630ef 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2094,12 +2094,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **e= rrp) return head; } =20 -static char *hexToIPAddress(const void *hexValue, int is_ipv6) +static char *hex_to_ip_address(const void *hex_value, int is_ipv6) { if (is_ipv6) { char addr[INET6_ADDRSTRLEN]; struct in6_addr in6; - const char *hexStr =3D (const char *)hexValue; + const char *hex_str =3D (const char *)hex_value; int i; =20 for (i =3D 0; i < 16; i++) { @@ -2111,11 +2111,11 @@ static char *hexToIPAddress(const void *hexValue, i= nt is_ipv6) =20 return g_strdup(addr); } else { - unsigned int hexInt =3D *(unsigned int *)hexValue; - unsigned int byte1 =3D (hexInt >> 24) & 0xFF; - unsigned int byte2 =3D (hexInt >> 16) & 0xFF; - unsigned int byte3 =3D (hexInt >> 8) & 0xFF; - unsigned int byte4 =3D hexInt & 0xFF; + unsigned int hex_int =3D *(unsigned int *)hex_value; + unsigned int byte1 =3D (hex_int >> 24) & 0xFF; + unsigned int byte2 =3D (hex_int >> 16) & 0xFF; + unsigned int byte3 =3D (hex_int >> 8) & 0xFF; + unsigned int byte4 =3D hex_int & 0xFF; =20 return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1); } @@ -2131,6 +2131,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) int firstLine; int is_ipv6; int i; + char iface[IFNAMSIZ]; =20 for (i =3D 0; i < 2; i++) { firstLine =3D 1; @@ -2146,72 +2147,61 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) firstLine =3D 0; continue; } - GuestNetworkRoute *route =3D NULL; - GuestNetworkRoute *networkroute; - char Iface[IFNAMSIZ]; - if (is_ipv6) { - char Destination[33], Source[33], NextHop[33]; - int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; =20 - /* Parse the line and extract the values */ + GuestNetworkRoute *route =3D g_new0(GuestNetworkRoute, 1); + + if (is_ipv6) { + char destination[33], source[33], next_hop[33]; + int des_prefixlen, src_prefixlen, metric, refcnt, use, fla= gs; if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x %s", - Destination, &DesPrefixlen, Source, - &SrcPrefixlen, NextHop, &Metric, &RefCnt, - &Use, &Flags, Iface) !=3D 10) { + destination, &des_prefixlen, source, + &src_prefixlen, next_hop, &metric, &refcnt, + &use, &flags, iface) !=3D 10) { continue; } =20 - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(Destination, = 1); - networkroute->metric =3D Metric; - networkroute->source =3D hexToIPAddress(Source, 1); - networkroute->desprefixlen =3D g_strdup_printf( - "%d", DesPrefixlen - ); - networkroute->srcprefixlen =3D g_strdup_printf( - "%d", SrcPrefixlen - ); - networkroute->nexthop =3D hexToIPAddress(NextHop, 1); - networkroute->has_flags =3D true; - networkroute->flags =3D Flags; - networkroute->has_refcnt =3D true; - networkroute->refcnt =3D RefCnt; - networkroute->has_use =3D true; - networkroute->use =3D Use; - networkroute->version =3D 6; - } else { - unsigned int Destination, Gateway, Mask, Flags; - int RefCnt, Use, Metric, MTU, Window, IRTT; + route->iface =3D g_strdup(iface); + route->destination =3D hex_to_ip_address(destination, 1); + route->source =3D hex_to_ip_address(source, 1); + route->nexthop =3D hex_to_ip_address(next_hop, 1); + route->desprefixlen =3D g_strdup_printf("%d", des_prefixle= n); + route->srcprefixlen =3D g_strdup_printf("%d", src_prefixle= n); + route->metric =3D metric; + route->has_flags =3D true; + route->flags =3D flags; + route->has_refcnt =3D true; + route->refcnt =3D refcnt; + route->has_use =3D true; + route->use =3D use; + route->version =3D 6; =20 - /* Parse the line and extract the values */ + } else { + unsigned int destination, gateway, mask, flags; + int refcnt, use, metric, mtu, window, irtt; if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d", - Iface, &Destination, &Gateway, &Flags, &RefCnt, - &Use, &Metric, &Mask, &MTU, &Window, &IRTT) != =3D 11) { + iface, &destination, &gateway, &flags, &refcnt, + &use, &metric, &mask, &mtu, &window, &irtt) != =3D 11) { continue; } =20 - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(&Destination,= 0); - networkroute->gateway =3D hexToIPAddress(&Gateway, 0); - networkroute->mask =3D hexToIPAddress(&Mask, 0); - networkroute->metric =3D Metric; - networkroute->has_flags =3D true; - networkroute->flags =3D Flags; - networkroute->has_refcnt =3D true; - networkroute->refcnt =3D RefCnt; - networkroute->has_use =3D true; - networkroute->use =3D Use; - networkroute->has_mtu =3D true; - networkroute->mtu =3D MTU; - networkroute->has_window =3D true; - networkroute->window =3D Window; - networkroute->has_irtt =3D true; - networkroute->irtt =3D IRTT; - networkroute->version =3D 4; + route->iface =3D g_strdup(iface); + route->destination =3D hex_to_ip_address(&destination, 0); + route->gateway =3D hex_to_ip_address(&gateway, 0); + route->mask =3D hex_to_ip_address(&mask, 0); + route->metric =3D metric; + route->has_flags =3D true; + route->flags =3D flags; + route->has_refcnt =3D true; + route->refcnt =3D refcnt; + route->has_use =3D true; + route->use =3D use; + route->has_mtu =3D true; + route->mtu =3D mtu; + route->has_window =3D true; + route->window =3D window; + route->has_irtt =3D true; + route->irtt =3D irtt; + route->version =3D 4; } =20 QAPI_LIST_APPEND(tail, route); --=20 2.40.1