On Mon, 04/27 18:28, Paolo Bonzini wrote:
> DIRTY_MEMORY_MIGRATION is triggered by memory_global_dirty_log_start
> and memory_global_dirty_log_stop, so it cannot be used with
> memory_region_set_log.
>
> Specify this in the documentation and assert it.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Fam Zheng <f...@redhat.com>
> ---
> include/exec/memory.h | 3 +--
> memory.c | 1 +
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index a2ea587..081f7d6 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -625,8 +625,7 @@ void memory_region_ram_resize(MemoryRegion *mr,
> ram_addr_t newsize,
> *
> * @mr: the memory region being updated.
> * @log: whether dirty logging is to be enabled or disabled.
> - * @client: the user of the logging information; %DIRTY_MEMORY_MIGRATION or
> - * %DIRTY_MEMORY_VGA.
> + * @client: the user of the logging information; %DIRTY_MEMORY_VGA only.
> */
> void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client);
>
> diff --git a/memory.c b/memory.c
> index a11e9bf..e688f5e 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1354,6 +1354,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log,
> unsigned client)
> {
> uint8_t mask = 1 << client;
>
> + assert(client == DIRTY_MEMORY_VGA);
> memory_region_transaction_begin();
> mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
> memory_region_update_pending |= mr->enabled;
> --
> 1.8.3.1
>
>
