mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga-pull-2024-11-07

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmcslmgACgkQ711egWG6
 hOeFDA//WTmLNpE2gvi6BdG5+2LsjG6eZdwW4sPczaXwU66Q6yrT2WXJD6I5Nztx
 kzB+8HUruLEh94sDn0+n5SFewcS0ffpydJ5OLDuq01BZZdhyRG7WaF0IaOEu6wup
 egEk6dRgOCSorNB6Tspqt00b/nzVpmHA983oWUR1fhhAsl6w5Nnw/pjDyFqbOOkd
 HxlBcIlINXznP0YBqbj9YE1KoJGXe/pDgPWJWBQC5bIhLiYvhGEbdOTnj6aiS8fL
 rd3+yBnw9aek2dGEnmHkbHI8ZR3n+sDcq5nBi/iMgQgBSO6lWgZlAJGI2KZL7+qj
 KUdvPovplU8lY9u/5UTJIba9YACQfr8fRc6stHNipccVsry1bANY8M/BgR4k7RAd
 cDyc4Lm3a3Z7EGWJsbQzOh6YFmheQ+BosgSEdj1JB21Ox2by0Nq4NZmy4VIH8hZS
 GbQ8ndWJyegxFuiw/veM8ihlSWnPwifNGQfKIg3+w1gZwGWHsPBFH9s3F2DLXBST
 2fRF+9jXbGaYvZO2l1ooBLI0kdnbJ/xHCR4A6MVKiCPJD+kXVnNbwrFS9QZwccNy
 932esfb2Zl5Si7Mwa3oapJlTdMAhLIXSuFTJGGmx+WD8aaQXsml8e9p6g+wSWxxk
 3OMcphiCdcOpxyV1WwF5RIharrnlBzLxKxfK2Qm6O9kz+ju+3oM=
 =Vixy
 -----END PGP SIGNATURE-----

Merge tag 'qga-pull-2024-11-07' of https://github.com/kostyanf14/qemu into staging

qga-pull-2024-11-07

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmcslmgACgkQ711egWG6
# hOeFDA//WTmLNpE2gvi6BdG5+2LsjG6eZdwW4sPczaXwU66Q6yrT2WXJD6I5Nztx
# kzB+8HUruLEh94sDn0+n5SFewcS0ffpydJ5OLDuq01BZZdhyRG7WaF0IaOEu6wup
# egEk6dRgOCSorNB6Tspqt00b/nzVpmHA983oWUR1fhhAsl6w5Nnw/pjDyFqbOOkd
# HxlBcIlINXznP0YBqbj9YE1KoJGXe/pDgPWJWBQC5bIhLiYvhGEbdOTnj6aiS8fL
# rd3+yBnw9aek2dGEnmHkbHI8ZR3n+sDcq5nBi/iMgQgBSO6lWgZlAJGI2KZL7+qj
# KUdvPovplU8lY9u/5UTJIba9YACQfr8fRc6stHNipccVsry1bANY8M/BgR4k7RAd
# cDyc4Lm3a3Z7EGWJsbQzOh6YFmheQ+BosgSEdj1JB21Ox2by0Nq4NZmy4VIH8hZS
# GbQ8ndWJyegxFuiw/veM8ihlSWnPwifNGQfKIg3+w1gZwGWHsPBFH9s3F2DLXBST
# 2fRF+9jXbGaYvZO2l1ooBLI0kdnbJ/xHCR4A6MVKiCPJD+kXVnNbwrFS9QZwccNy
# 932esfb2Zl5Si7Mwa3oapJlTdMAhLIXSuFTJGGmx+WD8aaQXsml8e9p6g+wSWxxk
# 3OMcphiCdcOpxyV1WwF5RIharrnlBzLxKxfK2Qm6O9kz+ju+3oM=
# =Vixy
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 07 Nov 2024 10:28:56 GMT
# gpg:                using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7
# gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) <kkostiuk@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C2C2 C109 EA43 C63C 1423  EB84 EF5D 5E81 61BA 84E7

* tag 'qga-pull-2024-11-07' of https://github.com/kostyanf14/qemu:
  qemu-ga: Avoiding freeing line prematurely
  qemu-ga: Optimize var declaration and definition
  qemu-ga: Add 'Null' check and Redefine 'route'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-11-07 20:45:16 +00:00
commit 080c8f2df7
1 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
qga/commands-linux.c
View File

@ -2093,26 +2093,28 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)
return head; return head;
} }
static char *hexToIPAddress(const void *hexValue, int is_ipv6) static char *hex_to_ip_address(const void *hex_value, int is_ipv6)
{ {
if (is_ipv6) { if (is_ipv6) {
char addr[INET6_ADDRSTRLEN]; char addr[INET6_ADDRSTRLEN];
struct in6_addr in6; struct in6_addr in6;
const char *hexStr = (const char *)hexValue; const char *hex_str = (const char *)hex_value;
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
sscanf(&hexStr[i * 2], "%02hhx", &in6.s6_addr[i]); if (sscanf(&hex_str[i * 2], "%02hhx", &in6.s6_addr[i]) != 1) {
return NULL;
}
} }
inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN);
return g_strdup(addr); return g_strdup(addr);
} else { } else {
unsigned int hexInt = *(unsigned int *)hexValue; unsigned int hex_int = *(unsigned int *)hex_value;
unsigned int byte1 = (hexInt >> 24) & 0xFF; unsigned int byte1 = (hex_int >> 24) & 0xFF;
unsigned int byte2 = (hexInt >> 16) & 0xFF; unsigned int byte2 = (hex_int >> 16) & 0xFF;
unsigned int byte3 = (hexInt >> 8) & 0xFF; unsigned int byte3 = (hex_int >> 8) & 0xFF;
unsigned int byte4 = hexInt & 0xFF; unsigned int byte4 = hex_int & 0xFF;
return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1); return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1);
} }
@ -2121,21 +2123,21 @@ static char *hexToIPAddress(const void *hexValue, int is_ipv6)
GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp) GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
{ {
GuestNetworkRouteList *head = NULL, **tail = &head; GuestNetworkRouteList *head = NULL, **tail = &head;
const char *routeFiles[] = {"/proc/net/route", "/proc/net/ipv6_route"}; const char *route_files[] = {"/proc/net/route", "/proc/net/ipv6_route"};
FILE *fp; FILE *fp;
size_t n; size_t n = 0;
char *line = NULL; char *line = NULL;
int firstLine; int firstLine;
int is_ipv6; int is_ipv6;
int i; int i;
char iface[IFNAMSIZ];
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
firstLine = 1; firstLine = 1;
is_ipv6 = (i == 1); is_ipv6 = (i == 1);
fp = fopen(routeFiles[i], "r"); fp = fopen(route_files[i], "r");
if (fp == NULL) { if (fp == NULL) {
error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]); error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
free(line);
continue; continue;
} }
@ -2144,80 +2146,74 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
firstLine = 0; firstLine = 0;
continue; continue;
} }
GuestNetworkRoute *route = NULL; g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
GuestNetworkRoute *networkroute;
char Iface[IFNAMSIZ];
if (is_ipv6) { if (is_ipv6) {
char Destination[33], Source[33], NextHop[33]; char destination[33], source[33], next_hop[33];
int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; int des_prefixlen, src_prefixlen, metric, refcnt, use, flags;
/* Parse the line and extract the values */
if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x %s", if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x %s",
Destination, &DesPrefixlen, Source, destination, &des_prefixlen, source,
&SrcPrefixlen, NextHop, &Metric, &RefCnt, &src_prefixlen, next_hop, &metric, &refcnt,
&Use, &Flags, Iface) != 10) { &use, &flags, iface) != 10) {
continue; continue;
} }
route = g_new0(GuestNetworkRoute, 1); route->destination = hex_to_ip_address(destination, 1);
networkroute = route; if (route->destination == NULL) {
networkroute->iface = g_strdup(Iface); continue;
networkroute->destination = hexToIPAddress(Destination, 1); }
networkroute->metric = Metric; route->iface = g_strdup(iface);
networkroute->source = hexToIPAddress(Source, 1); route->source = hex_to_ip_address(source, 1);
networkroute->desprefixlen = g_strdup_printf( route->nexthop = hex_to_ip_address(next_hop, 1);
"%d", DesPrefixlen route->desprefixlen = g_strdup_printf("%d", des_prefixlen);
); route->srcprefixlen = g_strdup_printf("%d", src_prefixlen);
networkroute->srcprefixlen = g_strdup_printf( route->metric = metric;
"%d", SrcPrefixlen route->has_flags = true;
); route->flags = flags;
networkroute->nexthop = hexToIPAddress(NextHop, 1); route->has_refcnt = true;
networkroute->has_flags = true; route->refcnt = refcnt;
networkroute->flags = Flags; route->has_use = true;
networkroute->has_refcnt = true; route->use = use;
networkroute->refcnt = RefCnt; route->version = 6;
networkroute->has_use = true;
networkroute->use = Use;
networkroute->version = 6;
} else { } else {
unsigned int Destination, Gateway, Mask, Flags; unsigned int destination, gateway, mask, flags;
int RefCnt, Use, Metric, MTU, Window, IRTT; int refcnt, use, metric, mtu, window, irtt;
/* Parse the line and extract the values */
if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d", if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d",
Iface, &Destination, &Gateway, &Flags, &RefCnt, iface, &destination, &gateway, &flags, &refcnt,
&Use, &Metric, &Mask, &MTU, &Window, &IRTT) != 11) { &use, &metric, &mask, &mtu, &window, &irtt) != 11) {
continue; continue;
} }
route = g_new0(GuestNetworkRoute, 1); route->destination = hex_to_ip_address(&destination, 0);
networkroute = route; if (route->destination == NULL) {
networkroute->iface = g_strdup(Iface); continue;
networkroute->destination = hexToIPAddress(&Destination, 0); }
networkroute->gateway = hexToIPAddress(&Gateway, 0); route->iface = g_strdup(iface);
networkroute->mask = hexToIPAddress(&Mask, 0); route->gateway = hex_to_ip_address(&gateway, 0);
networkroute->metric = Metric; route->mask = hex_to_ip_address(&mask, 0);
networkroute->has_flags = true; route->metric = metric;
networkroute->flags = Flags; route->has_flags = true;
networkroute->has_refcnt = true; route->flags = flags;
networkroute->refcnt = RefCnt; route->has_refcnt = true;
networkroute->has_use = true; route->refcnt = refcnt;
networkroute->use = Use; route->has_use = true;
networkroute->has_mtu = true; route->use = use;
networkroute->mtu = MTU; route->has_mtu = true;
networkroute->has_window = true; route->mtu = mtu;
networkroute->window = Window; route->has_window = true;
networkroute->has_irtt = true; route->window = window;
networkroute->irtt = IRTT; route->has_irtt = true;
networkroute->version = 4; route->irtt = irtt;
route->version = 4;
} }
QAPI_LIST_APPEND(tail, route); QAPI_LIST_APPEND(tail, route);
route = NULL;
} }
free(line);
fclose(fp); fclose(fp);
} }
free(line);
return head; return head;
} }