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 lists1p.gnu.org (lists1p.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 1E586CC6B08 for ; Tue, 13 Oct 2026 15:01:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xGdzw-0007Kp-Qw; Tue, 13 Oct 2026 11:01:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xGdzP-00079R-IM for qemu-devel@nongnu.org; Tue, 13 Oct 2026 11:00:28 -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 1xGdzO-0007ZH-4r for qemu-devel@nongnu.org; Tue, 13 Oct 2026 11:00:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1791903625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sSGsgj2MuGepcX9kG2adGcKa1CGq3lzc+Qef4GxPUEI=; b=dvN6oKeoXFYLruQL8ZCTqK/PsHcZf7txkm9J0flyOvUOVwGYZsKGGZ/uRGWYMTg9pwr7Uv u95bW1zgY5xoRfROPHfz8T0EYBFghpJyZXTsfsirQFF08ucHYUw8qdvFq2xuf2lnzCH/kq vV8QY7jMEuoOyu2K1MzsYgdIK8dB0JU= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-12-JGczy_HlPBaUemOM1mDHqQ-1; Tue, 13 Oct 2026 15:00:21 +0000 X-MC-Unique: JGczy_HlPBaUemOM1mDHqQ-1 X-Mimecast-MFC-AGG-ID: JGczy_HlPBaUemOM1mDHqQ_1791903620 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 810C01944D04; Tue, 13 Oct 2026 15:00:20 +0000 (UTC) Received: from redhat.com (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0201E767; Tue, 13 Oct 2026 15:00:17 +0000 (UTC) Date: Tue, 13 Oct 2026 10:00:15 -0500 From: Eric Blake To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org, akalenyu@redhat.com, qemu-block@nongnu.org, Pierrick Bouvier , Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= , Paolo Bonzini , Benjamin Marzinski , Hanna Reitz , Kevin Wolf , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Fam Zheng Subject: Re: [PATCH 3/8] hw/scsi-disk: move MIG_EVENT_FAILED into a new function Message-ID: References: <20261009153058.1089786-1-stefanha@redhat.com> <20261009153058.1089786-4-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20261009153058.1089786-4-stefanha@redhat.com> User-Agent: NeoMutt/20260616 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass client-ip=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.24, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 Fri, Oct 09, 2026 at 11:30:53AM -0400, Stefan Hajnoczi wrote: > Move the MIG_EVENT_FAILED logic from scsi_block_migration_notifier() > into its own new scsi_block_migration_failed() function. The next commit > adds logic for handling another event, so doing that in dedicated > functions makes the code easier to read. > > Signed-off-by: Stefan Hajnoczi > --- > hw/scsi/scsi-disk.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index deb33ac1dda..3d88e57eded 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2761,20 +2761,26 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, > * fails because the destination may have already preempted and we need to get > * the reservation back. > */ I think this comment... > +static void scsi_block_migration_failed(SCSIDiskState *s) > +{ > + SCSIDevice *d = &s->qdev; > + Error *local_err = NULL; > + > + if (!scsi_generic_pr_state_preempt(d, &local_err)) { > + /* MIG_EVENT_FAILED cannot fail, so just warn */ > + error_prepend(&local_err, "scsi-block migration rollback: "); > + warn_report_err(local_err); > + } > +} > + > static int scsi_block_migration_notifier(NotifierWithReturn *notifier, ...belongs better with the function it was originally introducing. Fix that, and you can add Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org