External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup spaces between parentheses and braces

Browse Source 
And add a syntax-check for '){$'.  It's not perfect, but better than
nothing.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-08-20 13:00:30 +02:00
parent b606bbb416
commit 93cf8f9861
19 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg.mk
View File

@ -943,6 +943,12 @@ sc_prohibit_empty_first_line:
print "$(ME): Prohibited empty first line" > "/dev/stderr"; \ print "$(ME): Prohibited empty first line" > "/dev/stderr"; \
} exit fail; }' $$($(VC_LIST_EXCEPT)); } exit fail; }' $$($(VC_LIST_EXCEPT));
sc_prohibit_paren_brace:
@prohibit='\)\{$$' \
in_vc_files='\.[chx]$$' \
halt='Put space between closing parenthesis and opening brace' \
$(_sc_search_regexp)
# We don't use this feature of maint.mk. # We don't use this feature of maint.mk.
prev_version_file = /dev/null prev_version_file = /dev/null

4
docs/java.html.in
View File

@ -130,7 +130,7 @@ public class minitest {
Connect conn=null; Connect conn=null;
try{ try{
conn = new <span style="color: #0071FF; background-color: #FFFFFF">Connect</span>("test:///default", true); conn = new <span style="color: #0071FF; background-color: #FFFFFF">Connect</span>("test:///default", true);
} catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){ } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
System.out.println("exception caught:"+e); System.out.println("exception caught:"+e);
System.out.println(e.getError()); System.out.println(e.getError());
} }
@ -139,7 +139,7 @@ public class minitest {
System.out.println("Domain:" + testDomain.<span style="color: #E50073; background-color: #FFFFFF">getName</span>() + " id " + System.out.println("Domain:" + testDomain.<span style="color: #E50073; background-color: #FFFFFF">getName</span>() + " id " +
testDomain.<span style="color: #E50073; background-color: #FFFFFF">getID</span>() + " running " + testDomain.<span style="color: #E50073; background-color: #FFFFFF">getID</span>() + " running " +
testDomain.<span style="color: #E50073; background-color: #FFFFFF">getOSType</span>()); testDomain.<span style="color: #E50073; background-color: #FFFFFF">getOSType</span>());
} catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){ } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
System.out.println("exception caught:"+e); System.out.println("exception caught:"+e);
System.out.println(e.getError()); System.out.println(e.getError());
} }

2
src/conf/domain_conf.c
View File

@ -14423,7 +14423,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
dst->os.type, src->os.type); dst->os.type, src->os.type);
goto error; goto error;
} }
if (src->os.arch != dst->os.arch){ if (src->os.arch != dst->os.arch) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target domain architecture %s does not match source %s"), _("Target domain architecture %s does not match source %s"),
virArchToString(dst->os.arch), virArchToString(dst->os.arch),

2
src/conf/node_device_conf.c
View File

@ -187,7 +187,7 @@ virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs,
} }
virNodeDeviceObjLock(device); virNodeDeviceObjLock(device);
if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0){ if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0) {
virNodeDeviceObjUnlock(device); virNodeDeviceObjUnlock(device);
virNodeDeviceObjFree(device); virNodeDeviceObjFree(device);
return NULL; return NULL;

2
src/conf/nwfilter_params.c
View File

@ -724,7 +724,7 @@ addToTable(void *payload, const void *name, void *data)
return; return;
} }
if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0){ if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not put variable '%s' into hashmap"), _("Could not put variable '%s' into hashmap"),
(const char *)name); (const char *)name);

2
src/conf/storage_conf.c
View File

@ -2122,7 +2122,7 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
def->source.adapter.data.fchost.wwpn)) def->source.adapter.data.fchost.wwpn))
matchpool = pool; matchpool = pool;
} else if (pool->def->source.adapter.type == } else if (pool->def->source.adapter.type ==
VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST){ VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) {
if (pool->def->source.adapter.data.scsi_host.name) { if (pool->def->source.adapter.data.scsi_host.name) {
if (STREQ(pool->def->source.adapter.data.scsi_host.name, if (STREQ(pool->def->source.adapter.data.scsi_host.name,
def->source.adapter.data.scsi_host.name)) def->source.adapter.data.scsi_host.name))

8
src/libvirt.c
View File

@ -7613,7 +7613,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams)
virCheckDomainReturn(domain, NULL); virCheckDomainReturn(domain, NULL);
conn = domain->conn; conn = domain->conn;
if (conn->driver->domainGetSchedulerType){ if (conn->driver->domainGetSchedulerType) {
schedtype = conn->driver->domainGetSchedulerType(domain, nparams); schedtype = conn->driver->domainGetSchedulerType(domain, nparams);
if (!schedtype) if (!schedtype)
goto error; goto error;
@ -10987,7 +10987,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
virCheckConnectReturn(conn, NULL); virCheckConnectReturn(conn, NULL);
virCheckNonNullArgGoto(uuid, error); virCheckNonNullArgGoto(uuid, error);
if (conn->networkDriver && conn->networkDriver->networkLookupByUUID){ if (conn->networkDriver && conn->networkDriver->networkLookupByUUID) {
virNetworkPtr ret; virNetworkPtr ret;
ret = conn->networkDriver->networkLookupByUUID(conn, uuid); ret = conn->networkDriver->networkLookupByUUID(conn, uuid);
if (!ret) if (!ret)
@ -14217,7 +14217,7 @@ virStorageVolGetInfo(virStorageVolPtr vol,
conn = vol->conn; conn = vol->conn;
if (conn->storageDriver->storageVolGetInfo){ if (conn->storageDriver->storageVolGetInfo) {
int ret; int ret;
ret = conn->storageDriver->storageVolGetInfo(vol, info); ret = conn->storageDriver->storageVolGetInfo(vol, info);
if (ret < 0) if (ret < 0)
@ -16964,7 +16964,7 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
virCheckConnectReturn(conn, NULL); virCheckConnectReturn(conn, NULL);
virCheckNonNullArgGoto(uuid, error); virCheckNonNullArgGoto(uuid, error);
if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID){ if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID) {
virNWFilterPtr ret; virNWFilterPtr ret;
ret = conn->nwfilterDriver->nwfilterLookupByUUID(conn, uuid); ret = conn->nwfilterDriver->nwfilterLookupByUUID(conn, uuid);
if (!ret) if (!ret)

4
src/lxc/lxc_driver.c
View File

@ -2193,7 +2193,7 @@ lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) { } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0) if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
goto error; goto error;
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0) if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
goto error; goto error;
} else { } else {
@ -2606,7 +2606,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
break; break;
} }
} }
} else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
for (j = 0; j < ndevices; j++) { for (j = 0; j < ndevices; j++) {
if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup, if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup,
devices[j].path, devices[j].path,

2
src/qemu/qemu_driver.c
View File

@ -7865,7 +7865,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
break; break;
} }
} }
} else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
for (j = 0; j < ndevices; j++) { for (j = 0; j < ndevices; j++) {
if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup, if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup,
devices[j].path, devices[j].path,

2
src/qemu/qemu_monitor_json.c
View File

@ -3868,7 +3868,7 @@ qemuMonitorJSONBlockJob(qemuMonitorPtr mon,
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("No active operation on device: %s"), _("No active operation on device: %s"),
device); device);
} else if (qemuMonitorJSONHasError(reply, "DeviceInUse")){ } else if (qemuMonitorJSONHasError(reply, "DeviceInUse")) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("Device %s in use"), device); _("Device %s in use"), device);
} else if (qemuMonitorJSONHasError(reply, "NotSupported")) { } else if (qemuMonitorJSONHasError(reply, "NotSupported")) {

2
src/rpc/virnettlscontext.c
View File

@ -1003,7 +1003,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt,
memset(dname, 0, dnamesize); memset(dname, 0, dnamesize);
if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0){ if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR, virReportError(VIR_ERR_SYSTEM_ERROR,
_("Unable to verify TLS peer: %s"), _("Unable to verify TLS peer: %s"),
gnutls_strerror(ret)); gnutls_strerror(ret));

2
src/security/virt-aa-helper.c
View File

@ -1075,7 +1075,7 @@ get_files(vahControl * ctl)
ctl->def->fss[i]->type == VIR_DOMAIN_FS_TYPE_MOUNT && ctl->def->fss[i]->type == VIR_DOMAIN_FS_TYPE_MOUNT &&
(ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || (ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH ||
ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) && ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) &&
ctl->def->fss[i]->src){ ctl->def->fss[i]->src) {
virDomainFSDefPtr fs = ctl->def->fss[i]; virDomainFSDefPtr fs = ctl->def->fss[i];
if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0) if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0)

2
src/util/virdnsmasq.c
View File

@ -332,7 +332,7 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile,
if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s",
mac, ipstr, name) < 0) mac, ipstr, name) < 0)
goto error; goto error;
} else if (name && !mac){ } else if (name && !mac) {
if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s",
name, ipstr) < 0) name, ipstr) < 0)
goto error; goto error;

2
src/util/virstorageencryption.c
View File

@ -193,7 +193,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt)
ret->format = format; ret->format = format;
n = virXPathNodeSet("./secret", ctxt, &nodes); n = virXPathNodeSet("./secret", ctxt, &nodes);
if (n < 0){ if (n < 0) {
goto cleanup; goto cleanup;
} }
if (n != 0 && VIR_ALLOC_N(ret->secrets, n) < 0) if (n != 0 && VIR_ALLOC_N(ret->secrets, n) < 0)

2
src/xen/xen_driver.c
View File

@ -2534,7 +2534,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev)
if (numdomains < 0) { if (numdomains < 0) {
return ret; return ret;
} }
if (numdomains > 0){ if (numdomains > 0) {
if (VIR_ALLOC_N(ids, numdomains) < 0) if (VIR_ALLOC_N(ids, numdomains) < 0)
goto out; goto out;
if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) { if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) {

22
src/xen/xen_hypervisor.c
View File

@ -1194,7 +1194,7 @@ xenHypervisorGetSchedulerType(virConnectPtr conn,
if (ret < 0) if (ret < 0)
return NULL; return NULL;
switch (op.u.getschedulerid.sched_id){ switch (op.u.getschedulerid.sched_id) {
case XEN_SCHEDULER_SEDF: case XEN_SCHEDULER_SEDF:
ignore_value(VIR_STRDUP(schedulertype, "sedf")); ignore_value(VIR_STRDUP(schedulertype, "sedf"));
if (nparams) if (nparams)
@ -1257,7 +1257,7 @@ xenHypervisorGetSchedulerParameters(virConnectPtr conn,
if (ret < 0) if (ret < 0)
return -1; return -1;
switch (op_sys.u.getschedulerid.sched_id){ switch (op_sys.u.getschedulerid.sched_id) {
case XEN_SCHEDULER_SEDF: case XEN_SCHEDULER_SEDF:
if (*nparams < XEN_SCHED_SEDF_NPARAM) { if (*nparams < XEN_SCHED_SEDF_NPARAM) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -1360,7 +1360,7 @@ xenHypervisorSetSchedulerParameters(virConnectPtr conn,
ret = xenHypervisorDoV2Sys(priv->handle, &op_sys); ret = xenHypervisorDoV2Sys(priv->handle, &op_sys);
if (ret == -1) return -1; if (ret == -1) return -1;
switch (op_sys.u.getschedulerid.sched_id){ switch (op_sys.u.getschedulerid.sched_id) {
case XEN_SCHEDULER_SEDF: case XEN_SCHEDULER_SEDF:
/* TODO: Implement for Xen/SEDF */ /* TODO: Implement for Xen/SEDF */
TODO TODO
@ -1885,13 +1885,13 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
/* RHEL 5.0 */ /* RHEL 5.0 */
hv_versions.dom_interface = 3; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 3; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver3"); VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver3");
goto done; goto done;
} }
/* Fedora 7 */ /* Fedora 7 */
hv_versions.dom_interface = 4; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 4; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver4"); VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver4");
goto done; goto done;
} }
@ -1901,7 +1901,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
/* xen-3.1 */ /* xen-3.1 */
hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver3 dom ver5"); VIR_DEBUG("Using hypervisor call v2, sys ver3 dom ver5");
goto done; goto done;
} }
@ -1911,7 +1911,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
/* Fedora 8 */ /* Fedora 8 */
hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver4 dom ver5"); VIR_DEBUG("Using hypervisor call v2, sys ver4 dom ver5");
goto done; goto done;
} }
@ -1921,7 +1921,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
/* Xen 3.2, Fedora 9 */ /* Xen 3.2, Fedora 9 */
hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver6 dom ver5"); VIR_DEBUG("Using hypervisor call v2, sys ver6 dom ver5");
goto done; goto done;
} }
@ -1943,12 +1943,12 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
hv_versions.sys_interface = 8; /* XEN_SYSCTL_INTERFACE_VERSION */ hv_versions.sys_interface = 8; /* XEN_SYSCTL_INTERFACE_VERSION */
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
hv_versions.dom_interface = 7; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 7; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver7"); VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver7");
goto done; goto done;
} }
hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver8"); VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver8");
goto done; goto done;
} }
@ -1961,7 +1961,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */ hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8"); VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8");
goto done; goto done;
} }

6
src/xen/xend_internal.c
View File

@ -2976,7 +2976,7 @@ xenDaemonGetSchedulerType(virConnectPtr conn,
/* get xen_scheduler from xend/node */ /* get xen_scheduler from xend/node */
ret = sexpr_node(root, "node/xen_scheduler"); ret = sexpr_node(root, "node/xen_scheduler");
if (ret == NULL){ if (ret == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("node information incomplete, missing scheduler name")); "%s", _("node information incomplete, missing scheduler name"));
goto error; goto error;
@ -3047,7 +3047,7 @@ xenDaemonGetSchedulerParameters(virConnectPtr conn,
goto error; goto error;
} }
switch (sched_nparam){ switch (sched_nparam) {
case XEN_SCHED_SEDF_NPARAM: case XEN_SCHED_SEDF_NPARAM:
if (*nparams < XEN_SCHED_SEDF_NPARAM) { if (*nparams < XEN_SCHED_SEDF_NPARAM) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -3152,7 +3152,7 @@ xenDaemonSetSchedulerParameters(virConnectPtr conn,
goto error; goto error;
} }
switch (sched_nparam){ switch (sched_nparam) {
case XEN_SCHED_SEDF_NPARAM: case XEN_SCHED_SEDF_NPARAM:
/* TODO: Implement for Xen/SEDF */ /* TODO: Implement for Xen/SEDF */
TODO TODO

2
tests/libvirtdconftest.c
View File

@ -217,7 +217,7 @@ mymain(void)
goto cleanup; goto cleanup;
} }
if (uncomment_all_params(filedata, &params) < 0){ if (uncomment_all_params(filedata, &params) < 0) {
perror("Find params"); perror("Find params");
ret = -1; ret = -1;
goto cleanup; goto cleanup;

2
tools/virsh-volume.c
View File

@ -1123,7 +1123,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd)
if (*capacityStr == '-') { if (*capacityStr == '-') {
/* The API always requires a positive value; but we allow a /* The API always requires a positive value; but we allow a
* negative value for convenience. */ * negative value for convenience. */
if (delta && vshCommandOptBool(cmd, "shrink")){ if (delta && vshCommandOptBool(cmd, "shrink")) {
capacityStr++; capacityStr++;
} else { } else {
vshError(ctl, "%s", vshError(ctl, "%s",