mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Fix cache_init()'s "Failed to allocate" error messages

Browse Source 
cache_init() attempts to handle allocation failure.  The two error
messages are garbage, as untested error messages commonly are:

    Parameter 'cache size' expects Failed to allocate cache
    Parameter 'cache size' expects Failed to allocate page cache

Fix them to just

    Failed to allocate cache
    Failed to allocate page cache

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210202141734.2488076-4-armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Markus Armbruster 2021-02-02 15:17:33 +01:00 committed by Dr. David Alan Gilbert
parent 8b9407a09f
commit 7bfc47936e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/page_cache.c
View File

@ -60,8 +60,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size, Error **errp)
/* We prefer not to abort if there is no memory */ /* We prefer not to abort if there is no memory */
cache = g_try_malloc(sizeof(*cache)); cache = g_try_malloc(sizeof(*cache));
if (!cache) { if (!cache) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", error_setg(errp, "Failed to allocate cache");
"Failed to allocate cache");
return NULL; return NULL;
} }
cache->page_size = page_size; cache->page_size = page_size;
@ -74,8 +73,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size, Error **errp)
cache->page_cache = g_try_malloc((cache->max_num_items) * cache->page_cache = g_try_malloc((cache->max_num_items) *
sizeof(*cache->page_cache)); sizeof(*cache->page_cache));
if (!cache->page_cache) { if (!cache->page_cache) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", error_setg(errp, "Failed to allocate page cache");
"Failed to allocate page cache");
g_free(cache); g_free(cache);
return NULL; return NULL;
} }