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

Add a space before ending a comment

Browse Source 
Also add a space after the start in some of the cases.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2020-01-24 21:30:04 +01:00
parent 2f74105d2c
commit 49882b3337
48 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/capabilities.h
View File

@ -150,7 +150,7 @@ struct _virCapsHostCache {
struct _virCapsHostMemBWNode {
unsigned int id;
virBitmapPtr cpus; /* All CPUs that belong to this node*/
virBitmapPtr cpus; /* All CPUs that belong to this node */
virResctrlInfoMemBWPerNode control;
};

2
src/conf/cpu_conf.c
View File

@ -507,7 +507,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
goto cleanup;
}
/* ensure that the string can be passed to qemu*/
/* ensure that the string can be passed to qemu */
if (strchr(vendor_id, ',')) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("vendor id is invalid"));

8
src/conf/domain_conf.c
View File

@ -4451,7 +4451,7 @@ virDomainDefPostParseMemory(virDomainDefPtr def,
if (numaMemory) {
/* update the sizes in XML if nothing was set in the XML or ABI update
* is supported*/
* is supported */
virDomainDefSetMemoryTotal(def, numaMemory + hotplugMemory);
} else {
/* verify that the sum of memory modules doesn't exceed the total
@ -7773,7 +7773,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
ignore_value(virStringParseYesNo(autoAddress, &usbsrc->autoAddress));
/* Product can validly be 0, so we need some extra help to determine
* if it is uninitialized*/
* if it is uninitialized */
got_product = false;
got_vendor = false;
@ -12402,7 +12402,7 @@ virDomainChrDefaultTargetType(int devtype)
case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
/* No target type yet*/
/* No target type yet */
break;
}
@ -12433,7 +12433,7 @@ virDomainChrTargetTypeFromString(int devtype,
case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
/* No target type yet*/
/* No target type yet */
ret = 0;
break;
}

2
src/conf/storage_conf.h
View File

@ -209,7 +209,7 @@ struct _virStoragePoolSource {
/* Vendor of the source */
char *vendor;
/* Product name of the source*/
/* Product name of the source */
char *product;
/* Pool type specific format such as filesystem type,

2
src/esx/esx_network_driver.c
View File

@ -508,7 +508,7 @@ esxNetworkUndefine(virNetworkPtr network)
if (esxVI_EnsureSession(priv->primary) < 0)
return -1;
/* Lookup HostVirtualSwitch and HostPortGroup list*/
/* Lookup HostVirtualSwitch and HostPortGroup list */
if (esxVI_LookupHostVirtualSwitchByName(priv->primary, network->name,
&hostVirtualSwitch,
esxVI_Occurrence_RequiredItem) < 0 ||

2
src/libxl/libxl_conf.c
View File

@ -395,7 +395,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
char xlCPU[32];
/* enable nested HVM only if global nested_hvm option enable it and
* host support it*/
* host support it */
if (ARCH_IS_X86(def->os.arch)) {
vmx = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "vmx");
svm = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "svm");

2
src/libxl/libxl_conf.h
View File

@ -138,7 +138,7 @@ struct _libxlDriverPrivate {
/* Immutable pointer, immutable object */
virPortAllocatorRangePtr migrationPorts;
/* Immutable pointer, lockless APIs*/
/* Immutable pointer, lockless APIs */
virSysinfoDefPtr hostsysinfo;
/* Immutable pointer. lockless access */

2
src/libxl/xen_xm.c
View File

@ -122,7 +122,7 @@ xenParseXMDisk(char *entry, int hvm)
* The DEST-DEVICE is optionally post-fixed with disk type
*/
/* Extract the source file path*/
/* Extract the source file path */
if (!(offset = strchr(head, ',')))
goto error;

2
src/locking/lock_daemon.c
View File

@ -1177,7 +1177,7 @@ int main(int argc, char **argv) {
}
}
/* Read the config file if it exists*/
/* Read the config file if it exists */
if (remote_config_file &&
virLockDaemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) {
VIR_ERROR(_("Can't load config file: %s: %s"),

2
src/logging/log_daemon.c
View File

@ -949,7 +949,7 @@ int main(int argc, char **argv) {
}
}
/* Read the config file if it exists*/
/* Read the config file if it exists */
if (remote_config_file &&
virLogDaemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) {
VIR_ERROR(_("Can't load config file: %s: %s"),

2
src/lxc/lxc_conf.h
View File

@ -80,7 +80,7 @@ struct _virLXCDriver {
/* Immutable pointer, Immutable object */
virDomainXMLOptionPtr xmlopt;
/* Immutable pointer, lockless APIs*/
/* Immutable pointer, lockless APIs */
virSysinfoDefPtr hostsysinfo;
/* Atomic inc/dec only */

4
src/lxc/lxc_controller.c
View File

@ -670,7 +670,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
/* The NBD device will be cleaned up while the cgroup will end.
* For this we need to remember the qemu-nbd pid and add it to
* the cgroup*/
* the cgroup */
if (virLXCControllerAppendNBDPids(ctrl, fs->src->path) < 0)
return -1;
} else {
@ -735,7 +735,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
/* The NBD device will be cleaned up while the cgroup will end.
* For this we need to remember the qemu-nbd pid and add it to
* the cgroup*/
* the cgroup */
if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource(disk)) < 0)
return -1;
} else {

2
src/lxc/lxc_process.c
View File

@ -493,7 +493,7 @@ virLXCProcessSetupNamespaces(virLXCDriverPtr driver,
for (i = 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++)
nsFDs[i] = -1;
/*If there are no namespace to be opened just return success*/
/* If there are no namespaces to be opened just return success */
if (lxcDef == NULL)
return 0;

2
src/network/bridge_driver.c
View File

@ -4059,7 +4059,7 @@ networkDestroy(virNetworkPtr net)
virNetworkObjDeleteAllPorts(obj, driver->stateDir);
/* @def replaced in virNetworkObjUnsetDefTransient*/
/* @def replaced in virNetworkObjUnsetDefTransient */
def = virNetworkObjGetDef(obj);
event = virNetworkEventLifecycleNew(def->name,

2
src/network/bridge_driver_linux.c
View File

@ -565,7 +565,7 @@ networkAddGeneralIPv4FirewallRules(virFirewallPtr fw,
iptablesAddTcpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 53);
iptablesAddUdpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 53);
/* allow TFTP requests through to dnsmasq if necessary & back out*/
/* allow TFTP requests through to dnsmasq if necessary & back out */
if (ipv4def && ipv4def->tftproot) {
iptablesAddUdpInput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 69);
iptablesAddUdpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 69);

4
src/openvz/openvz_conf.c
View File

@ -233,7 +233,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
} else if (ret > 0) {
token = strtok_r(temp, ";", &saveptr);
while (token != NULL) {
/*add new device to list*/
/* add new device to list */
if (VIR_ALLOC(net) < 0)
goto error;
@ -243,7 +243,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
char cpy_temp[32];
int len;
/*parse string*/
/* parse string */
do {
char *next = strchr(p, ',');
if (!next)

4
src/openvz/openvz_driver.c
View File

@ -1498,7 +1498,7 @@ Version: 2.2
if ((fp = fopen("/proc/vz/vestat", "r")) == NULL)
return -1;
/*search line with VEID=vpsid*/
/* search line with VEID=vpsid */
while (1) {
ret = getline(&line, &line_size, fp);
if (ret < 0) {
@ -1508,7 +1508,7 @@ Version: 2.2
if (sscanf(line, "%d %llu %llu %llu",
&readvps, &usertime, &nicetime, &systime) == 4
&& readvps == vpsid) { /*found vpsid*/
&& readvps == vpsid) { /* found vpsid */
/* convert jiffies to nanoseconds */
*cpuTime = (1000ull * 1000ull * 1000ull
* (usertime + nicetime + systime)

4
src/qemu/qemu_capabilities.h
View File

@ -123,7 +123,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */
/* 55 */
X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/
X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc */
QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */
X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */
@ -232,7 +232,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
X_QEMU_CAPS_DTB, /* -dtb file */
QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */
X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */
X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/
X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx */
/* 135 */
X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */

2
src/qemu/qemu_conf.h
View File

@ -301,7 +301,7 @@ struct _virQEMUDriver {
/* Immutable pointer, immutable object */
virPortAllocatorRangePtr migrationPorts;
/* Immutable pointer, lockless APIs*/
/* Immutable pointer, lockless APIs */
virSysinfoDefPtr hostsysinfo;
/* Immutable pointer. lockless access */

4
src/qemu/qemu_domain.c
View File

@ -7438,7 +7438,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *cont,
}
/* For all other pci-root and pcie-root controllers, though,
* the index must be zero*/
* the index must be zero */
if (cont->idx != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Index for '%s' controllers must be 0"),
@ -12354,7 +12354,7 @@ qemuDomainGetMemorySizeAlignment(virDomainDefPtr def)
return 256 * 1024;
/* Align memory size. QEMU requires rounding to next 4KiB block.
* We'll take the "traditional" path and round it to 1MiB*/
* We'll take the "traditional" path and round it to 1MiB */
return 1024;
}

2
src/qemu/qemu_domain_address.c
View File

@ -2211,7 +2211,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
continue;
/* First IDE controller lives on the PIIX3 at slot=1, function=1,
dealt with earlier on*/
dealt with earlier on */
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
cont->idx == 0)
continue;

2
src/qemu/qemu_driver.c
View File

@ -15189,7 +15189,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm,
}
/* internal snapshot requires a disk image to store the memory image to, and
* also disks can't be excluded from an internal snapshot*/
* also disks can't be excluded from an internal snapshot */
if ((def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL && !found_internal) ||
(found_internal && forbid_internal)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

2
src/qemu/qemu_hotplug.c
View File

@ -283,7 +283,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver,
return -1;
} else {
/* otherwise report possible errors from the attempt to eject the media*/
/* otherwise report possible errors from the attempt to eject the media */
if (rc < 0)
return -1;
}

2
src/qemu/qemu_interface.c
View File

@ -685,7 +685,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def,
vhostnet_path = "/dev/vhost-net";
/* If running a plain QEMU guest, or
* if the config says explicitly to not use vhost, return now*/
* if the config says explicitly to not use vhost, return now */
if (def->virtType != VIR_DOMAIN_VIRT_KVM ||
net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) {
*vhostfdSize = 0;

2
src/remote/remote_daemon.c
View File

@ -1135,7 +1135,7 @@ int main(int argc, char **argv) {
}
}
/* Read the config file if it exists*/
/* Read the config file if it exists */
if (remote_config_file &&
daemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) {
VIR_ERROR(_("Can't load config file: %s: %s"),

2
src/rpc/virnetclient.c
View File

@ -1252,7 +1252,7 @@ virNetClientCallDispatch(virNetClientPtr client)
return virNetClientCallDispatchMessage(client);
case VIR_NET_STREAM: /* Stream protocol */
case VIR_NET_STREAM_HOLE: /* Sparse stream protocol*/
case VIR_NET_STREAM_HOLE: /* Sparse stream protocol */
return virNetClientCallDispatchStream(client);
case VIR_NET_CALL:

4
src/rpc/virnetsshsession.c
View File

@ -345,7 +345,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess)
}
/* calculate remote key hash, using MD5 algorithm that is
* usual in OpenSSH. The returned value should *NOT* be freed*/
* usual in OpenSSH. The returned value should *NOT* be freed */
if (!(keyhash = libssh2_hostkey_hash(sess->session,
LIBSSH2_HOSTKEY_HASH_MD5))) {
virReportError(VIR_ERR_SSH, "%s",
@ -925,7 +925,7 @@ virNetSSHOpenChannel(virNetSSHSessionPtr sess)
return -1;
}
/* nonblocking mode - currently does nothing*/
/* nonblocking mode - currently does nothing */
libssh2_channel_set_blocking(sess->channel, 0);
/* channel open */

2
src/security/security_apparmor.c
View File

@ -256,7 +256,7 @@ use_apparmor(void)
rc = profile_status(libvirt_daemon, 1);
if (rc < 0) {
rc = profile_status("libvirtd", 1);
/* Error or unconfined should all result in -1*/
/* Error or unconfined should all result in -1 */
if (rc < 0)
rc = -1;
}

2
src/storage/storage_util.c
View File

@ -3137,7 +3137,7 @@ typedef enum {
VIR_STORAGE_PARTED_DIFFERENT, /* Valid label found but not match format */
VIR_STORAGE_PARTED_UNKNOWN, /* No or unrecognized label */
VIR_STORAGE_PARTED_NOPTTYPE, /* Did not find the Partition Table type */
VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown*/
VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown */
} virStorageBackendPARTEDResult;
/**

4
src/test/test_driver.c
View File

@ -4960,7 +4960,7 @@ static int testDomainBlockStats(virDomainPtr domain,
goto error;
}
/* No significance to these numbers, just enough to mix it up*/
/* No significance to these numbers, just enough to mix it up */
statbase = g_get_real_time();
stats->rd_req = statbase / 10;
stats->rd_bytes = statbase / 20;
@ -5119,7 +5119,7 @@ testDomainInterfaceStats(virDomainPtr domain,
if (!(net = virDomainNetFind(privdom->def, device)))
goto error;
/* No significance to these numbers, just enough to mix it up*/
/* No significance to these numbers, just enough to mix it up */
statbase = g_get_real_time();
stats->rx_bytes = statbase / 10;
stats->rx_packets = statbase / 100;

2
src/util/virarch.h
View File

@ -63,7 +63,7 @@ typedef enum {
VIR_ARCH_SH4EB, /* SuperH4 32 BE http://en.wikipedia.org/wiki/SuperH */
VIR_ARCH_SPARC, /* Sparc 32 BE http://en.wikipedia.org/wiki/Sparc */
VIR_ARCH_SPARC64, /* Sparc 64 BE http://en.wikipedia.org/wiki/Sparc */
VIR_ARCH_UNICORE32, /* UniCore 32 LE http://en.wikipedia.org/wiki/Unicore*/
VIR_ARCH_UNICORE32, /* UniCore 32 LE http://en.wikipedia.org/wiki/Unicore */
VIR_ARCH_X86_64, /* x86 64 LE http://en.wikipedia.org/wiki/X86 */
VIR_ARCH_XTENSA, /* XTensa 32 LE http://en.wikipedia.org/wiki/Xtensa#Processor_Cores */

2
src/util/vircommand.c
View File

@ -2426,7 +2426,7 @@ virCommandDoAsyncIOHelper(void *opaque)
{
virCommandPtr cmd = opaque;
if (virCommandProcessIO(cmd) < 0) {
/* If something went wrong, save errno or -1*/
/* If something went wrong, save errno or -1 */
cmd->has_error = errno ? errno : -1;
}
}

2
src/util/virnetdevbandwidth.c
View File

@ -501,7 +501,7 @@ virNetDevBandwidthEqual(const virNetDevBandwidth *a,
return false;
}
/*out*/
/* out */
if (a->out) {
if (!b->out)
return false;

2
src/util/virnetdevvportprofile.c
View File

@ -960,7 +960,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex,
return rc;
}
if (setlink_only) /*for re-associations on existing links*/
if (setlink_only) /* for re-associations on existing links */
return 0;
if (!nltarget_kernel &&

4
src/util/virnetlink.c
View File

@ -61,12 +61,12 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkHandle, virNetlinkFree);
typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate;
typedef virNetlinkEventSrvPrivate *virNetlinkEventSrvPrivatePtr;
struct _virNetlinkEventSrvPrivate {
/*Server*/
/* Server */
virMutex lock;
int eventwatch;
int netlinkfd;
virNetlinkHandle *netlinknh;
/*Events*/
/* Events */
int handled;
size_t handlesCount;
size_t handlesAlloc;

6
src/util/virperf.h
View File

@ -36,7 +36,7 @@ typedef enum {
VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions
for applications */
VIR_PERF_EVENT_BRANCH_MISSES, /* Count of branch misses for applications */
VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applications*/
VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applications */
VIR_PERF_EVENT_STALLED_CYCLES_FRONTEND, /* Count of stalled cpu cycles in
the frontend of the instruction
processor pipeline */
@ -44,8 +44,8 @@ typedef enum {
the backend of the instruction
processor pipeline */
VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */
VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time*/
VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/
VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time */
VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time */
VIR_PERF_EVENT_PAGE_FAULTS, /* Count of total page faults */
VIR_PERF_EVENT_CONTEXT_SWITCHES, /* Count of context switches */
VIR_PERF_EVENT_CPU_MIGRATIONS, /* Count of cpu migrations */

2
src/util/virresctrl.c
View File

@ -234,7 +234,7 @@ virResctrlInfoMonFree(virResctrlInfoMonPtr mon)
}
/* virResctrlAlloc and virResctrlMonitor*/
/* virResctrlAlloc and virResctrlMonitor */
/*
* virResctrlAlloc and virResctrlMonitor are representing a resource control

65
src/vbox/vbox_common.c
View File

@ -617,7 +617,7 @@ static int vboxConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
static int vboxConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
{
/* No encryption is needed, or used on the local transport*/
/* No encryption is needed, or used on the local transport */
return 0;
}
@ -769,7 +769,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id)
VBOX_IID_INITIALIZE(&iid);
/* Internal vbox IDs start from 0, the public libvirt ID
* starts from 1, so refuse id == 0, and adjust the rest*/
* starts from 1, so refuse id == 0, and adjust the rest */
if (id == 0) {
virReportError(VIR_ERR_NO_DOMAIN,
_("no domain with matching id %d"), id);
@ -4592,7 +4592,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
goto cleanup;
rc = gVBoxAPI.UIMachine.SaveSettings(machine);
/*It may failed when the machine is not mutable.*/
/* It may failed when the machine is not mutable. */
rc = gVBoxAPI.UIMachine.GetSettingsFilePath(machine, &settingsFilePath);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -4601,7 +4601,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
}
VBOX_UTF16_TO_UTF8(settingsFilePath, &settingsFilePath_Utf8);
/*Getting the machine name to retrieve the machine location path.*/
/* Getting the machine name to retrieve the machine location path. */
rc = gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -4618,7 +4618,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
goto cleanup;
}
/*We create the xml struct with the settings file path.*/
/* We create the xml struct with the settings file path. */
snapshotMachineDesc = virVBoxSnapshotConfLoadVboxFile(settingsFilePath_Utf8, machineLocationPath);
if (snapshotMachineDesc == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -4646,8 +4646,8 @@ vboxSnapshotRedefine(virDomainPtr dom,
&realReadWriteDisksPath);
realReadOnlyDisksPathSize = virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(currentSnapshotXmlFilePath,
&realReadOnlyDisksPath);
/*The read-only disk number is necessarily greater or equal to the
*read-write disk number*/
/* The read-only disk number is necessarily greater or equal to the
* read-write disk number */
if (realReadOnlyDisksPathSize < realReadWriteDisksPathSize) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("The read only disk number must be greater or equal to the "
@ -4769,9 +4769,9 @@ vboxSnapshotRedefine(virDomainPtr dom,
_("Unable to know if disk is in media registry"));
goto cleanup;
}
if (diskInMediaRegistry == 1) /*Nothing to do.*/
if (diskInMediaRegistry == 1) /* Nothing to do. */
continue;
/*The read only disk is not in the media registry*/
/* The read only disk is not in the media registry */
VBOX_UTF8_TO_UTF16(def->parent.dom->disks[it]->src->path, &locationUtf);
rc = gVBoxAPI.UIVirtualBox.OpenMedium(data->vboxObj,
@ -4807,7 +4807,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
VBOX_UTF16_TO_UTF8(formatUtf, &format);
VBOX_UTF16_FREE(formatUtf);
/*This disk is already in the media registry*/
/* This disk is already in the media registry */
IMedium *parentReadOnlyMedium = NULL;
rc = gVBoxAPI.UIMedium.GetParent(readOnlyMedium, &parentReadOnlyMedium);
if (NS_FAILED(rc)) {
@ -4857,7 +4857,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
}
}
/*Now, we can unregister the machine*/
/* Now, we can unregister the machine */
rc = gVBoxAPI.UIMachine.Unregister(machine,
CleanupMode_DetachAllReturnHardDisksOnly,
&aMediaSize,
@ -4890,7 +4890,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
VBOX_UTF16_TO_UTF8(locationUtf16, &locationUtf8);
VBOX_UTF16_FREE(locationUtf16);
if (strstr(locationUtf8, "fake") != NULL) {
/*we delete the fake disk because we don't need it anymore*/
/* we delete the fake disk because we don't need it anymore */
IProgress *progress = NULL;
resultCodeUnion resultCode;
rc = gVBoxAPI.UIMedium.DeleteStorage(medium, &progress);
@ -4925,7 +4925,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
VBOX_UTF8_FREE(locationUtf8);
}
}
/*Close all disks that failed to close normally.*/
/* Close all disks that failed to close normally. */
for (it = 0; it < snapshotMachineDesc->mediaRegistry->ndisks; it++) {
if (vboxCloseDisksRecursively(dom, snapshotMachineDesc->mediaRegistry->disks[it]->location) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -4933,9 +4933,9 @@ vboxSnapshotRedefine(virDomainPtr dom,
goto cleanup;
}
}
/*Here, all disks are closed or deleted*/
/* Here, all disks are closed or deleted */
/*We are now going to create and fill the Snapshot xml struct*/
/* We are now going to create and fill the Snapshot xml struct */
if (VIR_ALLOC(newSnapshotPtr) < 0)
goto cleanup;
@ -4957,7 +4957,8 @@ vboxSnapshotRedefine(virDomainPtr dom,
newSnapshotPtr->storageController = g_strdup(snapshotMachineDesc->storageController);
/*We get the parent disk uuid from the parent disk location to correctly fill the storage controller.*/
/* We get the parent disk uuid from the parent disk location
* to correctly fill the storage controller. */
for (it = 0; it < def->parent.dom->ndisks; it++) {
char *location = NULL;
const char *uuidReplacing = NULL;
@ -4966,7 +4967,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
location = def->parent.dom->disks[it]->src->path;
if (!location)
goto cleanup;
/*Replacing the uuid*/
/* Replacing the uuid */
uuidReplacing = virVBoxSnapshotConfHardDiskUuidByLocation(snapshotMachineDesc, location);
if (uuidReplacing == NULL)
goto cleanup;
@ -5120,7 +5121,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
}
if (needToChangeStorageController) {
/*We need to append this disk in the storage controller*/
/* We need to append this disk in the storage controller */
char *tmp = NULL;
resultSize = virStringSearch(snapshotMachineDesc->storageController,
VBOX_UUID_REGEX,
@ -5142,7 +5143,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
VIR_FREE(tmp);
}
/*Close disk*/
/* Close disk */
rc = gVBoxAPI.UIMedium.Close(medium);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -5152,7 +5153,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
}
}
} else {
/*Create a "fake" disk to avoid corrupting children snapshot disks.*/
/* Create a "fake" disk to avoid corrupting children snapshot disks. */
for (it = 0; it < def->parent.dom->ndisks; it++) {
IMedium *medium = NULL;
PRUnichar *locationUtf16 = NULL;
@ -5259,7 +5260,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
goto cleanup;
}
newHardDisk = NULL; /* Consumed by above */
/*Adding the fake disk to the machine storage controllers*/
/* Adding the fake disk to the machine storage controllers */
resultSize = virStringSearch(snapshotMachineDesc->storageController,
VBOX_UUID_REGEX,
@ -5280,7 +5281,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
snapshotMachineDesc->storageController = g_strdup(tmp);
VIR_FREE(tmp);
/*Closing the "fake" disk*/
/* Closing the "fake" disk */
rc = gVBoxAPI.UIMedium.Close(newMedium);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -5348,7 +5349,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
}
}
/*Now, we rewrite the 'machineName'.vbox file to redefine the machine.*/
/* Now, we rewrite the 'machineName'.vbox file to redefine the machine. */
if (virVBoxSnapshotConfSaveVboxFile(snapshotMachineDesc, settingsFilePath_Utf8) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to serialize the machine description"));
@ -6872,7 +6873,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
}
VBOX_UTF16_TO_UTF8(settingsFilePathUtf16, &settingsFilepath);
/*Getting the machine name to retrieve the machine location path.*/
/* Getting the machine name to retrieve the machine location path. */
rc = gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -7027,7 +7028,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
_("Unable to add hard disk to the media registry"));
goto cleanup;
}
/*Adding fake disks to the machine storage controllers*/
/* Adding fake disks to the machine storage controllers */
resultSize = virStringSearch(snapshotMachineDesc->storageController,
VBOX_UUID_REGEX,
@ -7048,7 +7049,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
snapshotMachineDesc->storageController = g_strdup(tmp);
VIR_FREE(tmp);
/*Closing the "fake" disk*/
/* Closing the "fake" disk */
rc = gVBoxAPI.UIMedium.Close(newMedium);
if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -7093,7 +7094,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
}
}
}
/*We remove the read write disks from the media registry*/
/* We remove the read write disks from the media registry */
for (it = 0; it < def->ndisks; it++) {
const char *uuidRW =
virVBoxSnapshotConfHardDiskUuidByLocation(snapshotMachineDesc,
@ -7109,7 +7110,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
goto cleanup;
}
}
/*If the parent snapshot is not NULL, we remove the-read only disks from the media registry*/
/* If the parent snapshot is not NULL, we remove the-read only disks from the media registry */
if (def->parent.parent_name != NULL) {
for (it = 0; it < def->parent.dom->ndisks; it++) {
const char *uuidRO =
@ -7149,7 +7150,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
rc = gVBoxAPI.UIMedium.GetLocation(medium, &locationUtf16);
VBOX_UTF16_TO_UTF8(locationUtf16, &locationUtf8);
if (isCurrent && strstr(locationUtf8, "fake") != NULL) {
/*we delete the fake disk because we don't need it anymore*/
/* we delete the fake disk because we don't need it anymore */
IProgress *progress = NULL;
resultCodeUnion resultCode;
rc = gVBoxAPI.UIMedium.DeleteStorage(medium, &progress);
@ -7181,7 +7182,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
VBOX_UTF8_FREE(locationUtf8);
}
/*removing the snapshot*/
/* removing the snapshot */
if (virVBoxSnapshotConfRemoveSnapshot(snapshotMachineDesc, def->parent.name) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to remove snapshot %s"), def->parent.name);
@ -7201,7 +7202,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
}
}
/*Registering the machine*/
/* Registering the machine */
if (virVBoxSnapshotConfSaveVboxFile(snapshotMachineDesc, settingsFilepath) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to serialize the machine description"));
@ -7593,7 +7594,7 @@ vboxConnectListAllDomains(virConnectPtr conn,
if (doms) {
/* safe to ignore, new size will be equal or less than
* previous allocation*/
* previous allocation */
ignore_value(VIR_REALLOC_N(doms, count + 1));
*domains = doms;
doms = NULL;

28
src/vbox/vbox_snapshot_conf.c
View File

@ -64,7 +64,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlNodePtr diskNode,
hardDisk->children[i]->parent = hardDisk;
}
uuid = virXMLPropString(diskNode, "uuid");
/*we use virStringSearch because the uuid is between brackets*/
/* we use virStringSearch because the uuid is between brackets */
resultSize = virStringSearch(uuid,
VBOX_UUID_REGEX,
1,
@ -83,7 +83,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlNodePtr diskNode,
goto cleanup;
}
if (location[0] != '/') {
/*The location is a relative path, so we must change it into an absolute one. */
/* The location is a relative path, so we must change it into an absolute one. */
tmp = g_strdup_printf("%s%s", machineLocation, location);
hardDisk->location = g_strdup(tmp);
} else {
@ -194,7 +194,7 @@ virVBoxSnapshotConfRetrieveSnapshot(xmlNodePtr snapshotNode,
goto cleanup;
uuid = virXMLPropString(snapshotNode, "uuid");
/*we use virStringSearch because the uuid is between brackets*/
/* we use virStringSearch because the uuid is between brackets */
resultSize = virStringSearch(uuid,
VBOX_UUID_REGEX,
1,
@ -385,7 +385,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node,
goto cleanup;
/* We change the date format from "yyyy-MM-dd hh:mm:ss.msec+timeZone"
* to "yyyy-MM-ddThh:mm:ssZ"*/
* to "yyyy-MM-ddThh:mm:ssZ" */
firstRegexResult = virStringSearch(snapshot->timeStamp,
"([0-9]{4}-[0-9]{2}-[0-9]{2})",
1,
@ -403,13 +403,13 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node,
if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) == NULL)
goto cleanup;
/*node description*/
/* node description */
if (snapshot->description != NULL) {
descriptionNode = xmlNewNode(NULL, BAD_CAST "Description");
xmlNodeSetContent(descriptionNode, BAD_CAST snapshot->description);
xmlAddChild(node, descriptionNode);
}
/*hardware*/
/* hardware */
parseError = xmlParseInNodeContext(node,
snapshot->hardware,
(int)strlen(snapshot->hardware),
@ -422,7 +422,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node,
}
xmlAddChild(node, hardwareNode);
/*storageController*/
/* storageController */
if (xmlParseInNodeContext(node, snapshot->storageController,
(int)strlen(snapshot->storageController),
0,
@ -620,7 +620,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
goto cleanup;
}
/*Retrieve MachineNode*/
/* Retrieve MachineNode */
cur = xmlDocGetRootElement(xml);
xPathContext->node = cur;
machineNode = virXPathNode("./vbox:Machine", xPathContext);
@ -645,7 +645,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
currentSnapshotAttribute = virXMLPropString(machineNode, "currentSnapshot");
if (currentSnapshotAttribute != NULL) {
/*we use virStringSearch because the uuid is between brackets*/
/* we use virStringSearch because the uuid is between brackets */
searchResultSize = virStringSearch(currentSnapshotAttribute,
VBOX_UUID_REGEX,
1,
@ -699,7 +699,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
}
machineDescription->storageController = virXMLNodeToString(xml, cur);
/*retrieve mediaRegistry*/
/* retrieve mediaRegistry */
cur = virXPathNode("./vbox:MediaRegistry", xPathContext);
if (cur == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@ -713,7 +713,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
goto cleanup;
}
/*retrieve snapshot*/
/* retrieve snapshot */
xPathContext->node = machineNode;
cur = virXPathNode("./vbox:Snapshot", xPathContext);
if (cur != NULL) {
@ -763,8 +763,8 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSnapshotConfSnapshotPtr snapsh
return -1;
}
/*If parent is NULL and the machine has no snapshot yet,
*it means that the added snapshot is the first snapshot*/
/* If parent is NULL and the machine has no snapshot yet,
* it means that the added snapshot is the first snapshot */
if (snapshotParentName == NULL) {
if (machine->snapshot != NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -829,7 +829,7 @@ virVBoxSnapshotConfAddHardDiskToMediaRegistry(virVBoxSnapshotConfHardDiskPtr har
_("Unable to get the parent disk"));
return -1;
}
/*Hard disk found*/
/* Hard disk found */
if (VIR_EXPAND_N(parentDisk->children, parentDisk->nchildren, 1) < 0)
return -1;

2
src/vbox/vbox_tmpl.c
View File

@ -1074,7 +1074,7 @@ _consoleTakeSnapshot(IConsole *console, PRUnichar *name,
IMachine *machine;
nsresult rc;
PRUnichar *id = NULL;
bool bpause = true; /*NO live snapshot*/
bool bpause = true; /* NO live snapshot */
rc = console->vtbl->GetMachine(console, &machine);

2
src/vz/vz_driver.c
View File

@ -4143,7 +4143,7 @@ static virStateDriver vzStateDriver = {
.stateCleanup = vzStateCleanup,
};
/* Parallels domain type backward compatibility*/
/* Parallels domain type backward compatibility */
static virHypervisorDriver parallelsHypervisorDriver;
static virConnectDriver parallelsConnectDriver = {
.localOnly = true,

2
tests/objecteventtest.c
View File

@ -864,7 +864,7 @@ mymain(void)
ret = EXIT_FAILURE;
/* Network event tests */
/* Tests requiring the test network not to be set up*/
/* Tests requiring the test network not to be set up */
if (virTestRun("Network createXML start event ", testNetworkCreateXML, &test) < 0)
ret = EXIT_FAILURE;
if (virTestRun("Network (un)define events", testNetworkDefine, &test) < 0)

2
tests/qemuagenttest.c
View File

@ -616,7 +616,7 @@ testQemuAgentCPU(const void *data)
if (qemuAgentSetVCPUs(qemuMonitorTestGetAgent(test), cpuinfo, nvcpus) < 0)
goto cleanup;
/* try to hotplug two, second one will fail*/
/* try to hotplug two, second one will fail */
if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
goto cleanup;

2
tests/vboxsnapshotxmltest.c
View File

@ -147,4 +147,4 @@ int main(void)
return EXIT_AM_SKIP;
}
#endif /*WITH_VBOX*/
#endif /* WITH_VBOX */

2
tests/vshtabletest.c
View File

@ -143,7 +143,7 @@ testUnicode(const void *opaque G_GNUC_UNUSED)
return ret;
}
/* Point of this test is to see how table behaves with right to left writing*/
/* Point of this test is to see how table behaves with right to left writing */
static int
testUnicodeArabic(const void *opaque G_GNUC_UNUSED)
{

2
tools/virsh-domain-monitor.c
View File

@ -1565,7 +1565,7 @@ static const vshCmdInfo info_list[] = {
{.name = NULL}
};
/* compare domains, pack NULLed ones at the end*/
/* compare domains, pack NULLed ones at the end */
static int
virshDomainSorter(const void *a, const void *b)
{

8
tools/virsh-domain.c
View File

@ -3671,7 +3671,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
const char *vol_string = NULL; /* string containing volumes to delete */
char **vol_list = NULL; /* tokenized vol_string */
int nvol_list = 0;
virshUndefineVolume *vols = NULL; /* info about the volumes to delete*/
virshUndefineVolume *vols = NULL; /* info about the volumes to delete */
size_t nvols = 0;
xmlDocPtr doc = NULL;
xmlXPathContextPtr ctxt = NULL;
@ -7132,7 +7132,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
/* Pin mode: pinning specified vcpu to specified physical cpus*/
/* Pin mode: pinning specified vcpu to specified physical cpus */
if (!(cpumap = virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu)))
goto cleanup;
@ -7239,7 +7239,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
/* Pin mode: pinning emulator threads to specified physical cpus*/
/* Pin mode: pinning emulator threads to specified physical cpus */
if (!(cpumap = virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu)))
goto cleanup;
@ -11862,7 +11862,7 @@ virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2)
if (!xmlStrEqual(n1->name, n2->name))
return false;
/* Iterate over n2 attributes and check if n1 contains them*/
/* Iterate over n2 attributes and check if n1 contains them */
attr = n2->properties;
while (attr) {
if (attr->type == XML_ATTRIBUTE_NODE) {

2
tools/virsh-pool.c
View File

@ -1363,7 +1363,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
if (!table)
goto cleanup;
/* Insert the pool info rows into table*/
/* Insert the pool info rows into table */
for (i = 0; i < list->npools; i++) {
if (vshTableRowAppend(table,
virStoragePoolGetName(list->pools[i]),