]> xenbits.xensource.com Git - libvirt.git/commitdiff
src: remove blank first line in function body
authorShi Lei <shi_lei@massclouds.com>
Thu, 13 Sep 2018 08:55:22 +0000 (16:55 +0800)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 17 Sep 2018 11:29:01 +0000 (13:29 +0200)
Signed-off-by: Shi Lei <shi_lei@massclouds.com>
35 files changed:
src/bhyve/bhyve_command.c
src/bhyve/bhyve_driver.c
src/bhyve/bhyve_monitor.c
src/bhyve/bhyve_process.c
src/conf/cpu_conf.c
src/conf/domain_capabilities.c
src/conf/domain_conf.c
src/conf/network_conf.c
src/cpu/cpu_x86.c
src/locking/lock_driver_nop.c
src/network/bridge_driver.c
src/network/bridge_driver_linux.c
src/nwfilter/nwfilter_learnipaddr.c
src/phyp/phyp_driver.c
src/qemu/qemu_alias.c
src/qemu/qemu_domain_address.c
src/qemu/qemu_driver.c
src/qemu/qemu_monitor.c
src/qemu/qemu_monitor_json.c
src/qemu/qemu_process.c
src/storage/storage_backend_sheepdog.c
src/storage/storage_driver.c
src/storage/storage_util.c
src/test/test_driver.c
src/util/virdnsmasq.c
src/util/virfile.c
src/util/virnetdev.c
src/util/virnetdevmacvlan.c
src/util/virstoragefile.c
src/util/virutil.c
src/vbox/vbox_storage.c
src/vz/vz_driver.c
src/vz/vz_sdk.c
src/xenapi/xenapi_driver.c
src/xenconfig/xen_common.c

index 802997bd2d7afaf32b890cb86c3f676da8ecab89..6149c9331e93e549b207dad51f4ed8859b553689 100644 (file)
@@ -147,7 +147,6 @@ bhyveBuildNetArgStr(virConnectPtr conn,
 static int
 bhyveBuildConsoleArgStr(const virDomainDef *def, virCommandPtr cmd)
 {
-
     virDomainChrDefPtr chr = NULL;
 
     if (!def->nserials)
@@ -710,7 +709,6 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDefPtr def)
 static bool
 virBhyveUsableDisk(virDomainDiskDefPtr disk)
 {
-
     if (virDomainDiskTranslateSourcePool(disk) < 0)
         return false;
 
@@ -734,7 +732,6 @@ virBhyveUsableDisk(virDomainDiskDefPtr disk)
 static void
 virBhyveFormatGrubDevice(virBufferPtr devicemap, virDomainDiskDefPtr def)
 {
-
     if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
         virBufferAsprintf(devicemap, "(cd) %s\n",
                           virDomainDiskGetSource(def));
index c9f58e1a88212ccc62021610247db6a2b321052d..4d4f85f5bfc7cb5c0cd1f40928162682d4eec06a 100644 (file)
@@ -133,7 +133,6 @@ bhyveAutostartDomains(bhyveConnPtr driver)
 virCapsPtr ATTRIBUTE_NONNULL(1)
 bhyveDriverGetCapabilities(bhyveConnPtr driver)
 {
-
     return virObjectRef(driver->caps);
 }
 
index 852483452bf06c6b4ce8cd76662d2ec807b0dfc5..4d5262c104e80a6619b43c18172453064731799a 100644 (file)
@@ -177,7 +177,6 @@ bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver)
 void
 bhyveMonitorClose(bhyveMonitorPtr mon)
 {
-
     if (mon == NULL)
         return;
 
index 9276d7d364c093b8f9560b9f4e9ae616a85f4c66..4dab6e5e5426ca9c3aa37015acf82b8eb5fcdef3 100644 (file)
@@ -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);
 }
index 43a3ab5dcdfa8d7de46b197f7ebaa77e7dd84722..863413e75eaad20d1eb02a6021d291004b79b7c8 100644 (file)
@@ -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);
index d3d108ab42f88b0bf8c7a91f2e47cb722dc077c7..3b87bdf98cf5212df6951cd8b231ec24dd0c5ea4 100644 (file)
@@ -559,7 +559,6 @@ static void
 virDomainCapsFeatureSEVFormat(virBufferPtr buf,
                               virSEVCapabilityPtr const sev)
 {
-
     if (!sev) {
         virBufferAddLit(buf, "<sev supported='no'/>\n");
     } else {
index 41e7af06e928e4e0a8209701d6397af1e10c9f0f..1ee43950ae2df0d6990faae75430ea298a1dea40 100644 (file)
@@ -989,7 +989,6 @@ static int
 virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
                                   xmlNodePtr node)
 {
-
     char *name = NULL;
     char *state = NULL;
     int state_type;
@@ -6900,7 +6899,6 @@ static int
 virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                                      virDomainHostdevDefPtr def)
 {
-
     int ret = -1;
     bool got_product, got_vendor;
     xmlNodePtr cur;
@@ -12138,7 +12136,6 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDefPtr def,
                                xmlNodePtr source,
                                xmlXPathContextPtr ctxt)
 {
-
     int mode;
 
     if ((mode = virDomainChrSourceDefParseMode(source)) < 0)
@@ -14194,7 +14191,6 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt,
                              xmlNodePtr node,
                              unsigned int flags)
 {
-
     char *model = NULL;
     char *action = NULL;
     virDomainWatchdogDefPtr def;
@@ -16291,7 +16287,6 @@ virDomainChrTargetTypeToString(int deviceType,
 int
 virDomainHostdevInsert(virDomainDefPtr def, virDomainHostdevDefPtr hostdev)
 {
-
     return VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev);
 }
 
@@ -16630,7 +16625,6 @@ virDomainDiskByName(virDomainDefPtr def,
 int virDomainDiskInsert(virDomainDefPtr def,
                         virDomainDiskDefPtr disk)
 {
-
     if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
         return -1;
 
@@ -16846,7 +16840,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;
 
@@ -17063,7 +17056,6 @@ void virDomainLeaseInsertPreAlloced(virDomainDefPtr def,
 virDomainLeaseDefPtr
 virDomainLeaseRemoveAt(virDomainDefPtr def, size_t i)
 {
-
     virDomainLeaseDefPtr lease = def->leases[i];
 
     VIR_DELETE_ELEMENT(def->leases, i, def->nleases);
@@ -28656,7 +28648,6 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk,
                             int *busIdx,
                             int *devIdx)
 {
-
     int idx = virDiskNameToIndex(disk->dst);
     if (idx < 0)
         return -1;
@@ -28687,7 +28678,6 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk,
 int
 virDomainFSInsert(virDomainDefPtr def, virDomainFSDefPtr fs)
 {
-
     return VIR_APPEND_ELEMENT(def->fss, def->nfss, fs);
 }
 
index c08456ba96b1e5ad1b2ec8dc5c054048d1f37a0a..5372aff82a57d50c2b0993a1359602243dd76092 100644 (file)
@@ -355,8 +355,6 @@ virSocketAddrRangeParseXML(const char *networkName,
                            xmlNodePtr node,
                            virSocketAddrRangePtr range)
 {
-
-
     char *start = NULL, *end = NULL;
     int ret = -1;
 
index cb27550025f4288ca55fbd3216ecb79c62370a7f..477085069325ee0bb504ad1458f4c6e98b13dfb2 100644 (file)
@@ -463,7 +463,6 @@ static bool
 x86DataIsSubset(const virCPUx86Data *data,
                 const virCPUx86Data *subset)
 {
-
     virCPUx86DataIterator iter = virCPUx86DataIteratorInit((virCPUx86Data *)subset);
     const virCPUx86CPUID *cpuid;
     const virCPUx86CPUID *cpuidSubset;
index b5eb2952e9e38653b258018580f9a4900404e4ea..227195ff64ceac292191b02ca64e85b2e72d65f7 100644 (file)
@@ -63,7 +63,6 @@ static int virLockManagerNopAddResource(virLockManagerPtr lock ATTRIBUTE_UNUSED,
                                         virLockManagerParamPtr params ATTRIBUTE_UNUSED,
                                         unsigned int flags_unused ATTRIBUTE_UNUSED)
 {
-
     return 0;
 }
 
index 588b0d147d397ed82f3208f78e55cd16f49bf653..3e2eac2795be2c740d8e28e46c10de922393d452 100644 (file)
@@ -3237,7 +3237,6 @@ static int
 networkFindUnusedBridgeName(virNetworkObjListPtr nets,
                             virNetworkDefPtr def)
 {
-
     int ret = -1, id = 0;
     char *newname = NULL;
     const char *templ = "virbr%d";
index 3effcdce222d94daf0484de90ae17ee60c088c0e..fb09954b8fc99ca62a6da13e2acdd6ed4751323b 100644 (file)
@@ -486,7 +486,6 @@ static void
 networkAddGeneralIPv6FirewallRules(virFirewallPtr fw,
                                    virNetworkDefPtr def)
 {
-
     if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) &&
         !def->ipv6nogw) {
         return;
index 6965af26b697219f15056c8e00a81b4120842899..008c24bc14b470d1d00087b6807e0dfeedaa536b 100644 (file)
@@ -796,7 +796,6 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED,
 int
 virNWFilterLearnInit(void)
 {
-
     if (pendingLearnReq)
         return 0;
 
index 28a1fa3c26b22f4e162029f94798b1775f9d6fc3..faa35a6a417efbd83a50353f7e066672edc094a7 100644 (file)
@@ -3652,7 +3652,6 @@ phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
 static int
 phypDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
 {
-
     phyp_driverPtr phyp_driver = dom->conn->privateData;
     LIBSSH2_SESSION *session = phyp_driver->session;
     char *managed_system = phyp_driver->managed_system;
index 162a4d3efe72ead56652ccc38ab7fea81bbf2fd4..815caec465cd507ceacfc5b60a09df88f3acc79e 100644 (file)
@@ -301,7 +301,6 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def,
                          virDomainNetDefPtr net,
                          int idx)
 {
-
     if (net->info.alias)
         return 0;
 
index 8f83ae261de974d89307fd78f538da3de11ecf55..8a8764cff5a47a369e885983ff1682f5ef43397c 100644 (file)
@@ -915,7 +915,6 @@ qemuDomainFillDevicePCIConnectFlagsIterInit(virDomainDefPtr def,
                                             virQEMUDriverPtr driver,
                                             qemuDomainFillDevicePCIConnectFlagsIterData *data)
 {
-
     data->driver = driver;
 
     if (qemuDomainHasPCIeRoot(def)) {
index 6763c8cddc7da7454381d50eff4ac176d53ae232..314c883ea18699ea0956fe5d768477b3937289c5 100644 (file)
@@ -5092,7 +5092,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
                        int maplen,
                        unsigned int flags)
 {
-
     virQEMUDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
     virDomainDefPtr def;
index 4c0002d16d85a8a321326aa5ca0764addc465b3b..7f7013e115e5a28dc0e275e70facb963f51de333 100644 (file)
@@ -4121,7 +4121,6 @@ int
 qemuMonitorGetIOThreads(qemuMonitorPtr mon,
                         qemuMonitorIOThreadInfoPtr **iothreads)
 {
-
     VIR_DEBUG("iothreads=%p", iothreads);
 
     QEMU_CHECK_MONITOR(mon);
index 3181805f9ce79d30b9aa011e9c5859576638f52f..38c30d1b15d7be78aeab11a9a1d973e89977182d 100644 (file)
@@ -1554,7 +1554,6 @@ int qemuMonitorJSONSetLink(qemuMonitorPtr mon,
                            const char *name,
                            virDomainNetInterfaceLinkState state)
 {
-
     int ret = -1;
     virJSONValuePtr reply = NULL;
     virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("set_link",
index 7d13bd410798251e18448c1651c5fe1c85fc7c42..72a59dec5584d85114e36fd15614bdfb5ee24298 100644 (file)
@@ -5489,7 +5489,6 @@ int
 qemuProcessSetupIOThread(virDomainObjPtr vm,
                          virDomainIOThreadIDDefPtr iothread)
 {
-
     return qemuProcessSetupPid(vm, iothread->thread_id,
                                VIR_CGROUP_THREAD_IOTHREAD,
                                iothread->iothread_id,
index 34c118fb32973670989ffd1096311ad54dfbd15e..419334d9ac2ce9a680287f7824dd9f786264a722 100644 (file)
@@ -216,7 +216,6 @@ virStorageBackendSheepdogDeleteVol(virStoragePoolObjPtr pool,
                                    virStorageVolDefPtr vol,
                                    unsigned int flags)
 {
-
     virCheckFlags(0, -1);
 
     virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "delete", vol->name, NULL);
@@ -386,7 +385,6 @@ virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr pool,
                                    unsigned long long capacity,
                                    unsigned int flags)
 {
-
     virCheckFlags(0, -1);
 
     virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "resize", vol->name, NULL);
@@ -396,7 +394,6 @@ virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr pool,
 
     virCommandFree(cmd);
     return ret;
-
 }
 
 
index 8943df1f847f819197473a6f3aafb4dd3cebea33..c7a7155c201754604e8a38932092abc71bf3fc8f 100644 (file)
@@ -2258,7 +2258,6 @@ virStorageBackendPloopRestoreDesc(char *path)
 static void
 virStorageVolPoolRefreshThread(void *opaque)
 {
-
     virStorageVolStreamInfoPtr cbdata = opaque;
     virStoragePoolObjPtr obj = NULL;
     virStoragePoolDefPtr def;
index 7d3db6a4491cdb5ccf893da02a6b3eca44fa6a92..e78372a5face05c8298f6a570ba163c2990ac1e9 100644 (file)
@@ -3174,7 +3174,6 @@ virStorageBackendBLKIDFindEmpty(const char *device,
                                 const char *format,
                                 bool writelabel)
 {
-
     int ret = -1;
     int rc;
     blkid_probe probe = NULL;
index c1f31b461cb41f48be3e99ec64a721e03b8fe7fc..8760babfa13ab7f805058bd558c8fa193c60ed86 100644 (file)
@@ -2719,7 +2719,6 @@ static int testConnectListDefinedDomains(virConnectPtr conn,
                                          char **const names,
                                          int maxnames)
 {
-
     testDriverPtr privconn = conn->privateData;
 
     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:
index 492dcadc96a94bf45fecd43eb00acb90e4240107..7872b6ef432e70594819a4743703743bc7638fac 100644 (file)
@@ -885,6 +885,5 @@ dnsmasqCapsGetVersion(dnsmasqCapsPtr caps)
 bool
 dnsmasqCapsGet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag)
 {
-
     return caps && virBitmapIsBitSet(caps->flags, flag);
 }
index 2366c119fd228397f6a174f7eaddafcf2f771f53..af45a51b7f00e90acc5eb667928d49e131e4ae11 100644 (file)
@@ -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");
 
     return access(path, mode);
index c30a60072a3ece89c36a9d3b319aa318834fa075..39c91313de041ee70d3286a307e1bcdde9a7b1d5 100644 (file)
@@ -665,7 +665,6 @@ int
 virNetDevSetOnline(const char *ifname,
                    bool online)
 {
-
     return virNetDevSetIFFlag(ifname, VIR_IFF_UP, online);
 }
 
@@ -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, file) < 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", ifname,
                     file) < 0)
         return -1;
index eff3ef94d0bcdedc9195e527e45e69661231c8ae..a6b726fedd10f3e199e430117fe764427d34af18 100644 (file)
@@ -83,7 +83,6 @@ virBitmapPtr macvlanIDs = NULL;
 static int
 virNetDevMacVLanOnceInit(void)
 {
-
     if (!macvtapIDs &&
         !(macvtapIDs = virBitmapNew(MACVLAN_MAX_ID + 1)))
         return -1;
index 6939d0d6c90bcc37cfec73c75c92fe8b2c658859..927223eca897182b3e8266823763f69b08161129 100644 (file)
@@ -4753,7 +4753,6 @@ virStorageFileReportBrokenChain(int errcode,
                                 virStorageSourcePtr src,
                                 virStorageSourcePtr parent)
 {
-
     if (src->drv) {
         unsigned int access_user = src->drv->uid;
         unsigned int access_group = src->drv->gid;
index aaa3cfae686e6f71adc742c258e06cae3ffe7835..0341c63493af493fe44bccbb621e0506df7a20ea 100644 (file)
@@ -1724,7 +1724,6 @@ virGetDeviceID(const char *path ATTRIBUTE_UNUSED,
                int *maj ATTRIBUTE_UNUSED,
                int *min ATTRIBUTE_UNUSED)
 {
-
     return -ENOSYS;
 }
 #endif
index 672caa6f9220c3c98b35c72ef6040bed28570aab..7047e540843bf521c8303d2724bd0b0963b66bfb 100644 (file)
@@ -44,7 +44,6 @@ static vboxUniformedAPI gVBoxAPI;
 
 static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-
     /** Currently only one pool supported, the default one
      * given by ISystemProperties::defaultHardDiskFolder()
      */
index c9520d4a584bf2e05b98c506ae9b5cc8facbeb80..7a79ec2c0ff9f218d8befd1a0c934b08e6823a88 100644 (file)
@@ -183,7 +183,6 @@ vzGetDriverConnection(void)
 void
 vzDestroyDriverConnection(void)
 {
-
     vzDriverPtr driver;
     vzConnPtr privconn_list;
 
index c6443d958e9fa9905a4e76493b225464fae6ed04..5ca906e65f23af95aecc24d8e6746586c356233c 100644 (file)
@@ -4126,7 +4126,6 @@ prlsdkCreateVm(vzDriverPtr driver, virDomainDefPtr def)
 static int
 virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSourcePtr src)
 {
-
     virStoragePoolPtr pool = NULL;
     virStorageVolPtr vol = NULL;
     virStorageVolInfo info;
index 96cad99e4e6af1a8aa89cfd2c9392e04b55e15f2..f7519cbaa76376078b4f02eba01aeb055e314e5e 100644 (file)
@@ -447,7 +447,6 @@ xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
 static char *
 xenapiConnectGetCapabilities(virConnectPtr conn)
 {
-
     virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps;
     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 = NULL;
     xen_vm vm = NULL;
     xen_string_string_map *vcpu_params = NULL;
index be9e2328b0bdc2e2b57eaa50cec40e02e1aac1d7..36a9d27c8019223c8e0ff0b18390144fcdef3d56 100644 (file)
@@ -1346,7 +1346,6 @@ xenFormatNet(virConnectPtr conn,
 static int
 xenFormatPCI(virConfPtr conf, virDomainDefPtr def)
 {
-
     virConfValuePtr pciVal = NULL;
     int hasPCI = 0;
     size_t i;