Message ID | 1538295197-23704-2-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="l5TRK0/+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NJDr2bW2z9s5c for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:17:32 +1000 (AEST) Received: from localhost ([::1]:54222 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 1g6Wuv-0004h4-PG for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:17:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wr2-00023K-Hx for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wr1-0008LL-Cv for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:28 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wr0-0008Bk-HU for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:27 -0400 Received: by mail-wr1-x444.google.com with SMTP id z4-v6so9103720wrb.1 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TEiJ69TlT1ABYM+gQLROSYSRA0nNW0Ldw9frKoU5DY4=; b=l5TRK0/+8dVXkkdRnoqiDExvSzPMaM/c05dvpm2/ZBiFXFPvFNs/UOb/w0sgoHUgH0 6sdF3TTOrpfS+AOjH+ZksX+C9q5wbLRUZCJW3hTjDORWn0ucsW4/ps3tN2sIexvGWmnQ FFIvvsE2qNg5mGn0uoRkAa0WFtd5NCvmtiRhX4Z2VSBxeJhocsMXODaWh7H/qdgYM7Eh GiLDKvUMLYLpR01lqEOWGzeQRgi/vw7QBwMIVTt9amnvc3L2dEx9E8z01DbvmzKFv7pN WfpR8ScXNFDn9TrcwXXwn6GJFR77hNNwczuwLTbros751zzVPdBBbkL1ck9253N0eKd+ SSqg== 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:cc:subject:date:message-id :in-reply-to:references; bh=TEiJ69TlT1ABYM+gQLROSYSRA0nNW0Ldw9frKoU5DY4=; b=G8cinUqkD2agmdxJPcf9AlXDWIT2v3fzn0GR+uml1lRnVA3o/tgdgCIxSbAST838Dw QLA8Fm7+4W7v1tKsXot0yaDvF8fCGapK4UF29m4V05exjl5bmSvNH8d6j7n5TJfCZvCv dcE9uxyejpR07NVtiFRkScDqBT0yuDQ8SFtvDLao5uJ9kx/r+Z7G0igvb7KpLUDgWXok Nhu5AQrGULA2j/YjS0z+PywemyWn31b9gB73VWnMHz/vh8egiaNtQ+DeaHmKkcgkipUt lPmNheY/7RkiMG3au5JBo2+JY8aZJftQ2cLLk0GJKeOc9co+Kj2n/qSbvQXWVAhltXIy g06A== X-Gm-Message-State: ABuFfojHyWsitV/QUpDmlwKHkKjnts3YkIc09e+h5E6O+7608uop6Teu JC3DFhheQE+bgtHTO7IvBhRxCQB9 X-Google-Smtp-Source: ACcGV62WV6RwqSFhb4P4Bf9JS7qZsTlAWDD4sv0vjXCMVdDarCzFn8zLRfhidxXodTatZyJWd9m74A== X-Received: by 2002:a5d:4a12:: with SMTP id m18-v6mr3717176wrq.278.1538295200337; Sun, 30 Sep 2018 01:13:20 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:19 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:11:59 +0200 Message-Id: <1538295197-23704-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 01/79] virtio: Return true from virtio_queue_empty if broken 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> Cc: Fam Zheng <famz@redhat.com> 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/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index f6a588a..94f5c8e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -358,6 +358,10 @@ int virtio_queue_ready(VirtQueue *vq) * Called within rcu_read_lock(). */ static int virtio_queue_empty_rcu(VirtQueue *vq) { + if (unlikely(vq->vdev->broken)) { + return 1; + } + if (unlikely(!vq->vring.avail)) { return 1; } @@ -373,6 +377,10 @@ int virtio_queue_empty(VirtQueue *vq) { bool empty; + if (unlikely(vq->vdev->broken)) { + return 1; + } + if (unlikely(!vq->vring.avail)) { return 1; }