[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] qemu-ga: qmp_guest_network_get_interfaces():
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 08/12] qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set() |
Date: |
Tue, 8 Jan 2013 17:00:05 -0600 |
From: Luiz Capitulino <address@hidden>
Convert them to error_setg_errno().
Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/commands-posix.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index fa786e5..9b6ef17 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -802,12 +802,9 @@ GuestNetworkInterfaceList
*qmp_guest_network_get_interfaces(Error **errp)
{
GuestNetworkInterfaceList *head = NULL, *cur_item = NULL;
struct ifaddrs *ifap, *ifa;
- char err_msg[512];
if (getifaddrs(&ifap) < 0) {
- snprintf(err_msg, sizeof(err_msg),
- "getifaddrs failed: %s", strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno, "getifaddrs failed");
goto error;
}
@@ -843,20 +840,16 @@ GuestNetworkInterfaceList
*qmp_guest_network_get_interfaces(Error **errp)
/* we haven't obtained HW address yet */
sock = socket(PF_INET, SOCK_STREAM, 0);
if (sock == -1) {
- snprintf(err_msg, sizeof(err_msg),
- "failed to create socket: %s", strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno, "failed to create socket");
goto error;
}
memset(&ifr, 0, sizeof(ifr));
pstrcpy(ifr.ifr_name, IF_NAMESIZE, info->value->name);
if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) {
- snprintf(err_msg, sizeof(err_msg),
- "failed to get MAC address of %s: %s",
- ifa->ifa_name,
- strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno,
+ "failed to get MAC address of %s",
+ ifa->ifa_name);
goto error;
}
@@ -867,9 +860,7 @@ GuestNetworkInterfaceList
*qmp_guest_network_get_interfaces(Error **errp)
(int) mac_addr[0], (int) mac_addr[1],
(int) mac_addr[2], (int) mac_addr[3],
(int) mac_addr[4], (int) mac_addr[5]) == -1) {
- snprintf(err_msg, sizeof(err_msg),
- "failed to format MAC: %s", strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno, "failed to format MAC");
goto error;
}
@@ -884,9 +875,7 @@ GuestNetworkInterfaceList
*qmp_guest_network_get_interfaces(Error **errp)
address_item->value = g_malloc0(sizeof(*address_item->value));
p = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) {
- snprintf(err_msg, sizeof(err_msg),
- "inet_ntop failed : %s", strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno, "inet_ntop failed");
goto error;
}
@@ -906,9 +895,7 @@ GuestNetworkInterfaceList
*qmp_guest_network_get_interfaces(Error **errp)
address_item->value = g_malloc0(sizeof(*address_item->value));
p = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) {
- snprintf(err_msg, sizeof(err_msg),
- "inet_ntop failed : %s", strerror(errno));
- error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg);
+ error_setg_errno(errp, errno, "inet_ntop failed");
goto error;
}
--
1.7.9.5
- [Qemu-devel] [PULL 0/12] qemu-ga: error handling improvements and fsfreeze hooks, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 01/12] qemu-ga: guest_file_handle_find(): take an Error argument, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 02/12] qemu-ga: qmp_guest_file_close(): fix fclose() error check, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 03/12] qemu-ga: qmp_guest_file_*: improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 04/12] qemu-ga: qmp_guest_shutdown(): improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 05/12] qemu-ga: build_fs_mount_list(): take an Error argument, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 06/12] qemu-ga: qmp_guest_fsfreeze_*(): get rid of sprintf() + error_set(), Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 08/12] qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set(),
Michael Roth <=
- [Qemu-devel] [PATCH 09/12] qemu-ga: bios_supports_mode(): improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 07/12] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set(), Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 10/12] qemu-ga: guest_suspend(): improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 11/12] qemu-ga: execute hook to quiesce the guest on fsfreeze-freeze/thaw, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 12/12] qemu-ga: sample fsfreeze hooks, Michael Roth, 2013/01/08
- Re: [Qemu-devel] [PULL 0/12] qemu-ga: error handling improvements and fsfreeze hooks, Anthony Liguori, 2013/01/09