From nobody Sun Feb 8 07:21:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605541244; cv=none; d=zohomail.com; s=zohoarc; b=UdjBwE/mMX/cxV4+9N8F0ycqnoa31oXLpxpFIJB+UwLFH4pFc+ML2wyPzJJ56Ehqz6pz+CnIT5u4rS/KTgvvXjOlza0SOoTyMURrWCCb0Wsz96fnPkwgIhF1/uc4zVI2XWqcS3smhJM0Z58AUk2oDZIdZaWg7+cE7BsdvOs7CSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605541244; h=Content-Type:Content-Transfer-Encoding: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=vVT8Be8/cR+HYsphGwYcKAM/RL4mPOmh9GslotRh0Z4=; b=DgM4as5LKt87CVZm8Vs2oqmoA91nvaaV00XE341Ie5azRKnNHUq5X9tb5a+X7VT8EY+vUTkSqolkUyQYEZyfdNiokf4tDlP725rHGsaVWKSWbpBQ7pPVPlSeUekoy14KLd6wXZpQVZyYIKbygdoWdzJPBwMQXDCwvyPX5fc2XM0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605541244735614.7098536841645; Mon, 16 Nov 2020 07:40:44 -0800 (PST) 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-457-mRG8WfbRPNu-KhTKNwRLRQ-1; Mon, 16 Nov 2020 10:39:42 -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 D0C5C8C18EA; Mon, 16 Nov 2020 15:39:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD99455769; Mon, 16 Nov 2020 15:39:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 79D3758130; Mon, 16 Nov 2020 15:39:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AGFd5Ww022543 for ; Mon, 16 Nov 2020 10:39:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB2BC6EF55; Mon, 16 Nov 2020 15:39:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.193.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 382816EF51 for ; Mon, 16 Nov 2020 15:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605541243; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vVT8Be8/cR+HYsphGwYcKAM/RL4mPOmh9GslotRh0Z4=; b=Adyh8aj5pDitW52AuXdx4ka3QJTEZGEXkyya1vQ+a/CpGMDivWaftb9m5LopSCFvBfTNzS JHXAx/YwNRS5JWljT9HzR7yCh2mLXVyv4RkcvaJcWQs8Mlf5XijY0/G8uq132YKHEiZKBU jLy56b6tK/lwf1cQ6B4wR0f9IA1Kz+0= X-MC-Unique: mRG8WfbRPNu-KhTKNwRLRQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 03/11] hyperv_wmi: remove unreachable cleanup code Date: Mon, 16 Nov 2020 16:38:50 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In the cleanup section @data will always be NULL. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/hyperv/hyperv_wmi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 866b347bc2..efd0659051 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -942,7 +942,6 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQueryPt= r wqlQuery, hypervObject *head =3D NULL; hypervObject *tail =3D NULL; WsXmlNodeH node =3D NULL; - XML_TYPE_PTR data =3D NULL; hypervObject *object; =20 query_string =3D virBufferContentAndReset(wqlQuery->query); @@ -983,6 +982,8 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQueryPt= r wqlQuery, response =3D NULL; =20 while (enumContext !=3D NULL && *enumContext !=3D '\0') { + XML_TYPE_PTR data =3D NULL; + response =3D wsmc_action_pull(priv->client, wmiInfo->resourceUri, = options, filter, enumContext); =20 @@ -1030,8 +1031,6 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQuery= Ptr wqlQuery, object->info =3D wmiInfo; object->data =3D data; =20 - data =3D NULL; - if (head =3D=3D NULL) { head =3D object; } else { @@ -1059,13 +1058,6 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQuer= yPtr wqlQuery, if (filter !=3D NULL) filter_destroy(filter); =20 - if (data !=3D NULL) { - if (ws_serializer_free_mem(serializerContext, data, - wmiInfo->serializerInfo) < 0) { - VIR_ERROR(_("Could not free deserialized data")); - } - } - VIR_FREE(query_string); ws_xml_destroy_doc(response); VIR_FREE(enumContext); --=20 2.26.2