ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ram: Rename qemu_target_page_bits() to qemu_target_page_size() 

It was used as a size in all cases except one.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2017-03-21 09:09:14 +01:00
parent a0a8aa147a
commit 20afaed98b
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exec.c
View File

@ -3307,9 +3307,9 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
* Allows code that needs to deal with migration bitmaps etc to still be built * Allows code that needs to deal with migration bitmaps etc to still be built
* target independent. * target independent.
*/ */
size_t qemu_target_page_bits(void) size_t qemu_target_page_size(void)
{ {
return TARGET_PAGE_BITS; return TARGET_PAGE_SIZE;
} }
#endif #endif

2
include/sysemu/sysemu.h
View File

@ -67,7 +67,7 @@ int qemu_reset_requested_get(void);
void qemu_system_killed(int signal, pid_t pid); void qemu_system_killed(int signal, pid_t pid);
void qemu_system_reset(bool report); void qemu_system_reset(bool report);
void qemu_system_guest_panicked(GuestPanicInformation *info); void qemu_system_guest_panicked(GuestPanicInformation *info);
size_t qemu_target_page_bits(void); size_t qemu_target_page_size(void);
void qemu_add_exit_notifier(Notifier *notify); void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify); void qemu_remove_exit_notifier(Notifier *notify);

4
migration/migration.c
View File

@ -654,7 +654,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->skipped = 0; info->ram->skipped = 0;
info->ram->normal = norm_mig_pages_transferred(); info->ram->normal = norm_mig_pages_transferred();
info->ram->normal_bytes = norm_mig_pages_transferred() * info->ram->normal_bytes = norm_mig_pages_transferred() *
(1ul << qemu_target_page_bits()); qemu_target_page_size();
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = ram_dirty_sync_count(); info->ram->dirty_sync_count = ram_dirty_sync_count();
info->ram->postcopy_requests = ram_postcopy_requests(); info->ram->postcopy_requests = ram_postcopy_requests();
@ -2009,7 +2009,7 @@ static void *migration_thread(void *opaque)
10000 is a small enough number for our purposes */ 10000 is a small enough number for our purposes */
if (ram_dirty_pages_rate() && transferred_bytes > 10000) { if (ram_dirty_pages_rate() && transferred_bytes > 10000) {
s->expected_downtime = ram_dirty_pages_rate() * s->expected_downtime = ram_dirty_pages_rate() *
(1ul << qemu_target_page_bits()) / bandwidth; qemu_target_page_size() / bandwidth;
} }
qemu_file_reset_rate_limit(s->to_dst_file); qemu_file_reset_rate_limit(s->to_dst_file);

8
migration/postcopy-ram.c
View File

@ -123,7 +123,7 @@ bool postcopy_ram_supported_by_host(void)
struct uffdio_range range_struct; struct uffdio_range range_struct;
uint64_t feature_mask; uint64_t feature_mask;
if ((1ul << qemu_target_page_bits()) > pagesize) { if (qemu_target_page_size() > pagesize) {
error_report("Target page size bigger than host page size"); error_report("Target page size bigger than host page size");
goto out; goto out;
} }
@ -745,10 +745,10 @@ PostcopyDiscardState *postcopy_discard_send_init(MigrationState *ms,
void postcopy_discard_send_range(MigrationState *ms, PostcopyDiscardState *pds, void postcopy_discard_send_range(MigrationState *ms, PostcopyDiscardState *pds,
unsigned long start, unsigned long length) unsigned long start, unsigned long length)
{ {
size_t tp_bits = qemu_target_page_bits(); size_t tp_size = qemu_target_page_size();
/* Convert to byte offsets within the RAM block */ /* Convert to byte offsets within the RAM block */
pds->start_list[pds->cur_entry] = (start - pds->offset) << tp_bits; pds->start_list[pds->cur_entry] = (start - pds->offset) * tp_size;
pds->length_list[pds->cur_entry] = length << tp_bits; pds->length_list[pds->cur_entry] = length * tp_size;
trace_postcopy_discard_send_range(pds->ramblock_name, start, length); trace_postcopy_discard_send_range(pds->ramblock_name, start, length);
pds->cur_entry++; pds->cur_entry++;
pds->nsentwords++; pds->nsentwords++;

8
migration/savevm.c
View File

@ -871,7 +871,7 @@ void qemu_savevm_send_postcopy_advise(QEMUFile *f)
{ {
uint64_t tmp[2]; uint64_t tmp[2];
tmp[0] = cpu_to_be64(ram_pagesize_summary()); tmp[0] = cpu_to_be64(ram_pagesize_summary());
tmp[1] = cpu_to_be64(1ul << qemu_target_page_bits()); tmp[1] = cpu_to_be64(qemu_target_page_size());
trace_qemu_savevm_send_postcopy_advise(); trace_qemu_savevm_send_postcopy_advise();
qemu_savevm_command_send(f, MIG_CMD_POSTCOPY_ADVISE, 16, (uint8_t *)tmp); qemu_savevm_command_send(f, MIG_CMD_POSTCOPY_ADVISE, 16, (uint8_t *)tmp);
@ -1390,13 +1390,13 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis)
} }
remote_tps = qemu_get_be64(mis->from_src_file); remote_tps = qemu_get_be64(mis->from_src_file);
if (remote_tps != (1ul << qemu_target_page_bits())) { if (remote_tps != qemu_target_page_size()) {
/* /*
* Again, some differences could be dealt with, but for now keep it * Again, some differences could be dealt with, but for now keep it
* simple. * simple.
*/ */
error_report("Postcopy needs matching target page sizes (s=%d d=%d)", error_report("Postcopy needs matching target page sizes (s=%d d=%zd)",
(int)remote_tps, 1 << qemu_target_page_bits()); (int)remote_tps, qemu_target_page_size());
return -1; return -1;
} }