Merge commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78' into upstream-merge

* commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78':
  Rename LIBOBJS to libobj-y
  Rename OBJS to obj-y
  cpu_unregister_map_client: fix memory leak.
  Add documentation for Multiboot

Conflicts:
	Makefile.target

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/exec.c b/exec.c
index a745fe1e7..f6d9ec9d8 100644
--- a/exec.c
+++ b/exec.c
@@ -3414,6 +3414,7 @@ void cpu_unregister_map_client(void *_client)
     MapClient *client = (MapClient *)_client;
 
     LIST_REMOVE(client, link);
+    qemu_free(client);
 }
 
 static void cpu_notify_map_clients(void)
@@ -3423,7 +3424,7 @@ static void cpu_notify_map_clients(void)
     while (!LIST_EMPTY(&map_client_list)) {
         client = LIST_FIRST(&map_client_list);
         client->callback(client->opaque);
-        LIST_REMOVE(client, link);
+        cpu_unregister_map_client(client);
     }
 }