Signed-off-by: Fangge Jin <fjin(a)redhat.com&gt; --- src/bhyve/libvirtd_bhyve.aug | 2 +- src/cpu/cpu_arm.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/interface/interface_backend_udev.c | 4 ++-- src/internal.h | 2 +- src/libvirt-domain.c | 2 +- src/libvirt-nodedev.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/locking/libvirt_lockd.aug | 2 +- src/locking/libvirt_sanlock.aug | 2 +- src/locking/virtlockd.aug | 2 +- src/logging/virtlogd.aug | 2 +- src/lxc/libvirtd_lxc.aug | 2 +- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_process.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 8 ++++---- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_qapi.c | 4 ++-- src/qemu/qemu_security.c | 2 +- src/remote/libvirtd.aug.in | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/rpc/virnetlibsshsession.c | 4 ++-- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsshsession.c | 4 ++-- src/storage/storage_util.c | 4 ++-- src/util/virbuffer.h | 2 +- src/util/vircommand.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virhostcpu.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virnetdevopenvswitch.c | 4 ++-- src/util/virnetdevtap.c | 2 +- src/util/virqemu.c | 2 +- src/util/virresctrl.c | 2 +- src/util/virsysinfo.c | 2 +- src/util/virsystemd.c | 2 +- src/util/virtpm.c | 2 +- src/vbox/vbox_common.h | 2 +- src/vbox/vbox_network.c | 4 ++-- src/vbox/vbox_snapshot_conf.c | 4 ++-- src/vbox/vbox_tmpl.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 4 ++-- 56 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/bhyve/libvirtd_bhyve.aug b/src/bhyve/libvirtd_bhyve.aug index 66079376c4..b6bee261a6 100644 --- a/src/bhyve/libvirtd_bhyve.aug +++ b/src/bhyve/libvirtd_bhyve.aug @@ -24,7 +24,7 @@ module Libvirtd_bhyve = let log_entry = str_entry "firmware_dir" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index cd4f720c95..016d414143 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -528,9 +528,9 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); VIR_DEBUG("CPUID read from register: 0x%016lx", cpuid); - /* parse the coresponding part_id bits */ + /* parse the corresponding part_id bits */ data->pvr = (cpuid >> 4) & 0xfff; - /* parse the coresponding vendor_id bits */ + /* parse the corresponding vendor_id bits */ data->vendor_id = (cpuid >> 24) & 0xff; hwcaps = getauxval(AT_HWCAP); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 16690edfbe..7564ece7e9 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3419,7 +3419,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, if (STREQ(directoryName, directoryAndFileName)) { /* - * The <path> part of the datatore path didn't contain a '/', assume + * The <path> part of the datastore path didn't contain a '/', assume * that the <path> part is actually the file name. */ datastorePathWithoutFileName = g_strdup_printf("[%s]", datastoreName); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index e388f98536..670de48d52 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -653,7 +653,7 @@ udevGetIfaceDefBond(struct udev *udev, /* bonding/mode is in the format: "balance-rr 0" so we find the * space and increment the pointer to get the number and convert - * it to an interger. libvirt uses 1 through 7 while the raw + * it to an integer. libvirt uses 1 through 7 while the raw * number is 0 through 6 so increment it by 1. */ tmp_str = udev_device_get_sysattr_value(dev, "bonding/mode"); @@ -684,7 +684,7 @@ udevGetIfaceDefBond(struct udev *udev, /* bonding/arp_validate is in the format: "none 0" so we find the * space and increment the pointer to get the number and convert - * it to an interger. + * it to an integer. */ tmp_str = udev_device_get_sysattr_value(dev, "bonding/arp_validate"); if (!tmp_str) { diff --git a/src/internal.h b/src/internal.h index e181218067..c054e3ce96 100644 --- a/src/internal.h +++ b/src/internal.h @@ -490,7 +490,7 @@ enum { #endif /* Ideally callers would use the g_*printf - * functions directly but there are alot to + * functions directly but there are a lot to * convert, so until then... */ #ifndef VIR_NO_GLIB_STDIO diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 52ce3ef798..9f65cba2e8 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -10016,7 +10016,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, * @bandwidth: specify bandwidth limit; flags determine the unit * @flags: bitwise-OR of virDomainBlockJobSetSpeedFlags * - * Set the maximimum allowable bandwidth that a block job may consume. If + * Set the maximum allowable bandwidth that a block job may consume. If * bandwidth is 0, the limit will revert to the hypervisor default of * unlimited. * diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index cdec123568..ca6c2bb057 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -492,7 +492,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) * virNodeDeviceDettach: * @dev: pointer to the node device * - * Dettach the node device from the node itself so that it may be + * Detach the node device from the node itself so that it may be * assigned to a guest domain. * * Depending on the hypervisor, this may involve operations such diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0059fc2a7..a2a2abfd8d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1866,7 +1866,7 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, } /* - * dom0's maximum memory can be controled by the user with the 'dom0_mem' Xen + * dom0's maximum memory can be controlled by the user with the 'dom0_mem' Xen * command line parameter. E.g. to set dom0's initial memory to 4G and max * memory to 8G: dom0_mem=4G,max:8G * Supported unit suffixes are [bBkKmMgGtT]. If not specified the default diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a80bc3fe3a..1585d8d0b3 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1533,7 +1533,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int flags) goto endjob; } virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_WAKEUP); - /* reenable death event - libxl reports it only once */ + /* re-enable death event - libxl reports it only once */ if (priv->deathW) libxl_evdisable_domain_death(cfg->ctx, priv->deathW); if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 379d7a8d00..58b6e7bfa1 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -119,7 +119,7 @@ libvirt_progress(xentoollog_logger *logger_in G_GNUC_UNUSED, unsigned long done G_GNUC_UNUSED, unsigned long total G_GNUC_UNUSED) { - /* This function purposedly does nothing: it's no logging info */ + /* This function purposely does nothing: it's no logging info */ } static void diff --git a/src/locking/libvirt_lockd.aug b/src/locking/libvirt_lockd.aug index 6888e8e9b7..8cdb71a8a4 100644 --- a/src/locking/libvirt_lockd.aug +++ b/src/locking/libvirt_lockd.aug @@ -16,7 +16,7 @@ module Libvirt_lockd = let int_entry (kw:string) = [ key kw . value_sep . int_val ] - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = bool_entry "auto_disk_leases" | bool_entry "require_lease_for_disks" | str_entry "file_lockspace_dir" diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug index 88435902d2..184ea1f181 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -16,7 +16,7 @@ module Libvirt_sanlock = let int_entry (kw:string) = [ key kw . value_sep . int_val ] - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = str_entry "disk_lease_dir" | bool_entry "auto_disk_leases" | int_entry "host_id" diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug index 06d508e6e5..4b8224b7bc 100644 --- a/src/locking/virtlockd.aug +++ b/src/locking/virtlockd.aug @@ -30,7 +30,7 @@ module Virtlockd = | int_entry "max_clients" | int_entry "admin_max_clients" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = logging_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/logging/virtlogd.aug b/src/logging/virtlogd.aug index 04580734d6..0f1b290c72 100644 --- a/src/logging/virtlogd.aug +++ b/src/logging/virtlogd.aug @@ -32,7 +32,7 @@ module Virtlogd = | int_entry "max_size" | int_entry "max_backups" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = logging_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/lxc/libvirtd_lxc.aug b/src/lxc/libvirtd_lxc.aug index be6402cc01..0e7666a70e 100644 --- a/src/lxc/libvirtd_lxc.aug +++ b/src/lxc/libvirtd_lxc.aug @@ -28,7 +28,7 @@ module Libvirtd_lxc = | bool_entry "security_default_confined" | bool_entry "security_require_confined" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 9e879e438a..cc545f5fda 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -713,7 +713,7 @@ lxcNetworkGetParseDataByIndexLegacy(lxcNetworkParseDataArray *networks, if (ndata > 0) return networks->parseData[ndata - 1]; - /* Not able to retrive an element */ + /* Not able to retrieve an element */ return NULL; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f3d57875ad..fc59c2e5af 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -861,7 +861,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, /* If the LXC domain is suspended we send all processes a SIGKILL * and thaw them. Upon wakeup the process sees the pending signal * and dies immediately. It is guaranteed that priv->cgroup != NULL - * here because the domain has aleady been suspended using the + * here because the domain has already been suspended using the * freezer cgroup. */ if (reason == VIR_DOMAIN_SHUTOFF_DESTROYED && diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index cec99cb898..ab993438ee 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1409,7 +1409,7 @@ udevEnumerateAddMatches(struct udev_enumerate *udev_enumerate) for (i = 0; i < G_N_ELEMENTS(subsystem_ignored); i++) { const char *s = subsystem_ignored[i]; if (udev_enumerate_add_nomatch_subsystem(udev_enumerate, s) < 0) { - virReportSystemError(errno, "%s", _("failed to add susbsystem filter")); + virReportSystemError(errno, "%s", _("failed to add subsystem filter")); return -1; } } diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 6fa48c06e3..609567664f 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -90,7 +90,7 @@ struct _qemuAgentMessage { bool finished; /* true for sync command */ bool sync; - /* id of the issued sync comand */ + /* id of the issued sync command */ unsigned long long id; bool first; }; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 435c945b78..0039bc0e9f 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -519,7 +519,7 @@ qemuBlockJobRefreshJobs(virQEMUDriverPtr driver, /* try cancelling invalid jobs - this works only if the job is not * concluded. In such case it will fail. We'll leave such job linger * in qemu and just forget about it in libvirt because there's not much - * we coud do besides killing the VM */ + * we could do besides killing the VM */ if (job->invalidData) { qemuBlockJobMarkBroken(job); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8d5b76d9ec..eb86cd9e81 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -615,7 +615,7 @@ typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData; typedef virQEMUCapsHostCPUData *virQEMUCapsHostCPUDataPtr; struct _virQEMUCapsHostCPUData { /* Only the "info" part is stored in the capabilities cache, the rest is - * re-computed from other fields and external data sources everytime we + * re-computed from other fields and external data sources every time we * probe QEMU or load the cache. */ qemuMonitorCPUModelInfoPtr info; @@ -5280,7 +5280,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasicArch(qemuCaps); - /* initiate all capapbilities based on qemu version */ + /* initiate all capabilities based on qemu version */ virQEMUCapsInitQMPVersionCaps(qemuCaps); if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7f215b4cc6..7b497f5330 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -806,7 +806,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, /* qemuBuildTLSx509BackendProps: * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @listen: boolean listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @alias: alias for the TLS credentials object * @secalias: if one exists, the alias of the security object for passwordid @@ -847,7 +847,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, /* qemuBuildTLSx509CommandLine: * @cmd: Pointer to command * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @listen: boolean listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @certEncSecretAlias: alias of a 'secret' object for decrypting TLS private key * (optional) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 30d7c61cf9..4762f2a88a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1646,7 +1646,7 @@ qemuSharedDeviceEntryRemove(virQEMUDriverPtr driver, if (!(entry = virHashLookup(driver->sharedDevices, key))) return -1; - /* Nothing to do if the shared disk is not recored in the table. */ + /* Nothing to do if the shared disk is not recorded in the table. */ if (!qemuSharedDeviceEntryDomainExists(entry, name, &idx)) return 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 42cc78ac1b..befe95f819 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4931,7 +4931,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && qemuCaps) { /* Pick a suitable default model for the USB controller if none * has been selected by the user and we have the qemuCaps for - * figuring out which contollers are supported. + * figuring out which controllers are supported. * * We rely on device availability instead of setting the model * unconditionally because, for some machine types, there's a @@ -8193,7 +8193,7 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) * @mem: memory device definition object * * Aligns the size of the memory module as qemu enforces it. The size is updated - * inplace. Default rounding is now to 1 MiB (qemu requires rouding to page, + * inplace. Default rounding is now to 1 MiB (qemu requires rounding to page, * size so this should be safe). */ int @@ -9307,7 +9307,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, if (vm->def->virtType == VIR_DOMAIN_VIRT_QEMU) return 0; - /* The halted state is interresting only on s390(x). On other platforms + /* The halted state is interesting only on s390(x). On other platforms * the data would be stale at the time when it would be used. * Calling qemuMonitorGetCpuHalted() can adversely affect the running * VM's performance unless QEMU supports query-cpus-fast. @@ -9402,7 +9402,7 @@ qemuDomainDiskByName(virDomainDefPtr def, * * Validate whether the disk source is valid for disk device='lun'. * - * Returns 0 if the configuration is valid -1 and a libvirt error if the soure + * Returns 0 if the configuration is valid -1 and a libvirt error if the source * is invalid. */ int diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index d2a0bd9c02..058cbda2a2 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2580,7 +2580,7 @@ qemuDomainAddressFindNewBusNr(virDomainDefPtr def) * never need any additional child buses (probably only a few of the * 32 will ever be used). So for pci-expander-bus we find the lowest * existing busNr, and set this one to the current lowest - 2 (one - * for the pxb, one for the intergrated pci-bridge), thus leaving the + * for the pxb, one for the integrated pci-bridge), thus leaving the * maximum possible bus numbers available for other buses plugged * into pci-root (i.e. pci-bridges and other * pci-expander-buses). Anyone who needs more than 32 devices diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd8d7ffb56..63b54e9f7b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6432,7 +6432,7 @@ qemuDomainDelIOThread(virDomainPtr dom, * * Alter the specified @iothread_id with the values provided. * - * Returs 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ static int qemuDomainSetIOThreadParams(virDomainPtr dom, @@ -6770,7 +6770,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, } if (header->version > QEMU_SAVE_VERSION) { - /* convert endianess and try again */ + /* convert endianness and try again */ bswap_header(header); } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3954ad1109..e897c059dd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -62,7 +62,7 @@ VIR_LOG_INIT("qemu.qemu_hotplug"); #define CHANGE_MEDIA_TIMEOUT 5000 -/* Timeout in miliseconds for device removal. PPC64 domains +/* Timeout in milliseconds for device removal. PPC64 domains * can experience a bigger delay in unplug operations during * heavy guest activity (vcpu being the most notable case), thus * the timeout for PPC64 is also bigger. */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13427c1203..ee3371c098 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3288,7 +3288,7 @@ static void qemuMigrationSrcIOFunc(void *arg) virErrorRestore(&err); error: - /* Let the source qemu know that the transfer cant continue anymore. + /* Let the source qemu know that the transfer can't continue anymore. * Don't copy the error for EPIPE as destination has the actual error. */ VIR_FORCE_CLOSE(data->sock); if (!virLastErrorIsSystemErrno(EPIPE)) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5033cbeabf..4b7e6e4e90 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4340,7 +4340,7 @@ qemuMonitorSetWatchdogAction(qemuMonitorPtr mon, * @jobname: name of the job * @props: JSON object describing the blockdev to add * - * Instructs qemu to create/format a new stroage or format layer. Note that + * Instructs qemu to create/format a new storage or format layer. Note that * the job does not add the created/formatted image into qemu and * qemuMonitorBlockdevAdd needs to be called separately with corresponding * arguments. Note that the arguments for creating and adding are different. diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index e6b5ea3763..a793ae74dd 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -403,12 +403,12 @@ virQEMUQAPISchemaTraverse(const char *baseName, * '*subattribute': same as above but the selected member must be optional * (has a property named 'default' in the schema) * '+variant": In the case of unionized objects, select a specific variant of - * the prevously selected member + * the previously selected member * * - Boolean queries - @entry remains NULL, return value indicates success: * '^enumval': returns true if the previously selected enum contains 'enumval' * '!basictype': returns true if previously selected type is of 'basictype' - * JSON type. Spported are 'null', 'string', 'number', 'value', + * JSON type. Supported are 'null', 'string', 'number', 'value', * 'int' and 'boolean. * '$feature': returns true if the previously selected type supports 'feature' * ('feature' is in the 'features' array of given type) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 3b6d6e91f4..f93d189df9 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -455,7 +455,7 @@ qemuSecurityRestoreChardevLabel(virQEMUDriverPtr driver, * @existstatus: pointer to int returning exit status of process * @cmdret: pointer to int returning result of virCommandRun * - * Start the vhost-user-gpu process with approriate labels. + * Start the vhost-user-gpu process with appropriate labels. * This function returns -1 on security setup error, 0 if all the * setup was done properly. In case the virCommand failed to run * 0 is returned but cmdret is set appropriately with the process diff --git a/src/remote/libvirtd.aug.in b/src/remote/libvirtd.aug.in index 23a01c41e2..61ea8067b9 100644 --- a/src/remote/libvirtd.aug.in +++ b/src/remote/libvirtd.aug.in @@ -91,7 +91,7 @@ module @DAEMON_NAME_UC@ = | str_entry "host_uuid_source" | int_entry "ovs_timeout" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = sock_acl_entry | authentication_entry @CUT_ENABLE_IP@ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 67b86cff78..85ca78a261 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1931,7 +1931,7 @@ void *remoteClientNew(virNetServerClientPtr client, * stateless ones inside libvirt.so). All the interesting * drivers are in separate daemons. Thus when we get a NULL * URI we need to simulate probing that virConnectOpen would - * previously do. We use the existance of the UNIX domain + * previously do. We use the existence of the UNIX domain * socket as our hook for probing. * * This assumes no stale sockets left over from a now dead diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 0a566eaa54..9c0875ef9f 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -598,7 +598,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSessionPtr sess, VIR_DEBUG("sess=%p", sess); if (priv->password) { - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = ssh_userauth_password(sess->session, NULL, priv->password)) == 0) return SSH_AUTH_SUCCESS; @@ -621,7 +621,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSessionPtr sess, sess->hostname))) return SSH_AUTH_ERROR; - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = ssh_userauth_password(sess->session, NULL, password)) == 0) return SSH_AUTH_SUCCESS; diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 8df92fb8df..f8d7fe85ed 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -354,7 +354,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, * * This method is used to dispatch a message representing an * incoming method call from a client. It decodes the payload - * to obtain method call arguments, invokves the method and + * to obtain method call arguments, invokes the method and * then sends a reply packet with the return values * * Returns 0 if the reply was sent, or -1 upon fatal error diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index b4dea15452..752c3fc915 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -681,7 +681,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, VIR_DEBUG("sess=%p", sess); if (priv->password) { - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = libssh2_userauth_password(sess->session, priv->username, priv->password)) == 0) { @@ -705,7 +705,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, sess->hostname))) goto cleanup; - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = libssh2_userauth_password(sess->session, priv->username, password)) == 0) { diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 1ec1d13625..666a7a91e8 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2403,7 +2403,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virCheckFlags(VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM, -1); /* if volume has target format VIR_STORAGE_FILE_PLOOP * we need to restore DiskDescriptor.xml, according to - * new contents of volume. This operation will be perfomed + * new contents of volume. This operation will be performed * when volUpload is fully finished. */ if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { /* Fail if the volume contains snapshots or we failed to check it.*/ @@ -2989,7 +2989,7 @@ virStorageBackendBLKIDFindPart(blkid_probe probe, * however, the blkid_do_probe for "dvh" returns "sgi" and * for "pc98" it returns "dos". Although "bsd" is recognized, * it seems that the parted created partition table is not being - * properly recogized. Since each of these will cause problems + * properly recognized. Since each of these will cause problems * with startup comparison, let's just treat them as UNKNOWN causing * the caller to fallback to using PARTED */ if (STREQ(format, "dvh") || STREQ(format, "pc98") || STREQ(format, "bsd")) diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index b66b1f2b23..e035135c1c 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -39,7 +39,7 @@ typedef virBuffer *virBufferPtr; * VIR_BUFFER_INIT_CHILD: * @parentbuf: parent buffer for XML element formatting * - * Intitialize a virBuffer structure and set up the indentation level for + * Initialize a virBuffer structure and set up the indentation level for * formatting XML subelements of @parentbuf. */ #define VIR_BUFFER_INIT_CHILD(parentbuf) { NULL, (parentbuf)->indent + 2 } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index aae0ddb730..f87400fc38 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1426,7 +1426,7 @@ virCommandAddEnvBuffer(virCommandPtr cmd, virBufferPtr buf) * @name: the name to look up in current environment * * Pass an environment variable to the child - * using current process' value + * using current process's value */ void virCommandAddEnvPass(virCommandPtr cmd, const char *name) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 818219fbeb..b0f180cd85 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -868,7 +868,7 @@ dnsmasqCapsGet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag) * * Turns a vector of dnsmasqDhcpHost into the string that is ought to be * stored in the hostsfile, this functionality is split to make hostsfiles - * testable. Returs NULL if nhosts is 0. + * testable. Returns NULL if nhosts is 0. */ char * dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 39bbcf8ca8..c9a9b016a9 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -663,7 +663,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, * subcore will vary accordingly to 8, 4 and 2 respectively. * So, On host threads_per_core what is arrived at from sysfs in the * current logic is actually the subcores_per_core. Threads per subcore - * can only be obtained from the kvm device. For example, on P8 wih 1 + * can only be obtained from the kvm device. For example, on P8 with 1 * core having 8 threads, sub_cores_percore=4, the threads 0,2,4 & 6 * will be online. The sysfs reflects this and in the current logic * variable 'threads' will be 4 which is nothing but subcores_per_core. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 1d024b8b97..41dc5bd4c4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1067,7 +1067,7 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, * * https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html * - * Returns true if devpath's susbsystem is pci, false otherwise. + * Returns true if devpath's subsystem is pci, false otherwise. */ static bool virNetDevIsPCIDevice(const char *devpath) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index dbb489d174..45fbf3f360 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -35,7 +35,7 @@ VIR_LOG_INIT("util.netdevopenvswitch"); /* - * Set openvswitch default timout + * Set openvswitch default timeout */ static unsigned int virNetDevOpenvswitchTimeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT; @@ -473,7 +473,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) * @path: the path of the unix socket * @ifname: the retrieved name of the interface * - * Retreives the ovs ifname from vhostuser unix socket path. + * Retrieves the ovs ifname from vhostuser unix socket path. * * Returns: 1 if interface is an openvswitch interface, * 0 if it is not, but no other error occurred, diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 7bd30ea0f9..c0a7c3019e 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -515,7 +515,7 @@ virNetDevTapAttachBridge(const char *tapname, * the bridge, or if it is smaller than the current MTU of the * bridge). If MTU isn't specified for the new device (i.e. 0), * we need to set the interface MTU to the current MTU of the - * bridge (to avoid inadvertantly changing the bridge's MTU). + * bridge (to avoid inadvertently changing the bridge's MTU). */ if (mtu > 0) { if (virNetDevSetMTU(tapname, mtu) < 0) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 321ddeb7e3..c3626189b9 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -110,7 +110,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, /** - * This array convertor is for quirky cases where the QMP schema mandates an + * This array converter is for quirky cases where the QMP schema mandates an * array of objects with only one attribute 'str' which needs to be formatted as * repeated key-value pairs without the 'str' being printed: * diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index e17f6bd1bd..f77adcfd6d 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1412,7 +1412,7 @@ virResctrlAllocGetID(virResctrlAllocPtr alloc) * * MB:0=100;1=100 * - * which indicates node id 0 has 100 percent bandwith and node id 1 + * which indicates node id 0 has 100 percent bandwidth and node id 1 * has 100 percent bandwidth. A trailing semi-colon is not formatted. */ static int diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index db84339bda..1e993ec53f 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -1002,7 +1002,7 @@ virSysinfoParseOEMStrings(const char *base, /* If OEM String contains newline, dmidecode escapes it as a dot. * If this is the case then run dmidecode again to get raw string. - * Unfortunately, we can't dinstinguish betwen dot an new line at + * Unfortunately, we can't dinstinguish between dot an new line at * this level. */ if (memchr(cur, '.', eol - cur)) { char *str; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 1d41ed34f7..9227b7aeba 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -916,7 +916,7 @@ virSystemdActivationNew(virSystemdActivationMap *map, * * Acquire an object for handling systemd activation. * If no activation FDs have been provided the returned object - * will be NULL, indicating normal sevice setup can be performed + * will be NULL, indicating normal service setup can be performed * If the returned object is non-NULL then at least one file * descriptor will be present. No normal service setup should * be performed. diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 71c1a2ecb3..1a3b5a05aa 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -89,7 +89,7 @@ virTPMCreateCancelPath(const char *devpath) /* * executables for the swtpm; to be found on the host along with - * capabilties bitmap + * capabilities bitmap */ static virMutex swtpm_tools_lock = VIR_MUTEX_INITIALIZER; static char *swtpm_path; diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index 6144714477..8b1fb2ac30 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -34,7 +34,7 @@ * vbox_CAPI_v*.h, or it would cause multiple * definitions. * - * You can see the more informations in vbox_api.h + * You can see the more information in vbox_api.h */ /* Copied definitions from vbox_CAPI_*.h. diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index cf273b9a48..dafbc114f6 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -439,7 +439,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); /* Currently support only one dhcp server per network - * with contigious address space from start to end + * with contiguous address space from start to end */ addr = ipdef->ranges[0].addr; if ((ipdef->nranges >= 1) && @@ -834,7 +834,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) gVBoxAPI.UIDHCPServer.GetLowerIP(dhcpServer, &fromIPAddressUtf16); gVBoxAPI.UIDHCPServer.GetUpperIP(dhcpServer, &toIPAddressUtf16); /* Currently virtualbox supports only one dhcp server per network - * with contigious address space from start to end + * with contiguous address space from start to end */ addr = ipdef->ranges[0].addr; if (vboxSocketParseAddrUtf16(data, ipAddressUtf16, diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 3876955981..5c3269b825 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -877,7 +877,7 @@ virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfMachinePtr machine, if (snapshot->nchildren > 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("This snapshot has children, " - "please delete theses snapshots before")); + "please delete these snapshots before")); return -1; } @@ -1387,7 +1387,7 @@ virVBoxSnapshotConfHardDiskUuidByLocation(virVBoxSnapshotConfMachinePtr machine, return hardDisk->uuid; } -/*Retreive the whole ancestry of the vboxSnapshotXmlHardDiskPtr whose location is +/*Retrieve the whole ancestry of the vboxSnapshotXmlHardDiskPtr whose location is *'location', and store them in a newly allocated list of vboxSnapshotXmlHardDiskPtr. *This list begins with the requested disk, and ends with the farthest ancestor. *return array length on success, -1 on failure.*/ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index a1a462cc74..a8ffd9f148 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1556,7 +1556,7 @@ _vrdeServerGetPorts(vboxDriverPtr data, IVRDEServer *VRDEServer, char *portUtf8 = NULL; /* get active (effective) port - available only when VM is running and has - * the VBOX extensions installed (without extenstions RDP server + * the VBOX extensions installed (without extensions RDP server * functionality is disabled) */ port = vboxGetActiveVRDEServerPort(data->vboxSession, machine); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 67bbe27fde..b9130d0902 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -888,7 +888,7 @@ virVMXSCSIDiskNameToControllerAndUnit(const char *name, int *controller, int *un *controller = idx / 15; *unit = idx % 15; - /* Skip the controller ifself at unit 7 */ + /* Skip the controller itself at unit 7 */ if (*unit >= 7) ++(*unit); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d882b91def..8d11719e7a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2628,7 +2628,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, if (vzEnsureDomainExists(dom) < 0) goto cleanup; - /* snaphot name is ignored, it will be set to auto generated by sdk uuid */ + /* snapshot name is ignored, it will be set to auto generated by sdk uuid */ if (prlsdkCreateSnapshot(dom, def->parent.description) < 0) goto cleanup; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9cee6f1fde..b5e69b385f 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2073,7 +2073,7 @@ prlsdkNewStateToEvent(VIRTUAL_MACHINE_STATE domainState, int *lvEventTypeDetails) { /* We skip all intermediate states here, because - * libvirt doesn't have correspoding event types for + * libvirt doesn't have corresponding event types for * them */ switch ((int)domainState) { case VMS_STOPPED: @@ -2549,7 +2549,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) /* * Though we don't support NUMA configuration at the moment * virDomainDefPtr always contain non zero NUMA configuration - * So, just make sure this configuration does't differ from auto generated. + * So, just make sure this configuration doesn't differ from auto generated. */ if ((virDomainNumatuneGetMode(def->numa, -1, &memMode) == 0 && memMode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) || -- 2.20.1