The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=0dc159ced7183e969a3b0be9f3f4411e5768e32a

commit 0dc159ced7183e969a3b0be9f3f4411e5768e32a
Author:     Elyes Haouas <ehao...@noos.fr>
AuthorDate: 2023-06-01 23:41:31 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2023-06-02 02:33:38 +0000

    bhyve: Fix typos
    
    Signed-off-by: Elyes Haouas <ehao...@noos.fr>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/653
---
 usr.sbin/bhyve/acpi.c           | 2 +-
 usr.sbin/bhyve/bhyverun.c       | 2 +-
 usr.sbin/bhyve/config.c         | 2 +-
 usr.sbin/bhyve/net_backends.h   | 2 +-
 usr.sbin/bhyve/pci_nvme.c       | 4 ++--
 usr.sbin/bhyve/pci_virtio_net.c | 2 +-
 usr.sbin/bhyve/usb_emul.h       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index fcf6858f40b9..c8fc65cb3b6e 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -422,7 +422,7 @@ basl_make_templates(void)
 
        if (!err) {
                /*
-                * len has been intialized (and maybe adjusted) above
+                * len has been initialized (and maybe adjusted) above
                 */
                if ((len + sizeof(BHYVE_ASL_TEMPLATE) + 1 +
                     sizeof(BHYVE_ASL_SUFFIX)) < MAXPATHLEN) {
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index ef5968ba6385..df9e1924a525 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -1503,7 +1503,7 @@ main(int argc, char *argv[])
        }
 
        /*
-        * Exit if a device emulation finds an error in its initilization
+        * Exit if a device emulation finds an error in its initialization
         */
        if (init_pci(ctx) != 0) {
                perror("device emulation initialization error");
diff --git a/usr.sbin/bhyve/config.c b/usr.sbin/bhyve/config.c
index ba51f81dd011..c844d30f2f74 100644
--- a/usr.sbin/bhyve/config.c
+++ b/usr.sbin/bhyve/config.c
@@ -144,7 +144,7 @@ set_config_value_node(nvlist_t *parent, const char *name, 
const char *value)
                nvlist_free_string(parent, name);
        else if (nvlist_exists(parent, name))
                errx(4,
-                   "Attemping to add value %s to existing node %s of list %p",
+                   "Attempting to add value %s to existing node %s of list %p",
                    value, name, parent);
        nvlist_add_string(parent, name, value);
 }
diff --git a/usr.sbin/bhyve/net_backends.h b/usr.sbin/bhyve/net_backends.h
index 844024e7bc9d..cc8c7b5cff32 100644
--- a/usr.sbin/bhyve/net_backends.h
+++ b/usr.sbin/bhyve/net_backends.h
@@ -55,7 +55,7 @@ void  netbe_rx_enable(net_backend_t *be);
 
 /*
  * Network device capabilities taken from the VirtIO standard.
- * Despite the name, these capabilities can be used by different frontents
+ * Despite the name, these capabilities can be used by different frontends
  * (virtio-net, ptnet) and supported by different backends (netmap, tap, ...).
  */
 #define        VIRTIO_NET_F_CSUM       (1 <<  0) /* host handles partial cksum 
*/
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index f3f10cba7502..de5865220155 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -1914,7 +1914,7 @@ nvme_opc_format_nvm(struct pci_nvme_softc* sc, struct 
nvme_command* command,
                return (1);
        }
 
-       /* Doesn't support Protection Infomation */
+       /* Doesn't support Protection Information */
        pi = (command->cdw10 >> 5) & 0x7;
        if (pi != 0) {
                pci_nvme_status_genc(&compl->status, NVME_SC_INVALID_FIELD);
@@ -2124,7 +2124,7 @@ pci_nvme_handle_admin_cmd(struct pci_nvme_softc* sc, 
uint64_t value)
  *
  * NVMe defines "data unit" as thousand's of 512 byte blocks and is rounded up.
  * E.g. 1 data unit is 1 - 1,000 512 byte blocks. 3 data units are 2,001 - 
3,000
- * 512 byte blocks. Rounding up is acheived by initializing the remainder to 
999.
+ * 512 byte blocks. Rounding up is achieved by initializing the remainder to 
999.
  */
 static void
 pci_nvme_stats_write_read_update(struct pci_nvme_softc *sc, uint8_t opc,
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 9af5854037fe..dd60c5a89523 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -787,7 +787,7 @@ pci_vtnet_snapshot(void *vsc, struct vm_snapshot_meta *meta)
        SNAPSHOT_VAR_OR_LEAVE(sc->vsc_features, meta, ret, done);
        SNAPSHOT_VAR_OR_LEAVE(sc->features_negotiated, meta, ret, done);
 
-       /* Force reapply negociated features at restore time */
+       /* Force reapply negotiated features at restore time */
        if (meta->op == VM_SNAPSHOT_RESTORE &&
            sc->features_negotiated) {
                pci_vtnet_neg_features(sc, sc->vsc_features);
diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h
index 1d713bc55cdc..b2122d6b7e13 100644
--- a/usr.sbin/bhyve/usb_emul.h
+++ b/usr.sbin/bhyve/usb_emul.h
@@ -91,7 +91,7 @@ struct usb_hci {
 
 /*
  * Each xfer block is mapped to the hci transfer block.
- * On input into the device handler, blen is set to the lenght of buf.
+ * On input into the device handler, blen is set to the length of buf.
  * The device handler is to update blen to reflect on the residual size
  * of the buffer, i.e. len(buf) - len(consumed).
  */

Reply via email to