shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

util: Fix misaligned arguments and misaligned conditions for [if|while|...]

Browse Source 
This patch just fixes misaligned arguments and misaligned conditions
of src/util/*.c.

Signed-off-by: Shi Lei <shi_lei@massclouds.com>
This commit is contained in:
Shi Lei 2018-09-19 16:38:14 +08:00 committed by Michal Privoznik
parent bfdd20c5a9
commit 34e9c29357
38 changed files with 197 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/util/vircgroup.c
View File

@ -2062,9 +2062,9 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.read_iops_device",
str);
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.read_iops_device",
str);
}
@ -2091,9 +2091,9 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.write_iops_device",
str);
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.write_iops_device",
str);
}
@ -2120,9 +2120,9 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.read_bps_device",
str);
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.read_bps_device",
str);
}
/**
@ -2148,9 +2148,9 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.write_bps_device",
str);
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.throttle.write_bps_device",
str);
}
@ -2178,9 +2178,9 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
str);
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
str);
}
/**
@ -3214,8 +3214,8 @@ virCgroupGetPercpuStats(virCgroupPtr group,
goto cleanup;
for (i = start_cpu; i < need_cpus; i++) {
if (virTypedParameterAssign(&params[(i - start_cpu) * nparams +
param_idx],
int idx = (i - start_cpu) * nparams + param_idx;
if (virTypedParameterAssign(&params[idx],
VIR_DOMAIN_CPU_STATS_VCPUTIME,
VIR_TYPED_PARAM_ULLONG,
sum_cpu_time[i]) < 0)

4
src/util/virconf.c
View File

@ -461,7 +461,7 @@ virConfParseValue(virConfParserCtxtPtr ctxt)
return NULL;
}
if ((CUR == '"') || (CUR == '\'') ||
(ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT)) {
(ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT)) {
type = VIR_CONF_STRING;
str = virConfParseString(ctxt);
if (str == NULL)
@ -1426,7 +1426,7 @@ int virConfWalk(virConfPtr conf,
cur = conf->entries;
while (cur != NULL) {
if (cur->name && cur->value &&
callback(cur->name, cur->value, opaque) < 0)
callback(cur->name, cur->value, opaque) < 0)
return -1;
cur = cur->next;
}

2
src/util/virdbus.c
View File

@ -1567,7 +1567,7 @@ virDBusCall(DBusConnection *conn,
ret = 0;
} else {
virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member,
localerror.message ? localerror.message : _("unknown error"));
localerror.message ? : _("unknown error"));
}
goto cleanup;
}

5
src/util/virdnsmasq.c
View File

@ -600,8 +600,9 @@ dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED)
#ifndef WIN32
if (kill(pid, SIGHUP) != 0) {
virReportSystemError(errno,
_("Failed to make dnsmasq (PID: %d) reload config files."),
pid);
_("Failed to make dnsmasq (PID: %d)"
" reload config files."),
pid);
return -1;
}
#endif /* WIN32 */

2
src/util/virerror.c
View File

@ -136,7 +136,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST,
"Perf", /* 65 */
"Libssh transport layer",
"Resource control",
)
)
/*

14
src/util/virevent.c
View File

@ -285,14 +285,12 @@ int virEventRegisterDefaultImpl(void)
return -1;
}
virEventRegisterImpl(
virEventPollAddHandle,
virEventPollUpdateHandle,
virEventPollRemoveHandle,
virEventPollAddTimeout,
virEventPollUpdateTimeout,
virEventPollRemoveTimeout
);
virEventRegisterImpl(virEventPollAddHandle,
virEventPollUpdateHandle,
virEventPollRemoveHandle,
virEventPollAddTimeout,
virEventPollUpdateTimeout,
virEventPollRemoveTimeout);
return 0;
}

8
src/util/vireventpoll.c
View File

@ -542,10 +542,10 @@ static void virEventPollCleanupTimeouts(void)
}
if ((i+1) < eventLoop.timeoutsCount) {
size_t count = eventLoop.timeoutsCount - (i+1);
memmove(eventLoop.timeouts+i,
eventLoop.timeouts+i+1,
sizeof(struct virEventPollTimeout)*(eventLoop.timeoutsCount
-(i+1)));
sizeof(struct virEventPollTimeout)*count);
}
eventLoop.timeoutsCount--;
}
@ -591,10 +591,10 @@ static void virEventPollCleanupHandles(void)
}
if ((i+1) < eventLoop.handlesCount) {
size_t count = eventLoop.handlesCount - (i+1);
memmove(eventLoop.handles+i,
eventLoop.handles+i+1,
sizeof(struct virEventPollHandle)*(eventLoop.handlesCount
-(i+1)));
sizeof(struct virEventPollHandle)*count);
}
eventLoop.handlesCount--;
}

6
src/util/virfile.c
View File

@ -303,7 +303,7 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED,
unsigned int fdflags ATTRIBUTE_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("virFileWrapperFd unsupported on this platform"));
_("virFileWrapperFd unsupported on this platform"));
return NULL;
}
#endif
@ -657,7 +657,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd)
if ((*fd = open(looppath, O_RDWR)) < 0) {
virReportSystemError(errno,
_("Unable to open %s"), looppath);
_("Unable to open %s"), looppath);
VIR_FREE(looppath);
return -1;
}
@ -3483,7 +3483,7 @@ virFileIsSharedFSType(const char *path,
if ((p = strrchr(dirpath, '/')) == NULL) {
virReportSystemError(EINVAL,
_("Invalid relative path '%s'"), path);
_("Invalid relative path '%s'"), path);
return -1;
}

2
src/util/virgic.c
View File

@ -30,4 +30,4 @@ VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST,
"host",
"2",
"3",
);
);

2
src/util/virhook.c
View File

@ -249,7 +249,7 @@ virHookCall(int driver,
if ((virHooksFound == -1) ||
((driver == VIR_HOOK_DRIVER_DAEMON) &&
(op == VIR_HOOK_DAEMON_OP_RELOAD ||
op == VIR_HOOK_DAEMON_OP_SHUTDOWN)))
op == VIR_HOOK_DAEMON_OP_SHUTDOWN)))
virHookInitialize();
if ((virHooksFound & (1 << driver)) == 0)

23
src/util/virhostdev.c
View File

@ -320,7 +320,7 @@ virHostdevNetDevice(virDomainHostdevDefPtr hostdev,
if (!linkdev) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("The device at %s has no network device name"),
sysfs_path);
sysfs_path);
return -1;
}
@ -538,13 +538,12 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
if (virHostdevNetDevice(hostdev, 0, &linkdev, &vf) < 0)
return -1;
virtPort = virDomainNetGetActualVirtPortProfile(
hostdev->parent.data.net);
virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
if (virtPort) {
return virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
&hostdev->parent.data.net->mac,
NULL,
port_profile_associate);
&hostdev->parent.data.net->mac,
NULL,
port_profile_associate);
} else {
/* we need to try 3 different places for the config file:
* 1) ${stateDir}/${PF}_vf${vf}
@ -768,7 +767,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
} else {
virReportError(VIR_ERR_OPERATION_INVALID,
_("Unmanaged PCI device %s must be manually "
"detached from the host"),
"detached from the host"),
virPCIDeviceGetName(pci));
goto reattachdevs;
}
@ -1918,8 +1917,8 @@ virHostdevReAttachSCSIHostDevices(virHostdevManagerPtr mgr,
}
VIR_DEBUG("Removing %s:%u:%u:%llu dom=%s from activeSCSIHostdevs",
scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target,
scsihostsrc->unit, dom_name);
scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target,
scsihostsrc->unit, dom_name);
virSCSIDeviceListDel(mgr->activeSCSIHostdevs, tmp,
drv_name, dom_name);
@ -2006,7 +2005,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManagerPtr mgr,
if (STREQ_NULLABLE(drv_name, usedby_drvname) &&
STREQ_NULLABLE(dom_name, usedby_domname)) {
VIR_DEBUG("Removing %s dom=%s from activeSCSIVHostHostdevs",
hostsrc->wwpn, dom_name);
hostsrc->wwpn, dom_name);
virSCSIVHostDeviceListDel(mgr->activeSCSIVHostHostdevs, tmp);
}
@ -2171,8 +2170,8 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr mgr,
if (flags & VIR_HOSTDEV_SP_USB) {
if (virHostdevPrepareUSBDevices(mgr, driver, def->name,
def->hostdevs, def->nhostdevs,
flags) < 0)
def->hostdevs, def->nhostdevs,
flags) < 0)
return -1;
}

18
src/util/viridentity.c
View File

@ -242,7 +242,7 @@ int virIdentitySetAttr(virIdentityPtr ident,
if (ident->attrs[attr]) {
virReportError(VIR_ERR_OPERATION_DENIED, "%s",
_("Identity attribute is already set"));
_("Identity attribute is already set"));
goto cleanup;
}
@ -463,8 +463,8 @@ int virIdentitySetUNIXUserID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_USER_ID,
val);
VIR_IDENTITY_ATTR_UNIX_USER_ID,
val);
}
@ -486,8 +486,8 @@ int virIdentitySetUNIXGroupID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
val);
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
val);
}
@ -500,8 +500,8 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
val);
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
val);
}
@ -514,8 +514,8 @@ int virIdentitySetUNIXProcessTime(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
val);
VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
val);
}

22
src/util/viriscsi.c
View File

@ -91,7 +91,7 @@ virISCSIGetSession(const char *devpath,
VIR_AUTOFREE(char *) error = NULL;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode",
"session", NULL);
"session", NULL);
virCommandSetErrorBuffer(cmd, &error);
if (virCommandRunRegex(cmd,
@ -126,7 +126,7 @@ virStorageBackendIQNFound(const char *initiatoriqn,
VIR_AUTOFREE(char *) iface = NULL;
VIR_AUTOFREE(char *) iqn = NULL;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
"--mode", "iface", NULL);
"--mode", "iface", NULL);
*ifacename = NULL;
@ -350,10 +350,10 @@ int
virISCSIRescanLUNs(const char *session)
{
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
"--mode", "session",
"-r", session,
"-R",
NULL);
"--mode", "session",
"-r", session,
"-R",
NULL);
return virCommandRun(cmd, NULL);
}
@ -405,10 +405,10 @@ virISCSIScanTargetsInternal(const char *portal,
struct virISCSITargetList list;
size_t i;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
"--mode", "discovery",
"--type", "sendtargets",
"--portal", portal,
NULL);
"--mode", "discovery",
"--type", "sendtargets",
"--portal", portal,
NULL);
if (!persist) {
virCommandAddArgList(cmd,
@ -495,7 +495,7 @@ virISCSIScanTargets(const char *portal,
}
return virISCSIScanTargetsInternal(portal, ifacename,
persist, ntargets, targets);
persist, ntargets, targets);
}

2
src/util/virjson.c
View File

@ -1898,7 +1898,7 @@ virJSONValueToStringOne(virJSONValuePtr object,
if (yajl_gen_string(g,
(unsigned char *)object->data.object.pairs[i].key,
strlen(object->data.object.pairs[i].key))
!= yajl_gen_status_ok)
!= yajl_gen_status_ok)
return -1;
if (virJSONValueToStringOne(object->data.object.pairs[i].value, g) < 0)
return -1;

22
src/util/virkeycode.c
View File

@ -69,17 +69,17 @@ verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_osx));
verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32));
VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST,
"linux",
"xt",
"atset1",
"atset2",
"atset3",
"os_x",
"xt_kbd",
"usb",
"win32",
"qnum",
);
"linux",
"xt",
"atset1",
"atset2",
"atset3",
"os_x",
"xt_kbd",
"usb",
"win32",
"qnum",
);
int virKeycodeValueFromString(virKeycodeSet codeset,
const char *keyname)

6
src/util/virkeyfile.c
View File

@ -333,7 +333,7 @@ void virKeyFileFree(virKeyFilePtr conf)
bool virKeyFileHasGroup(virKeyFilePtr conf,
const char *groupname)
const char *groupname)
{
VIR_DEBUG("conf=%p groupname=%s", conf, groupname);
return virHashLookup(conf->groups, groupname) != NULL;
@ -341,8 +341,8 @@ bool virKeyFileHasGroup(virKeyFilePtr conf,
bool virKeyFileHasValue(virKeyFilePtr conf,
const char *groupname,
const char *valuename)
const char *groupname,
const char *valuename)
{
virHashTablePtr group = virHashLookup(conf->groups, groupname);
VIR_DEBUG("conf=%p groupname=%s valuename=%s", conf, groupname, valuename);

2
src/util/virlockspace.c
View File

@ -269,7 +269,7 @@ virLockSpacePtr virLockSpaceNew(const char *directory)
if (!virFileIsDir(directory)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Lockspace location %s exists, but is not a directory"),
directory);
directory);
goto error;
}
} else {

18
src/util/virlog.c
View File

@ -632,23 +632,23 @@ virLogVMessage(virLogSourcePtr source,
char *initmsg = NULL;
if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
__FILE__, __LINE__, __func__,
timestamp, NULL, 0, rawinitmsg, initmsg,
virLogOutputs[i]->data);
__FILE__, __LINE__, __func__,
timestamp, NULL, 0, rawinitmsg, initmsg,
virLogOutputs[i]->data);
VIR_FREE(initmsg);
if (virLogHostnameString(&hoststr, &initmsg) >= 0)
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
__FILE__, __LINE__, __func__,
timestamp, NULL, 0, hoststr, initmsg,
virLogOutputs[i]->data);
__FILE__, __LINE__, __func__,
timestamp, NULL, 0, hoststr, initmsg,
virLogOutputs[i]->data);
VIR_FREE(hoststr);
VIR_FREE(initmsg);
virLogOutputs[i]->logInitMessage = false;
}
virLogOutputs[i]->f(source, priority,
filename, linenr, funcname,
timestamp, metadata, filterflags,
str, msg, virLogOutputs[i]->data);
filename, linenr, funcname,
timestamp, metadata, filterflags,
str, msg, virLogOutputs[i]->data);
}
}
if (virLogNbOutputs == 0) {

4
src/util/virnetdev.c
View File

@ -1079,7 +1079,7 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname,
static int
virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname,
const char *file)
const char *file)
{
if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname,
file) < 0)
@ -2717,7 +2717,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast)
break;
case VIR_MCAST_TYPE_ADDR_TOKEN:
if (virMacAddrParseHex((const char*)token,
&mcast->macaddr) < 0) {
&mcast->macaddr) < 0) {
virReportSystemError(EINVAL,
_("Failed to parse MAC address from '%s'"),
buf);

2
src/util/virnetdevbridge.c
View File

@ -642,7 +642,7 @@ int virNetDevBridgeRemovePort(const char *brname,
}
#elif defined(HAVE_BSD_BRIDGE_MGMT)
int virNetDevBridgeRemovePort(const char *brname,
const char *ifname)
const char *ifname)
{
struct ifbreq req;

11
src/util/virnetdevip.c
View File

@ -404,7 +404,7 @@ virNetDevIPParseDadStatus(struct nlmsghdr *nlh, int len,
VIR_WARNINGS_NO_CAST_ALIGN
rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr);
for (; RTA_OK(rtattr_ptr, ifaddrmsg_len);
rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) {
rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) {
VIR_WARNINGS_RESET
if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) {
/* No address: ignore. */
@ -660,9 +660,10 @@ virNetDevIPAddrAdd(const char *ifname,
return -1;
/* format up a broadcast address if this is IPv4 */
if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) &&
((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) ||
!(bcaststr = virSocketAddrFormat(&broadcast))))) {
if (!peerstr &&
((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) &&
((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) ||
!(bcaststr = virSocketAddrFormat(&broadcast))))) {
return -1;
}
@ -749,7 +750,7 @@ virNetDevIPRouteAdd(const char *ifname,
virCommandAddArgList(cmd, "route", "add", NULL);
virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix);
virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname,
"proto", "static", "metric", NULL);
"proto", "static", "metric", NULL);
virCommandAddArgFormat(cmd, "%u", metric);
if (virCommandRun(cmd, NULL) < 0)

30
src/util/virnetdevmacvlan.c
View File

@ -599,25 +599,25 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
case RTM_GETLINK:
VIR_DEBUG(" IFINFOMSG");
VIR_DEBUG(" ifi_family = 0x%02x",
((struct ifinfomsg *)data)->ifi_family);
((struct ifinfomsg *)data)->ifi_family);
VIR_DEBUG(" ifi_type = 0x%x",
((struct ifinfomsg *)data)->ifi_type);
((struct ifinfomsg *)data)->ifi_type);
VIR_DEBUG(" ifi_index = %i",
((struct ifinfomsg *)data)->ifi_index);
((struct ifinfomsg *)data)->ifi_index);
VIR_DEBUG(" ifi_flags = 0x%04x",
((struct ifinfomsg *)data)->ifi_flags);
((struct ifinfomsg *)data)->ifi_flags);
VIR_DEBUG(" ifi_change = 0x%04x",
((struct ifinfomsg *)data)->ifi_change);
((struct ifinfomsg *)data)->ifi_change);
}
/* DEBUG end */
/* Parse netlink message assume a setlink with vfports */
memcpy(&ifinfo, NLMSG_DATA(hdr), sizeof(ifinfo));
VIR_DEBUG("family:%#x type:%#x index:%d flags:%#x change:%#x",
ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index,
ifinfo.ifi_flags, ifinfo.ifi_change);
ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index,
ifinfo.ifi_flags, ifinfo.ifi_change);
if (nlmsg_parse(hdr, sizeof(ifinfo),
(struct nlattr **)&tb, IFLA_MAX, NULL)) {
(struct nlattr **)&tb, IFLA_MAX, NULL)) {
VIR_DEBUG("error parsing request...");
return;
}
@ -628,13 +628,13 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
nla_for_each_nested(tb_vfinfo_list, tb[IFLA_VFINFO_LIST], rem) {
if (nla_type(tb_vfinfo_list) != IFLA_VF_INFO) {
VIR_DEBUG("nested parsing of"
"IFLA_VFINFO_LIST failed.");
"IFLA_VFINFO_LIST failed.");
return;
}
if (nla_parse_nested(tb_vfinfo, IFLA_VF_MAX,
tb_vfinfo_list, ifla_vf_policy)) {
tb_vfinfo_list, ifla_vf_policy)) {
VIR_DEBUG("nested parsing of "
"IFLA_VF_INFO failed.");
"IFLA_VF_INFO failed.");
return;
}
}
@ -688,7 +688,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
continue;
}
if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb_vf_ports,
ifla_port_policy)) {
ifla_port_policy)) {
VIR_DEBUG("nested parsing on level 2"
" failed.");
}
@ -739,8 +739,8 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
}
if (tb3[IFLA_PORT_RESPONSE]) {
VIR_DEBUG("IFLA_PORT_RESPONSE = %d", *(uint16_t *)
RTA_DATA(tb3[IFLA_PORT_RESPONSE]));
VIR_DEBUG("IFLA_PORT_RESPONSE = %d",
*(uint16_t *) RTA_DATA(tb3[IFLA_PORT_RESPONSE]));
}
}
}
@ -1103,7 +1103,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
if ((virNetDevReadNetConfig(linkdev, -1, stateDir,
&adminMAC, &vlan, &MAC) == 0) &&
(adminMAC || vlan || MAC)) {
(adminMAC || vlan || MAC)) {
ignore_value(virNetDevSetNetConfig(linkdev, -1,
adminMAC, vlan, MAC, !!vlan));

34
src/util/virnetdevopenvswitch.c
View File

@ -138,10 +138,10 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan)
* Returns 0 in case of success or -1 in case of failure.
*/
int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport,
virNetDevVlanPtr virtVlan)
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport,
virNetDevVlanPtr virtVlan)
{
char macaddrstr[VIR_MAC_STRING_BUFLEN];
char ifuuidstr[VIR_UUID_STRING_BUFLEN];
@ -181,21 +181,21 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
if (ovsport->profileID[0] == '\0') {
virCommandAddArgList(cmd,
"--", "set", "Interface", ifname, attachedmac_ex_id,
"--", "set", "Interface", ifname, ifaceid_ex_id,
"--", "set", "Interface", ifname, vmid_ex_id,
"--", "set", "Interface", ifname,
"external-ids:iface-status=active",
NULL);
"--", "set", "Interface", ifname, attachedmac_ex_id,
"--", "set", "Interface", ifname, ifaceid_ex_id,
"--", "set", "Interface", ifname, vmid_ex_id,
"--", "set", "Interface", ifname,
"external-ids:iface-status=active",
NULL);
} else {
virCommandAddArgList(cmd,
"--", "set", "Interface", ifname, attachedmac_ex_id,
"--", "set", "Interface", ifname, ifaceid_ex_id,
"--", "set", "Interface", ifname, vmid_ex_id,
"--", "set", "Interface", ifname, profile_ex_id,
"--", "set", "Interface", ifname,
"external-ids:iface-status=active",
NULL);
"--", "set", "Interface", ifname, attachedmac_ex_id,
"--", "set", "Interface", ifname, ifaceid_ex_id,
"--", "set", "Interface", ifname, vmid_ex_id,
"--", "set", "Interface", ifname, profile_ex_id,
"--", "set", "Interface", ifname,
"external-ids:iface-status=active",
NULL);
}
if (virCommandRun(cmd, NULL) < 0) {

24
src/util/virnetdevvportprofile.c
View File

@ -810,8 +810,8 @@ virNetDevVPortProfileOpSetLink(const char *ifname, int ifindex,
if (err->error) {
virReportSystemError(-err->error,
_("error during virtual port configuration of ifindex %d"),
ifindex);
_("error during virtual port configuration of ifindex %d"),
ifindex);
goto cleanup;
}
break;
@ -976,9 +976,9 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex,
/* keep trying... */
} else {
virReportSystemError(EINVAL,
_("error %d during port-profile setlink on "
"interface %s (%d)"),
status, ifname, ifindex);
_("error %d during port-profile setlink on "
"interface %s (%d)"),
status, ifname, ifindex);
rc = -1;
break;
}
@ -1344,13 +1344,13 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname,
#else /* ! WITH_VIRTUALPORT */
int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
const virNetDevVPortProfile *virtPort ATTRIBUTE_UNUSED,
const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED,
int vf ATTRIBUTE_UNUSED,
const unsigned char *vmuuid ATTRIBUTE_UNUSED,
virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
bool setlink_only ATTRIBUTE_UNUSED)
const virNetDevVPortProfile *virtPort ATTRIBUTE_UNUSED,
const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED,
int vf ATTRIBUTE_UNUSED,
const unsigned char *vmuuid ATTRIBUTE_UNUSED,
virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
bool setlink_only ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this platform"));

10
src/util/virnetlink.c
View File

@ -542,9 +542,9 @@ virNetlinkNewLink(const char *ifname,
NETLINK_MSG_PUT(nl_msg, IFLA_INFO_KIND, (strlen(type) + 1), type);
if ((STREQ(type, "macvtap") || STREQ(type, "macvlan")) &&
extra_args &&
extra_args->macvlan_mode &&
*extra_args->macvlan_mode > 0) {
extra_args &&
extra_args->macvlan_mode &&
*extra_args->macvlan_mode > 0) {
NETLINK_MSG_NEST_START(nl_msg, infodata, IFLA_INFO_DATA);
NETLINK_MSG_PUT(nl_msg, IFLA_MACVLAN_MODE,
sizeof(uint32_t), extra_args->macvlan_mode);
@ -870,7 +870,7 @@ virNetlinkEventCallback(int watch,
virNetlinkEventServerLock(srv);
VIR_DEBUG("dispatching to max %d clients, called from event watch %d",
(int)srv->handlesCount, watch);
(int)srv->handlesCount, watch);
for (i = 0; i < srv->handlesCount; i++) {
if (srv->handles[i].deleted != VIR_NETLINK_HANDLE_VALID)
@ -1142,7 +1142,7 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
VIR_DEBUG("Used %zu handle slots, adding at least %d more",
srv->handlesAlloc, NETLINK_EVENT_ALLOC_EXTENT);
if (VIR_RESIZE_N(srv->handles, srv->handlesAlloc,
srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0)
srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0)
goto error;
}
r = srv->handlesCount++;

2
src/util/virobject.c
View File

@ -60,7 +60,7 @@ struct _virClass {
obj, obj->u.s.magic); \
} else { \
VIR_WARN("Object %p (%s) is not a %s instance", \
anyobj, obj->klass->name, #objclass); \
anyobj, obj->klass->name, #objclass); \
} \
} while (0)

4
src/util/virpci.c
View File

@ -56,13 +56,13 @@ VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST,
"pciback", /* XEN */
"pci-stub", /* KVM */
"vfio-pci", /* VFIO */
);
);
VIR_ENUM_IMPL(virPCIHeader, VIR_PCI_HEADER_LAST,
"endpoint",
"pci-bridge",
"cardbus-bridge",
);
);
struct _virPCIDevice {
virPCIDeviceAddress address;

4
src/util/virperf.c
View File

@ -212,8 +212,8 @@ virPerfEventEnable(virPerfPtr perf,
return 0;
if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT ||
type == VIR_PERF_EVENT_MBMT ||
type == VIR_PERF_EVENT_MBML)) {
type == VIR_PERF_EVENT_MBMT ||
type == VIR_PERF_EVENT_MBML)) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
_("unable to enable host cpu perf event for %s"),
virPerfEventTypeToString(type));

2
src/util/virprocess.c
View File

@ -700,7 +700,7 @@ int virProcessSetNamespaces(size_t nfdlist,
if (nfdlist == 0) {
virReportInvalidArg(nfdlist, "%s",
_("Expected at least one file descriptor"));
_("Expected at least one file descriptor"));
return -1;
}
for (i = 0; i < nfdlist; i++) {

4
src/util/virqemu.c
View File

@ -117,10 +117,10 @@ virQEMUBuildCommandLineJSONIterate(const char *key,
return -1;
return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf,
data->arrayFunc, false);
data->arrayFunc, false);
} else {
return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf,
data->arrayFunc, false);
data->arrayFunc, false);
}
}

7
src/util/virresctrl.c
View File

@ -845,7 +845,7 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("level %u cache size %llu does not match "
"expected size %llu"),
level, i_type->size, size);
level, i_type->size, size);
goto error;
}
i_type->max_cache_id++;
@ -1666,9 +1666,8 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl,
{
char *schemata = NULL;
int rv = virFileReadValueString(&schemata,
SYSFS_RESCTRL_PATH
"/%s/schemata",
groupname);
SYSFS_RESCTRL_PATH "/%s/schemata",
groupname);
*alloc = NULL;

2
src/util/virsocketaddr.c
View File

@ -1168,7 +1168,7 @@ virSocketAddrIsNumericLocalhost(const char *addr)
switch (res.data.stor.ss_family) {
case AF_INET:
return memcmp(&res.data.inet4.sin_addr.s_addr, &tmp.s_addr,
sizeof(res.data.inet4.sin_addr.s_addr)) == 0;
sizeof(res.data.inet4.sin_addr.s_addr)) == 0;
case AF_INET6:
return IN6_IS_ADDR_LOOPBACK(&res.data.inet6.sin6_addr);
}

2
src/util/virstorageencryption.c
View File

@ -300,7 +300,7 @@ virStorageEncryptionParseNode(xmlNodePtr node,
/* If no cipher node, then fail */
if (!encdef->encinfo.cipher_name) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("ivgen element found, but cipher is missing"));
_("ivgen element found, but cipher is missing"));
goto cleanup;
}

60
src/util/virstoragefile.c
View File

@ -458,8 +458,7 @@ qcow2GetBackingStoreFormat(int *format,
case QCOW2_HDR_EXTENSION_BACKING_FORMAT:
if (buf[offset+len] != '\0')
break;
*format = virStorageFileFormatTypeFromString(
((const char *)buf)+offset);
*format = virStorageFileFormatTypeFromString(buf+offset);
if (*format <= VIR_STORAGE_FILE_NONE)
return -1;
}
@ -827,16 +826,14 @@ virStorageFileProbeFormatFromBuf(const char *path,
/* First check file magic */
for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
if (virStorageFileMatchesMagic(
fileTypeInfo[i].magicOffset,
fileTypeInfo[i].magic,
buf, buflen)) {
if (!virStorageFileMatchesVersion(
fileTypeInfo[i].versionOffset,
fileTypeInfo[i].versionSize,
fileTypeInfo[i].versionNumbers,
fileTypeInfo[i].endian,
buf, buflen)) {
if (virStorageFileMatchesMagic(fileTypeInfo[i].magicOffset,
fileTypeInfo[i].magic,
buf, buflen)) {
if (!virStorageFileMatchesVersion(fileTypeInfo[i].versionOffset,
fileTypeInfo[i].versionSize,
fileTypeInfo[i].versionNumbers,
fileTypeInfo[i].endian,
buf, buflen)) {
possibleFormat = i;
continue;
}
@ -852,8 +849,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
/* No magic, so check file extension */
for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
if (virStorageFileMatchesExtension(
fileTypeInfo[i].extension, path)) {
if (virStorageFileMatchesExtension(fileTypeInfo[i].extension, path)) {
format = i;
goto cleanup;
}
@ -1039,8 +1035,8 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
VIR_FREE(meta->backingStoreRaw);
if (fileTypeInfo[meta->format].getBackingStore != NULL) {
int store = fileTypeInfo[meta->format].getBackingStore(&meta->backingStoreRaw,
backingFormat,
buf, len);
backingFormat,
buf, len);
if (store == BACKING_STORE_INVALID)
goto done;
@ -1377,12 +1373,11 @@ int virStorageFileGetLVMKey(const char *path,
* 06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky
*/
int status;
virCommandPtr cmd = virCommandNewArgList(
LVS,
"--noheadings", "--unbuffered", "--nosuffix",
"--options", "uuid", path,
NULL
);
virCommandPtr cmd = virCommandNewArgList(LVS, "--noheadings",
"--unbuffered", "--nosuffix",
"--options", "uuid", path,
NULL
);
int ret = -1;
*key = NULL;
@ -1437,13 +1432,12 @@ int virStorageFileGetSCSIKey(const char *path,
char **key)
{
int status;
virCommandPtr cmd = virCommandNewArgList(
"/lib/udev/scsi_id",
"--replace-whitespace",
"--whitelisted",
"--device", path,
NULL
);
virCommandPtr cmd = virCommandNewArgList("/lib/udev/scsi_id",
"--replace-whitespace",
"--whitelisted",
"--device", path,
NULL
);
int ret = -1;
*key = NULL;
@ -3707,9 +3701,9 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot retrieve physical for path '%s' type '%s'"),
NULLSTR(src->path),
virStorageTypeToString(actual_type));
_("cannot retrieve physical for path '%s' type '%s'"),
NULLSTR(src->path),
virStorageTypeToString(actual_type));
return -1;
break;
}
@ -4674,7 +4668,7 @@ virStorageFileGetUniqueIdentifier(virStorageSourcePtr src)
if (!src->drv->backend->storageFileGetUniqueIdentifier) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unique storage file identifier not implemented for "
"storage type %s (protocol: %s)'"),
"storage type %s (protocol: %s)'"),
virStorageTypeToString(src->type),
virStorageNetProtocolTypeToString(src->protocol));
return NULL;

2
src/util/virsysinfo.c
View File

@ -1601,7 +1601,7 @@ virSysinfoBaseBoardIsEqual(virSysinfoBaseBoardDefPtr src,
static bool
virSysinfoChassisIsEqual(virSysinfoChassisDefPtr src,
virSysinfoChassisDefPtr dst)
virSysinfoChassisDefPtr dst)
{
bool identical = false;

2
src/util/viruri.c
View File

@ -342,7 +342,7 @@ virURIFindAliasMatch(char *const*aliases, const char *alias,
virReportError(VIR_ERR_CONF_SYNTAX,
_("Malformed 'uri_aliases' config entry '%s', "
"aliases may only contain 'a-Z, 0-9, _, -'"),
*aliases);
*aliases);
return -1;
}

2
src/util/virutil.c
View File

@ -321,7 +321,7 @@ virScaleInteger(unsigned long long *value, const char *suffix,
base = 1000;
} else {
virReportError(VIR_ERR_INVALID_ARG,
_("unknown suffix '%s'"), suffix);
_("unknown suffix '%s'"), suffix);
return -1;
}
scale = 1;

2
src/util/virxml.c
View File

@ -1252,7 +1252,7 @@ virXMLValidatorInit(const char *schemafile)
goto error;
if (!(validator->rngParser =
xmlRelaxNGNewParserCtxt(validator->schemafile))) {
xmlRelaxNGNewParserCtxt(validator->schemafile))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to create RNG parser for %s"),
validator->schemafile);