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=-15.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 00331C48BE6 for ; Mon, 14 Jun 2021 07:45:35 +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 6857861246 for ; Mon, 14 Jun 2021 07:45:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6857861246 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lshHq-0001FI-80 for qemu-devel@archiver.kernel.org; Mon, 14 Jun 2021 03:45:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lshGh-0000YW-VX for qemu-devel@nongnu.org; Mon, 14 Jun 2021 03:44:23 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:41836 helo=mail.default.ilande.bv.iomart.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lshGg-0004Gv-6A for qemu-devel@nongnu.org; Mon, 14 Jun 2021 03:44:23 -0400 Received: from host86-132-109-72.range86-132.btcentralplus.com ([86.132.109.72] helo=[192.168.1.65]) by mail.default.ilande.bv.iomart.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lshGQ-0001rO-5U; Mon, 14 Jun 2021 08:44:10 +0100 To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , pbonzini@redhat.com, qemu-devel@nongnu.org, laurent@vivier.eu, hpoussin@reactos.org References: <20210613102614.5438-1-mark.cave-ayland@ilande.co.uk> <75bf9945-9953-ba75-048a-a1570c6746ac@amsat.org> From: Mark Cave-Ayland Message-ID: <0940b4dd-563e-6c9b-fd66-91f5bc664ef3@ilande.co.uk> Date: Mon, 14 Jun 2021 08:44:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <75bf9945-9953-ba75-048a-a1570c6746ac@amsat.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 86.132.109.72 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH] esp: fix migration version check in esp_is_version_5() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.bv.iomart.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.bv.iomart.io X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.144, 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 14/06/2021 06:42, Philippe Mathieu-Daudé wrote: > On 6/13/21 12:26 PM, Mark Cave-Ayland wrote: >> Commit 4e78f3bf35 "esp: defer command completion interrupt on incoming data >> transfers" added a version check for use with VMSTATE_*_TEST macros to allow >> migration from older QEMU versions. Unfortunately the version check fails to >> work in its current form since if the VMStateDescription version_id is >> incremented, the test returns false and so the fields are not included in the >> outgoing migration stream. >> >> Change the version check to use >= rather == to ensure that migration works >> correctly when the ESPState VMStateDescription has version_id > 5. >> >> Signed-off-by: Mark Cave-Ayland >> Fixes: 4e78f3bf35 ("esp: defer command completion interrupt on incoming data transfers") >> --- > Well, it is not buggy yet :) :) >> hw/scsi/esp.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c >> index bfdb94292b..39756ddd99 100644 >> --- a/hw/scsi/esp.c >> +++ b/hw/scsi/esp.c >> @@ -1120,7 +1120,7 @@ static bool esp_is_version_5(void *opaque, int version_id) > > Can you rename esp_is_at_least_version_5()? Sure, I can rename it if you like but it will of course make the diff noisier. esp_is_at_least_version_5() seems quite a mouthful though, what about esp_min_version_5() instead? >> ESPState *s = ESP(opaque); >> >> version_id = MIN(version_id, s->mig_version_id); >> - return version_id == 5; >> + return version_id >= 5; >> } >> >> int esp_pre_save(void *opaque) ATB, Mark.