From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:cf90:b0:9bd:85f7:2662 with SMTP id um16csp1080117ejb; Fri, 20 Oct 2023 02:09:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt4IRTfhfayiawtSzbgZ/rSEivkDBR9Ilh1qQUZ1XKc0P7zC8C4zE55FVJddKAb+jD3cWN X-Received: by 2002:a05:6214:19e2:b0:66d:9caf:c054 with SMTP id q2-20020a05621419e200b0066d9cafc054mr158153qvc.4.1697792942950; Fri, 20 Oct 2023 02:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697792942; cv=none; d=google.com; s=arc-20160816; b=fiTHIWsPqvWPGmKfMkIUrVjNn278BtZW1vb5MDSuFEoFiVPCvzP7kwpy/8Gc7jMIO0 UxwBl3uvz3ieZbWEWkNDZGcS4QHTY+2XeE3w/c+yJUr/5vY716o2f0bFrVlj+ViI++zU d98fiPvEzdOawIDYDfSshXmIBEWq3DkWS/DIFN6Ag5HwOwe43xWTMlolEG1NLhWVX6r1 1z7lMaIWYnkOHCvdzl7Y1cQ94bkoO1D2DXXKSHEdwSrc5/nUuWANHC2n1RsrK05E2R4i xDkNVJ0vdVoKnVLDvRk4u5CTFw14mPGzdQb9UGQAJjb54q4PBlr6SgTji4h9Uo1j1o/N vSvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=d9ROGmImGcNEhlqZIjyhd4kZVRhSXS7if8/sbCOuTpk=; fh=rTkH9/wDYQMZLVlaH0neZTzbhrqu7oCVHTTGZPWdq9o=; b=bpVb+WybOIu0D0TnQBSYgDsxz41xbClXWuOtw1BpgdsINSHnRSzPFfot7Tu2E44uQX fAU9TvkjpoheY0Gumn8I4//mmrj9M0t8XA1KNdZ2Khxs9Gub52CVWLlymOo2m32C4w1b tcUcsk16Pn7kTx5oLxeiVQKZjRnna6xeC3O1FWN2dWyhBiRjBwohDZzwVx51VXWZrwRp VnqWuQLozG/JsbJyP+uSa5/1Ctrqc8i+g69iN9sGm5NKUVSS2w5kRU1ecmsuCotb7T+q +1Gt3u0gA+qz/mbO/ZsVgdvuVEeVpgmDwNQpVKAVoEbSfeF4UxQR7yXFiwJfxKTxS4lS 3aww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Euyk82AG; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id oo7-20020a056214450700b0065b231f117dsi1058836qvb.205.2023.10.20.02.09.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 02:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Euyk82AG; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtlUk-00042h-6Z; Fri, 20 Oct 2023 05:08:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtlUU-0003TC-61 for qemu-arm@nongnu.org; Fri, 20 Oct 2023 05:08:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtlUP-0005G0-FA for qemu-arm@nongnu.org; Fri, 20 Oct 2023 05:08:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697792890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d9ROGmImGcNEhlqZIjyhd4kZVRhSXS7if8/sbCOuTpk=; b=Euyk82AG5mGgpox2rolKpDpfwKbw8zZ/zP6wTzTSYsXUg3Wm5Vol2r7QsYN5jhR3zkqIrq eUr1NlLjxzauO/gQ9DTi7udI1Omgap7bDXxSdM0kWmTLfROsTQ+vtlNTkH+fiNpcFT70eK v6PluY9Uf6NRH1QqMjX0mvg9tHzPaco= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-522-szTGTDK9P6K8xKR6v5qjCg-1; Fri, 20 Oct 2023 05:08:06 -0400 X-MC-Unique: szTGTDK9P6K8xKR6v5qjCg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B7365380664F; Fri, 20 Oct 2023 09:08:04 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5A342166B26; Fri, 20 Oct 2023 09:07:59 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Peter Maydell , Harsh Prateek Bora , David Hildenbrand , Samuel Thibault , Eric Farman , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Thomas Huth , Gerd Hoffmann , Fabiano Rosas , David Gibson , Corey Minyard , "Michael S. Tsirkin" , Peter Xu , Corey Minyard , Stefan Berger , Juan Quintela , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , Halil Pasic , Leonardo Bras , John Snow , Nicholas Piggin , Mark Cave-Ayland , Christian Borntraeger , Ilya Leoshkevich , Jason Wang , qemu-block@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Daniel Henrique Barboza , Stefan Weil , Stefan Berger Subject: [PATCH v2 05/13] migration: Use VMSTATE_INSTANCE_ID_ANY for slirp Date: Fri, 20 Oct 2023 11:07:23 +0200 Message-ID: <20231020090731.28701-6-quintela@redhat.com> In-Reply-To: <20231020090731.28701-1-quintela@redhat.com> References: <20231020090731.28701-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: JnBCV9Gg47aa Each user network conection create a new slirp instance. We register more than one slirp instance for number 0. qemu-system-x86_64: -netdev user,id=hs1: savevm_state_handler_insert: Detected duplicate SaveStateEntry: id=slirp, instance_id=0x0 Broken pipe ../../../../../mnt/code/qemu/full/tests/qtest/libqtest.c:195: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) Aborted (core dumped) Reviewed-by: Stefan Berger Signed-off-by: Juan Quintela --- net/slirp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index c33b3e02e7..25b49c4526 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -46,6 +46,7 @@ #include "qapi/qmp/qdict.h" #include "util.h" #include "migration/register.h" +#include "migration/vmstate.h" #include "migration/qemu-file-types.h" static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) @@ -659,8 +660,8 @@ static int net_slirp_init(NetClientState *peer, const char *model, * specific version? */ g_assert(slirp_state_version() == 4); - register_savevm_live("slirp", 0, slirp_state_version(), - &savevm_slirp_state, s->slirp); + register_savevm_live("slirp", VMSTATE_INSTANCE_ID_ANY, + slirp_state_version(), &savevm_slirp_state, s->slirp); s->poll_notifier.notify = net_slirp_poll_notify; main_loop_poll_add_notifier(&s->poll_notifier); -- 2.41.0