diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 10:06:50 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 10:06:50 -0500 |
| commit | 82ac96a72b860f6a4f125edd12f85cb21b3d66bf (patch) | |
| tree | d0df62dba6fa89870cb1cbafdc412ba2c0b81446 /qga/commands-posix.c | |
| parent | 90ca64a970b1d10352df3b2c68099341e900abe9 (diff) | |
| parent | b65ee4fa29ebfffb96a3ea983c97a664d30efd3f (diff) | |
| download | qemu-82ac96a72b860f6a4f125edd12f85cb21b3d66bf.tar.gz | |
Merge remote-tracking branch 'sweil/for-1.1' into staging
* sweil/for-1.1:
qemu-doc: Use QEMU instead of qemu for product name
qemu-doc: Fix executable name in examples
qemu-doc: Add missing parameter in description of -D option
configure: Use QEMU instead of Qemu
fix some common typos
qemu-timer: Fix wrong error message
Diffstat (limited to 'qga/commands-posix.c')
| -rw-r--r-- | qga/commands-posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |