From patchwork Fri May 6 07:26:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 761072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p467QsYs007360 for ; Fri, 6 May 2011 07:26:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612Ab1EFH0v (ORCPT ); Fri, 6 May 2011 03:26:51 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:37547 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753057Ab1EFH0v (ORCPT ); Fri, 6 May 2011 03:26:51 -0400 Received: by wya21 with SMTP id 21so2188193wya.19 for ; Fri, 06 May 2011 00:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=ujSSTqiaYmrsicpe5jfaMd8XXLx0QoLUbngC455qTmE=; b=ISzQ8O+HYdjuz5uKbVWevgoXYnZbqBycp8F32AyCDYamSpZiI0kyM+HKRTifGK4pZ8 fS8Xi55BS2sivennmW3PxvQZsnKs87VHRmAdBWg5kXA5/jmqunJKZslR1cnUSdOUxvdL nu3KI3N6oUrtUSA88OcKlvlWYknwuSoY6w75Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=GPp6Ua4Bs1zSerFGLjhRc7EtLhqCUpJOe40v2A0TjgP9ZCwTsiBJHb++U1sSwnZf93 574ilmMTJDRxkGgOMVh42RABl0eXASaPWZzds2vkymR3psdRXH8F0C32lD56XEssjBhB v23zlgh2Cey3UpVq32XvIbFC9pqhFT1ACNkFA= Received: by 10.216.143.7 with SMTP id k7mr3240227wej.95.1304666809642; Fri, 06 May 2011 00:26:49 -0700 (PDT) Received: from localhost.localdomain ([109.65.211.213]) by mx.google.com with ESMTPS id d54sm1453950wej.34.2011.05.06.00.26.47 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 May 2011 00:26:48 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, kvm@vger.kernel.org, Sasha Levin Subject: [PATCH 1/2] kvm tools: Fix IRQ assignments Date: Fri, 6 May 2011 10:26:34 +0300 Message-Id: <1304666795-15251-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 06 May 2011 07:26:54 +0000 (UTC) virtio-blk needs a block of 4 IRQs (currently - staticly defined). Giving the initial IRQ of 15 causes breakage when adding more than one device. Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/virtio-pci-dev.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/kvm/include/kvm/virtio-pci-dev.h b/tools/kvm/include/kvm/virtio-pci-dev.h index 431289d..41125c2 100644 --- a/tools/kvm/include/kvm/virtio-pci-dev.h +++ b/tools/kvm/include/kvm/virtio-pci-dev.h @@ -31,10 +31,16 @@ enum { }; enum { - VIRTIO_RNG_IRQ = 11, - VIRTIO_CONSOLE_IRQ = 13, - VIRTIO_NET_IRQ = 14, - VIRTIO_BLK_IRQ = 15, + VIRTIO_RNG_IRQ = 9, + VIRTIO_CONSOLE_IRQ = 10, + VIRTIO_NET_IRQ = 11, + VIRTIO_BLK_IRQ = 12, + /* + * FIXME: Currently IRQs 12-15 are reserved for possible + * virtio-blk devices. Static assignment will be avoided + * once dynamic IRQ assignment is added (or switch to + * MSI-X). + */ }; #endif /* VIRTIO_PCI_DEV_H_ */