4:31 a.m.
Some cleanups I found along the way, including elimination of 'ret'
in qemuExtDevicesStart.
Ján Tomko (10):
qemu: use g_auto in qemuExtTPMStartEmulator
qemu: eliminate ret variable in qemuExtTPMStartEmulator
qemu: eliminate ret variable in qemuExtTPMStart
qemu: use def instead of vm->def in qemuExtDevicesStart
qemu: eliminate ret in qemuExtDevicesStart
conf: remove outdated comments
conf: unmark xmlopt as unused in virDomainDeviceInfoParseXML
include: add a space before ending a comment
Add a space before ending a comment
vz: fix typos of 'explicitly'
include/libvirt/libvirt-domain.h | 8 ++--
include/libvirt/libvirt-host.h | 2 +-
include/libvirt/virterror.h | 5 +--
src/conf/capabilities.h | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 27 +++----------
src/conf/storage_conf.h | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_conf.h | 2 +-
src/libxl/xen_xm.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/logging/log_daemon.c | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_controller.c | 4 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver_linux.c | 2 +-
src/openvz/openvz_conf.c | 4 +-
src/openvz/openvz_driver.c | 4 +-
src/qemu/qemu_capabilities.h | 4 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_domain.c | 4 +-
src/qemu/qemu_domain_address.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_extdevice.c | 18 ++++-----
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_interface.c | 2 +-
src/qemu/qemu_tpm.c | 37 +++++++-----------
src/remote/remote_daemon.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetsshsession.c | 4 +-
src/security/security_apparmor.c | 2 +-
src/storage/storage_util.c | 2 +-
src/test/test_driver.c | 4 +-
src/util/virarch.h | 2 +-
src/util/vircommand.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 4 +-
src/util/virperf.h | 6 +--
src/util/virresctrl.c | 2 +-
src/vbox/vbox_common.c | 65 ++++++++++++++++---------------
src/vbox/vbox_snapshot_conf.c | 28 ++++++-------
src/vbox/vbox_tmpl.c | 2 +-
src/vz/vz_driver.c | 4 +-
src/vz/vz_sdk.c | 2 +-
tests/objecteventtest.c | 2 +-
tests/qemuagenttest.c | 2 +-
tests/vboxsnapshotxmltest.c | 2 +-
tests/vshtabletest.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 8 ++--
tools/virsh-pool.c | 2 +-
54 files changed, 140 insertions(+), 170 deletions(-)
--
2.21.0
4:31 a.m.
New subject: [libvirt PATCH 01/10] qemu: use g_auto in qemuExtTPMStartEmulator
Use the g_auto macros wherever possible to eliminate the cleanup
section.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 262e6c4f07..c2132250eb 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -794,12 +794,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
bool incomingMigration)
{
int ret = -1;
- virCommandPtr cmd = NULL;
+ g_autoptr(virCommand) cmd = NULL;
int exitstatus = 0;
- char *errbuf = NULL;
- virQEMUDriverConfigPtr cfg;
+ g_autofree char *errbuf = NULL;
+ g_autoptr(virQEMUDriverConfig) cfg = NULL;
virDomainTPMDefPtr tpm = vm->def->tpm;
- char *shortName = virDomainDefGetShortName(vm->def);
+ g_autofree char *shortName = virDomainDefGetShortName(vm->def);
int cmdret = 0, timeout, rc;
pid_t pid;
@@ -855,12 +855,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
ret = 0;
cleanup:
- VIR_FREE(shortName);
- VIR_FREE(errbuf);
- virCommandFree(cmd);
-
- virObjectUnref(cfg);
-
return ret;
error:
--
2.21.0
4:56 a.m.
New subject: [libvirt PATCH 01/10] qemu: use g_auto in qemuExtTPMStartEmulator
On Tue, Jan 28, 2020 at 11:31:17 +0100, Ján Tomko wrote:
Use the g_auto macros wherever possible to eliminate the cleanup
section.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 02/10] qemu: eliminate ret variable in qemuExtTPMStartEmulator
Now that the cleanup section is empty, eliminate the cleanup
label as well as the 'ret' variable.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index c2132250eb..21792f6992 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -793,7 +793,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
virDomainObjPtr vm,
bool incomingMigration)
{
- int ret = -1;
g_autoptr(virCommand) cmd = NULL;
int exitstatus = 0;
g_autofree char *errbuf = NULL;
@@ -817,23 +816,23 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
cfg->swtpm_group,
cfg->swtpmStateDir, shortName,
incomingMigration)))
- goto cleanup;
+ return -1;
if (qemuExtDeviceLogCommand(driver, vm, cmd, "TPM Emulator") < 0)
- goto cleanup;
+ return -1;
virCommandSetErrorBuffer(cmd, &errbuf);
if (qemuSecurityStartTPMEmulator(driver, vm, cmd,
cfg->swtpm_user, cfg->swtpm_group,
&exitstatus, &cmdret) < 0)
- goto cleanup;
+ return -1;
if (cmdret < 0 || exitstatus != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not start 'swtpm'. exitstatus: %d, "
"error: %s"), exitstatus, errbuf);
- goto cleanup;
+ return -1;
}
/* check that the swtpm has written its pid into the file */
@@ -852,15 +851,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
if (timeout <= 0)
goto error;
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
error:
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("swtpm failed to start"));
- goto cleanup;
+ return -1;
}
--
2.21.0
4:59 a.m.
New subject: [libvirt PATCH 02/10] qemu: eliminate ret variable in qemuExtTPMStartEmulator
On Tue, Jan 28, 2020 at 11:31:18 +0100, Ján Tomko wrote:
Now that the cleanup section is empty, eliminate the cleanup
label as well as the 'ret' variable.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
It's a shame this code uses hand-rolled waiting loop for the process
rather than the backoff timer.
Also would be great to get rid of the error label too.
But those comments are out of scope of this patch thus:
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 03/10] qemu: eliminate ret variable in qemuExtTPMStart
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 21792f6992..6741373583 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -865,19 +865,18 @@ qemuExtTPMStart(virQEMUDriverPtr driver,
virDomainObjPtr vm,
bool incomingMigration)
{
- int ret = 0;
virDomainTPMDefPtr tpm = vm->def->tpm;
switch (tpm->type) {
case VIR_DOMAIN_TPM_TYPE_EMULATOR:
- ret = qemuExtTPMStartEmulator(driver, vm, incomingMigration);
- break;
+ return qemuExtTPMStartEmulator(driver, vm, incomingMigration);
+
case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
case VIR_DOMAIN_TPM_TYPE_LAST:
break;
}
- return ret;
+ return 0;
}
--
2.21.0
5 a.m.
New subject: [libvirt PATCH 03/10] qemu: eliminate ret variable in qemuExtTPMStart
On Tue, Jan 28, 2020 at 11:31:19 +0100, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_tpm.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 04/10] qemu: use def instead of vm->def in qemuExtDevicesStart
We have a helper variable to make the code more concise,
use it consistently.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_extdevice.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 463f76c21a..1869a42f11 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -159,11 +159,11 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
int ret = 0;
size_t i;
- if (qemuExtDevicesInitPaths(driver, vm->def) < 0)
+ if (qemuExtDevicesInitPaths(driver, def) < 0)
return -1;
- for (i = 0; i < vm->def->nvideos; i++) {
- virDomainVideoDefPtr video = vm->def->videos[i];
+ for (i = 0; i < def->nvideos; i++) {
+ virDomainVideoDefPtr video = def->videos[i];
if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
ret = qemuExtVhostUserGPUStart(driver, vm, video);
@@ -172,7 +172,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
}
}
- if (vm->def->tpm)
+ if (def->tpm)
ret = qemuExtTPMStart(driver, vm, incomingMigration);
for (i = 0; i < def->nnets; i++) {
--
2.21.0
5:02 a.m.
New subject: [libvirt PATCH 04/10] qemu: use def instead of vm->def in qemuExtDevicesStart
On Tue, Jan 28, 2020 at 11:31:20 +0100, Ján Tomko wrote:
We have a helper variable to make the code more concise,
use it consistently.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_extdevice.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 05/10] qemu: eliminate ret in qemuExtDevicesStart
All the callees return either 0 or -1 so there is no need
for propagating the value. And we bail on the first error.
Remove the variable to make the function simpler.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_extdevice.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 1869a42f11..9c0c0fd573 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -156,7 +156,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
bool incomingMigration)
{
virDomainDefPtr def = vm->def;
- int ret = 0;
size_t i;
if (qemuExtDevicesInitPaths(driver, def) < 0)
@@ -166,14 +165,13 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
virDomainVideoDefPtr video = def->videos[i];
if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
- ret = qemuExtVhostUserGPUStart(driver, vm, video);
- if (ret < 0)
- return ret;
+ if (qemuExtVhostUserGPUStart(driver, vm, video) < 0)
+ return -1;
}
}
- if (def->tpm)
- ret = qemuExtTPMStart(driver, vm, incomingMigration);
+ if (def->tpm && qemuExtTPMStart(driver, vm, incomingMigration) < 0)
+ return -1;
for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
@@ -184,7 +182,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
return -1;
}
- return ret;
+ return 0;
}
--
2.21.0
5:03 a.m.
New subject: [libvirt PATCH 05/10] qemu: eliminate ret in qemuExtDevicesStart
On Tue, Jan 28, 2020 at 11:31:21 +0100, Ján Tomko wrote:
All the callees return either 0 or -1 so there is no need
for propagating the value. And we bail on the first error.
Remove the variable to make the function simpler.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_extdevice.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 06/10] conf: remove outdated comments
Some *ParseXML functions have comments stating what kind of device
they parse with an outdated list of parameters, with the exception
of virDomainFSDefParseXML which claims to parse a disk.
Remove them, assuming the function names are descriptive enough.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 853cfddf1b..70501c4ffc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7598,9 +7598,6 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr)
}
-/* Parse the XML definition for a device address
- * @param node XML nodeset to parse for device address definition
- */
static int
virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED,
xmlNodePtr node,
@@ -10040,9 +10037,6 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt,
#define VENDOR_LEN 8
#define PRODUCT_LEN 16
-/* Parse the XML definition for a disk
- * @param node XML nodeset to parse for disk definition
- */
static virDomainDiskDefPtr
virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
@@ -10721,9 +10715,6 @@ virDomainControllerModelTypeToString(virDomainControllerDefPtr
def,
}
-/* Parse the XML definition for a controller
- * @param node XML nodeset to parse for controller definition
- */
static virDomainControllerDefPtr
virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
@@ -11094,9 +11085,6 @@ virDomainNetGenerateMAC(virDomainXMLOptionPtr xmlopt,
}
-/* Parse the XML definition for a disk
- * @param node XML nodeset to parse for disk definition
- */
static virDomainFSDefPtr
virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
@@ -11521,10 +11509,6 @@
virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
}
-/* Parse the XML definition for a network interface
- * @param node XML nodeset to parse for net definition
- * @return 0 on success, -1 on failure
- */
static virDomainNetDefPtr
virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
@@ -12909,7 +12893,6 @@ virDomainChrDefNew(virDomainXMLOptionPtr xmlopt)
}
/* Parse the XML definition for a character device
- * @param node XML nodeset to parse for net definition
*
* The XML we're dealing with looks like
*
--
2.21.0
5:04 a.m.
New subject: [libvirt PATCH 06/10] conf: remove outdated comments
On Tue, Jan 28, 2020 at 11:31:22 +0100, Ján Tomko wrote:
Some *ParseXML functions have comments stating what kind of device
they parse with an outdated list of parameters, with the exception
of virDomainFSDefParseXML which claims to parse a disk.
Remove them, assuming the function names are descriptive enough.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 17 -----------------
1 file changed, 17 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 07/10] conf: unmark xmlopt as unused in virDomainDeviceInfoParseXML
It is used by the user-alias handling code.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 70501c4ffc..9f7fe2aa78 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7599,7 +7599,7 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr)
static int
-virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED,
+virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
virDomainDeviceInfoPtr info,
unsigned int flags)
--
2.21.0
5:05 a.m.
New subject: [libvirt PATCH 07/10] conf: unmark xmlopt as unused in virDomainDeviceInfoParseXML
On Tue, Jan 28, 2020 at 11:31:23 +0100, Ján Tomko wrote:
It is used by the user-alias handling code.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 08/10] include: add a space before ending a comment
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
include/libvirt/libvirt-domain.h | 8 ++++----
include/libvirt/libvirt-host.h | 2 +-
include/libvirt/virterror.h | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index faba90b040..5846e93d98 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1428,7 +1428,7 @@ char * virDomainGetSchedulerType(virDomainPtr
domain,
# define VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS "device_write_bytes_sec"
-/* Set Blkio tunables for the domain*/
+/* Set Blkio tunables for the domain */
int virDomainSetBlkioParameters(virDomainPtr domain,
virTypedParameterPtr params,
int nparams, unsigned int flags);
@@ -1436,7 +1436,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain,
virTypedParameterPtr params,
int *nparams, unsigned int flags);
-/* Manage memory parameters. */
+/* Manage memory parameters. */
/**
* VIR_DOMAIN_MEMORY_PARAM_UNLIMITED:
@@ -1483,7 +1483,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain,
# define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit"
-/* Set memory tunables for the domain*/
+/* Set memory tunables for the domain */
int virDomainSetMemoryParameters(virDomainPtr domain,
virTypedParameterPtr params,
int nparams, unsigned int flags);
@@ -1768,7 +1768,7 @@ struct _virDomainBlockInfo {
* holes, similar to 'du') */
unsigned long long physical; /* host physical size in bytes of
* the image container (last
- * offset, similar to 'ls')*/
+ * offset, similar to 'ls') */
};
int virDomainGetBlockInfo(virDomainPtr dom,
diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
index b87d634813..6972834175 100644
--- a/include/libvirt/libvirt-host.h
+++ b/include/libvirt/libvirt-host.h
@@ -167,7 +167,7 @@ struct _virNodeInfo {
unsigned int sockets; /* number of CPU sockets per node if nodes > 1,
1 in case of unusual NUMA topology */
unsigned int cores; /* number of cores per socket, total number of
- processors in case of unusual NUMA topology*/
+ processors in case of unusual NUMA topology */
unsigned int threads; /* number of threads per core, 1 in case of
unusual numa topology */
};
diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index b7aa2a0ec3..0f1c32283d 100644
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -313,15 +313,14 @@ typedef enum {
was denied */
VIR_ERR_DBUS_SERVICE = 89, /* error from a dbus service */
VIR_ERR_STORAGE_VOL_EXIST = 90, /* the storage vol already exists */
- VIR_ERR_CPU_INCOMPATIBLE = 91, /* given CPU is incompatible with host
- CPU*/
+ VIR_ERR_CPU_INCOMPATIBLE = 91, /* given CPU is incompatible with host CPU */
VIR_ERR_XML_INVALID_SCHEMA = 92, /* XML document doesn't validate against
schema */
VIR_ERR_MIGRATE_FINISH_OK = 93, /* Finish API succeeded but it is expected to
return NULL */
VIR_ERR_AUTH_UNAVAILABLE = 94, /* authentication unavailable */
VIR_ERR_NO_SERVER = 95, /* Server was not found */
VIR_ERR_NO_CLIENT = 96, /* Client was not found */
VIR_ERR_AGENT_UNSYNCED = 97, /* guest agent replies with wrong id
- to guest-sync command (DEPRECATED)*/
+ to guest-sync command (DEPRECATED) */
VIR_ERR_LIBSSH = 98, /* error in libssh transport driver */
VIR_ERR_DEVICE_MISSING = 99, /* fail to find the desired device */
VIR_ERR_INVALID_NWFILTER_BINDING = 100, /* invalid nwfilter binding */
--
2.21.0
5:06 a.m.
New subject: [libvirt PATCH 08/10] include: add a space before ending a comment
On Tue, Jan 28, 2020 at 11:31:24 +0100, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
include/libvirt/libvirt-domain.h | 8 ++++----
include/libvirt/libvirt-host.h | 2 +-
include/libvirt/virterror.h | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 09/10] Add a space before ending a comment
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/capabilities.h | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 8 ++--
src/conf/storage_conf.h | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_conf.h | 2 +-
src/libxl/xen_xm.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/logging/log_daemon.c | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_controller.c | 4 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver_linux.c | 2 +-
src/openvz/openvz_conf.c | 4 +-
src/openvz/openvz_driver.c | 4 +-
src/qemu/qemu_capabilities.h | 4 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_domain.c | 4 +-
src/qemu/qemu_domain_address.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_interface.c | 2 +-
src/remote/remote_daemon.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetsshsession.c | 4 +-
src/security/security_apparmor.c | 2 +-
src/storage/storage_util.c | 2 +-
src/test/test_driver.c | 4 +-
src/util/virarch.h | 2 +-
src/util/vircommand.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 4 +-
src/util/virperf.h | 6 +--
src/util/virresctrl.c | 2 +-
src/vbox/vbox_common.c | 65 ++++++++++++++++---------------
src/vbox/vbox_snapshot_conf.c | 28 ++++++-------
src/vbox/vbox_tmpl.c | 2 +-
src/vz/vz_driver.c | 2 +-
tests/objecteventtest.c | 2 +-
tests/qemuagenttest.c | 2 +-
tests/vboxsnapshotxmltest.c | 2 +-
tests/vshtabletest.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 8 ++--
tools/virsh-pool.c | 2 +-
48 files changed, 109 insertions(+), 108 deletions(-)
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 75f29666c9..e2581fac8b 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -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;
};
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 837d77581c..8fca3df874 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -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"));
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9f7fe2aa78..8e1d498c68 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4444,7 +4444,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
@@ -7723,7 +7723,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;
@@ -12333,7 +12333,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;
}
@@ -12364,7 +12364,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;
}
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index c0baeffc1c..daa21a127b 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -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,
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 0d52818e18..d46fc9253d 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -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 ||
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index e41e84e3e2..86decdc853 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -397,7 +397,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");
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 4b5d240684..b61c52f1a5 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -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 */
diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 54eb6fc97d..3883725efc 100644
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -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;
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 65c38139c4..7ea228ce37 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -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"),
diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 488f3b459d..97be2be0a1 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -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"),
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index 59782d9cb2..f2f0e0a570 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -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 */
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 42c631ed0b..723680aa8f 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -672,7 +672,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 {
@@ -737,7 +737,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 {
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index af8593d6a5..2e860e2fae 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -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;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index b66135f2d9..8a6de9d382 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -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,
diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
index 9de8e93c60..7bbde5c6a9 100644
--- a/src/network/bridge_driver_linux.c
+++ b/src/network/bridge_driver_linux.c
@@ -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);
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index e9ee1a7bf4..bc45e96fab 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -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 = strchrnul(p, ',');
if (STRPREFIX(p, "ifname=")) {
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 62644f3129..e3245aec4d 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -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)
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 56af9e9a0e..0e72057052 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -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 */
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 4ab1999568..cedf232223 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -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 */
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b0c0e1a19b..5bfff6042f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7408,7 +7408,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"),
@@ -12324,7 +12324,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;
}
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 9e3bcc434d..b663e05391 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -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;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 048855b533..c24543d323 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15190,7 +15190,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",
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 31d455505b..7ed78cfe26 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -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;
}
diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index bb62b53c04..c514c804ea 100644
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -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;
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 33697988b6..c427864ce1 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -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"),
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 000b937cdd..e62cfe64bc 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -1241,7 +1241,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:
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index ed8e948835..63773ecfc2 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -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 */
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 7cea788931..ca02631f7f 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -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;
}
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 987d937b04..62b0d9b66f 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -3123,7 +3123,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;
/**
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 1908185743..47c1fc588f 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -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;
diff --git a/src/util/virarch.h b/src/util/virarch.h
index 233b83f31b..c3890606ec 100644
--- a/src/util/virarch.h
+++ b/src/util/virarch.h
@@ -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 */
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index dd37b0b8dc..24ba86f99d 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2456,7 +2456,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;
}
}
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 094821cd30..5fd7186760 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -501,7 +501,7 @@ virNetDevBandwidthEqual(const virNetDevBandwidth *a,
return false;
}
- /*out*/
+ /* out */
if (a->out) {
if (!b->out)
return false;
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 5ca96132c4..5a85f2cb64 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -961,7 +961,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 &&
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 710b4f5f51..cc86b6e315 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -62,12 +62,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;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index 3102b42af9..db61f94888 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -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 */
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 684d2ce398..615166469c 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -234,7 +234,7 @@ virResctrlInfoMonFree(virResctrlInfoMonPtr mon)
}
-/* virResctrlAlloc and virResctrlMonitor*/
+/* virResctrlAlloc and virResctrlMonitor */
/*
* virResctrlAlloc and virResctrlMonitor are representing a resource control
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index fc67b716da..7cd9b7be20 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -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;
diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 4cd4e3a983..3876955981 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -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;
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 872825d86f..a2d3db4307 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -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);
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index e8a7522732..c4b2049958 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -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,
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index dac6938b63..80889339bd 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -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)
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index a45ce4f44a..86fbfbaa4c 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -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;
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index d1a7522931..dbeebec196 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -147,4 +147,4 @@ int main(void)
return EXIT_AM_SKIP;
}
-#endif /*WITH_VBOX*/
+#endif /* WITH_VBOX */
diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index f2e0554f0a..27837f4122 100644
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -142,7 +142,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)
{
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 933e2aa75f..9b8c69fa9d 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -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)
{
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index e64e08e5da..8d56eedffe 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3666,7 +3666,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;
@@ -7105,7 +7105,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;
@@ -7212,7 +7212,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;
@@ -11831,7 +11831,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) {
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 9c32449fbb..d190eed2b1 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -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]),
--
2.21.0
5:13 a.m.
New subject: [libvirt PATCH 09/10] Add a space before ending a comment
On Tue, Jan 28, 2020 at 11:31:25 +0100, Ján Tomko wrote:
It also adds space after the start of the comment in many cases.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/capabilities.h | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 8 ++--
src/conf/storage_conf.h | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_conf.h | 2 +-
src/libxl/xen_xm.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/logging/log_daemon.c | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_controller.c | 4 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver_linux.c | 2 +-
src/openvz/openvz_conf.c | 4 +-
src/openvz/openvz_driver.c | 4 +-
src/qemu/qemu_capabilities.h | 4 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_domain.c | 4 +-
src/qemu/qemu_domain_address.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_interface.c | 2 +-
src/remote/remote_daemon.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetsshsession.c | 4 +-
src/security/security_apparmor.c | 2 +-
src/storage/storage_util.c | 2 +-
src/test/test_driver.c | 4 +-
src/util/virarch.h | 2 +-
src/util/vircommand.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 4 +-
src/util/virperf.h | 6 +--
src/util/virresctrl.c | 2 +-
src/vbox/vbox_common.c | 65 ++++++++++++++++---------------
src/vbox/vbox_snapshot_conf.c | 28 ++++++-------
src/vbox/vbox_tmpl.c | 2 +-
src/vz/vz_driver.c | 2 +-
tests/objecteventtest.c | 2 +-
tests/qemuagenttest.c | 2 +-
tests/vboxsnapshotxmltest.c | 2 +-
tests/vshtabletest.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 8 ++--
tools/virsh-pool.c | 2 +-
48 files changed, 109 insertions(+), 108 deletions(-)
I'm not really convinced that the churn outweighs the benefits of the
change especially since it was apparently done programatically yet this
patch/series is not adding a syntax-check rule.
6:22 a.m.
New subject: [libvirt PATCH 09/10] Add a space before ending a comment
On Tue, Jan 28, 2020 at 12:13:14PM +0100, Peter Krempa wrote:
On Tue, Jan 28, 2020 at 11:31:25 +0100, Ján Tomko wrote:
It also adds space after the start of the comment in many cases.
> Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
> ---
> src/conf/capabilities.h | 2 +-
> src/conf/cpu_conf.c | 2 +-
> src/conf/domain_conf.c | 8 ++--
> src/conf/storage_conf.h | 2 +-
> src/esx/esx_network_driver.c | 2 +-
> src/libxl/libxl_conf.c | 2 +-
> src/libxl/libxl_conf.h | 2 +-
> src/libxl/xen_xm.c | 2 +-
> src/locking/lock_daemon.c | 2 +-
> src/logging/log_daemon.c | 2 +-
> src/lxc/lxc_conf.h | 2 +-
> src/lxc/lxc_controller.c | 4 +-
> src/lxc/lxc_process.c | 2 +-
> src/network/bridge_driver.c | 2 +-
> src/network/bridge_driver_linux.c | 2 +-
> src/openvz/openvz_conf.c | 4 +-
> src/openvz/openvz_driver.c | 4 +-
> src/qemu/qemu_capabilities.h | 4 +-
> src/qemu/qemu_conf.h | 2 +-
> src/qemu/qemu_domain.c | 4 +-
> src/qemu/qemu_domain_address.c | 2 +-
> src/qemu/qemu_driver.c | 2 +-
> src/qemu/qemu_hotplug.c | 2 +-
> src/qemu/qemu_interface.c | 2 +-
> src/remote/remote_daemon.c | 2 +-
> src/rpc/virnetclient.c | 2 +-
> src/rpc/virnetsshsession.c | 4 +-
> src/security/security_apparmor.c | 2 +-
> src/storage/storage_util.c | 2 +-
> src/test/test_driver.c | 4 +-
> src/util/virarch.h | 2 +-
> src/util/vircommand.c | 2 +-
> src/util/virnetdevbandwidth.c | 2 +-
> src/util/virnetdevvportprofile.c | 2 +-
> src/util/virnetlink.c | 4 +-
> src/util/virperf.h | 6 +--
> src/util/virresctrl.c | 2 +-
> src/vbox/vbox_common.c | 65 ++++++++++++++++---------------
> src/vbox/vbox_snapshot_conf.c | 28 ++++++-------
> src/vbox/vbox_tmpl.c | 2 +-
> src/vz/vz_driver.c | 2 +-
> tests/objecteventtest.c | 2 +-
> tests/qemuagenttest.c | 2 +-
> tests/vboxsnapshotxmltest.c | 2 +-
> tests/vshtabletest.c | 2 +-
> tools/virsh-domain-monitor.c | 2 +-
> tools/virsh-domain.c | 8 ++--
> tools/virsh-pool.c | 2 +-
> 48 files changed, 109 insertions(+), 108 deletions(-)
I'm not really convinced that the churn outweighs the benefits of the
change especially since it was apparently done programatically yet this
patch/series is not adding a syntax-check rule.
Parts of it were done by 'git grep', but for the rest I trained a neural
network [0], which I do not feel comfortable putting into syntax check.
Jano
[0] https://xkcd.com/2173/
1:01 a.m.
New subject: [libvirt PATCH 09/10] Add a space before ending a comment
On Tue, Jan 28, 2020 at 13:22:26 +0100, Ján Tomko wrote:
On Tue, Jan 28, 2020 at 12:13:14PM +0100, Peter Krempa wrote:
> On Tue, Jan 28, 2020 at 11:31:25 +0100, Ján Tomko wrote:
>
> It also adds space after the start of the comment in many cases.
>
> > Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
> > ---
> > src/conf/capabilities.h | 2 +-
> > src/conf/cpu_conf.c | 2 +-
> > src/conf/domain_conf.c | 8 ++--
> > src/conf/storage_conf.h | 2 +-
> > src/esx/esx_network_driver.c | 2 +-
> > src/libxl/libxl_conf.c | 2 +-
> > src/libxl/libxl_conf.h | 2 +-
> > src/libxl/xen_xm.c | 2 +-
> > src/locking/lock_daemon.c | 2 +-
> > src/logging/log_daemon.c | 2 +-
> > src/lxc/lxc_conf.h | 2 +-
> > src/lxc/lxc_controller.c | 4 +-
> > src/lxc/lxc_process.c | 2 +-
> > src/network/bridge_driver.c | 2 +-
> > src/network/bridge_driver_linux.c | 2 +-
> > src/openvz/openvz_conf.c | 4 +-
> > src/openvz/openvz_driver.c | 4 +-
> > src/qemu/qemu_capabilities.h | 4 +-
> > src/qemu/qemu_conf.h | 2 +-
> > src/qemu/qemu_domain.c | 4 +-
> > src/qemu/qemu_domain_address.c | 2 +-
> > src/qemu/qemu_driver.c | 2 +-
> > src/qemu/qemu_hotplug.c | 2 +-
> > src/qemu/qemu_interface.c | 2 +-
> > src/remote/remote_daemon.c | 2 +-
> > src/rpc/virnetclient.c | 2 +-
> > src/rpc/virnetsshsession.c | 4 +-
> > src/security/security_apparmor.c | 2 +-
> > src/storage/storage_util.c | 2 +-
> > src/test/test_driver.c | 4 +-
> > src/util/virarch.h | 2 +-
> > src/util/vircommand.c | 2 +-
> > src/util/virnetdevbandwidth.c | 2 +-
> > src/util/virnetdevvportprofile.c | 2 +-
> > src/util/virnetlink.c | 4 +-
> > src/util/virperf.h | 6 +--
> > src/util/virresctrl.c | 2 +-
> > src/vbox/vbox_common.c | 65 ++++++++++++++++---------------
> > src/vbox/vbox_snapshot_conf.c | 28 ++++++-------
> > src/vbox/vbox_tmpl.c | 2 +-
> > src/vz/vz_driver.c | 2 +-
> > tests/objecteventtest.c | 2 +-
> > tests/qemuagenttest.c | 2 +-
> > tests/vboxsnapshotxmltest.c | 2 +-
> > tests/vshtabletest.c | 2 +-
> > tools/virsh-domain-monitor.c | 2 +-
> > tools/virsh-domain.c | 8 ++--
> > tools/virsh-pool.c | 2 +-
> > 48 files changed, 109 insertions(+), 108 deletions(-)
>
> I'm not really convinced that the churn outweighs the benefits of the
> change especially since it was apparently done programatically yet this
> patch/series is not adding a syntax-check rule.
>
Parts of it were done by 'git grep', but for the rest I trained a neural
network [0], which I do not feel comfortable putting into syntax check.
Hmm, ok.
Just fix the summary.
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
4:31 a.m.
New subject: [libvirt PATCH 10/10] vz: fix typos of 'explicitly'
Also add a space before ending a comment.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/vz/vz_driver.c | 2 +-
src/vz/vz_sdk.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index c4b2049958..1443fdcc8a 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -341,7 +341,7 @@ vzDriverObjNew(void)
ignore_value(prlsdkLoadDomains(driver));
/* As far as waitDomainJob finally calls virReportErrorHelper
- * and we are not going to report it, reset it expicitly*/
+ * and we are not going to report it, reset it explicitly */
virResetLastError();
return driver;
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 32e0046763..877692aeba 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3186,7 +3186,7 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet,
virDomainNetDefPtr net)
: VIR_SOCKET_ADDR_IPV6_ALL),
VIR_SOCKET_ADDR_FAMILY(addrdst)));
/* virSocketAddrParse raises an error
- * and we are not going to report it, reset it expicitly*/
+ * and we are not going to report it, reset it explicitly */
virResetLastError();
if (!virSocketAddrEqual(addrdst, &zero)) {
--
2.21.0
5:13 a.m.
New subject: [libvirt PATCH 10/10] vz: fix typos of 'explicitly'
On Tue, Jan 28, 2020 at 11:31:26 +0100, Ján Tomko wrote:
Also add a space before ending a comment.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/vz/vz_driver.c | 2 +-
src/vz/vz_sdk.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
1759
days inactive
1760
days old
22 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa