From nobody Thu May 16 10:47:21 2024 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=1606841082; cv=none; d=zohomail.com; s=zohoarc; b=CMgUxuss/Lj9DM/6k48MKSJi568h4bMZ08DR+nR5EdIUpkYQWsq49pqRMdsDtHDIVPqFoT9xq4LNvx88tX7ocomS2KJ9Pz0Ic6sszlWAAWQHEw7Re3YFrCVNEhVlS4x1YM+/ofWx2YJMZlc6iLzEzmZXMzwem6fFmo6eYo4NUvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606841082; 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=3QHjZJV0I5xosDZD/unkne/PEzyGKncWC1hyqCUHk2I=; b=NMsIFqCS2WXy5FBxDd81rnsSYlCAogBsp6AR9WgOwLhp+ufIyCXJobKtSRLf9Ej54dzwo2HLrXTkP2W9xPARuJK+6TCYDVqjS2Lhcpd3n6jjE7YcQlbMB+J4D47ZdOLUMOvkq7jSFmp8Ye6zPVHLZrkLK9iMBD7s7A+cVcYPywg= 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 1606841082228936.0837356634459; Tue, 1 Dec 2020 08:44:42 -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-139-mXnmTrcJMkGnGjnYg0qrLw-1; Tue, 01 Dec 2020 11:44:37 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B14984A5E4; Tue, 1 Dec 2020 16:44:31 +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 E808660C0F; Tue, 1 Dec 2020 16:44:30 +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 AF40A4E58E; Tue, 1 Dec 2020 16:44:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.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 0B1GiTVA030681 for ; Tue, 1 Dec 2020 11:44:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7D98710023BD; Tue, 1 Dec 2020 16:44:29 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0DEA10013C1 for ; Tue, 1 Dec 2020 16:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606841080; 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=3QHjZJV0I5xosDZD/unkne/PEzyGKncWC1hyqCUHk2I=; b=MEbSz7JCqS6MHJ5o0myUZMu0A2ZLQBx06F3+JLCbiP1lKTZxecT2bhUBJ85shZzKFqFdzj F11KYY8xDciBgrvBv3SVbMJS7TEzApXupKDqUrLD6BXYDN+N9C+1Xw4YN0tEDTC2p7CxVf kjEBlfyXHhmiDHPGAKkp3Wv1V05PHzw= X-MC-Unique: mXnmTrcJMkGnGjnYg0qrLw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/2] lib: Replace VIR_AUTOSTRINGLIST with GStrv Date: Tue, 1 Dec 2020 17:44:22 +0100 Message-Id: <3e7e10851dd05ce5353983b2ef6fea9daf6bf18e.1606840945.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.12 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" Glib provides g_auto(GStrv) which is in-place replacement of our VIR_AUTOSTRINGLIST. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 2 +- src/cpu/cpu_arm.c | 2 +- src/libxl/xen_common.c | 10 +++---- src/libxl/xen_xl.c | 2 +- src/lxc/lxc_process.c | 2 +- src/qemu/qemu_capabilities.c | 6 ++--- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_conf.c | 10 +++---- src/qemu/qemu_firmware.c | 4 +-- src/qemu/qemu_monitor_json.c | 4 +-- src/qemu/qemu_namespace.c | 28 ++++++++++---------- src/qemu/qemu_process.c | 4 +-- src/qemu/qemu_qapi.c | 2 +- src/qemu/qemu_vhost_user.c | 2 +- src/rpc/virnetsocket.c | 4 +-- src/storage/storage_backend_sheepdog.c | 4 +-- src/storage/storage_backend_zfs.c | 12 ++++----- src/util/vircgroup.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdevmapper.c | 6 ++--- src/util/virfile.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhook.c | 2 +- src/util/virjson.c | 2 +- src/util/virprocess.c | 2 +- src/util/virstoragefile.c | 10 +++---- src/util/virsystemd.c | 2 +- src/vmx/vmx.c | 2 +- tests/qemufirmwaretest.c | 2 +- tests/qemusecuritytest.c | 2 +- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvtest.c | 4 +-- tests/virfirewalltest.c | 2 +- tools/virsh-completer-domain.c | 36 +++++++++++++------------- tools/virsh-completer-host.c | 6 ++--- tools/virsh-completer-interface.c | 2 +- tools/virsh-completer-network.c | 8 +++--- tools/virsh-completer-nodedev.c | 6 ++--- tools/virsh-completer-nwfilter.c | 4 +-- tools/virsh-completer-pool.c | 6 ++--- tools/virsh-completer-secret.c | 4 +-- tools/virsh-completer-snapshot.c | 2 +- tools/virsh-completer-volume.c | 2 +- tools/virsh-completer.c | 4 +-- tools/virsh-domain.c | 4 +-- 46 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 5ff87cb41c..a2d88ba818 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -985,7 +985,7 @@ virCPUDefCheckFeatures(virCPUDefPtr cpu, void *opaque, char ***features) { - VIR_AUTOSTRINGLIST list =3D NULL; + g_auto(GStrv) list =3D NULL; size_t n =3D 0; size_t i; =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b1534dcc1e..cef3b2b9f1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -32595,7 +32595,7 @@ static int virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src, virStoragePoolDefPtr pooldef) { - VIR_AUTOSTRINGLIST tokens =3D NULL; + g_auto(GStrv) tokens =3D NULL; size_t ntokens; =20 /* Only support one host */ diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 8a408a324a..6ba5bf0724 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -550,7 +550,7 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) { unsigned long cpuid; unsigned long hwcaps; - VIR_AUTOSTRINGLIST features =3D NULL; + g_auto(GStrv) features =3D NULL; int cpu_feature_index =3D 0; size_t i; =20 diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c82e487d80..407d28aaa5 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -370,8 +370,8 @@ static virDomainHostdevDefPtr xenParsePCI(char *entry) { virDomainHostdevDefPtr hostdev =3D NULL; - VIR_AUTOSTRINGLIST tokens =3D NULL; - VIR_AUTOSTRINGLIST options =3D NULL; + g_auto(GStrv) tokens =3D NULL; + g_auto(GStrv) options =3D NULL; size_t ntokens =3D 0; size_t nexttoken =3D 0; char *str; @@ -482,7 +482,7 @@ xenHandleConfGetValueStringListErrors(int ret) static int xenParsePCIList(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOSTRINGLIST pcis =3D NULL; + g_auto(GStrv) pcis =3D NULL; char **entries =3D NULL; int rc; =20 @@ -709,7 +709,7 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def) } =20 if (!hvm && def->graphics =3D=3D NULL) { /* New PV guests use this for= mat */ - VIR_AUTOSTRINGLIST vfbs =3D NULL; + g_auto(GStrv) vfbs =3D NULL; int rc; =20 if ((rc =3D virConfGetValueStringList(conf, "vfb", false, &vfbs)) = =3D=3D 1) { @@ -941,7 +941,7 @@ xenParseSxprChar(const char *value, static int xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFo= rmat) { - VIR_AUTOSTRINGLIST serials =3D NULL; + g_auto(GStrv) serials =3D NULL; virDomainChrDefPtr chr =3D NULL; =20 if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) { diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index ed0ce77db4..ba0942601f 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1151,7 +1151,7 @@ static int xenParseXLNamespaceData(virConfPtr conf, virDomainDefPtr def) { virConfValuePtr list =3D virConfGetValue(conf, "device_model_args"); - VIR_AUTOSTRINGLIST args =3D NULL; + g_auto(GStrv) args =3D NULL; size_t nargs; libxlDomainXmlNsDefPtr nsdata =3D NULL; =20 diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c5a710fc3f..7e07f49f9a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1184,7 +1184,7 @@ int virLXCProcessStart(virConnectPtr conn, size_t i; g_autofree char *logfile =3D NULL; int logfd =3D -1; - VIR_AUTOSTRINGLIST veths =3D NULL; + g_auto(GStrv) veths =3D NULL; int handshakefds[2] =3D { -1, -1 }; off_t pos =3D -1; char ebuf[1024]; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 538551e772..5802d0e2c5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2616,7 +2616,7 @@ virQEMUCapsProbeQMPObjectProperties(virQEMUCapsPtr qe= muCaps, =20 for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) { virQEMUCapsObjectTypeProps *props =3D virQEMUCapsObjectProps + i; - VIR_AUTOSTRINGLIST values =3D NULL; + g_auto(GStrv) values =3D NULL; int nvalues; =20 if (props->capsCondition >=3D 0 && @@ -2883,7 +2883,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, /* QEMU 2.11 for Power renamed all CPU models to lower case, we need to * translate them back to libvirt's upper case model names. */ if (ARCH_IS_PPC64(arch)) { - VIR_AUTOSTRINGLIST libvirtModels =3D NULL; + g_auto(GStrv) libvirtModels =3D NULL; char **name; =20 if (virCPUGetModels(arch, &libvirtModels) < 0) @@ -5908,7 +5908,7 @@ virQEMUCapsFillDomainCPUCaps(virQEMUCapsPtr qemuCaps, VIR_CPU_MODE_CUSTOM, domCaps->machine)) { const char *forbidden[] =3D { "host", NULL }; - VIR_AUTOSTRINGLIST models =3D NULL; + g_auto(GStrv) models =3D NULL; =20 if (virCPUGetModels(domCaps->arch, &models) >=3D 0) { domCaps->cpu.custom =3D virQEMUCapsGetCPUModels(qemuCaps, diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 10fdc7444d..f7146a71c9 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -60,7 +60,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; int perms =3D VIR_CGROUP_DEVICE_READ; - VIR_AUTOSTRINGLIST targetPaths =3D NULL; + g_auto(GStrv) targetPaths =3D NULL; size_t i; int rv; =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index cbdde0c0dc..0ee51f1cec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -632,7 +632,7 @@ static int virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) { - VIR_AUTOSTRINGLIST hugetlbfs =3D NULL; + g_auto(GStrv) hugetlbfs =3D NULL; g_autofree char *stdioHandler =3D NULL; g_autofree char *corestr =3D NULL; size_t i; @@ -825,13 +825,13 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfig= Ptr cfg, virConfPtr conf, bool privileged) { - VIR_AUTOSTRINGLIST nvram =3D NULL; + g_auto(GStrv) nvram =3D NULL; size_t i; =20 if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) return -1; if (nvram) { - VIR_AUTOSTRINGLIST fwList =3D NULL; + g_auto(GStrv) fwList =3D NULL; =20 virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); cfg->firmwares =3D NULL; @@ -880,8 +880,8 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfi= gPtr cfg, virConfPtr conf, bool privileged) { - VIR_AUTOSTRINGLIST controllers =3D NULL; - VIR_AUTOSTRINGLIST namespaces =3D NULL; + g_auto(GStrv) controllers =3D NULL; + g_auto(GStrv) namespaces =3D NULL; g_autofree char *user =3D NULL; g_autofree char *group =3D NULL; size_t i, j; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index eebe6fcf78..639cff7459 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1183,7 +1183,7 @@ qemuFirmwareFetchParsedConfigs(bool privileged, qemuFirmwarePtr **firmwaresRet, char ***pathsRet) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; size_t npaths; qemuFirmwarePtr *firmwares =3D NULL; size_t i; @@ -1218,7 +1218,7 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver, virDomainDefPtr def, unsigned int flags) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; qemuFirmwarePtr *firmwares =3D NULL; ssize_t nfirmwares =3D 0; const qemuFirmware *theone =3D NULL; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 49751570a5..1326e76192 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8049,7 +8049,7 @@ qemuMonitorJSONGetCPUData(qemuMonitorPtr mon, virCPUDataPtr data) { qemuMonitorJSONObjectProperty prop =3D { .type =3D QEMU_MONITOR_OBJECT= _PROPERTY_BOOLEAN }; - VIR_AUTOSTRINGLIST props =3D NULL; + g_auto(GStrv) props =3D NULL; char **p; =20 if (qemuMonitorJSONGetCPUProperties(mon, &props) < 0) @@ -8081,7 +8081,7 @@ qemuMonitorJSONGetCPUDataDisabled(qemuMonitorPtr mon, void *opaque, virCPUDataPtr data) { - VIR_AUTOSTRINGLIST props =3D NULL; + g_auto(GStrv) props =3D NULL; char **p; =20 if (qemuMonitorJSONGetStringListProperty(mon, QOM_CPU_PATH, diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 1030309b5a..1002455ddf 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -247,7 +247,7 @@ qemuDomainSetupDisk(virStorageSourcePtr src, if (!(tmpPath =3D virPCIDeviceAddressGetIOMMUGroupDev(&next->n= vme->pciAddr))) return -1; } else { - VIR_AUTOSTRINGLIST targetPaths =3D NULL; + g_auto(GStrv) targetPaths =3D NULL; =20 if (virStorageSourceIsEmpty(next) || !virStorageSourceIsLocalStorage(next)) { @@ -613,7 +613,7 @@ int qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { VIR_DEBUG("namespaces disabled for domain %s", vm->def->name); @@ -1335,7 +1335,7 @@ qemuNamespaceUnlinkPaths(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - VIR_AUTOSTRINGLIST unlinkPaths =3D NULL; + g_auto(GStrv) unlinkPaths =3D NULL; char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; size_t npaths; @@ -1387,7 +1387,7 @@ int qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, virStorageSourcePtr src) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1431,7 +1431,7 @@ int qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1464,7 +1464,7 @@ int qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1486,7 +1486,7 @@ int qemuDomainNamespaceSetupMemory(virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1505,7 +1505,7 @@ int qemuDomainNamespaceTeardownMemory(virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1524,7 +1524,7 @@ int qemuDomainNamespaceSetupChardev(virDomainObjPtr vm, virDomainChrDefPtr chr) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1543,7 +1543,7 @@ int qemuDomainNamespaceTeardownChardev(virDomainObjPtr vm, virDomainChrDefPtr chr) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1562,7 +1562,7 @@ int qemuDomainNamespaceSetupRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1581,7 +1581,7 @@ int qemuDomainNamespaceTeardownRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1600,7 +1600,7 @@ int qemuDomainNamespaceSetupInput(virDomainObjPtr vm, virDomainInputDefPtr input) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -1618,7 +1618,7 @@ int qemuDomainNamespaceTeardownInput(virDomainObjPtr vm, virDomainInputDefPtr input) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 579b3c3713..20e90026e1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5482,7 +5482,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, =20 if (ARCH_IS_X86(vm->def->os.arch) && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES))= { - VIR_AUTOSTRINGLIST features =3D NULL; + g_auto(GStrv) features =3D NULL; int n; =20 if ((n =3D virCPUDefCheckFeatures(vm->def->cpu, @@ -6181,7 +6181,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, return -1; =20 if (ARCH_IS_X86(def->os.arch)) { - VIR_AUTOSTRINGLIST features =3D NULL; + g_auto(GStrv) features =3D NULL; =20 if (virQEMUCapsGetCPUFeatures(qemuCaps, def->virtType, false, &fea= tures) < 0) return -1; diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 3f2c52f69d..b41016f7d8 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -432,7 +432,7 @@ virQEMUQAPISchemaPathGet(const char *query, GHashTable *schema, virJSONValuePtr *entry) { - VIR_AUTOSTRINGLIST elems =3D NULL; + g_auto(GStrv) elems =3D NULL; struct virQEMUQAPISchemaTraverseContext ctxt; const char *cmdname; int rc; diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 260f3cd550..0a69d690ca 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -242,7 +242,7 @@ qemuVhostUserFetchParsedConfigs(bool privileged, qemuVhostUserPtr **vhostuserRet, char ***pathsRet) { - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; size_t npaths; qemuVhostUserPtr *vus =3D NULL; size_t i; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index fc9dd023da..e56d43ba85 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -920,7 +920,7 @@ virNetSocketNewConnectLibSSH2(const char *host, int ret =3D -1; int portN; =20 - VIR_AUTOSTRINGLIST authMethodList =3D NULL; + g_auto(GStrv) authMethodList =3D NULL; char **authMethodNext; =20 /* port number will be verified while opening the socket */ @@ -1052,7 +1052,7 @@ virNetSocketNewConnectLibssh(const char *host, int ret =3D -1; int portN; =20 - VIR_AUTOSTRINGLIST authMethodList =3D NULL; + g_auto(GStrv) authMethodList =3D NULL; char **authMethodNext; =20 /* port number will be verified while opening the socket */ diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index 12ff9f44d0..c5b7c568dd 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -139,8 +139,8 @@ virStorageBackendSheepdogRefreshAllVol(virStoragePoolOb= jPtr pool) { size_t i; g_autofree char *output =3D NULL; - VIR_AUTOSTRINGLIST lines =3D NULL; - VIR_AUTOSTRINGLIST cells =3D NULL; + g_auto(GStrv) lines =3D NULL; + g_auto(GStrv) cells =3D NULL; g_autoptr(virCommand) cmd =3D NULL; =20 cmd =3D virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", "-r", NULL); diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index 4a89f98350..31ffcc6f15 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -101,8 +101,8 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, bool is_new_vol =3D false; virStorageVolDefPtr volume =3D NULL; virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); - VIR_AUTOSTRINGLIST tokens =3D NULL; - VIR_AUTOSTRINGLIST name_tokens =3D NULL; + g_auto(GStrv) tokens =3D NULL; + g_auto(GStrv) name_tokens =3D NULL; =20 if (!(tokens =3D virStringSplitCount(volume_string, "\t", 0, &count))) return -1; @@ -169,7 +169,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); size_t i; - VIR_AUTOSTRINGLIST lines =3D NULL; + g_auto(GStrv) lines =3D NULL; g_autoptr(virCommand) cmd =3D NULL; g_autofree char *volumes_list =3D NULL; =20 @@ -216,9 +216,9 @@ virStorageBackendZFSRefreshPool(virStoragePoolObjPtr po= ol G_GNUC_UNUSED) char *zpool_props =3D NULL; size_t i; g_autoptr(virCommand) cmd =3D NULL; - VIR_AUTOSTRINGLIST lines =3D NULL; - VIR_AUTOSTRINGLIST tokens =3D NULL; - VIR_AUTOSTRINGLIST name_tokens =3D NULL; + g_auto(GStrv) lines =3D NULL; + g_auto(GStrv) tokens =3D NULL; + g_auto(GStrv) name_tokens =3D NULL; =20 /** * $ zpool get -Hp health,size,free,allocated test diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 13df10e507..15071d8b1b 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1140,7 +1140,7 @@ virCgroupEnableMissingControllers(char *path, virCgroupPtr *group) { g_autoptr(virCgroup) parent =3D NULL; - VIR_AUTOSTRINGLIST tokens =3D virStringSplit(path, "/", 0); + g_auto(GStrv) tokens =3D virStringSplit(path, "/", 0); size_t i; =20 if (virCgroupNew("/", controllers, &parent) < 0) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index e47dd6b932..c3a98bbeac 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -3201,7 +3201,7 @@ virCommandRunRegex(virCommandPtr cmd, int totgroups =3D 0, ngroup =3D 0; char **groups; g_autofree char *outbuf =3D NULL; - VIR_AUTOSTRINGLIST lines =3D NULL; + g_auto(GStrv) lines =3D NULL; int ret =3D -1; =20 /* Compile all regular expressions */ diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index c4719d0670..15a7eb9fde 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -54,7 +54,7 @@ static int virDevMapperGetMajor(unsigned int *major) { g_autofree char *buf =3D NULL; - VIR_AUTOSTRINGLIST lines =3D NULL; + g_auto(GStrv) lines =3D NULL; size_t i; =20 if (!virFileExists(CONTROL_PATH)) @@ -223,7 +223,7 @@ virDevMapperGetTargetsImpl(int controlFD, g_autofree char *buf =3D NULL; struct dm_ioctl dm; struct dm_target_deps *deps =3D NULL; - VIR_AUTOSTRINGLIST devPaths =3D NULL; + g_auto(GStrv) devPaths =3D NULL; size_t i; =20 memset(&dm, 0, sizeof(dm)); @@ -265,7 +265,7 @@ virDevMapperGetTargetsImpl(int controlFD, } =20 for (i =3D 0; i < deps->count; i++) { - VIR_AUTOSTRINGLIST tmpPaths =3D NULL; + g_auto(GStrv) tmpPaths =3D NULL; =20 if (virDevMapperGetTargetsImpl(controlFD, devPaths[i], &tmpPaths, = ttl - 1) < 0) return -1; diff --git a/src/util/virfile.c b/src/util/virfile.c index f57272ca2f..f7283fa72f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1619,7 +1619,7 @@ char * virFindFileInPath(const char *file) { const char *origpath =3D NULL; - VIR_AUTOSTRINGLIST paths =3D NULL; + g_auto(GStrv) paths =3D NULL; char **pathiter; =20 if (file =3D=3D NULL) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 21dea3013a..b84f0f5f48 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -686,7 +686,7 @@ virFirewallApplyRule(virFirewallPtr firewall, { g_autofree char *output =3D NULL; g_autofree char *str =3D virFirewallRuleToString(rule); - VIR_AUTOSTRINGLIST lines =3D NULL; + g_auto(GStrv) lines =3D NULL; VIR_INFO("Applying rule '%s'", NULLSTR(str)); =20 if (rule->ignoreErrors) diff --git a/src/util/virhook.c b/src/util/virhook.c index aad3e667d3..05d46f259e 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -343,7 +343,7 @@ virHookCall(int driver, struct dirent *entry; g_autofree char *path =3D NULL; g_autofree char *dir_path =3D NULL; - VIR_AUTOSTRINGLIST entries =3D NULL; + g_auto(GStrv) entries =3D NULL; const char *drvstr; const char *opstr; const char *subopstr; diff --git a/src/util/virjson.c b/src/util/virjson.c index 4f92464421..c80c2f1ecb 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -2112,7 +2112,7 @@ virJSONValueObjectDeflattenWorker(const char *key, virJSONValuePtr retobj =3D opaque; g_autoptr(virJSONValue) newval =3D NULL; virJSONValuePtr existobj; - VIR_AUTOSTRINGLIST tokens =3D NULL; + g_auto(GStrv) tokens =3D NULL; size_t ntokens =3D 0; =20 /* non-nested keys only need to be copied */ diff --git a/src/util/virprocess.c b/src/util/virprocess.c index dccfc2558e..0523bf9afb 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -985,7 +985,7 @@ int virProcessGetStartTime(pid_t pid, int len; g_autofree char *filename =3D NULL; g_autofree char *buf =3D NULL; - VIR_AUTOSTRINGLIST tokens =3D NULL; + g_auto(GStrv) tokens =3D NULL; =20 filename =3D g_strdup_printf("/proc/%llu/stat", (long long)pid); =20 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 35e6dcf5de..fac93118fd 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1503,7 +1503,7 @@ virStorageFileParseBackingStoreStr(const char *str, size_t nstrings; unsigned int idx =3D 0; char *suffix; - VIR_AUTOSTRINGLIST strings =3D NULL; + g_auto(GStrv) strings =3D NULL; =20 *chainIndex =3D 0; =20 @@ -2778,7 +2778,7 @@ virStorageSourceParseBackingURI(virStorageSourcePtr s= rc, { g_autoptr(virURI) uri =3D NULL; const char *path =3D NULL; - VIR_AUTOSTRINGLIST scheme =3D NULL; + g_auto(GStrv) scheme =3D NULL; =20 if (!(uri =3D virURIParse(uristr))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2880,7 +2880,7 @@ virStorageSourceRBDAddHost(virStorageSourcePtr src, { char *port; size_t skip; - VIR_AUTOSTRINGLIST parts =3D NULL; + g_auto(GStrv) parts =3D NULL; =20 if (VIR_EXPAND_N(src->hosts, src->nhosts, 1) < 0) return -1; @@ -3220,7 +3220,7 @@ virStorageSourceParseBackingJSONUriCookies(virStorage= SourcePtr src, const char *jsonstr) { const char *cookiestr; - VIR_AUTOSTRINGLIST cookies =3D NULL; + g_auto(GStrv) cookies =3D NULL; size_t ncookies =3D 0; size_t i; =20 @@ -4512,7 +4512,7 @@ int virStorageFileCheckCompat(const char *compat) { unsigned int result; - VIR_AUTOSTRINGLIST version =3D NULL; + g_auto(GStrv) version =3D NULL; =20 if (!compat) return 0; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index de8763033d..edd29f0fdd 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -681,7 +681,7 @@ virSystemdActivationInitFromNames(virSystemdActivationP= tr act, int nfds, const char *fdnames) { - VIR_AUTOSTRINGLIST fdnamelistptr =3D NULL; + g_auto(GStrv) fdnamelistptr =3D NULL; char **fdnamelist; size_t nfdnames; size_t i; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0d79b8f0ec..b86dbe9ca2 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1577,7 +1577,7 @@ virVMXParseConfig(virVMXContext *ctx, } =20 if (sched_cpu_affinity !=3D NULL && STRCASENEQ(sched_cpu_affinity, "al= l")) { - VIR_AUTOSTRINGLIST afflist =3D NULL; + g_auto(GStrv) afflist =3D NULL; char **aff; size_t naffs; =20 diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 2b56e5ac82..ced9d53260 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -56,7 +56,7 @@ static int testFWPrecedence(const void *opaque G_GNUC_UNUSED) { g_autofree char *fakehome =3D NULL; - VIR_AUTOSTRINGLIST fwList =3D NULL; + g_auto(GStrv) fwList =3D NULL; size_t nfwList; size_t i; const char *expected[] =3D { diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index dc3deb37d2..1750018137 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -87,7 +87,7 @@ testDomain(const void *opaque) { const struct testData *data =3D opaque; g_autoptr(virDomainObj) vm =3D NULL; - VIR_AUTOSTRINGLIST notRestored =3D NULL; + g_auto(GStrv) notRestored =3D NULL; size_t i; int ret =3D -1; =20 diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 273db560e3..17e4e83b99 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -56,7 +56,7 @@ static int testVUPrecedence(const void *opaque G_GNUC_UNUSED) { g_autofree char *fakehome =3D NULL; - VIR_AUTOSTRINGLIST vuList =3D NULL; + g_auto(GStrv) vuList =3D NULL; size_t nvuList; size_t i; const char *expected[] =3D { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 42d147243e..409680c84e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -130,7 +130,7 @@ static virStorageVolPtr fakeStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { - VIR_AUTOSTRINGLIST volinfo =3D NULL; + g_auto(GStrv) volinfo =3D NULL; virStorageVolPtr ret =3D NULL; =20 if (STREQ(pool->name, "inactive")) { @@ -517,7 +517,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv, struct testQemuInfo *info, unsigned int flags) { - VIR_AUTOSTRINGLIST args =3D NULL; + g_auto(GStrv) args =3D NULL; g_autoptr(virDomainObj) vm =3D NULL; size_t nargs =3D 0; size_t i; diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 2670eb1561..9f95520859 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -102,7 +102,7 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync, } else if (STREQ(bus_name, VIR_FIREWALL_FIREWALLD_SERVICE) && STREQ(method_name, "passthrough")) { g_autoptr(GVariantIter) iter =3D NULL; - VIR_AUTOSTRINGLIST args =3D NULL; + g_auto(GStrv) args =3D NULL; size_t nargs =3D 0; char *type =3D NULL; char *item =3D NULL; diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index dad0ea6812..4a3459f12a 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -42,7 +42,7 @@ virshDomainNameCompleter(vshControl *ctl, int ndomains =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE | VIR_CONNECT_LIST_DOMAINS_INACTIVE | @@ -89,7 +89,7 @@ virshDomainUUIDCompleter(vshControl *ctl, int ndomains =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE | VIR_CONNECT_LIST_DOMAINS_INACTIVE | @@ -142,7 +142,7 @@ virshDomainInterfaceCompleter(vshControl *ctl, g_autofree xmlNodePtr *interfaces =3D NULL; size_t i; unsigned int domainXMLFlags =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC, NULL); =20 @@ -189,7 +189,7 @@ virshDomainDiskTargetCompleter(vshControl *ctl, g_autofree xmlNodePtr *disks =3D NULL; int ndisks; size_t i; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -221,7 +221,7 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UN= USED, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -249,7 +249,7 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, g_autofree xmlNodePtr *interfaces =3D NULL; g_autofree char *xpath =3D NULL; g_autofree char *state =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -303,7 +303,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, g_autofree xmlNodePtr *aliases =3D NULL; size_t i; unsigned int domainXMLFlags =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -392,7 +392,7 @@ virshDomainPerfEnableCompleter(vshControl *ctl, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST events =3D NULL; + g_auto(GStrv) events =3D NULL; const char *event =3D NULL; =20 virCheckFlags(0, NULL); @@ -415,7 +415,7 @@ virshDomainPerfDisableCompleter(vshControl *ctl, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST events =3D NULL; + g_auto(GStrv) events =3D NULL; const char *event =3D NULL; =20 virCheckFlags(0, NULL); @@ -443,7 +443,7 @@ virshDomainIOThreadIdCompleter(vshControl *ctl, size_t i; int rc; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -479,7 +479,7 @@ virshDomainVcpuCompleter(vshControl *ctl, int nvcpus =3D 0; unsigned int id; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -519,7 +519,7 @@ virshDomainVcpulistCompleter(vshControl *ctl, xmlXPathContextPtr ctxt =3D NULL; int nvcpus =3D 0; unsigned int id; - VIR_AUTOSTRINGLIST vcpulist =3D NULL; + g_auto(GStrv) vcpulist =3D NULL; const char *vcpuid =3D NULL; char **ret =3D NULL; =20 @@ -564,7 +564,7 @@ virshDomainCpulistCompleter(vshControl *ctl, int cpunum; g_autofree unsigned char *cpumap =3D NULL; unsigned int online; - VIR_AUTOSTRINGLIST cpulist =3D NULL; + g_auto(GStrv) cpulist =3D NULL; const char *cpuid =3D NULL; =20 virCheckFlags(0, NULL); @@ -596,7 +596,7 @@ virshDomainVcpulistViaAgentCompleter(vshControl *ctl, unsigned int nparams =3D 0; size_t i; int nvcpus; - VIR_AUTOSTRINGLIST cpulist =3D NULL; + g_auto(GStrv) cpulist =3D NULL; const char *vcpuid =3D NULL; char **ret =3D NULL; =20 @@ -677,7 +677,7 @@ virshDomainConsoleCompleter(vshControl *ctl, g_autofree xmlNodePtr *parallels =3D NULL; size_t i; size_t offset =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -722,7 +722,7 @@ virshDomainSignalCompleter(vshControl *ctl G_GNUC_UNUSE= D, const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; size_t i =3D 0; =20 virCheckFlags(0, NULL); @@ -743,7 +743,7 @@ virshDomainLifecycleCompleter(vshControl *ctl G_GNUC_UN= USED, const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; size_t i =3D 0; =20 virCheckFlags(0, NULL); @@ -764,7 +764,7 @@ virshDomainLifecycleActionCompleter(vshControl *ctl G_G= NUC_UNUSED, const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; size_t i =3D 0; =20 virCheckFlags(0, NULL); diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 4c277f2ada..9d3bdb2024 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -63,7 +63,7 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, bool cellno =3D vshCommandOptBool(cmd, "cellno"); g_autofree char *path =3D NULL; g_autofree char *cap_xml =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -110,7 +110,7 @@ virshCellnoCompleter(vshControl *ctl, g_autoptr(xmlDoc) doc =3D NULL; size_t i =3D 0; g_autofree char *cap_xml =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -144,7 +144,7 @@ virshNodeCpuCompleter(vshControl *ctl, unsigned int flags) { virshControlPtr priv =3D ctl->privData; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; size_t i; int cpunum; size_t offset =3D 0; diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-inte= rface.c index 1eea2d462a..db819ae689 100644 --- a/tools/virsh-completer-interface.c +++ b/tools/virsh-completer-interface.c @@ -38,7 +38,7 @@ virshInterfaceStringHelper(vshControl *ctl, virInterfacePtr *ifaces =3D NULL; int nifaces =3D 0; size_t i =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | VIR_CONNECT_LIST_INTERFACES_INACTIVE, diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-networ= k.c index 3094b9d5d6..5f5f527fa4 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -36,7 +36,7 @@ virshNetworkNameCompleter(vshControl *ctl, int nnets =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_NETWORKS_INACTIVE | VIR_CONNECT_LIST_NETWORKS_ACTIVE | @@ -72,7 +72,7 @@ virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_UNU= SED, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -145,7 +145,7 @@ virshNetworkUUIDCompleter(vshControl *ctl, int nnets =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -187,7 +187,7 @@ virshNetworkDhcpMacCompleter(vshControl *ctl, int nleases; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodede= v.c index a9fc37733c..1165e0680c 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -37,7 +37,7 @@ virshNodeDeviceNameCompleter(vshControl *ctl, int ndevs =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -70,7 +70,7 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_= UNUSED, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -88,7 +88,7 @@ virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags) { - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; const char *cap_str =3D NULL; size_t i =3D 0; =20 diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfil= ter.c index b1aa084b49..13caefff1e 100644 --- a/tools/virsh-completer-nwfilter.c +++ b/tools/virsh-completer-nwfilter.c @@ -35,7 +35,7 @@ virshNWFilterNameCompleter(vshControl *ctl, int nnwfilters =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -72,7 +72,7 @@ virshNWFilterBindingNameCompleter(vshControl *ctl, int nbindings =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index ecf2514a59..4a0eb1582d 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -37,7 +37,7 @@ virshStoragePoolNameCompleter(vshControl *ctl, int npools =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE | VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE | @@ -73,7 +73,7 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -91,7 +91,7 @@ virshPoolTypeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags) { - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; const char *type_str =3D NULL; size_t i =3D 0; =20 diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index 940d65a322..75ebe7b4e9 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -37,7 +37,7 @@ virshSecretUUIDCompleter(vshControl *ctl, int nsecrets =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -73,7 +73,7 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUS= ED, unsigned int flags) { size_t i; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 diff --git a/tools/virsh-completer-snapshot.c b/tools/virsh-completer-snaps= hot.c index f6aa405ea3..e64b2442ca 100644 --- a/tools/virsh-completer-snapshot.c +++ b/tools/virsh-completer-snapshot.c @@ -38,7 +38,7 @@ virshSnapshotNameCompleter(vshControl *ctl, int nsnapshots =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index 29330f5bd8..2ac8cd25cc 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -38,7 +38,7 @@ virshStorageVolNameCompleter(vshControl *ctl, int nvols =3D 0; size_t i =3D 0; char **ret =3D NULL; - VIR_AUTOSTRINGLIST tmp =3D NULL; + g_auto(GStrv) tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index a05ce0bfca..c7aed7c779 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -89,8 +89,8 @@ virshCommaStringListComplete(const char *input, { const size_t optionsLen =3D virStringListLength(options); g_autofree char *inputCopy =3D NULL; - VIR_AUTOSTRINGLIST inputList =3D NULL; - VIR_AUTOSTRINGLIST ret =3D NULL; + g_auto(GStrv) inputList =3D NULL; + g_auto(GStrv) ret =3D NULL; size_t nret =3D 0; size_t i; =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 655bac3315..51a9fd90d1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -14288,7 +14288,7 @@ cmdGetUserSSHKeys(vshControl *ctl, const vshCmd *cm= d) { virDomainPtr dom =3D NULL; const char *user; - VIR_AUTOSTRINGLIST keys =3D NULL; + g_auto(GStrv) keys =3D NULL; int nkeys =3D 0; size_t i; const unsigned int flags =3D 0; @@ -14358,7 +14358,7 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cm= d) const char *user; const char *from; g_autofree char *buffer =3D NULL; - VIR_AUTOSTRINGLIST keys =3D NULL; + g_auto(GStrv) keys =3D NULL; int nkeys =3D 0; unsigned int flags =3D 0; bool ret =3D false; --=20 2.26.2 From nobody Thu May 16 10:47:21 2024 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=1606841107; cv=none; d=zohomail.com; s=zohoarc; b=nIF17aZDI+0pEsbMIXWZK+TQZPg25HtbLZR7A889UhZKkLC44qLqph2ALQQe9F3HpSaDpf2fd6Oqcy4TYa+ERYXxoIC0Be+2um3MKXpdpHn2znZ2hUMk8pVnzhoqIsGcGaipMxjQbVWDldkXcXeY8Grss+pda4WW4kHuSw7Hxcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606841107; 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=97pKKHJT/bAmOPA156O75fTFC0H2DULsMICQqOclfsc=; b=C0WmVNl97jrsiPNoOQZw0HBo3x9pQK96RCfh6h/48Mvs6+swkMHCM1GkRt/eiWkoY7WsBDWC/Z55s6IOFdh/wJbjkH2d6R6Y1hDUzpf4N0OemmBV9yyEGz++CcsYAF84MLcyT6QSJu4+nZE0qHhIF+iu+sKSNx+JuIaWKoXUaQg= 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 1606841107016233.63289460981412; Tue, 1 Dec 2020 08:45:07 -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-59-TfGm6VgGMF-yuWHKlao87g-1; Tue, 01 Dec 2020 11:44:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56B38100C665; Tue, 1 Dec 2020 16:44:35 +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 2E1775C1B4; Tue, 1 Dec 2020 16:44:35 +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 EDF0A4EEEE; Tue, 1 Dec 2020 16:44:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.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 0B1GiUHM030686 for ; Tue, 1 Dec 2020 11:44:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5C9A410016FF; Tue, 1 Dec 2020 16:44:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0B0A10013C1 for ; Tue, 1 Dec 2020 16:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606841105; 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=97pKKHJT/bAmOPA156O75fTFC0H2DULsMICQqOclfsc=; b=OqkQYjFbrUwFvpLXeSJVfDc93/Wtz1cuwd9zWpnXaqIvDNI8wLIyQfOLZsTfF74sJlHNAp xR8alUBs7pGIx30X2tzLPQ5BplVi+UQbii71bWNv5WOffzOkBRq6fxPApV5+djwTsZPOfr Yd0+JeAPNWm3BaxNMper2mWiY7eoauY= X-MC-Unique: TfGm6VgGMF-yuWHKlao87g-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/2] virstring: Drop VIR_AUTOSTRINGLIST Date: Tue, 1 Dec 2020 17:44:23 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.16 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" Now that no one uses VIR_AUTOSTRINGLIST it can be dropped. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 - src/util/virstring.c | 10 ---------- src/util/virstring.h | 9 --------- 3 files changed, 20 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 179dcecb0a..2f640ef1c4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3227,7 +3227,6 @@ virStringHasSuffix; virStringIsEmpty; virStringIsPrintable; virStringListAdd; -virStringListAutoFree; virStringListFreeCount; virStringListGetFirstWithPrefix; virStringListHasString; diff --git a/src/util/virstring.c b/src/util/virstring.c index 5c49b56f75..5578a5545b 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -259,16 +259,6 @@ virStringListMerge(char ***dst, } =20 =20 -void virStringListAutoFree(char ***strings) -{ - if (!*strings) - return; - - g_strfreev(*strings); - *strings =3D NULL; -} - - /** * virStringListFreeCount: * @strings: array of strings to free diff --git a/src/util/virstring.h b/src/util/virstring.h index 561ce0cbc0..210e43a953 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -45,7 +45,6 @@ void virStringListRemove(char ***strings, int virStringListMerge(char ***dst, char ***src); =20 -void virStringListAutoFree(char ***strings); void virStringListFreeCount(char **strings, size_t count); =20 @@ -179,11 +178,3 @@ int virStringParsePort(const char *str, int virStringParseYesNo(const char *str, bool *result) G_GNUC_WARN_UNUSED_RESULT; -/** - * VIR_AUTOSTRINGLIST: - * - * Declares a NULL-terminated list of strings which will be automatically = freed - * when the pointer goes out of scope. - */ -#define VIR_AUTOSTRINGLIST \ - __attribute__((cleanup(virStringListAutoFree))) char ** --=20 2.26.2