diff mbox series

[20/88] Migration: use g_new() family of functions

Message ID 20171006235023.11952-21-f4bug@amsat.org
State New
Headers show
Series use g_new() family of functions | expand

Commit Message

Philippe Mathieu-Daudé Oct. 6, 2017, 11:49 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: indented, added migration/migration.c and migration/page_cache.c]
---
 migration/migration.c    | 2 +-
 migration/page_cache.c   | 2 +-
 migration/postcopy-ram.c | 2 +-
 migration/ram.c          | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

Comments

Juan Quintela Oct. 7, 2017, 10:15 a.m. UTC | #1 
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> [PMD: indented, added migration/migration.c and migration/page_cache.c]

Reviewed-by: Juan Quintela <quintela@redhat.com>

Do you want me to include it, or you want to include it yourself?

Later, Juan.
diff mbox series

Patch

diff --git a/migration/migration.c b/migration/migration.c
index 98429dc843..4899182b32 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -485,7 +485,7 @@  MigrationParameters *qmp_query_migrate_parameters(Error **errp)
     MigrationState *s = migrate_get_current();
 
     /* TODO use QAPI_CLONE() instead of duplicating it inline */
-    params = g_malloc0(sizeof(*params));
+    params = g_new0(MigrationParameters, 1);
     params->has_compress_level = true;
     params->compress_level = s->parameters.compress_level;
     params->has_compress_threads = true;
diff --git a/migration/page_cache.c b/migration/page_cache.c
index ba984c4858..30169a1dd3 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -57,7 +57,7 @@  PageCache *cache_init(int64_t num_pages, unsigned int page_size)
     }
 
     /* We prefer not to abort if there is no memory */
-    cache = g_try_malloc(sizeof(*cache));
+    cache = g_try_new(PageCache, 1);
     if (!cache) {
         DPRINTF("Failed to allocate cache\n");
         return NULL;
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 0de68e8b25..d51684ce30 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -811,7 +811,7 @@  void *postcopy_get_tmp_page(MigrationIncomingState *mis)
 PostcopyDiscardState *postcopy_discard_send_init(MigrationState *ms,
                                                  const char *name)
 {
-    PostcopyDiscardState *res = g_malloc0(sizeof(PostcopyDiscardState));
+    PostcopyDiscardState *res = g_new0(PostcopyDiscardState, 1);
 
     if (res) {
         res->ramblock_name = name;
diff --git a/migration/ram.c b/migration/ram.c
index b83f8977c5..3f5407ee43 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1376,8 +1376,7 @@  int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
         goto err;
     }
 
-    struct RAMSrcPageRequest *new_entry =
-        g_malloc0(sizeof(struct RAMSrcPageRequest));
+    struct RAMSrcPageRequest *new_entry = g_new0(struct RAMSrcPageRequest, 1);
     new_entry->rb = ramblock;
     new_entry->offset = start;
     new_entry->len = len;