From patchwork Thu Jun 22 11:22:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 13288985 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 2E8BFEB64D8 for ; Thu, 22 Jun 2023 11:23:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCIOr-0005FF-9S; Thu, 22 Jun 2023 07:22:53 -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 1qCIOm-0005AB-Ed for qemu-devel@nongnu.org; Thu, 22 Jun 2023 07:22:48 -0400 Received: from mout.web.de ([212.227.15.4]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCIOk-0006J6-RL for qemu-devel@nongnu.org; Thu, 22 Jun 2023 07:22:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1687432962; x=1688037762; i=lukasstraub2@web.de; bh=tk8ma7v3hC61F8xrAUpSv6dthTlZBmxKf3VkzxTLhp4=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=WKa0SpEUqmUywMetO4HlaxCsMkgVZ1ABChPaaAREWyULs9kjOUyl3XxoWxs77ZQHoRaKU23 GvhQRJ+X56ox7dCTlp82GyvXDmsbPRWXOa+LSLaB5J0PM6r2eYYiNL2/tonvijyJy7f4fGoOs wXV+PPnqHTVa1uIdklH2FuWrMrCZyBkrtnyrC+1xB49CYBWTf7IM/20NlPMvGK+fjDhZlJ1eG kJW0hZFFwubaixVGiHFWUYMz5Zp8hDaWD1sOFoVEgwqi///7dzzKTPXQOJWTDsjVvPJe1OXj+ tXqqI656kG9S0DUchmlnL1WRskNjxY2hasXZfJxjLxEffrP/q5/w== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from mobian ([46.114.147.93]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1M4KNZ-1qCZNY3rLl-000P41; Thu, 22 Jun 2023 13:22:42 +0200 Date: Thu, 22 Jun 2023 13:22:38 +0200 From: Lukas Straub To: qemu-devel Cc: Juan Quintela , Peter Xu , Leonardo Bras , " =?utf-8?q?C=C3=A9dric?= Le Goater" , Alex Williamson Subject: [PATCH 2/2] savevm: Disallow devices being legacy and iterable at the same time Message-ID: In-Reply-To: <3c45b84bf970d20bfc72865c4de5c33563c2b62d.1687430098.git.lukasstraub2@web.de> References: <3c45b84bf970d20bfc72865c4de5c33563c2b62d.1687430098.git.lukasstraub2@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:hcdoR5mPasvgGWzs2TUzneFrxRhaVsrYMPJCtoN6xoHKtmvJQiv ++xzbxVgPmh296LPFShafkf3XcIPir5o0xGBcGZvnJv/a87E30yloy1xqNPeGPM6/4N9Hz2 0otMChUktP0087sis4+sHD7AjDppBRJWMwh23+mPx++56jpF0DrbT62TefACabwQnfkDBs5 HFYuK1gFDgX5CUKVhwvew== UI-OutboundReport: notjunk:1;M01:P0:EKmtBgFf2RU=;HNF3LuuETJ4C8Z0SBydsF8kP8rM VXgXZLbyi2lk612ESMlR5gg9kCUibD6gLhuFQJrbBvg4FEuv6d8sXfejHQOdPHLsy2juaQjzh bgFwre3iIn691U6EI2wONOycNne8UyYK4pNk+ITEpc+gp2d+vwgUmC4u+U13w6yCpRzGQ6p6n fNQOiyLZ7FRdHVKuJJHI0KIY7wLeeIIsztwAy623kDizOXkp16VuAopknBx+BAI8NT6lpLHDs 89JToOHX3oNQ+ofJY/BuUmmWNgWp+UBMqE0mzwJ+Bnnr/ptXSb+sNiI/F0R+VvWb/8Yult9Sx ZW0eSfEQYLXM0Uz3IAz3L1Okw0fZLw9VKlGcAv8zLcKlff5iar123FscLqHk0Oij7KeKV7WKz +cq9HOut31yijP63rvwfUqzb7wqL5WhsW6YojE7UaAhoXcy2waDpzFyhaa3zLQoDO3N2fS01m pkr2O6O7xingNiBDRhYG+AbhWBQ9dOOorIN1dHBLWlr3g20nXoHpfAIHU3+sfDeRJeiQ6mntQ Kkboatf0yvV+RcuHk3rBMvjewrU1SAtpq4myPPH906MXC9Z+PseDySYIinQAdzu6sk+XcQCqS zOV/ST+e7/SSnt/s94yjSN+MGjULsPaP+fGKvReSF4LV2chKOe5RfzJ6g52D5J3ityDOlVZ5U w+6i3NxCbLvFeX+7Jeao37/Oejx7MAKxkwI12j/1vmZ4ppRYfgph41z77f6gmkpws7sQFrhF/ vSQFfXqPzDsHqi0t9cDAgDWj3UEiRYQejBATS3oSUEY5NK2e554rR+CVz8TX9tTb9s3zXbMCZ 0UzHweKDNaQFlpscjaecvFil27vlX4NVgQPjZ8VTQTI0u4Z98bJLz1ic/MUomh4EifJs60Uaj ynQkwBeOGtcWdOvo9bRXdGHqErwxfggWkUu8b8bRiYAYNgwEQcZDHeKz0HeX0LSECln/c+eaE xUitJuQQr4ADZikeJoWhVYF8EQg= Received-SPF: pass client-ip=212.227.15.4; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 Signed-off-by: Lukas Straub --- migration/savevm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 5986f852b2..8d3cf7d675 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -774,6 +774,8 @@ int register_savevm_live(const char *idstr, se->is_ram = 1; } + assert(!(se->ops->save_setup && se->ops->save_state)); + pstrcat(se->idstr, sizeof(se->idstr), idstr); if (instance_id == VMSTATE_INSTANCE_ID_ANY) {