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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5DFD8CDB465 for ; Thu, 19 Oct 2023 20:31:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtZep-0002Oi-6l; Thu, 19 Oct 2023 16:30:15 -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 1qtZen-0002OD-FE; Thu, 19 Oct 2023 16:30:13 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtZel-0004yv-75; Thu, 19 Oct 2023 16:30:13 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39JKQkuM031521; Thu, 19 Oct 2023 20:29:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=TmRI68Iob89crTy0YFgiPtlij3tobhQNhxNbxAWFrHo=; b=TwvHWCUNCzTqwmWpTkKOU7N4r+yYkADhHeXvmYjnGmXNwW5freEcivyjJrrsMoEaz2Qc NeO3NSwiw/ou7+mZkUkr6qW8GcfCUxJU/u6bHkv8W027kjeRUBhB95s0LtlCzr1Vu8wi vFoD7iXyErWWzFLMO36L/keVe5rR2xuKCcu7a0rMwYHuFLCDcXiJ9Jx8FO/Q6Wqmm8OJ Bn/WOoUQenZfWBi2bxX8ebIoL6ck6R1l9JUkgQY424Q/vb4O3MVNGZPS7nBl+8Bepaa8 Arr+TmPtUNd2fV45AfBRstqw7NcNwXEQGZYc9OU4PfwHlxjy2NzEMqmkT1cEsL5b1AGL kw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tubgcr3gt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Oct 2023 20:29:48 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39JKSsuG007857; Thu, 19 Oct 2023 20:29:47 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tubgcr3g8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Oct 2023 20:29:47 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39JK220A030742; Thu, 19 Oct 2023 20:29:46 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3tr7hk30v7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Oct 2023 20:29:46 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39JKTj0O24314446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 20:29:45 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2FBA458061; Thu, 19 Oct 2023 20:29:45 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 08DA458057; Thu, 19 Oct 2023 20:29:41 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTPS; Thu, 19 Oct 2023 20:29:40 +0000 (GMT) Message-ID: <745782e7-f236-32d5-f63b-cc91a94857a0@linux.ibm.com> Date: Thu, 19 Oct 2023 16:29:39 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 05/13] migration: Use VMSTATE_INSTANCE_ID_ANY for slirp Content-Language: en-US To: Juan Quintela , qemu-devel@nongnu.org Cc: Stefan Berger , Marcel Apfelbaum , qemu-ppc@nongnu.org, Nicholas Piggin , qemu-s390x@nongnu.org, Gerd Hoffmann , Corey Minyard , Samuel Thibault , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Fabiano Rosas , Eric Farman , Peter Xu , Harsh Prateek Bora , John Snow , qemu-block@nongnu.org, Mark Cave-Ayland , Christian Borntraeger , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Stefan Weil , qemu-arm@nongnu.org, Jason Wang , Corey Minyard , Leonardo Bras , Thomas Huth , Peter Maydell , "Michael S. Tsirkin" , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , David Gibson , Halil Pasic , Daniel Henrique Barboza References: <20231019190831.20363-1-quintela@redhat.com> <20231019190831.20363-6-quintela@redhat.com> From: Stefan Berger In-Reply-To: <20231019190831.20363-6-quintela@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ZNI5tbRSK_sSpuhijyalOxs7KtvzTPeh X-Proofpoint-GUID: MlPP0ungcSBMoPqY25Xl60Q-a-XhVHQc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_20,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190174 Received-SPF: pass client-ip=148.163.158.5; envelope-from=stefanb@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -52 X-Spam_score: -5.3 X-Spam_bar: ----- X-Spam_report: (-5.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-3.339, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 10/19/23 15:08, Juan Quintela wrote: > 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) > > Signed-off-by: Juan Quintela Reviewed-by: Stefan Berger > --- > 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);