Message ID | 1530216310-52873-34-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HuUnQOWN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gs1L3xm2z9ryk for <incoming@patchwork.ozlabs.org>; Fri, 29 Jun 2018 06:33:26 +1000 (AEST) Received: from localhost ([::1]:38429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fYdbY-0004mD-57 for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 16:33:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAq-0007T4-Gs for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAp-0000oJ-LU for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:48 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:32836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAp-0000nF-DI for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:47 -0400 Received: by mail-wr0-x236.google.com with SMTP id k7-v6so3190053wrq.0 for <qemu-devel@nongnu.org>; Thu, 28 Jun 2018 13:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NNxdw9EfoglPw0eE0yAPZpny98Ei/3+q+kS3oSgkaso=; b=HuUnQOWNAODYzoDtINl70KDtCu4ZNoPKDCAOWVy7HFE7VWf80TRQnatZLx7UVcTKbf 8utkQIW2oBOHjRwSkSvY0+2eaWIJXCkIbSVPFsuOUmGUVgOD6An41ExFxPs1M7y2HuyR UyylS4DJ39P0yUQyFHZZJ6GXXttq94/GCI5+v+NU+2e2LOpzN8I0Eh008Mpy0XJkYkEG iVw9CQRdIHnitzBPihhv9qYdZYdfKZzrCkn1Ta/9Lnv9Ljdk1zIOMf0KHVSDuVRTl3sT Ed/mIzZx5PsO8QzV6mrLCHW62cgUSC2EYmE7J10AHGwBEsTgl4qLX7T4C6h/lNvxOCNI AzVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NNxdw9EfoglPw0eE0yAPZpny98Ei/3+q+kS3oSgkaso=; b=h6TCDgj7enNnv9jPklnLK+/NeReIc7X620VlZqmnZXvSIRHP8B1cDBz3uXe1u7yA9S 0Gv1KeAxcKiLhNpY0ELCLruXJz78lRXOR/EZ++HabT7X6K9Cg4iz2KVZoGIfwZrn2Haj iHuoQsBNVOoZQpeFctLQKSkRqmpNRpMvmaZEhNurvPDattmg94YjDwz7a5sK9mMVcOpx EQTBOdJiBzmFEYn8iblSN8Is7TDTlL+kx7CC8XXAy1oLYUk7Wg9HVD319ZshXfR17Min ukSRDKTgE2Mkkz1CLVTQlzigjdXwmLwQ+ZTXVSZWNNCm9WglSx1tk/CS0ZMHUbZ0sfng Gbng== X-Gm-Message-State: APt69E38sCofhAndxLPK0Re19GHS88niXs3s5HVsAZhIhfmiZ2Bp14Mu e4rXfn7lUH9zc2cZhJ0J2TgKdHh+ X-Google-Smtp-Source: AAOMgpcKHUEOPuvoLwUezKIb+ftFBPhO39F7C0hXyvTfAJ8EMjBUuFxixFF+wSLX0nIwULQ/NEpEEg== X-Received: by 2002:adf:f98a:: with SMTP id f10-v6mr9803728wrr.105.1530216346069; Thu, 28 Jun 2018 13:05:46 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.45 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:45 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:43 +0200 Message-Id: <1530216310-52873-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::236 Subject: [Qemu-devel] [PULL 33/60] pr-helper: fix assertion failure on failed multipath PERSISTENT RESERVE IN X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/60] exec: Fix MAP_RAM for cached access
|
expand
|
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index 4057cf3..0218d65 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -558,7 +558,11 @@ static int do_pr_in(int fd, const uint8_t *cdb, uint8_t *sense, #ifdef CONFIG_MPATH if (is_mpath(fd)) { /* multipath_pr_in fills the whole input buffer. */ - return multipath_pr_in(fd, cdb, sense, data, *resp_sz); + int r = multipath_pr_in(fd, cdb, sense, data, *resp_sz); + if (r != GOOD) { + *resp_sz = 0; + } + return r; } #endif