OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QAPI patches patches for 2021-03-05 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmBCQ0oSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZT4lcP/ioSOs1kQ4qo9+yz1aRRUVe0wz0jpR7T
 KDmHp4CyDsyoo99HhSnvDrRLKKwmUvisUYOeChFGFbulMtrpwunV9I1dm8EYcuBX
 j9TPoChppLm4Eeu8WZLP1o5m16liKLt3dC5H5ZabK71pemht4Pf2GR9LUwNRBllT
 9C0na3coTd0t2VjrsAsYmYxMCBm4nGgyEEOl3RhrxVoPVGZUxHmjotzA384bjMtj
 O+O/m5M5TM6p7c+l2EWeWKM8cRfuB+SXZG0qj7XJlPaauZZ9ybGL4foe/DvwSvUQ
 X5RFwJJ65OLaDvks9kGQZTDGOCNDSlgCk2cMtBW6wbybQsaXrmZrbSBlWorgQ66l
 qajcuUzd/9YbpBhdZlcJlrJ6d1TnNWOzaLlB/ZSP5/gYrS4RjAxYs0SxfDO0jO/G
 IRuvgBChZ+IGn6xk8GlOUbTqPudawxiWXZpDzKJ1cpv1tHER+wOwNklCJTanaDft
 n39VH9WQsUp3I7hHtyMOXqoykD95SiuU9gKvzYSHyYodyS4bZDirvSljVhzn/V58
 9qYdBa1YX6mOmdn3ePxyxpguNpyBzU4aDaGvBgnpTTOIjk5j5sNvoygI4QUndScn
 +PdG+vcxdEjO0MJAKYIspI2M+cwOpYyw6Qd+ZY0jLFEw98WtMBNTjlOMwqx+fgon
 855ZmbkheHqY
 =h6c5
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-03-05' into staging

QAPI patches patches for 2021-03-05

# gpg: Signature made Fri 05 Mar 2021 14:42:18 GMT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2021-03-05:
  qapi: Fix parse errors for removal of null from schema language
  qapi: Remove QMP events and commands from user-mode builds
  qga: Utilize QAPI_LIST_APPEND in qmp_guest_network_get_interfaces
  error: Fix "Converting to ERRP_GUARD()" doc on "valid at return"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-03-05 15:15:32 +00:00
parent 9a7beaad3d 0e92a19b8c
commit bb736b20a3
6 changed files with 45 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qapi/error.h
View File

@ -235,7 +235,7 @@
* error_propagate_prepend(errp, *errp, ...) by error_prepend(errp, ...) * error_propagate_prepend(errp, *errp, ...) by error_prepend(errp, ...)
* *
* 4. Ensure @errp is valid at return: when you destroy *errp, set * 4. Ensure @errp is valid at return: when you destroy *errp, set
* errp = NULL. * *errp = NULL.
* *
* Example: * Example:
* *

12
qapi/meson.build
View File

@ -102,11 +102,15 @@ foreach module : qapi_all_modules
'qapi-types-@0@.h'.format(module), 'qapi-types-@0@.h'.format(module),
'qapi-visit-@0@.c'.format(module), 'qapi-visit-@0@.c'.format(module),
'qapi-visit-@0@.h'.format(module), 'qapi-visit-@0@.h'.format(module),
'qapi-events-@0@.c'.format(module),
'qapi-events-@0@.h'.format(module),
'qapi-commands-@0@.c'.format(module),
'qapi-commands-@0@.h'.format(module),
] ]
if have_system or have_tools
qapi_module_outputs += [
'qapi-events-@0@.c'.format(module),
'qapi-events-@0@.h'.format(module),
'qapi-commands-@0@.c'.format(module),
'qapi-commands-@0@.h'.format(module),
]
endif
if module.endswith('-target') if module.endswith('-target')
qapi_specific_outputs += qapi_module_outputs qapi_specific_outputs += qapi_module_outputs
else else

75
qga/commands-posix.c
View File

@ -2153,17 +2153,17 @@ void qmp_guest_suspend_hybrid(Error **errp)
guest_suspend(SUSPEND_MODE_HYBRID, errp); guest_suspend(SUSPEND_MODE_HYBRID, errp);
} }
static GuestNetworkInterfaceList * static GuestNetworkInterface *
guest_find_interface(GuestNetworkInterfaceList *head, guest_find_interface(GuestNetworkInterfaceList *head,
const char *name) const char *name)
{ {
for (; head; head = head->next) { for (; head; head = head->next) {
if (strcmp(head->value->name, name) == 0) { if (strcmp(head->value->name, name) == 0) {
break; return head->value;
} }
} }
return head; return NULL;
} }
static int guest_get_network_stats(const char *name, static int guest_get_network_stats(const char *name,
@ -2232,7 +2232,7 @@ static int guest_get_network_stats(const char *name,
*/ */
GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
{ {
GuestNetworkInterfaceList *head = NULL, *cur_item = NULL; GuestNetworkInterfaceList *head = NULL, **tail = &head;
struct ifaddrs *ifap, *ifa; struct ifaddrs *ifap, *ifa;
if (getifaddrs(&ifap) < 0) { if (getifaddrs(&ifap) < 0) {
@ -2241,9 +2241,10 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
} }
for (ifa = ifap; ifa; ifa = ifa->ifa_next) { for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
GuestNetworkInterfaceList *info; GuestNetworkInterface *info;
GuestIpAddressList **address_list = NULL, *address_item = NULL; GuestIpAddressList **address_tail;
GuestNetworkInterfaceStat *interface_stat = NULL; GuestIpAddress *address_item = NULL;
GuestNetworkInterfaceStat *interface_stat = NULL;
char addr4[INET_ADDRSTRLEN]; char addr4[INET_ADDRSTRLEN];
char addr6[INET6_ADDRSTRLEN]; char addr6[INET6_ADDRSTRLEN];
int sock; int sock;
@ -2257,19 +2258,12 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
if (!info) { if (!info) {
info = g_malloc0(sizeof(*info)); info = g_malloc0(sizeof(*info));
info->value = g_malloc0(sizeof(*info->value)); info->name = g_strdup(ifa->ifa_name);
info->value->name = g_strdup(ifa->ifa_name);
if (!cur_item) { QAPI_LIST_APPEND(tail, info);
head = cur_item = info;
} else {
cur_item->next = info;
cur_item = info;
}
} }
if (!info->value->has_hardware_address && if (!info->has_hardware_address && ifa->ifa_flags & SIOCGIFHWADDR) {
ifa->ifa_flags & SIOCGIFHWADDR) {
/* we haven't obtained HW address yet */ /* we haven't obtained HW address yet */
sock = socket(PF_INET, SOCK_STREAM, 0); sock = socket(PF_INET, SOCK_STREAM, 0);
if (sock == -1) { if (sock == -1) {
@ -2278,7 +2272,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
} }
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
pstrcpy(ifr.ifr_name, IF_NAMESIZE, info->value->name); pstrcpy(ifr.ifr_name, IF_NAMESIZE, info->name);
if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) {
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"failed to get MAC address of %s", "failed to get MAC address of %s",
@ -2290,13 +2284,13 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
close(sock); close(sock);
mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
info->value->hardware_address = info->hardware_address =
g_strdup_printf("%02x:%02x:%02x:%02x:%02x:%02x", g_strdup_printf("%02x:%02x:%02x:%02x:%02x:%02x",
(int) mac_addr[0], (int) mac_addr[1], (int) mac_addr[0], (int) mac_addr[1],
(int) mac_addr[2], (int) mac_addr[3], (int) mac_addr[2], (int) mac_addr[3],
(int) mac_addr[4], (int) mac_addr[5]); (int) mac_addr[4], (int) mac_addr[5]);
info->value->has_hardware_address = true; info->has_hardware_address = true;
} }
if (ifa->ifa_addr && if (ifa->ifa_addr &&
@ -2309,15 +2303,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
} }
address_item = g_malloc0(sizeof(*address_item)); address_item = g_malloc0(sizeof(*address_item));
address_item->value = g_malloc0(sizeof(*address_item->value)); address_item->ip_address = g_strdup(addr4);
address_item->value->ip_address = g_strdup(addr4); address_item->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4;
address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4;
if (ifa->ifa_netmask) { if (ifa->ifa_netmask) {
/* Count the number of set bits in netmask. /* Count the number of set bits in netmask.
* This is safe as '1' and '0' cannot be shuffled in netmask. */ * This is safe as '1' and '0' cannot be shuffled in netmask. */
p = &((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr; p = &((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr;
address_item->value->prefix = ctpop32(((uint32_t *) p)[0]); address_item->prefix = ctpop32(((uint32_t *) p)[0]);
} }
} else if (ifa->ifa_addr && } else if (ifa->ifa_addr &&
ifa->ifa_addr->sa_family == AF_INET6) { ifa->ifa_addr->sa_family == AF_INET6) {
@ -2329,15 +2322,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
} }
address_item = g_malloc0(sizeof(*address_item)); address_item = g_malloc0(sizeof(*address_item));
address_item->value = g_malloc0(sizeof(*address_item->value)); address_item->ip_address = g_strdup(addr6);
address_item->value->ip_address = g_strdup(addr6); address_item->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6;
address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6;
if (ifa->ifa_netmask) { if (ifa->ifa_netmask) {
/* Count the number of set bits in netmask. /* Count the number of set bits in netmask.
* This is safe as '1' and '0' cannot be shuffled in netmask. */ * This is safe as '1' and '0' cannot be shuffled in netmask. */
p = &((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr; p = &((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr;
address_item->value->prefix = address_item->prefix =
ctpop32(((uint32_t *) p)[0]) + ctpop32(((uint32_t *) p)[0]) +
ctpop32(((uint32_t *) p)[1]) + ctpop32(((uint32_t *) p)[1]) +
ctpop32(((uint32_t *) p)[2]) + ctpop32(((uint32_t *) p)[2]) +
@ -2349,29 +2341,22 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
continue; continue;
} }
address_list = &info->value->ip_addresses; address_tail = &info->ip_addresses;
while (*address_tail) {
while (*address_list && (*address_list)->next) { address_tail = &(*address_tail)->next;
address_list = &(*address_list)->next;
} }
QAPI_LIST_APPEND(address_tail, address_item);
if (!*address_list) { info->has_ip_addresses = true;
*address_list = address_item;
} else {
(*address_list)->next = address_item;
}
info->value->has_ip_addresses = true; if (!info->has_statistics) {
if (!info->value->has_statistics) {
interface_stat = g_malloc0(sizeof(*interface_stat)); interface_stat = g_malloc0(sizeof(*interface_stat));
if (guest_get_network_stats(info->value->name, if (guest_get_network_stats(info->name, interface_stat) == -1) {
interface_stat) == -1) { info->has_statistics = false;
info->value->has_statistics = false;
g_free(interface_stat); g_free(interface_stat);
} else { } else {
info->value->statistics = interface_stat; info->statistics = interface_stat;
info->value->has_statistics = true; info->has_statistics = true;
} }
} }
} }

8
scripts/qapi/parser.py
View File

@ -236,9 +236,9 @@ class QAPISchemaParser:
if self.tok == ']': if self.tok == ']':
self.accept() self.accept()
return expr return expr
if self.tok not in "{['tfn": if self.tok not in "{['tf":
raise QAPIParseError( raise QAPIParseError(
self, "expected '{', '[', ']', string, boolean or 'null'") self, "expected '{', '[', ']', string, or boolean")
while True: while True:
expr.append(self.get_expr(True)) expr.append(self.get_expr(True))
if self.tok == ']': if self.tok == ']':
@ -257,12 +257,12 @@ class QAPISchemaParser:
elif self.tok == '[': elif self.tok == '[':
self.accept() self.accept()
expr = self.get_values() expr = self.get_values()
elif self.tok in "'tfn": elif self.tok in "'tf":
expr = self.val expr = self.val
self.accept() self.accept()
else: else:
raise QAPIParseError( raise QAPIParseError(
self, "expected '{', '[', string, boolean or 'null'") self, "expected '{', '[', string, or boolean")
return expr return expr
def get_doc(self, info): def get_doc(self, info):

2
tests/qapi-schema/leading-comma-list.err
View File

@ -1 +1 @@
leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null' leading-comma-list.json:2:13: expected '{', '[', ']', string, or boolean

2
tests/qapi-schema/trailing-comma-list.err
View File

@ -1 +1 @@
trailing-comma-list.json:2:36: expected '{', '[', string, boolean or 'null' trailing-comma-list.json:2:36: expected '{', '[', string, or boolean