* Markus Armbruster ([email protected]) wrote: > 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 <[email protected]>
Reviewed-by: Dr. David Alan Gilbert <[email protected]> > --- > migration/page_cache.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/migration/page_cache.c b/migration/page_cache.c > index e07f4ad1dc..ed979eeb45 100644 > --- a/migration/page_cache.c > +++ b/migration/page_cache.c > @@ -53,8 +53,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size, > Error **errp) > /* We prefer not to abort if there is no memory */ > cache = g_try_malloc(sizeof(*cache)); > if (!cache) { > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", > - "Failed to allocate cache"); > + error_setg(errp, "Failed to allocate cache"); > return NULL; > } > cache->page_size = page_size; > @@ -67,8 +66,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size, > Error **errp) > cache->page_cache = g_try_malloc_n(cache->max_num_items, > sizeof(*cache->page_cache)); > if (!cache->page_cache) { > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", > - "Failed to allocate page cache"); > + error_setg(errp, "Failed to allocate page cache"); > g_free(cache); > return NULL; > } > -- > 2.26.2 > -- Dr. David Alan Gilbert / [email protected] / Manchester, UK
