From nobody Sat May 4 08:27:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1488573558401280.99459015192497; Fri, 3 Mar 2017 12:39:18 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v23Ka2Eo016175; Fri, 3 Mar 2017 15:36:02 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v23Ka1kf011043 for ; Fri, 3 Mar 2017 15:36:01 -0500 Received: from virval.usersys.redhat.com (dhcp129-92.brq.redhat.com [10.34.129.92]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v23Ka0df020478 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 3 Mar 2017 15:36:01 -0500 Received: by virval.usersys.redhat.com (Postfix, from userid 500) id C4D21100F62; Fri, 3 Mar 2017 21:35:59 +0100 (CET) From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 3 Mar 2017 21:35:45 +0100 Message-Id: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemu: Drop virQEMUCapsFreeStringList 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The implementation matches virStringListFreeCount. The only difference between the two functions is the ordering of their parameters. Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5694d0ba4..359a0d87a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1881,19 +1881,6 @@ virQEMUCapsProcessProps(virQEMUCapsPtr qemuCaps, } =20 =20 -static void -virQEMUCapsFreeStringList(size_t len, - char **values) -{ - size_t i; - if (!values) - return; - for (i =3D 0; i < len; i++) - VIR_FREE(values[i]); - VIR_FREE(values); -} - - #define OBJECT_TYPE_PREFIX "name \"" =20 static int @@ -1928,7 +1915,7 @@ virQEMUCapsParseDeviceStrObjectTypes(const char *str, =20 cleanup: if (ret < 0) - virQEMUCapsFreeStringList(ntypelist, typelist); + virStringListFreeCount(typelist, ntypelist); return ret; } =20 @@ -1981,7 +1968,7 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str, =20 cleanup: if (ret < 0) - virQEMUCapsFreeStringList(nproplist, proplist); + virStringListFreeCount(proplist, nproplist); return ret; } =20 @@ -1999,7 +1986,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, co= nst char *str) ARRAY_CARDINALITY(virQEMUCapsObjectTypes= ), virQEMUCapsObjectTypes, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); =20 for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { const char *type =3D virQEMUCapsObjectProps[i].type; @@ -2011,7 +1998,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, co= nst char *str) virQEMUCapsObjectProps[i].nprops, virQEMUCapsObjectProps[i].props, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); } =20 /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ @@ -2665,7 +2652,7 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsCommands), virQEMUCapsCommands, ncommands, commands); - virQEMUCapsFreeStringList(ncommands, commands); + virStringListFreeCount(commands, ncommands); =20 /* QMP add-fd was introduced in 1.2, but did not support * management control of set numbering, and did not have a @@ -2707,7 +2694,7 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), virQEMUCapsEvents, nevents, events); - virQEMUCapsFreeStringList(nevents, events); + virStringListFreeCount(events, nevents); =20 return 0; } @@ -2727,7 +2714,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsObjectTypes= ), virQEMUCapsObjectTypes, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); =20 for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { const char *type =3D virQEMUCapsObjectProps[i].type; @@ -2743,7 +2730,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsPropObjects), virQEMUCapsPropObjects, type, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); } =20 /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ @@ -3043,7 +3030,7 @@ virQEMUCapsProbeQMPMigrationCapabilities(virQEMUCapsP= tr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsMigration), virQEMUCapsMigration, ncaps, caps); - virQEMUCapsFreeStringList(ncaps, caps); + virStringListFreeCount(caps, ncaps); =20 return 0; } --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list