xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: Clean up signed vs. unsigned XBZRLE cache-size

Browse Source 
73af8dd8d7 "migration: Make xbzrle_cache_size a migration
parameter" (v2.11.0) made the new parameter unsigned (QAPI type
'size', uint64_t in C).  It neglected to update existing code, which
continues to use int64_t.

migrate_xbzrle_cache_size() returns the new parameter.  Adjust its
return type.

QMP query-migrate-cache-size returns migrate_xbzrle_cache_size().
Adjust its return type.

migrate-set-parameters passes the new parameter to
xbzrle_cache_resize().  Adjust its parameter type.

xbzrle_cache_resize() passes it on to cache_init().  Adjust its
parameter type.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210202141734.2488076-3-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:32 +01:00 committed by Dr. David Alan Gilbert
parent ec17de0ac0
commit 8b9407a09f
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/migration.c
View File

@ -2308,7 +2308,7 @@ void qmp_migrate_set_cache_size(int64_t value, Error **errp)
qmp_migrate_set_parameters(&p, errp); qmp_migrate_set_parameters(&p, errp);
} }
int64_t qmp_query_migrate_cache_size(Error **errp) uint64_t qmp_query_migrate_cache_size(Error **errp)
{ {
return migrate_xbzrle_cache_size(); return migrate_xbzrle_cache_size();
} }
@ -2538,7 +2538,7 @@ int migrate_use_xbzrle(void)
return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE]; return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE];
} }
int64_t migrate_xbzrle_cache_size(void) uint64_t migrate_xbzrle_cache_size(void)
{ {
MigrationState *s; MigrationState *s;

2
migration/migration.h
View File

@ -327,7 +327,7 @@ int migrate_multifd_zlib_level(void);
int migrate_multifd_zstd_level(void); int migrate_multifd_zstd_level(void);
int migrate_use_xbzrle(void); int migrate_use_xbzrle(void);
int64_t migrate_xbzrle_cache_size(void); uint64_t migrate_xbzrle_cache_size(void);
bool migrate_colo_enabled(void); bool migrate_colo_enabled(void);
bool migrate_use_block(void); bool migrate_use_block(void);

2
migration/page_cache.c
View File

@ -38,7 +38,7 @@ struct PageCache {
size_t num_items; size_t num_items;
}; };
PageCache *cache_init(int64_t new_size, size_t page_size, Error **errp) PageCache *cache_init(uint64_t new_size, size_t page_size, Error **errp)
{ {
int64_t i; int64_t i;
size_t num_pages = new_size / page_size; size_t num_pages = new_size / page_size;

2
migration/page_cache.h
View File

@ -28,7 +28,7 @@ typedef struct PageCache PageCache;
* @page_size: cache page size * @page_size: cache page size
* @errp: set *errp if the check failed, with reason * @errp: set *errp if the check failed, with reason
*/ */
PageCache *cache_init(int64_t cache_size, size_t page_size, Error **errp); PageCache *cache_init(uint64_t cache_size, size_t page_size, Error **errp);
/** /**
* cache_fini: free all cache resources * cache_fini: free all cache resources
* @cache pointer to the PageCache struct * @cache pointer to the PageCache struct

2
migration/ram.c
View File

@ -131,7 +131,7 @@ static void XBZRLE_cache_unlock(void)
* @new_size: new cache size * @new_size: new cache size
* @errp: set *errp if the check failed, with reason * @errp: set *errp if the check failed, with reason
*/ */
int xbzrle_cache_resize(int64_t new_size, Error **errp) int xbzrle_cache_resize(uint64_t new_size, Error **errp)
{ {
PageCache *new_cache; PageCache *new_cache;
int64_t ret = 0; int64_t ret = 0;

2
migration/ram.h
View File

@ -47,7 +47,7 @@ bool ramblock_is_ignored(RAMBlock *block);
INTERNAL_RAMBLOCK_FOREACH(block) \ INTERNAL_RAMBLOCK_FOREACH(block) \
if (!qemu_ram_is_migratable(block)) {} else if (!qemu_ram_is_migratable(block)) {} else
int xbzrle_cache_resize(int64_t new_size, Error **errp); int xbzrle_cache_resize(uint64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void); uint64_t ram_bytes_total(void);

4
qapi/migration.json
View File

@ -78,7 +78,7 @@
# Since: 1.2 # Since: 1.2
## ##
{ 'struct': 'XBZRLECacheStats', { 'struct': 'XBZRLECacheStats',
'data': {'cache-size': 'int', 'bytes': 'int', 'pages': 'int', 'data': {'cache-size': 'size', 'bytes': 'int', 'pages': 'int',
'cache-miss': 'int', 'cache-miss-rate': 'number', 'cache-miss': 'int', 'cache-miss-rate': 'number',
'encoding-rate': 'number', 'overflow': 'int' } } 'encoding-rate': 'number', 'overflow': 'int' } }
@ -1470,7 +1470,7 @@
# <- { "return": 67108864 } # <- { "return": 67108864 }
# #
## ##
{ 'command': 'query-migrate-cache-size', 'returns': 'int', { 'command': 'query-migrate-cache-size', 'returns': 'size',
'features': [ 'deprecated' ] } 'features': [ 'deprecated' ] }
## ##