From patchwork Thu Apr 11 16:36:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 2429591 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 58578DF230 for ; Thu, 11 Apr 2013 16:36:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762683Ab3DKQgt (ORCPT ); Thu, 11 Apr 2013 12:36:49 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:64790 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754654Ab3DKQgr (ORCPT ); Thu, 11 Apr 2013 12:36:47 -0400 Received: from mudshark.cambridge.arm.com (mudshark.cambridge.arm.com [10.1.79.58]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id r3BGaeki007869; Thu, 11 Apr 2013 17:36:40 +0100 (BST) Received: by mudshark.cambridge.arm.com (Postfix, from userid 1000) id AAF38C2A93; Thu, 11 Apr 2013 17:36:28 +0100 (BST) From: Will Deacon To: kvm@vger.kernel.org Cc: penberg@kernel.org, sasha.levin@oracle.com, marc.zyngier@arm.com, Will Deacon Subject: [PATCH 5/5] kvm tools: bump number of virtio MMIO vqueues Date: Thu, 11 Apr 2013 17:36:26 +0100 Message-Id: <1365698186-27355-6-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1365698186-27355-1-git-send-email-will.deacon@arm.com> References: <1365698186-27355-1-git-send-email-will.deacon@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Commit 4d789d4a2050 ("kvm tools: Increase amount of possible interrupts per PCI device") increased the maximum amount of virtio queues for the PCI transport, but neglected to do the same for MMIO. This patch makes the same change for virtio-mmio. Cc: Sasha Levin Reported-by: Marc Zyngier Signed-off-by: Will Deacon --- Sasha -- although this fixes a SEGV when booting a guest which tries to use virtio-net over MMIO, it *drastically* increases the memory footprint of a guest kernel to unacceptable levels (38MB -> 170MB). tools/kvm/include/kvm/virtio-mmio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/kvm/include/kvm/virtio-mmio.h b/tools/kvm/include/kvm/virtio-mmio.h index 983c8fc..4d6a671 100644 --- a/tools/kvm/include/kvm/virtio-mmio.h +++ b/tools/kvm/include/kvm/virtio-mmio.h @@ -4,7 +4,7 @@ #include #include -#define VIRTIO_MMIO_MAX_VQ 3 +#define VIRTIO_MMIO_MAX_VQ 32 #define VIRTIO_MMIO_MAX_CONFIG 1 #define VIRTIO_MMIO_IO_SIZE 0x200