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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 BD5ECC4360C for ; Fri, 4 Oct 2019 22:35:46 +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 86A8D20873 for ; Fri, 4 Oct 2019 22:35:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86A8D20873 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]:53538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGWAr-00073t-MK for qemu-devel@archiver.kernel.org; Fri, 04 Oct 2019 18:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47957) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGW9w-0006WZ-AW for qemu-devel@nongnu.org; Fri, 04 Oct 2019 18:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGW9t-0002Q2-N8 for qemu-devel@nongnu.org; Fri, 04 Oct 2019 18:34:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGW9t-0002Ps-Hx for qemu-devel@nongnu.org; Fri, 04 Oct 2019 18:34:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B5F230BBE85; Fri, 4 Oct 2019 22:34:43 +0000 (UTC) Received: from redhat.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0CC85C1B5; Fri, 4 Oct 2019 22:34:39 +0000 (UTC) From: Juan Quintela To: Eric Auger Subject: Re: [PATCH v3] migration: Support gtree migration In-Reply-To: <20191004112025.28868-1-eric.auger@redhat.com> (Eric Auger's message of "Fri, 4 Oct 2019 13:20:25 +0200") References: <20191004112025.28868-1-eric.auger@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Date: Sat, 05 Oct 2019 00:34:37 +0200 Message-ID: <87a7aguole.fsf@trasno.org> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 04 Oct 2019 22:34:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: , Reply-To: quintela@redhat.com Cc: peterx@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eric Auger wrote: > Introduce support for GTree migration. A custom save/restore > is implemented. Each item is made of a key and a data. > > If the key is a pointer to an object, 2 VMSDs are passed into > the GTree VMStateField. > > When putting the items, the tree is traversed in sorted order by > g_tree_foreach. > > On the get() path, gtrees must be allocated using the proper > key compare, key destroy and value destroy. This must be handled > beforehand, for example in a pre_load method. > > Tests are added to test save/dump of structs containing gtrees > including the virtio-iommu domain/mappings scenario. > > Signed-off-by: Eric Auger Overal I like the patch. I think that I found a minor error. > +static int put_gtree(QEMUFile *f, void *pv, size_t unused_size, > + const VMStateField *field, QJSON *vmdesc) > +{ > + bool direct_key = (!field->start); > + const VMStateDescription *key_vmsd = direct_key ? NULL : &field->vmsd[0]; > + const VMStateDescription *val_vmsd = direct_key ? &field->vmsd[0] : > + &field->vmsd[1]; > + struct put_gtree_data capsule = {f, key_vmsd, val_vmsd, 0}; Please, consider change the last line to: struct put_gtree_data capsule = { .f = f, .key_vmsd = key_vmsd, .val_vmsd = val_vmsd, .ret = 0}; It makes much easier make changes on the future. Once here, I think that you are missing on the middle a: .vmdesc = vmdesc, No? At least you use it on put_gtree_elem, and I don't see any place where you assign it. When I did the change is when I noticed that it was missing. > + GTree **pval = pv; > + GTree *tree = *pval; > + int ret; > + > + qemu_put_be32(f, g_tree_nnodes(tree)); > + g_tree_foreach(tree, put_gtree_elem, (gpointer)&capsule); > + qemu_put_byte(f, false); > + ret = capsule.ret; > + if (ret) { > + error_report("%s : failed to save gtree (%d)", field->name, ret); > + } > + return ret; > +} As said before, with this changes you have my reviewed-by. Later, Juan.