From nobody Mon Feb 9 03:12:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15368289767501007.2669895702867; Thu, 13 Sep 2018 01:56:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A982A307D857; Thu, 13 Sep 2018 08:56:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FD6F4531; Thu, 13 Sep 2018 08:56:14 +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 EF33D181A139; Thu, 13 Sep 2018 08:56:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8D8tZ0M002787 for ; Thu, 13 Sep 2018 04:55:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6B4730912F4; Thu, 13 Sep 2018 08:55:35 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF01F3091330 for ; Thu, 13 Sep 2018 08:55:35 +0000 (UTC) Received: from m97134.mail.qiye.163.com (m97134.mail.qiye.163.com [220.181.97.134]) by mx1.redhat.com (Postfix) with ESMTP id 93D4030A7B84 for ; Thu, 13 Sep 2018 08:55:31 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp5 (Coremail) with SMTP id huCowACHxWL+JZpbTfvyAQ--.224S6; Thu, 13 Sep 2018 16:55:29 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Thu, 13 Sep 2018 16:55:22 +0800 Message-Id: <20180913085524.3520-5-shi_lei@massclouds.com> In-Reply-To: <20180913085524.3520-1-shi_lei@massclouds.com> References: <20180913085524.3520-1-shi_lei@massclouds.com> X-CM-TRANSID: huCowACHxWL+JZpbTfvyAQ--.224S6 X-Coremail-Antispam: 1Uf129KBjvAXoW3KF45Jr45ur48CFWxWw1rJFb_yoW8CFy7Ao Z7Jr12gr1rWrWxZr92yr1fJFW7JFsxt3y5Xa10qFWkK3s7Ar1kurWDuF13XF95XryrtFy7 A3WUX34fJrs2krn3n29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRNHUDUUUUU X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbifgLAT1rpNP8JMgAAsw X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 212 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 13 Sep 2018 08:55:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 13 Sep 2018 08:55:33 +0000 (UTC) for IP:'220.181.97.134' DOMAIN:'m97134.mail.qiye.163.com' HELO:'m97134.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 220.181.97.134 m97134.mail.qiye.163.com 220.181.97.134 m97134.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 4/6] src: remove blank first line in function body 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-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 13 Sep 2018 08:56:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- src/bhyve/bhyve_command.c | 3 --- src/bhyve/bhyve_driver.c | 1 - src/bhyve/bhyve_monitor.c | 1 - src/bhyve/bhyve_process.c | 1 - src/conf/cpu_conf.c | 1 - src/conf/domain_capabilities.c | 1 - src/conf/domain_conf.c | 10 ---------- src/conf/network_conf.c | 2 -- src/cpu/cpu_x86.c | 1 - src/locking/lock_driver_nop.c | 1 - src/network/bridge_driver.c | 1 - src/network/bridge_driver_linux.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_domain_address.c | 1 - src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_process.c | 1 - src/storage/storage_backend_sheepdog.c | 3 --- src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 1 - src/test/test_driver.c | 2 -- src/util/virdnsmasq.c | 1 - src/util/virfile.c | 1 - src/util/virnetdev.c | 3 --- src/util/virnetdevmacvlan.c | 1 - src/util/virstoragefile.c | 1 - src/util/virutil.c | 1 - src/vbox/vbox_storage.c | 1 - src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 1 - src/xenapi/xenapi_driver.c | 2 -- src/xenconfig/xen_common.c | 1 - 35 files changed, 53 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 802997b..6149c93 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -147,7 +147,6 @@ bhyveBuildNetArgStr(virConnectPtr conn, static int bhyveBuildConsoleArgStr(const virDomainDef *def, virCommandPtr cmd) { - virDomainChrDefPtr chr =3D NULL; =20 if (!def->nserials) @@ -710,7 +709,6 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDefPtr def) static bool virBhyveUsableDisk(virDomainDiskDefPtr disk) { - if (virDomainDiskTranslateSourcePool(disk) < 0) return false; =20 @@ -734,7 +732,6 @@ virBhyveUsableDisk(virDomainDiskDefPtr disk) static void virBhyveFormatGrubDevice(virBufferPtr devicemap, virDomainDiskDefPtr def) { - if (def->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) virBufferAsprintf(devicemap, "(cd) %s\n", virDomainDiskGetSource(def)); diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index c9f58e1..4d4f85f 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -133,7 +133,6 @@ bhyveAutostartDomains(bhyveConnPtr driver) virCapsPtr ATTRIBUTE_NONNULL(1) bhyveDriverGetCapabilities(bhyveConnPtr driver) { - return virObjectRef(driver->caps); } =20 diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 8524834..4d5262c 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -177,7 +177,6 @@ bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr drive= r) void bhyveMonitorClose(bhyveMonitorPtr mon) { - if (mon =3D=3D NULL) return; =20 diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9276d7d..4dab6e5 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -89,7 +89,6 @@ bhyveNetCleanup(virDomainObjPtr vm) static int virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - return virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_= DIR, vm_name); } diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 43a3ab5..863413e 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -87,7 +87,6 @@ virCPUDefFreeFeatures(virCPUDefPtr def) void ATTRIBUTE_NONNULL(1) virCPUDefFreeModel(virCPUDefPtr def) { - VIR_FREE(def->model); VIR_FREE(def->vendor); VIR_FREE(def->vendor_id); diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index d3d108a..3b87bdf 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -559,7 +559,6 @@ static void virDomainCapsFeatureSEVFormat(virBufferPtr buf, virSEVCapabilityPtr const sev) { - if (!sev) { virBufferAddLit(buf, "\n"); } else { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b08e90e..85cc0de 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -989,7 +989,6 @@ static int virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap, xmlNodePtr node) { - char *name =3D NULL; char *state =3D NULL; int state_type; @@ -6900,7 +6899,6 @@ static int virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virDomainHostdevDefPtr def) { - int ret =3D -1; bool got_product, got_vendor; xmlNodePtr cur; @@ -12138,7 +12136,6 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDe= fPtr def, xmlNodePtr source, xmlXPathContextPtr ctxt) { - int mode; =20 if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) @@ -14189,7 +14186,6 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr = xmlopt, xmlNodePtr node, unsigned int flags) { - char *model =3D NULL; char *action =3D NULL; virDomainWatchdogDefPtr def; @@ -16286,7 +16282,6 @@ virDomainChrTargetTypeToString(int deviceType, int virDomainHostdevInsert(virDomainDefPtr def, virDomainHostdevDefPtr hostdev) { - return VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev); } =20 @@ -16625,7 +16620,6 @@ virDomainDiskByName(virDomainDefPtr def, int virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk) { - if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) return -1; =20 @@ -16841,7 +16835,6 @@ virDomainNetRemove(virDomainDefPtr def, size_t i) int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller) { - if (VIR_REALLOC_N(def->controllers, def->ncontrollers+1) < 0) return -1; =20 @@ -17058,7 +17051,6 @@ void virDomainLeaseInsertPreAlloced(virDomainDefPtr= def, virDomainLeaseDefPtr virDomainLeaseRemoveAt(virDomainDefPtr def, size_t i) { - virDomainLeaseDefPtr lease =3D def->leases[i]; =20 VIR_DELETE_ELEMENT(def->leases, i, def->nleases); @@ -28647,7 +28639,6 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr dis= k, int *busIdx, int *devIdx) { - int idx =3D virDiskNameToIndex(disk->dst); if (idx < 0) return -1; @@ -28678,7 +28669,6 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr dis= k, int virDomainFSInsert(virDomainDefPtr def, virDomainFSDefPtr fs) { - return VIR_APPEND_ELEMENT(def->fss, def->nfss, fs); } =20 diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c08456b..5372aff 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -355,8 +355,6 @@ virSocketAddrRangeParseXML(const char *networkName, xmlNodePtr node, virSocketAddrRangePtr range) { - - char *start =3D NULL, *end =3D NULL; int ret =3D -1; =20 diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index cb27550..4770850 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -463,7 +463,6 @@ static bool x86DataIsSubset(const virCPUx86Data *data, const virCPUx86Data *subset) { - virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit((virCPUx86Dat= a *)subset); const virCPUx86CPUID *cpuid; const virCPUx86CPUID *cpuidSubset; diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index b5eb295..227195f 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -63,7 +63,6 @@ static int virLockManagerNopAddResource(virLockManagerPtr= lock ATTRIBUTE_UNUSED, virLockManagerParamPtr params ATTR= IBUTE_UNUSED, unsigned int flags_unused ATTRIBUT= E_UNUSED) { - return 0; } =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 588b0d1..3e2eac2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3237,7 +3237,6 @@ static int networkFindUnusedBridgeName(virNetworkObjListPtr nets, virNetworkDefPtr def) { - int ret =3D -1, id =3D 0; char *newname =3D NULL; const char *templ =3D "virbr%d"; diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 3effcdc..fb09954 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -486,7 +486,6 @@ static void networkAddGeneralIPv6FirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { - if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) && !def->ipv6nogw) { return; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index 6965af2..008c24b 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -796,7 +796,6 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr tech= driver ATTRIBUTE_UNUSED, int virNWFilterLearnInit(void) { - if (pendingLearnReq) return 0; =20 diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 28a1fa3..faa35a6 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3652,7 +3652,6 @@ phypDomainSetVcpus(virDomainPtr dom, unsigned int nvc= pus) static int phypDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { - phyp_driverPtr phyp_driver =3D dom->conn->privateData; LIBSSH2_SESSION *session =3D phyp_driver->session; char *managed_system =3D phyp_driver->managed_system; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 162a4d3..815caec 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -301,7 +301,6 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) { - if (net->info.alias) return 0; =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 8f83ae2..8a8764c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -915,7 +915,6 @@ qemuDomainFillDevicePCIConnectFlagsIterInit(virDomainDe= fPtr def, virQEMUDriverPtr driver, qemuDomainFillDevicePCIConnect= FlagsIterData *data) { - data->driver =3D driver; =20 if (qemuDomainHasPCIeRoot(def)) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f8d691..5c8fd55 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5092,7 +5092,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int maplen, unsigned int flags) { - virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; virDomainDefPtr def; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4c0002d..7f7013e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4121,7 +4121,6 @@ int qemuMonitorGetIOThreads(qemuMonitorPtr mon, qemuMonitorIOThreadInfoPtr **iothreads) { - VIR_DEBUG("iothreads=3D%p", iothreads); =20 QEMU_CHECK_MONITOR(mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3181805..38c30d1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1554,7 +1554,6 @@ int qemuMonitorJSONSetLink(qemuMonitorPtr mon, const char *name, virDomainNetInterfaceLinkState state) { - int ret =3D -1; virJSONValuePtr reply =3D NULL; virJSONValuePtr cmd =3D qemuMonitorJSONMakeCommand("set_link", diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eb9904b..a06fbf6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5492,7 +5492,6 @@ int qemuProcessSetupIOThread(virDomainObjPtr vm, virDomainIOThreadIDDefPtr iothread) { - return qemuProcessSetupPid(vm, iothread->thread_id, VIR_CGROUP_THREAD_IOTHREAD, iothread->iothread_id, diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index 34c118f..419334d 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -216,7 +216,6 @@ virStorageBackendSheepdogDeleteVol(virStoragePoolObjPtr= pool, virStorageVolDefPtr vol, unsigned int flags) { - virCheckFlags(0, -1); =20 virCommandPtr cmd =3D virCommandNewArgList(SHEEPDOGCLI, "vdi", "delete= ", vol->name, NULL); @@ -386,7 +385,6 @@ virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr= pool, unsigned long long capacity, unsigned int flags) { - virCheckFlags(0, -1); =20 virCommandPtr cmd =3D virCommandNewArgList(SHEEPDOGCLI, "vdi", "resize= ", vol->name, NULL); @@ -396,7 +394,6 @@ virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr= pool, =20 virCommandFree(cmd); return ret; - } =20 =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 8943df1..c7a7155 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2258,7 +2258,6 @@ virStorageBackendPloopRestoreDesc(char *path) static void virStorageVolPoolRefreshThread(void *opaque) { - virStorageVolStreamInfoPtr cbdata =3D opaque; virStoragePoolObjPtr obj =3D NULL; virStoragePoolDefPtr def; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7d3db6a..e78372a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3174,7 +3174,6 @@ virStorageBackendBLKIDFindEmpty(const char *device, const char *format, bool writelabel) { - int ret =3D -1; int rc; blkid_probe probe =3D NULL; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c1f31b4..8760bab 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2719,7 +2719,6 @@ static int testConnectListDefinedDomains(virConnectPt= r conn, char **const names, int maxnames) { - testDriverPtr privconn =3D conn->privateData; =20 memset(names, 0, sizeof(*names)*maxnames); @@ -5235,7 +5234,6 @@ testStorageVolDelete(virStorageVolPtr vol, static int testStorageVolumeTypeForPool(int pooltype) { - switch (pooltype) { case VIR_STORAGE_POOL_DIR: case VIR_STORAGE_POOL_FS: diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 492dcad..7872b6e 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -885,6 +885,5 @@ dnsmasqCapsGetVersion(dnsmasqCapsPtr caps) bool dnsmasqCapsGet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag) { - return caps && virBitmapIsBitSet(caps->flags, flag); } diff --git a/src/util/virfile.c b/src/util/virfile.c index 2366c11..af45a51 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2819,7 +2819,6 @@ virFileAccessibleAs(const char *path, uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED) { - VIR_WARN("Ignoring uid/gid due to WIN32"); =20 return access(path, mode); diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index c30a600..39c9131 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -665,7 +665,6 @@ int virNetDevSetOnline(const char *ifname, bool online) { - return virNetDevSetIFFlag(ifname, VIR_IFF_UP, online); } =20 @@ -1073,7 +1072,6 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, f= ile) < 0) return -1; return 0; @@ -1083,7 +1081,6 @@ static int virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", if= name, file) < 0) return -1; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index eff3ef9..a6b726f 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -83,7 +83,6 @@ virBitmapPtr macvlanIDs =3D NULL; static int virNetDevMacVLanOnceInit(void) { - if (!macvtapIDs && !(macvtapIDs =3D virBitmapNew(MACVLAN_MAX_ID + 1))) return -1; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6939d0d..927223e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -4753,7 +4753,6 @@ virStorageFileReportBrokenChain(int errcode, virStorageSourcePtr src, virStorageSourcePtr parent) { - if (src->drv) { unsigned int access_user =3D src->drv->uid; unsigned int access_group =3D src->drv->gid; diff --git a/src/util/virutil.c b/src/util/virutil.c index 2900836..47f5bd0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1688,7 +1688,6 @@ virGetDeviceID(const char *path ATTRIBUTE_UNUSED, int *maj ATTRIBUTE_UNUSED, int *min ATTRIBUTE_UNUSED) { - return -ENOSYS; } #endif diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 672caa6..7047e54 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -44,7 +44,6 @@ static vboxUniformedAPI gVBoxAPI; =20 static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSE= D) { - /** Currently only one pool supported, the default one * given by ISystemProperties::defaultHardDiskFolder() */ diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index c9520d4..7a79ec2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -183,7 +183,6 @@ vzGetDriverConnection(void) void vzDestroyDriverConnection(void) { - vzDriverPtr driver; vzConnPtr privconn_list; =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c6443d9..5ca906e 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4126,7 +4126,6 @@ prlsdkCreateVm(vzDriverPtr driver, virDomainDefPtr de= f) static int virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSourcePtr src) { - virStoragePoolPtr pool =3D NULL; virStorageVolPtr vol =3D NULL; virStorageVolInfo info; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 96cad99..f7519cb 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -447,7 +447,6 @@ xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr in= fo) static char * xenapiConnectGetCapabilities(virConnectPtr conn) { - virCapsPtr caps =3D ((struct _xenapiPrivate *)(conn->privateData))->ca= ps; if (caps) return virCapabilitiesFormatXML(caps); @@ -1241,7 +1240,6 @@ xenapiDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, int maplen) { - xen_vm_set *vms =3D NULL; xen_vm vm =3D NULL; xen_string_string_map *vcpu_params =3D NULL; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index be9e232..36a9d27 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1346,7 +1346,6 @@ xenFormatNet(virConnectPtr conn, static int xenFormatPCI(virConfPtr conf, virDomainDefPtr def) { - virConfValuePtr pciVal =3D NULL; int hasPCI =3D 0; size_t i; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list