From patchwork Tue Oct 9 18:08:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 1571071 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 58035DFFF1 for ; Tue, 9 Oct 2012 18:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756748Ab2JISJU (ORCPT ); Tue, 9 Oct 2012 14:09:20 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56369 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756704Ab2JISJK (ORCPT ); Tue, 9 Oct 2012 14:09:10 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id A23DAA3E19; Tue, 9 Oct 2012 20:09:09 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: kvm@vger.kernel.org Cc: Marcelo Tosatti , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH stable-0.15 5/6] pci-assign: Update legacy interrupts only if used Date: Tue, 9 Oct 2012 20:08:52 +0200 Message-Id: <1349806133-1916-6-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349806133-1916-1-git-send-email-afaerber@suse.de> References: <1349806133-1916-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Jan Kiszka Don't mess with assign_intx on devices that are in MSI or MSI-X mode, it would corrupt their interrupt routing. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti (cherry picked from commit 096392efe1e5ee670f880c96c31f7ea8d6d76cf4) Signed-off-by: Andreas Färber --- hw/device-assignment.c | 9 ++++++--- 1 Datei geändert, 6 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index d586ce4..43029a4 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1062,9 +1062,12 @@ void assigned_dev_update_irqs(void) dev = QLIST_FIRST(&devs); while (dev) { next = QLIST_NEXT(dev, next); - r = assign_irq(dev); - if (r < 0) - qdev_unplug(&dev->dev.qdev); + if (dev->irq_requested_type & KVM_DEV_IRQ_HOST_INTX) { + r = assign_irq(dev); + if (r < 0) { + qdev_unplug(&dev->dev.qdev); + } + } dev = next; } }