Skip to content

Commit

Permalink
backends: Use g_autofree in HostMemoryBackendClass::alloc() handlers
Browse files Browse the repository at this point in the history
In preparation of having HostMemoryBackendClass::alloc() handlers
return a boolean, have them use g_autofree.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-15-philmd@linaro.org>
  • Loading branch information
philmd committed Jan 5, 2024
1 parent 9583a90 commit 2d7a1eb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions backends/hostmem-epc.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
static void
sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
{
g_autofree char *name = NULL;
uint32_t ram_flags;
char *name;
int fd;

if (!backend->size) {
Expand All @@ -41,7 +41,6 @@ sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),
name, backend->size, ram_flags,
fd, 0, errp);
g_free(name);
}

static void sgx_epc_backend_instance_init(Object *obj)
Expand Down
3 changes: 1 addition & 2 deletions backends/hostmem-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
object_get_typename(OBJECT(backend)));
#else
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);
g_autofree gchar *name = NULL;
uint32_t ram_flags;
gchar *name;

if (!backend->size) {
error_setg(errp, "can't create backend with size 0");
Expand Down Expand Up @@ -89,7 +89,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), name,
backend->size, fb->align, ram_flags,
fb->mem_path, fb->offset, errp);
g_free(name);
#endif
}

Expand Down
3 changes: 1 addition & 2 deletions backends/hostmem-memfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ static void
memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
{
HostMemoryBackendMemfd *m = MEMORY_BACKEND_MEMFD(backend);
g_autofree char *name = NULL;
uint32_t ram_flags;
char *name;
int fd;

if (!backend->size) {
Expand All @@ -57,7 +57,6 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
ram_flags |= backend->reserve ? 0 : RAM_NORESERVE;
memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend), name,
backend->size, ram_flags, fd, 0, errp);
g_free(name);
}

static bool
Expand Down
3 changes: 1 addition & 2 deletions backends/hostmem-ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
static void
ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
{
g_autofree char *name = NULL;
uint32_t ram_flags;
char *name;

if (!backend->size) {
error_setg(errp, "can't create backend with size 0");
Expand All @@ -32,7 +32,6 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
ram_flags |= backend->reserve ? 0 : RAM_NORESERVE;
memory_region_init_ram_flags_nomigrate(&backend->mr, OBJECT(backend), name,
backend->size, ram_flags, errp);
g_free(name);
}

static void
Expand Down

0 comments on commit 2d7a1eb

Please sign in to comment.