From patchwork Fri Dec 7 19:46:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 204600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0ACB62C0134 for ; Sat, 8 Dec 2012 06:46:36 +1100 (EST) Received: from localhost ([::1]:52111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th3sY-0000g2-TA for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 14:46:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th3sM-0000ew-R5 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 14:46:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th3sG-0007cs-UK for qemu-devel@nongnu.org; Fri, 07 Dec 2012 14:46:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th3sG-0007co-N0 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 14:46:16 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB7JkEJw019871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Dec 2012 14:46:14 -0500 Received: from bling.home (ovpn-113-97.phx2.redhat.com [10.3.113.97]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qB7JkAbH024851; Fri, 7 Dec 2012 14:46:14 -0500 To: mtosatti@redhat.com, gleb@redhat.com From: Alex Williamson Date: Fri, 07 Dec 2012 12:46:10 -0700 Message-ID: <20121207194503.20524.17054.stgit@bling.home> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH] kvm: Detect number of available memory slots from the host kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The kernel already exposes an interface for this, x86 returns a proper value and for the rest we can default to the defacto standard of 32. The primary motivation for this is to support more PCI assigned devices, both through pci-assign and vfio-pci. Signed-off-by: Alex Williamson --- kvm-all.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 8e9a8d8..34d97f3 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -71,7 +71,8 @@ typedef struct kvm_dirty_log KVMDirtyLog; struct KVMState { - KVMSlot slots[32]; + KVMSlot *slots; + int num_slots; int fd; int vmfd; int coalesced_mmio; @@ -120,7 +121,7 @@ static KVMSlot *kvm_alloc_slot(KVMState *s) { int i; - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + for (i = 0; i < s->num_slots; i++) { if (s->slots[i].memory_size == 0) { return &s->slots[i]; } @@ -136,7 +137,7 @@ static KVMSlot *kvm_lookup_matching_slot(KVMState *s, { int i; - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + for (i = 0; i < s->num_slots; i++) { KVMSlot *mem = &s->slots[i]; if (start_addr == mem->start_addr && @@ -158,7 +159,7 @@ static KVMSlot *kvm_lookup_overlapping_slot(KVMState *s, KVMSlot *found = NULL; int i; - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + for (i = 0; i < s->num_slots; i++) { KVMSlot *mem = &s->slots[i]; if (mem->memory_size == 0 || @@ -180,7 +181,7 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram, { int i; - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + for (i = 0; i < s->num_slots; i++) { KVMSlot *mem = &s->slots[i]; if (ram >= mem->ram && ram < mem->ram + mem->memory_size) { @@ -340,7 +341,7 @@ static int kvm_set_migration_log(int enable) s->migration_log = enable; - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + for (i = 0; i < s->num_slots; i++) { mem = &s->slots[i]; if (!mem->memory_size) { @@ -1268,9 +1269,6 @@ int kvm_init(void) #ifdef KVM_CAP_SET_GUEST_DEBUG QTAILQ_INIT(&s->kvm_sw_breakpoints); #endif - for (i = 0; i < ARRAY_SIZE(s->slots); i++) { - s->slots[i].slot = i; - } s->vmfd = -1; s->fd = qemu_open("/dev/kvm", O_RDWR); if (s->fd == -1) { @@ -1324,6 +1322,16 @@ int kvm_init(void) goto err; } + s->num_slots = kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS); + if (s->num_slots <= 0) { + s->num_slots = 32; + } + s->slots = g_malloc0(s->num_slots * sizeof(*s->slots)); + + for (i = 0; i < s->num_slots; i++) { + s->slots[i].slot = i; + } + s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); s->broken_set_mem_region = 1; @@ -1393,6 +1401,7 @@ err: if (s->fd != -1) { close(s->fd); } + g_free(s->slots); g_free(s); return ret;