From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78A80C433E6 for ; Tue, 26 Jan 2021 09:32:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8F3723110 for ; Tue, 26 Jan 2021 09:32:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8F3723110 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4Ki7-0002fy-Q0 for qemu-devel@archiver.kernel.org; Tue, 26 Jan 2021 04:32:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4KhJ-0002Al-V2 for qemu-devel@nongnu.org; Tue, 26 Jan 2021 04:31:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4KhH-0005S9-4t for qemu-devel@nongnu.org; Tue, 26 Jan 2021 04:31:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611653496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+639xN3xQICoTj8a3Y4V1jtAGdfUutKvucgNvWXZFSs=; b=W1+W1yWdw6nDekQaLUC1qbIUc+rJzRbKGvuim54qYGxpldNi5Sg7jfLztMZsdZHQoTnV0x szwYZWDs8JnOj+WaAI8EXb3zFHdvo/HKohupbnM0yrWl7lQOuuiH0oWj82z/5NW/UCn8Xc XO11893h16c4TBoSr51zOlGEGY53Mbs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-AxHntuaPNtqfC2lmDs3ktw-1; Tue, 26 Jan 2021 04:31:34 -0500 X-MC-Unique: AxHntuaPNtqfC2lmDs3ktw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA28E80667F; Tue, 26 Jan 2021 09:31:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-224.ams2.redhat.com [10.36.113.224]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AEEE26267C; Tue, 26 Jan 2021 09:31:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4035A113865F; Tue, 26 Jan 2021 10:31:22 +0100 (CET) From: Markus Armbruster To: Eric Blake Subject: Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND References: <20210113221013.390592-1-eblake@redhat.com> <20210113221013.390592-6-eblake@redhat.com> Date: Tue, 26 Jan 2021 10:31:22 +0100 In-Reply-To: <20210113221013.390592-6-eblake@redhat.com> (Eric Blake's message of "Wed, 13 Jan 2021 16:10:13 -0600") Message-ID: <87mtww59jp.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Eduardo Habkost , "open list:GLUSTER" , "Michael S. Tsirkin" , Michael Roth , Jason Wang , Juan Quintela , qemu-devel@nongnu.org, Max Reitz , "open list:GLUSTER" , Gerd Hoffmann , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Igor Mammedov , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eric Blake writes: > These cases require a bit more thought to review; in each case, the > code was appending to a list, but not with a FOOList **tail variable. > > Signed-off-by: Eric Blake > Reviewed-by: Vladimir Sementsov-Ogievskiy > > --- > fix qmp_guest_network_get_interfaces [Vladimir] Fails tests/test-qga. I should've double-checked earlier. > --- [...] > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index f0a23b0402a4..6387fa3d2cdd 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -2153,17 +2153,17 @@ void qmp_guest_suspend_hybrid(Error **errp) > guest_suspend(SUSPEND_MODE_HYBRID, errp); > } > > -static GuestNetworkInterfaceList * > +static GuestNetworkInterface * > guest_find_interface(GuestNetworkInterfaceList *head, > const char *name) > { > for (; head; head = head->next) { > if (strcmp(head->value->name, name) == 0) { > - break; > + return head->value; > } > } > > - return head; > + return NULL; > } > > 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 *head = NULL, *cur_item = NULL; > + GuestNetworkInterfaceList *head = NULL, **tail = &head; > struct ifaddrs *ifap, *ifa; > > if (getifaddrs(&ifap) < 0) { > @@ -2241,9 +2241,10 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > } > > for (ifa = ifap; ifa; ifa = ifa->ifa_next) { > - GuestNetworkInterfaceList *info; > - GuestIpAddressList **address_list = NULL, *address_item = NULL; > - GuestNetworkInterfaceStat *interface_stat = NULL; > + GuestNetworkInterface *info; > + GuestIpAddressList **address_tail; > + GuestIpAddress *address_item = NULL; > + GuestNetworkInterfaceStat *interface_stat = NULL; > char addr4[INET_ADDRSTRLEN]; > char addr6[INET6_ADDRSTRLEN]; > int sock; > @@ -2257,19 +2258,12 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > > if (!info) { > info = g_malloc0(sizeof(*info)); > - info->value = g_malloc0(sizeof(*info->value)); > - info->value->name = g_strdup(ifa->ifa_name); > + info->name = g_strdup(ifa->ifa_name); > > - if (!cur_item) { > - head = cur_item = info; > - } else { > - cur_item->next = info; > - cur_item = info; > - } > + QAPI_LIST_APPEND(tail, info); > } > > - if (!info->value->has_hardware_address && > - ifa->ifa_flags & SIOCGIFHWADDR) { > + if (!info->has_hardware_address && ifa->ifa_flags & SIOCGIFHWADDR) { > /* we haven't obtained HW address yet */ > sock = socket(PF_INET, SOCK_STREAM, 0); > if (sock == -1) { > @@ -2278,7 +2272,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > } > > 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) { > error_setg_errno(errp, errno, > "failed to get MAC address of %s", > @@ -2290,13 +2284,13 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > close(sock); > 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", > (int) mac_addr[0], (int) mac_addr[1], > (int) mac_addr[2], (int) mac_addr[3], > (int) mac_addr[4], (int) mac_addr[5]); > > - info->value->has_hardware_address = true; > + info->has_hardware_address = true; > } > > 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->value = g_malloc0(sizeof(*address_item->value)); > - address_item->value->ip_address = g_strdup(addr4); > - address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4; > + address_item->ip_address = g_strdup(addr4); > + address_item->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4; > > if (ifa->ifa_netmask) { > /* Count the number of set bits in netmask. > * This is safe as '1' and '0' cannot be shuffled in netmask. */ > 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 && > 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->value = g_malloc0(sizeof(*address_item->value)); > - address_item->value->ip_address = g_strdup(addr6); > - address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6; > + address_item->ip_address = g_strdup(addr6); > + address_item->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6; > > if (ifa->ifa_netmask) { > /* Count the number of set bits in netmask. > * This is safe as '1' and '0' cannot be shuffled in netmask. */ > 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)[1]) + > ctpop32(((uint32_t *) p)[2]) + > @@ -2349,29 +2341,22 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > continue; > } > > - address_list = &info->value->ip_addresses; > - > - while (*address_list && (*address_list)->next) { > - address_list = &(*address_list)->next; > - } > - > - if (!*address_list) { > - *address_list = address_item; > - } else { > - (*address_list)->next = address_item; > + address_tail = &info->ip_addresses; > + while (!*address_tail) { > + address_tail = &(*address_tail)->next; > } > + QAPI_LIST_APPEND(address_tail, address_item); > > - info->value->has_ip_addresses = true; > + info->has_ip_addresses = true; > > - if (!info->value->has_statistics) { > + if (!info->has_statistics) { > interface_stat = g_malloc0(sizeof(*interface_stat)); > - if (guest_get_network_stats(info->value->name, > - interface_stat) == -1) { > - info->value->has_statistics = false; > + if (guest_get_network_stats(info->name, interface_stat) == -1) { > + info->has_statistics = false; > g_free(interface_stat); > } else { > - info->value->statistics = interface_stat; > - info->value->has_statistics = true; > + info->statistics = interface_stat; > + info->has_statistics = true; > } > } > } Dropping this part unbreaks the test. I'd like to drop just this part, and merge the rest. You can then respin just this part as a follow-up patch. Okay? I can't test qemu-ga under Windows. Fingers crossed... [...]