diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | coroutine-sigaltstack.c | 2 | ||||
| -rw-r--r-- | disas.c | 2 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 4 | ||||
| -rw-r--r-- | qapi-schema-guest.json | 2 | ||||
| -rw-r--r-- | qemu-ga.c | 2 | ||||
| -rw-r--r-- | qga/commands-posix.c | 4 | ||||
| -rw-r--r-- | tests/tcg/test-mmap.c | 2 |
8 files changed, 10 insertions, 10 deletions
@@ -447,7 +447,7 @@ version 0.5.0: - multi-target build - fixed: no error code in hardware interrupts - fixed: pop ss, mov ss, x and sti disable hardware irqs for the next insn - - correct single stepping thru string operations + - correct single stepping through string operations - preliminary SPARC target support (Thomas M. Ogrisegg) - tun-fd option (Rusty Russell) - automatic IDE geometry detection diff --git a/coroutine-sigaltstack.c b/coroutine-sigaltstack.c index 7ff2d3379e..7fa2e85540 100644 --- a/coroutine-sigaltstack.c +++ b/coroutine-sigaltstack.c @@ -257,7 +257,7 @@ static Coroutine *coroutine_new(void) /* * Now enter the trampoline again, but this time not as a signal * handler. Instead we jump into it directly. The functionally - * redundant ping-pong pointer arithmentic is neccessary to avoid + * redundant ping-pong pointer arithmetic is necessary to avoid * type-conversion warnings related to the `volatile' qualifier and * the fact that `jmp_buf' usually is an array type. */ @@ -51,7 +51,7 @@ perror_memory (int status, bfd_vma memaddr, struct disassemble_info *info) "Address 0x%" PRIx64 " is out of bounds.\n", memaddr); } -/* This could be in a separate file, to save miniscule amounts of space +/* This could be in a separate file, to save minuscule amounts of space in statically linked executables. */ /* Just print the address is hex. This is included for completeness even diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 4ff4d40a8c..e759c996ce 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1091,8 +1091,8 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val) break; case USBSTS: - val &= USBSTS_RO_MASK; // bits 6 thru 31 are RO - ehci_clear_usbsts(s, val); // bits 0 thru 5 are R/WC + val &= USBSTS_RO_MASK; // bits 6 through 31 are RO + ehci_clear_usbsts(s, val); // bits 0 through 5 are R/WC val = s->usbsts; ehci_set_interrupt(s, 0); break; diff --git a/qapi-schema-guest.json b/qapi-schema-guest.json index d7a073ee70..692b570675 100644 --- a/qapi-schema-guest.json +++ b/qapi-schema-guest.json @@ -18,7 +18,7 @@ # lexer/tokenizer/parser state should be flushed/reset in # preparation for reliably receiving the subsequent response. As # an optimization, clients may opt to ignore all data until a -# sentinel value is receiving to avoid unecessary processing of +# sentinel value is receiving to avoid unnecessary processing of # stale data. # # Similarly, clients should also precede this *request* @@ -304,7 +304,7 @@ static void ga_disable_non_whitelisted(void) g_free(list_head); } -/* [re-]enable all commands, except those explictly blacklisted by user */ +/* [re-]enable all commands, except those explicitly blacklisted by user */ static void ga_enable_non_blacklisted(GList *blacklist) { char **list_head, **list; diff --git a/qga/commands-posix.c b/qga/commands-posix.c index d58730ad80..e448431c66 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -487,7 +487,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) * was returned the filesystem was *not* unfrozen by that particular * call. * - * since multiple preceeding FIFREEZEs require multiple calls to FITHAW + * since multiple preceding FIFREEZEs require multiple calls to FITHAW * to unfreeze, continuing issuing FITHAW until an error is returned, * in which case either the filesystem is in an unfreezable state, or, * more likely, it was thawed previously (and remains so afterward). @@ -789,7 +789,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) strncpy(ifr.ifr_name, info->value->name, IF_NAMESIZE); if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { snprintf(err_msg, sizeof(err_msg), - "failed to get MAC addres of %s: %s", + "failed to get MAC address of %s: %s", ifa->ifa_name, strerror(errno)); error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); diff --git a/tests/tcg/test-mmap.c b/tests/tcg/test-mmap.c index c67174a260..c418b67660 100644 --- a/tests/tcg/test-mmap.c +++ b/tests/tcg/test-mmap.c @@ -3,7 +3,7 @@ * * When running qemu-linux-user with the -p flag, you may need to tell * this test program about the pagesize because getpagesize() will not reflect - * the -p choice. Simply pass one argument beeing the pagesize. + * the -p choice. Simply pass one argument being the pagesize. * * Copyright (c) 2007 AXIS Communications AB * Written by Edgar E. Iglesias. |