qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling
Date: Thu, 29 Oct 2015 11:39:33 +0200	[thread overview]
Message-ID: <1446111531-5755-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1446111531-5755-1-git-send-email-mst@redhat.com>

Existing callers are checking for MAP_FAILED,
so we should return that on error.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 util/mmap-alloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 1394269..c37acbe 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -26,7 +26,7 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
     void *ptr1;
 
     if (ptr == MAP_FAILED) {
-        return NULL;
+        return MAP_FAILED;
     }
 
     /* Make sure align is a power of 2 */
@@ -41,7 +41,7 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
                 fd, 0);
     if (ptr1 == MAP_FAILED) {
         munmap(ptr, total);
-        return NULL;
+        return MAP_FAILED;
     }
 
     ptr += offset;
-- 
MST

  parent reply	other threads:[~2015-10-29  9:39 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-29  9:39 [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5 Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 01/16] vhost-user: cleanup struct size math Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 02/16] vhost-user: cleanup msg " Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 03/16] vhost-user-test: fix up rhel6 build Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 04/16] pc: memhp: do not emit inserting event for coldplugged DIMMs Michael S. Tsirkin
2015-10-29  9:39 ` Michael S. Tsirkin [this message]
2015-10-29  9:39 ` [Qemu-devel] [PULL 06/16] virtio: introduce virtio_map Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 07/16] virtio: switch to virtio_map Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 08/16] virtio-blk: convert to virtqueue_map Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 09/16] virtio-serial: convert to virtio_map Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 10/16] virtio-scsi: convert to virtqueue_map Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 11/16] virtio: drop virtqueue_map_sg Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's GPA" Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 13/16] Revert "memhp: extend address auto assignment to support gaps" Michael S. Tsirkin
2015-10-29  9:39 ` [Qemu-devel] [PULL 14/16] tests/vhost-user-bridge: add vhost-user bridge application Michael S. Tsirkin
2015-10-29  9:40 ` [Qemu-devel] [PULL 15/16] remove function during multi-function hot-add Michael S. Tsirkin
2015-10-29  9:40 ` [Qemu-devel] [PULL 16/16] enable " Michael S. Tsirkin
2015-10-29 11:09 ` [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446111531-5755-6-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).