mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
lib: Fix c99 style comments
We prefer c89 style of comments. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
eeb2feb9fb
commit
1a4a4ffa3e
@ -216,7 +216,7 @@ static virConnectAuth auth = {
|
|||||||
credTypes,
|
credTypes,
|
||||||
sizeof(credTypes) / sizeof(int),
|
sizeof(credTypes) / sizeof(int),
|
||||||
authCallback,
|
authCallback,
|
||||||
NULL, // cbdata will be initialized in main
|
NULL, /* cbdata will be initialized in main */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1800,7 +1800,7 @@ virLXCControllerSetupHostdevCaps(virDomainDefPtr vmDef,
|
|||||||
securityDriver);
|
securityDriver);
|
||||||
|
|
||||||
case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
|
case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
|
||||||
return 0; // case is handled in virLXCControllerMoveInterfaces
|
return 0; /* case is handled in virLXCControllerMoveInterfaces */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
@ -1145,7 +1145,7 @@ doRemoteOpen(virConnectPtr conn,
|
|||||||
|
|
||||||
if (!(priv->closeCallback = virNewConnectCloseCallbackData()))
|
if (!(priv->closeCallback = virNewConnectCloseCallbackData()))
|
||||||
goto failed;
|
goto failed;
|
||||||
// ref on behalf of netclient
|
/* ref on behalf of netclient */
|
||||||
virObjectRef(priv->closeCallback);
|
virObjectRef(priv->closeCallback);
|
||||||
virNetClientSetCloseCallback(priv->client,
|
virNetClientSetCloseCallback(priv->client,
|
||||||
remoteClientCloseFunc,
|
remoteClientCloseFunc,
|
||||||
|
@ -128,7 +128,7 @@ static void virNetServerMDNSGroupCallback(AvahiEntryGroup *g ATTRIBUTE_UNUSED,
|
|||||||
avahi_strerror(avahi_client_errno(group->mdns->client)));
|
avahi_strerror(avahi_client_errno(group->mdns->client)));
|
||||||
|
|
||||||
/* Some kind of failure happened while we were registering our services */
|
/* Some kind of failure happened while we were registering our services */
|
||||||
//avahi_simple_poll_quit(simple_poll);
|
/* avahi_simple_poll_quit(simple_poll); */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case AVAHI_ENTRY_GROUP_UNCOMMITED:
|
case AVAHI_ENTRY_GROUP_UNCOMMITED:
|
||||||
|
@ -210,7 +210,7 @@ virSecurityStackGenLabel(virSecurityManagerPtr mgr,
|
|||||||
if (virSecurityManagerGenLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
|
if (virSecurityManagerGenLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
|
||||||
rc = -1;
|
rc = -1;
|
||||||
|
|
||||||
// TODO
|
/* TODO */
|
||||||
#if 0
|
#if 0
|
||||||
/* We don't allow secondary drivers to generate labels.
|
/* We don't allow secondary drivers to generate labels.
|
||||||
* This may have to change in the future, but requires
|
* This may have to change in the future, but requires
|
||||||
@ -235,7 +235,7 @@ virSecurityStackReleaseLabel(virSecurityManagerPtr mgr,
|
|||||||
if (virSecurityManagerReleaseLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
|
if (virSecurityManagerReleaseLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
|
||||||
rc = -1;
|
rc = -1;
|
||||||
|
|
||||||
// TODO
|
/* TODO */
|
||||||
#if 0
|
#if 0
|
||||||
/* XXX See note in GenLabel */
|
/* XXX See note in GenLabel */
|
||||||
if (virSecurityManagerReleaseLabel(priv->secondary, vm) < 0)
|
if (virSecurityManagerReleaseLabel(priv->secondary, vm) < 0)
|
||||||
@ -255,7 +255,7 @@ virSecurityStackReserveLabel(virSecurityManagerPtr mgr,
|
|||||||
|
|
||||||
if (virSecurityManagerReserveLabel(virSecurityStackGetPrimary(mgr), vm, pid) < 0)
|
if (virSecurityManagerReserveLabel(virSecurityStackGetPrimary(mgr), vm, pid) < 0)
|
||||||
rc = -1;
|
rc = -1;
|
||||||
// TODO
|
/* TODO */
|
||||||
#if 0
|
#if 0
|
||||||
/* XXX See note in GenLabel */
|
/* XXX See note in GenLabel */
|
||||||
if (virSecurityManagerReserveLabel(priv->secondary, vm, pid) < 0)
|
if (virSecurityManagerReserveLabel(priv->secondary, vm, pid) < 0)
|
||||||
@ -460,7 +460,7 @@ virSecurityStackGetProcessLabel(virSecurityManagerPtr mgr,
|
|||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
// TODO
|
/* TODO */
|
||||||
#if 0
|
#if 0
|
||||||
if (virSecurityManagerGetProcessLabel(priv->secondary, vm, pid, seclabel) < 0)
|
if (virSecurityManagerGetProcessLabel(priv->secondary, vm, pid, seclabel) < 0)
|
||||||
rc = -1;
|
rc = -1;
|
||||||
|
@ -399,7 +399,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
|
|||||||
|
|
||||||
virCommandAddEnvPassCommon(cmd);
|
virCommandAddEnvPassCommon(cmd);
|
||||||
|
|
||||||
//virCommandAddArgPair(cmd, "con0", "fd:0,fd:1");
|
/* virCommandAddArgPair(cmd, "con0", "fd:0,fd:1"); */
|
||||||
virCommandAddArgFormat(cmd, "mem=%lluK", vm->def->mem.cur_balloon);
|
virCommandAddArgFormat(cmd, "mem=%lluK", vm->def->mem.cur_balloon);
|
||||||
virCommandAddArgPair(cmd, "umid", vm->def->name);
|
virCommandAddArgPair(cmd, "umid", vm->def->name);
|
||||||
virCommandAddArgPair(cmd, "uml_dir", driver->monitorDir);
|
virCommandAddArgPair(cmd, "uml_dir", driver->monitorDir);
|
||||||
|
@ -795,8 +795,8 @@ virHostCPUGetStatsLinux(FILE *procstat,
|
|||||||
|
|
||||||
if (STRPREFIX(buf, cpu_header)) { /* aka logical CPU time */
|
if (STRPREFIX(buf, cpu_header)) { /* aka logical CPU time */
|
||||||
if (sscanf(buf,
|
if (sscanf(buf,
|
||||||
"%*s %llu %llu %llu %llu %llu" // user ~ iowait
|
"%*s %llu %llu %llu %llu %llu" /* user ~ iowait */
|
||||||
"%llu %llu %llu %llu %llu", // irq ~ guest_nice
|
"%llu %llu %llu %llu %llu", /* irq ~ guest_nice */
|
||||||
&usr, &ni, &sys, &idle, &iowait,
|
&usr, &ni, &sys, &idle, &iowait,
|
||||||
&irq, &softirq, &steal, &guest, &guest_nice) < 4) {
|
&irq, &softirq, &steal, &guest, &guest_nice) < 4) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -158,8 +158,8 @@ virHostMemGetStatsLinux(FILE *meminfo,
|
|||||||
char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH];
|
char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH];
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
struct field_conv {
|
struct field_conv {
|
||||||
const char *meminfo_hdr; // meminfo header
|
const char *meminfo_hdr; /* meminfo header */
|
||||||
const char *field; // MemoryStats field name
|
const char *field; /* MemoryStats field name */
|
||||||
} field_conv[] = {
|
} field_conv[] = {
|
||||||
{"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL},
|
{"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL},
|
||||||
{"MemFree:", VIR_NODE_MEMORY_STATS_FREE},
|
{"MemFree:", VIR_NODE_MEMORY_STATS_FREE},
|
||||||
|
@ -958,7 +958,7 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMediaRegistryPtr mediaRegis
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
if (hardDisk->parent == NULL) {
|
if (hardDisk->parent == NULL) {
|
||||||
//it means that the hard disk is in 'root'
|
/* it means that the hard disk is in 'root' */
|
||||||
for (i = 0; i < mediaRegistry->ndisks; i++) {
|
for (i = 0; i < mediaRegistry->ndisks; i++) {
|
||||||
if (hardDisk == mediaRegistry->disks[i])
|
if (hardDisk == mediaRegistry->disks[i])
|
||||||
break;
|
break;
|
||||||
|
@ -523,7 +523,7 @@ mymain(void)
|
|||||||
if (finishJob("Write duplicate", 1, -1) != EXIT_SUCCESS)
|
if (finishJob("Write duplicate", 1, -1) != EXIT_SUCCESS)
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
||||||
//pthread_kill(eventThread, SIGTERM);
|
/* pthread_kill(eventThread, SIGTERM); */
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch)
|
|||||||
{
|
{
|
||||||
int threads_per_subcore = 0;
|
int threads_per_subcore = 0;
|
||||||
|
|
||||||
// Emulate SMT=8 on POWER hardware
|
/* Emulate SMT=8 on POWER hardware */
|
||||||
if (ARCH_IS_PPC64(arch))
|
if (ARCH_IS_PPC64(arch))
|
||||||
threads_per_subcore = 8;
|
threads_per_subcore = 8;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user