From nobody Sun Feb 8 11:21:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1596473848; cv=none; d=zohomail.com; s=zohoarc; b=Wsz7oBPfbNivdSh8nD6KaZdBq4XE5q4ExNDQfX/yyhFeQPPx5Lops6ElSmK2mdnZ16msQ9FQy8AYMxwUbN4QiEice5CHFp7aqgndtfI6dYvXvr890mN6RAqESRD+K1Y5m5e2LHM76khZ8KiZykTie0Qau4dGye8BtrYfHlctL50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473848; 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=dRMAGWKj62fFik2F0mFY1hLFtZMFroX+zL0F5z77M/k=; b=S5PrvtL00at/ICAwD72N8ErQf5dYTgdAxhfz7hs2uidmDHsAUvEIdZLfpO0UY9LGqRDZkScPQMCtKEyAxPX2/MaODTeXv7J1KTvFLQ8kcEWptRXv46uDD5M3erLaShOjoro00hVcWd1li8F0q52cPJ5qd/F+EKXxkXbzc2RXrFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596473848610537.9583508925011; Mon, 3 Aug 2020 09:57:28 -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-287-0edn0MKXMmKp8zu62Ksb5g-1; Mon, 03 Aug 2020 12:57:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07B77800470; Mon, 3 Aug 2020 16:57:18 +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 D7B6F1002397; Mon, 3 Aug 2020 16:57:17 +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 A3CC79A115; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvB5S007691 for ; Mon, 3 Aug 2020 12:57:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1758A71765; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 189617190D for ; Mon, 3 Aug 2020 16:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473847; 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=dRMAGWKj62fFik2F0mFY1hLFtZMFroX+zL0F5z77M/k=; b=ZiyKC3zCtLFdE0WL6b6ZnMpjUCKpxeaIaNiWVR6YQzTugil9yz5kz1C60V98qUWIWK1L+j PG4HF5MENHjRYw6jhGUa6pXyxSamLKRbjbQFk83csJunBuFs0WOarV7jaXj4CKS/B4XYNA Gl0em9TuWzAJa4Sh/fo6EvbkDrIm8yE= X-MC-Unique: 0edn0MKXMmKp8zu62Ksb5g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/19] Move declarations before statements Date: Mon, 3 Aug 2020 18:56:42 +0200 Message-Id: <4afd4316c05fa502849603b7a8ce6abfbc28760e.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.22 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 --- src/bhyve/bhyve_parse_command.c | 3 ++- src/conf/domain_conf.c | 9 ++++++--- src/conf/network_conf.c | 3 ++- src/conf/virstorageobj.c | 3 ++- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 12 ++++++------ src/qemu/qemu_process.c | 5 +++-- src/remote/remote_driver.c | 3 +-- src/storage/storage_util.c | 2 +- src/util/virdbus.c | 2 +- src/util/virqemu.c | 2 +- src/vbox/vbox_common.c | 21 +++++++++++---------- src/vbox/vbox_snapshot_conf.c | 8 ++++++-- src/vz/vz_driver.c | 10 +++++----- tests/commandhelper.c | 5 ++--- tests/eventtest.c | 5 +++-- tests/vircgroupmock.c | 8 ++++++-- tools/virsh-domain.c | 4 +++- tools/virsh-interface.c | 3 ++- tools/virsh-network.c | 3 ++- tools/virsh-nodedev.c | 2 +- tools/virsh-util.c | 3 ++- tools/virt-host-validate-common.c | 3 ++- 23 files changed, 71 insertions(+), 50 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index b2d2280872..67ca0ddfa3 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -171,12 +171,13 @@ bhyveCommandLineToArgv(const char *nativeConfig, } =20 for (i =3D 0; i < line_count; i++) { - curr =3D lines[i]; size_t j; char **arglist =3D NULL; size_t args_count =3D 0; size_t args_alloc =3D 0; =20 + curr =3D lines[i]; + /* iterate over each line, splitting on sequences of ' '. This cod= e is * adapted from qemu/qemu_parse_command.c. */ while (curr && *curr !=3D '\0') { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 69e0439e7e..570812cefb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2845,12 +2845,13 @@ void virDomainSoundCodecDefFree(virDomainSoundCodec= DefPtr def) =20 void virDomainSoundDefFree(virDomainSoundDefPtr def) { + size_t i; + if (!def) return; =20 virDomainDeviceInfoClear(&def->info); =20 - size_t i; for (i =3D 0; i < def->ncodecs; i++) virDomainSoundCodecDefFree(def->codecs[i]); VIR_FREE(def->codecs); @@ -3222,10 +3223,11 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr d= ef) static void virDomainClockDefClear(virDomainClockDefPtr def) { + size_t i; + if (def->offset =3D=3D VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE) VIR_FREE(def->data.timezone); =20 - size_t i; for (i =3D 0; i < def->ntimers; i++) VIR_FREE(def->timers[i]); VIR_FREE(def->timers); @@ -16585,9 +16587,10 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, virDomainMemoryDefPtr def) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - ctxt->node =3D node; g_autofree char *nodemask =3D NULL; =20 + ctxt->node =3D node; + switch ((virDomainMemoryModel) def->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4221623c37..cd708e654f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2534,9 +2534,10 @@ virNetworkDefFormatBuf(virBufferPtr buf, =20 if (def->forward.type !=3D VIR_NETWORK_FORWARD_NONE) { const char *dev =3D NULL; + const char *mode =3D virNetworkForwardTypeToString(def->forward.ty= pe); + if (!def->forward.npfs) dev =3D virNetworkDefForwardIf(def, 0); - const char *mode =3D virNetworkForwardTypeToString(def->forward.ty= pe); =20 if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index f3c54d0c52..1c7d615a7a 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1114,9 +1114,10 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjListPt= r pools, /* UUID does not match, but if a name matches, refuse it */ obj =3D virStoragePoolObjFindByNameLocked(pools, def->name); if (obj) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virObjectLock(obj); =20 - char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, _("pool '%s' already exists with uuid %s"), diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index c6497450eb..c28b12f2f0 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -626,12 +626,12 @@ learnIPAddressThread(void *arg) pcap_close(handle); =20 if (req->status =3D=3D 0) { + g_autofree char *inetaddr =3D NULL; int ret; virSocketAddr sa; sa.len =3D sizeof(sa.data.inet4); sa.data.inet4.sin_family =3D AF_INET; sa.data.inet4.sin_addr.s_addr =3D vmaddr; - g_autofree char *inetaddr =3D NULL; =20 /* It is necessary to unlock interface here to avoid updateMutex a= nd * interface ordering deadlocks. Otherwise we are going to diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index db3df5ed5a..6d54123a35 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -233,16 +233,16 @@ openvzReadNetworkConf(virDomainDefPtr def, } else if (ret > 0) { token =3D strtok_r(temp, ";", &saveptr); while (token !=3D NULL) { - /* add new device to list */ - if (VIR_ALLOC(net) < 0) - goto error; - - net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - char *p =3D token; char cpy_temp[32]; int len; =20 + /* add new device to list */ + if (VIR_ALLOC(net) < 0) + goto error; + + net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; + /* parse string */ do { char *next =3D strchr(p, ','); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 812220769d..7c312efd8b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -522,9 +522,10 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver, =20 if (priv->fakeReboot) { g_autofree char *name =3D g_strdup_printf("reboot-%s", vm->def->na= me); - qemuDomainSetFakeReboot(driver, vm, false); - virObjectRef(vm); virThread th; + + qemuDomainSetFakeReboot(driver, vm, false); + virObjectRef(vm); if (virThreadCreateFull(&th, false, qemuProcessFakeReboot, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 0331060a2d..2402f73475 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -957,6 +957,7 @@ doRemoteOpen(virConnectPtr conn, bool tty =3D true; #endif int mode; + size_t i; =20 if (inside_daemon && !conn->uri->server) { mode =3D REMOTE_DRIVER_MODE_DIRECT; @@ -1014,8 +1015,6 @@ doRemoteOpen(virConnectPtr conn, * feasibly it might contain variables needed by the real driver, * although that won't be the case for now). */ - size_t i; - if (conn->uri) { for (i =3D 0; i < conn->uri->paramsCount; i++) { virURIParamPtr var =3D &conn->uri->params[i]; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f7c09e3375..4752ab78a3 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -192,8 +192,8 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, * blocks */ amtleft =3D amtread; do { - interval =3D ((wbytes > amtleft) ? amtleft : wbytes); int offset =3D amtread - amtleft; + interval =3D ((wbytes > amtleft) ? amtleft : wbytes); =20 if (want_sparse && memcmp(buf+offset, zerobuf, interval) =3D= =3D 0) { if (lseek(fd, interval, SEEK_CUR) < 0) { diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 77691cd2b0..f512031b42 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -999,6 +999,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, case DBUS_TYPE_SIGNATURE: do { char **x; + char *s; if (arrayref) { char ***xptrptr =3D arrayptr; if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) @@ -1008,7 +1009,6 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, } else { x =3D (char **)va_arg(args, char **); } - char *s; dbus_message_iter_get_basic(iter, &s); *x =3D g_strdup(s); VIR_DEBUG("Read basic type 'char *' varg 'char **'" diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 20cb09d878..25d6fd35c5 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -94,9 +94,9 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, size_t i; =20 for (i =3D 0; i < virJSONValueArraySize(array); i++) { - member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix =3D NULL; =20 + member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); prefix =3D g_strdup_printf("%s.%zu", key, i); =20 if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKe= y, onOff, diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 1adafa1e70..bae62f6967 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -653,6 +653,7 @@ static int vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) { vboxDriverPtr data =3D conn->privateData; + ISystemProperties *systemProperties =3D NULL; PRUint32 maxCPUCount =3D 0; int ret =3D -1; =20 @@ -662,7 +663,6 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *= type G_GNUC_UNUSED) /* VirtualBox Supports only hvm and thus the type passed to it * has no meaning, setting it to G_GNUC_UNUSED */ - ISystemProperties *systemProperties =3D NULL; =20 gVBoxAPI.UIVirtualBox.GetSystemProperties(data->vboxObj, &systemProper= ties); if (!systemProperties) @@ -4603,6 +4603,7 @@ vboxSnapshotRedefine(virDomainPtr dom, char *nameTmpUse =3D NULL; bool snapshotFileExists =3D false; bool needToChangeStorageController =3D false; + char uuidtmp[VIR_UUID_STRING_BUFLEN]; int ret =3D -1; =20 if (!data->vboxObj) @@ -4782,6 +4783,7 @@ vboxSnapshotRedefine(virDomainPtr dom, char *parentUuid =3D NULL; virVBoxSnapshotConfHardDiskPtr readOnlyDisk =3D NULL; vboxIID iid, parentiid; + IMedium *parentReadOnlyMedium =3D NULL; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -4831,7 +4833,6 @@ vboxSnapshotRedefine(virDomainPtr dom, VBOX_UTF16_FREE(formatUtf); =20 /* This disk is already in the media registry */ - IMedium *parentReadOnlyMedium =3D NULL; rc =3D gVBoxAPI.UIMedium.GetParent(readOnlyMedium, &parentReadOnly= Medium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4965,7 +4966,6 @@ vboxSnapshotRedefine(virDomainPtr dom, if (virUUIDGenerate(snapshotUuid) < 0) goto cleanup; =20 - char uuidtmp[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(snapshotUuid, uuidtmp); newSnapshotPtr->uuid =3D g_strdup(uuidtmp); =20 @@ -5176,6 +5176,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } } } else { + char *snapshotContent; /* Create a "fake" disk to avoid corrupting children snapshot disk= s. */ for (it =3D 0; it < def->parent.dom->ndisks; it++) { IMedium *medium =3D NULL; @@ -5190,6 +5191,8 @@ vboxSnapshotRedefine(virDomainPtr dom, char *format =3D NULL; char *tmp =3D NULL; vboxIID iid, parentiid; + IProgress *progress =3D NULL; + PRUint32 tab[1]; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -5235,8 +5238,6 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } =20 - IProgress *progress =3D NULL; - PRUint32 tab[1]; tab[0] =3D MediumVariant_Diff; gVBoxAPI.UIMedium.CreateDiffStorage(medium, newMedium, 1, tab,= &progress); =20 @@ -5320,9 +5321,9 @@ vboxSnapshotRedefine(virDomainPtr dom, VIR_FREE(currentSnapshotXmlFilePath); currentSnapshotXmlFilePath =3D g_strdup_printf("%s%s.xml", machineLocationPath, = snapshotMachineDesc->currentSnapshot); - char *snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, - data->xmlopt, - VIR_DOMAIN_SNAP= SHOT_FORMAT_SECURE); + snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, + data->xmlopt, + VIR_DOMAIN_SNAPSHOT_F= ORMAT_SECURE); if (snapshotContent =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to get snapshot content")); @@ -6947,6 +6948,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) char *tmp =3D NULL; vboxIID iid, parentiid; resultCodeUnion resultCode; + PRUint32 tab[1]; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -7004,7 +7006,6 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) VBOX_UTF16_FREE(formatUtf16); VBOX_UTF16_FREE(newLocation); =20 - PRUint32 tab[1]; tab[0] =3D MediumVariant_Diff; gVBoxAPI.UIMedium.CreateDiffStorage(medium, newMedium, 1, = tab, &progress); =20 @@ -7536,12 +7537,12 @@ vboxConnectListAllDomains(virConnectPtr conn, =20 for (i =3D 0; i < machines.count; i++) { IMachine *machine =3D machines.items[i]; + PRBool isAccessible =3D PR_FALSE; int id =3D -1; =20 if (!machine) continue; =20 - PRBool isAccessible =3D PR_FALSE; gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible); =20 if (!isAccessible) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 6b95311328..ee644e1e2d 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -1286,8 +1286,10 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(con= st char *filePath, =20 for (i =3D 0; i < nodeSize; i++) { xmlNodePtr node =3D nodes[i]; + xmlNodePtr sourceNode; + xPathContext->node =3D node; - xmlNodePtr sourceNode =3D virXPathNode("./source", xPathContext); + sourceNode =3D virXPathNode("./source", xPathContext); if (sourceNode) ret[i] =3D virXMLPropString(sourceNode, "file"); } @@ -1347,8 +1349,10 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(con= st char *filePath, =20 for (i =3D 0; i < nodeSize; i++) { xmlNodePtr node =3D nodes[i]; + xmlNodePtr sourceNode; + xPathContext->node =3D node; - xmlNodePtr sourceNode =3D virXPathNode("./source", xPathContext); + sourceNode =3D virXPathNode("./source", xPathContext); if (sourceNode) ret[i] =3D virXMLPropString(sourceNode, "file"); } diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 1f9c4c79c0..40b1828eb2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -112,6 +112,8 @@ vzBuildCapabilities(void) }; size_t i, j, k; =20 + G_STATIC_ASSERT(G_N_ELEMENTS(archs) =3D=3D G_N_ELEMENTS(emulators)); + if ((caps =3D virCapabilitiesNew(virArchFromHost(), false, false)) =3D=3D NULL) return NULL; @@ -122,8 +124,6 @@ vzBuildCapabilities(void) if (virCapabilitiesInitCaches(caps) < 0) goto error; =20 - G_STATIC_ASSERT(G_N_ELEMENTS(archs) =3D=3D G_N_ELEMENTS(emulators)); - for (i =3D 0; i < G_N_ELEMENTS(ostypes); i++) for (j =3D 0; j < G_N_ELEMENTS(archs); j++) for (k =3D 0; k < G_N_ELEMENTS(emulators); k++) @@ -220,12 +220,12 @@ vzConnectGetCapabilities(virConnectPtr conn) static int vzDomainDefAddDefaultInputDevices(virDomainDefPtr def) { - if (def->ngraphics =3D=3D 0) - return 0; - int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; =20 + if (def->ngraphics =3D=3D 0) + return 0; + if (virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus) < 0) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b366483771..05f577730f 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -74,6 +74,8 @@ int main(int argc, char **argv) { char c; bool daemonize_check =3D false; size_t daemonize_retries =3D 3; + char buf[1024]; + ssize_t got; =20 if (!log) return ret; @@ -167,9 +169,6 @@ int main(int argc, char **argv) { usleep(100*1000); } =20 - char buf[1024]; - ssize_t got; - fprintf(stdout, "BEGIN STDOUT\n"); fflush(stdout); fprintf(stderr, "BEGIN STDERR\n"); diff --git a/tests/eventtest.c b/tests/eventtest.c index 06b5e7b20c..4a23bd6e62 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,10 +89,11 @@ G_GNUC_PRINTF(3, 4) testEventReport(const char *name, bool failed, const char *msg, ...) { va_list vargs; - va_start(vargs, msg); char *str =3D NULL; struct testEventResultData data; =20 + va_start(vargs, msg); + if (msg) str =3D g_strdup_vprintf(msg, vargs); =20 @@ -325,6 +326,7 @@ mymain(void) size_t i; pthread_t eventThread; char one =3D '1'; + char *debugEnv =3D getenv("LIBVIRT_DEBUG"); =20 for (i =3D 0; i < NUM_FDS; i++) { if (virPipeQuiet(handles[i].pipeFD) < 0) { @@ -333,7 +335,6 @@ mymain(void) } } =20 - char *debugEnv =3D getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && (virLogSetDefaultPriority(virLogParseDefaultPriority(debugEnv)) < = 0)) { fprintf(stderr, "Invalid log level setting.\n"); diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 66b8c01852..2da60f886a 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -467,8 +467,10 @@ int access(const char *path, int mode) init_syms(); =20 if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) { - init_sysfs(); char *newpath; + + init_sysfs(); + if (asprintf(&newpath, "%s%s", fakesysfscgroupdir, path + strlen(SYSFS_CGROUP_PREFIX)) < 0) { @@ -534,8 +536,10 @@ int mkdir(const char *path, mode_t mode) init_syms(); =20 if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) { - init_sysfs(); char *newpath; + + init_sysfs(); + if (asprintf(&newpath, "%s%s", fakesysfscgroupdir, path + strlen(SYSFS_CGROUP_PREFIX)) < 0) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 286cf79671..7ce848f92e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3794,8 +3794,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) goto error; =20 for (i =3D 0; i < nvol_nodes; i++) { - ctxt->node =3D vol_nodes[i]; virshUndefineVolume vol; + + ctxt->node =3D vol_nodes[i]; + VIR_FREE(source); VIR_FREE(target); VIR_FREE(pool); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index b8e424091d..a6b52726c9 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -49,8 +49,9 @@ virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd = *cmd, const char *n =3D NULL; bool is_mac =3D false; virMacAddr dummy; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYNAME | VIRSH_BYMAC, NULL); - virshControlPtr priv =3D ctl->privData; =20 if (!optname) optname =3D "interface"; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index f2a5d09732..f0f5358625 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -69,8 +69,9 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *c= md, virNetworkPtr network =3D NULL; const char *n =3D NULL; const char *optname =3D "network"; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - virshControlPtr priv =3D ctl->privData; =20 if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index e576b3c847..e9414f429f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -285,6 +285,7 @@ virshNodeDeviceListCollect(vshControl *ctl, char **caps =3D NULL; int ncaps =3D 0; bool match =3D false; + size_t j, k; =20 device =3D list->devices[i]; =20 @@ -305,7 +306,6 @@ virshNodeDeviceListCollect(vshControl *ctl, /* Check if the device's capability matches with provided * capabilities. */ - size_t j, k; for (j =3D 0; j < ncaps; j++) { for (k =3D 0; k < ncapnames; k++) { if (STREQ(caps[j], capnames[k])) { diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 932d6d0849..3b375c60f1 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -32,8 +32,9 @@ virshLookupDomainInternal(vshControl *ctl, { virDomainPtr dom =3D NULL; int id; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME, NULL); - virshControlPtr priv =3D ctl->privData; =20 /* try it by ID */ if (flags & VIRSH_BYID) { diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index f68c9c7c96..e0e22a133a 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -172,9 +172,10 @@ int virHostValidateNamespace(const char *hvname, virHostValidateLevel level, const char *hint) { - virHostMsgCheck(hvname, "for namespace %s", ns_name); char nspath[100]; =20 + virHostMsgCheck(hvname, "for namespace %s", ns_name); + g_snprintf(nspath, sizeof(nspath), "/proc/self/ns/%s", ns_name); =20 if (access(nspath, F_OK) < 0) { --=20 2.26.2