From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5Bcb-00032l-G2 for qemu-devel@nongnu.org; Fri, 11 Nov 2016 08:11:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5BcX-0004jv-IB for qemu-devel@nongnu.org; Fri, 11 Nov 2016 08:11:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5BcX-0004jr-CR for qemu-devel@nongnu.org; Fri, 11 Nov 2016 08:11:53 -0500 References: <20161110152751.4267-2-pbonzini@redhat.com> <20161111125010.GD8930@stefanha-x1.localdomain> From: Paolo Bonzini Message-ID: <02d56da8-212f-56cc-0e41-a0cb87e116b3@redhat.com> Date: Fri, 11 Nov 2016 14:11:48 +0100 MIME-Version: 1.0 In-Reply-To: <20161111125010.GD8930@stefanha-x1.localdomain> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.8] megasas: clean up and fix request completion/cancellation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org On 11/11/2016 13:50, Stefan Hajnoczi wrote: > On Thu, Nov 10, 2016 at 04:27:51PM +0100, Paolo Bonzini wrote: >> megasas_command_cancel is a callback; it should report the abort in >> the frame, not try another abort! Compare for instance with >> mptsas_request_cancelled. >> >> So extract the common bits for request completion in a new function >> megasas_complete_command, call it from both the .complete and .cancel >> callbacks, and remove duplicate pieces from the DCMD path. >> >> Signed-off-by: Paolo Bonzini >> --- >> hw/scsi/megasas.c | 53 ++++++++++++++++++++++++++++------------------= ------- >> 1 file changed, 28 insertions(+), 25 deletions(-) >=20 > Reviewed-by: Stefan Hajnoczi >=20 >> @@ -2316,7 +2319,7 @@ static const struct SCSIBusInfo megasas_scsi_inf= o =3D { >> .transfer_data =3D megasas_xfer_complete, >> .get_sg_list =3D megasas_get_sg_list, >> .complete =3D megasas_command_complete, >> - .cancel =3D megasas_command_cancel, >> + .cancel =3D megasas_command_cancelled, >=20 > Should .cancel be renamed in a separate patch? Good idea, or even .request_completed/.request_cancelled. Paolo