From nobody Sun Feb 8 11:16:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1602074164; cv=none; d=zohomail.com; s=zohoarc; b=C7UkSfWVrHcsG4eNjOWbs+d4rUE7o0w7NE3Zxe0dNVFzT0GVqG/JNjs/hq0JF65DfdvLkIC14nHM2WfrpKlfAhVNmX+0llv/FW2rcDAAcI/njmRfXU/yxBNoI8wLpIBevDCMm6H5ILl1KWVN6U3LU75py6vx2IPtguZFBpPEmmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602074164; 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=3Xylamo07JXCQP5Xyj3lzIq/bktN0Msjrxf7JVW+kso=; b=JG/Mr5lnko3F0+ASmttzvX1k84oS0mHNI3lxWTys+IcCF6L1opp5mA4c7O8QpYTtoIJwjQQZgU7ng1kteIwl+N5QjD3ZcO8g0/MPg8Vzeo16mObxr+3ZkGZ865uBLP42Gd9vJZdfxs2O/RECZdentJ9Yv6YvMgwaQwbBhDc+VAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602074164528805.8112047250266; Wed, 7 Oct 2020 05:36:04 -0700 (PDT) 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-336-g4oONQIEMiW9PJ6em242kw-1; Wed, 07 Oct 2020 08:36:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94896100856D; Wed, 7 Oct 2020 12:35:54 +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 715F05D9DD; Wed, 7 Oct 2020 12:35:54 +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 3B29C8C7A9; Wed, 7 Oct 2020 12:35:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 097CZokj012512 for ; Wed, 7 Oct 2020 08:35:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id C4A0F76644; Wed, 7 Oct 2020 12:35:50 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6D0702E7 for ; Wed, 7 Oct 2020 12:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602074163; 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=3Xylamo07JXCQP5Xyj3lzIq/bktN0Msjrxf7JVW+kso=; b=LwWkki6EqNAdfzk1GLjW3w667A7a5H2l1LlF7ybe7QDvtIVfihNYcrRufNZScqAk5qJXND 1BLsJZOjzwbGVrru5arauYmzVPk5Vd/qGnBADFAgwmq/zr62d+LUROIXgaC3G/A0Cpr0NY wyyK91PmhEncBI8KBIupNAoiFgCFSPI= X-MC-Unique: g4oONQIEMiW9PJ6em242kw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 14/16] qemu: agent: rename tmp_iface to iface_obj Date: Wed, 7 Oct 2020 14:35:35 +0200 Message-Id: <8920f3db0ddc0d35e0c16ff6baacfea09c23aac0.1602074066.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_agent.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5cb6257bfc..301707b136 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2109,9 +2109,9 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr= ip_addr, * @ifaces_ret: the array to put/update the interface in * @ifaces_count: the number of interfaces in that array * @ifaces_store: hash table into @ifaces_ret by interface name - * @tmp_iface: one item from the JSON array of interfaces + * @iface_obj: one item from the JSON array of interfaces * - * This function processes @tmp_iface (which represents + * This function processes @iface_obj (which represents * information about a single interface) and adds the information * into the ifaces_ret array. * @@ -2126,7 +2126,7 @@ static int qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, size_t *ifaces_count, virHashTablePtr ifaces_store, - virJSONValuePtr tmp_iface) + virJSONValuePtr iface_obj) { virJSONValuePtr ip_addr_arr =3D NULL; const char *hwaddr, *name =3D NULL; @@ -2136,7 +2136,7 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr = **ifaces_ret, size_t j; =20 /* interface name is required to be presented */ - name =3D virJSONValueObjectGetString(tmp_iface, "name"); + name =3D virJSONValueObjectGetString(iface_obj, "name"); if (!name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qemu agent didn't provide 'name' field")); @@ -2162,13 +2162,13 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePt= r **ifaces_ret, iface->naddrs =3D 0; iface->name =3D g_strdup(ifname); =20 - hwaddr =3D virJSONValueObjectGetString(tmp_iface, "hardware-addres= s"); + hwaddr =3D virJSONValueObjectGetString(iface_obj, "hardware-addres= s"); iface->hwaddr =3D g_strdup(hwaddr); } =20 /* as well as IP address which - moreover - * can be presented multiple times */ - ip_addr_arr =3D virJSONValueObjectGet(tmp_iface, "ip-addresses"); + ip_addr_arr =3D virJSONValueObjectGet(iface_obj, "ip-addresses"); if (!ip_addr_arr) return 0; =20 @@ -2237,10 +2237,10 @@ qemuAgentGetInterfaces(qemuAgentPtr agent, } =20 for (i =3D 0; i < virJSONValueArraySize(ret_array); i++) { - virJSONValuePtr tmp_iface =3D virJSONValueArrayGet(ret_array, i); + virJSONValuePtr iface_obj =3D virJSONValueArrayGet(ret_array, i); =20 if (qemuAgentGetInterfaceAddresses(&ifaces_ret, &ifaces_count, - ifaces_store, tmp_iface) < 0) + ifaces_store, iface_obj) < 0) goto error; } =20 --=20 2.26.2