Message ID | 1517858941-5538-27-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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eWDmOZWC"; 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 3zZykD53Kyz9s8J for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 06:45:40 +1100 (AEDT) Received: from localhost ([::1]:54851 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 1eimhu-0002lk-MX for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 14:45:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSR-0004dJ-T0 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSP-00054E-4W for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:39 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33630) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSO-000541-TW for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:37 -0500 Received: by mail-wm0-x242.google.com with SMTP id x4-v6so14586036wmc.0 for <qemu-devel@nongnu.org>; Mon, 05 Feb 2018 11:29:36 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=/BcBK52QDUslaIzvep9QkNP18vkykrhqx+VVpa2xSMs=; b=eWDmOZWCUa62XyhdIakh3/i+T10RIli/6TInodOYGTrO2a6P97WVzIEsrTstCigWMG v5O53JAUlEs/HfREdONzJLb9kpwIaDj9hhughk/ppdjt4e1IxwHL0CYOiB4rbI42YL+I EtC2S54W5L86+a8s78fKXrbcUdbl1OtS2pI2860FW4v2iiY5DzQhU2wRi1NoznLnFLen mQC8z+KpXiiiept8fx5mnALXznoxAYaBytry1FZMOkvi7CiUhHlIneCTGSmbE9PIW25X od92Si9xb7VKYcqaI/IipNrozT967zX1W9tb11gGExPRTaB32GWkEB+rNaGq1DlzYlRM nJtA== 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:mime-version:content-transfer-encoding; bh=/BcBK52QDUslaIzvep9QkNP18vkykrhqx+VVpa2xSMs=; b=lFfHLzBwA4sAeSr6MkM9qjrVaBdu3kcoNRscASgQvQPWrWSJH4CpzSfIUv02r2xuwG Oc+auPSfFCUSQl4uYzdsSgMrg+ho4QM8G7yAFMRtqmKnyIFIZaBUpHBQmgYJ1qx9Qucb e1/1acgLnQcJLbHN0INVnPST6waiEPw0Y7RTENWSauSgCDVqjYgiLHw4rddsPQcQJj8R 9NnW3cmzdzCjxZU2kGSx1hqk69gMwePD2/HtIcNmAYP/VHCiweOe5I2awwYApX7CEM5i 6i5MwrpR/SICrI2CQ3qdF+Y8DCalOxp7HnY6oLINz2Yjy5fKmcUTiDZsMcuXOyFIg6RW 109g== X-Gm-Message-State: APf1xPAsNRndLXhSjZOomq0uUwAYZqO8ousuJliTZJy3qGZ4cAD4MFO1 2DNtYajQq8745nc37Um1E7dYdXM9 X-Google-Smtp-Source: AH8x225yMJM578PIDbbkBp9rfs/rYzbLM2BY1knglZy1yI+AbKtq6ed1x3JzUYI8Sp3MI/02I+RFmg== X-Received: by 10.28.169.200 with SMTP id s191mr324035wme.9.1517858975554; Mon, 05 Feb 2018 11:29:35 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:34 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:40 +0100 Message-Id: <1517858941-5538-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-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:c09::242 Subject: [Qemu-devel] [PULL 26/47] ivshmem: Don't update non-existent MSI routes 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: Ladi Prosek <lprosek@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/47] memory: update comments and fix some typos
|
expand
|
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 4919011..0b471d9 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -316,6 +316,10 @@ static int ivshmem_vector_unmask(PCIDevice *dev, unsigned vector, int ret; IVSHMEM_DPRINTF("vector unmask %p %d\n", dev, vector); + if (!v->pdev) { + error_report("ivshmem: vector %d route does not exist", vector); + return -EINVAL; + } ret = kvm_irqchip_update_msi_route(kvm_state, v->virq, msg, dev); if (ret < 0) { @@ -330,12 +334,16 @@ static void ivshmem_vector_mask(PCIDevice *dev, unsigned vector) { IVShmemState *s = IVSHMEM_COMMON(dev); EventNotifier *n = &s->peers[s->vm_id].eventfds[vector]; + MSIVector *v = &s->msi_vectors[vector]; int ret; IVSHMEM_DPRINTF("vector mask %p %d\n", dev, vector); + if (!v->pdev) { + error_report("ivshmem: vector %d route does not exist", vector); + return; + } - ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, - s->msi_vectors[vector].virq); + ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, v->virq); if (ret != 0) { error_report("remove_irqfd_notifier_gsi failed"); }