From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyrill Gorcunov Subject: [PATCH] kvm tools: Fix test for mmap failure Date: Fri, 3 Feb 2012 23:15:41 +0400 Message-ID: <20120203191541.GO11834@moon> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Sasha Levin , Asias He , Ingo Molnar , KVM-ML To: Pekka Enberg Return-path: Received: from mail-bk0-f46.google.com ([209.85.214.46]:58416 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753377Ab2BCTPr (ORCPT ); Fri, 3 Feb 2012 14:15:47 -0500 Received: by bkcjm19 with SMTP id jm19so3336855bkc.19 for ; Fri, 03 Feb 2012 11:15:45 -0800 (PST) Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: On error mmap returns MAP_FAILED so we need a proper test here. Signed-off-by: Cyrill Gorcunov --- tools/kvm/hw/pci-shmem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux-2.6.git/tools/kvm/hw/pci-shmem.c =================================================================== --- linux-2.6.git.orig/tools/kvm/hw/pci-shmem.c +++ linux-2.6.git/tools/kvm/hw/pci-shmem.c @@ -209,7 +209,7 @@ static void *setup_shmem(const char *key PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NORESERVE, fd, 0); close(fd); - if (mem == NULL) + if (mem == MAP_FAILED) pr_warning("Failed to mmap shared memory file"); return mem; @@ -259,8 +259,9 @@ int pci_shmem__init(struct kvm *kvm) /* Open shared memory and plug it into the guest */ mem = setup_shmem(shmem_region->handle, shmem_region->size, shmem_region->create); - if (mem == NULL) + if (mem == MAP_FAILED) return 0; + kvm__register_mem(kvm, shmem_region->phys_addr, shmem_region->size, mem); return 1;