1. Patchew
  2. QEMU
  3. View series

[PATCH] monitor/hmp-cmds: add units for mirate_parameters.

Mao Zhongyi posted 1 patch 4 years ago
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test FreeBSD passed
Test asan passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200327073210.198080-1-maozhongyi@cmss.chinamobile.com
Maintainers: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
monitor/hmp-cmds.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Mao Zhongyi 4 years ago 
When running:
(qemu) info migrate_parameters
announce-initial: 50 ms
announce-max: 550 ms
announce-step: 100 ms
compress-wait-thread: on
...
max-bandwidth: 33554432 bytes/second
downtime-limit: 300 milliseconds
x-checkpoint-delay: 20000
...
xbzrle-cache-size: 67108864

add units for the parameters 'x-checkpoint-delay' and
'xbzrle-cache-size', it's easier to read.

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
---
 monitor/hmp-cmds.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 2a900a528a..8d22f96e57 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
             MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
             params->downtime_limit);
         assert(params->has_x_checkpoint_delay);
-        monitor_printf(mon, "%s: %u\n",
+        monitor_printf(mon, "%s: %u" " milliseconds\n",
             MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
             params->x_checkpoint_delay);
         assert(params->has_block_incremental);
@@ -453,7 +453,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
         monitor_printf(mon, "%s: %s\n",
             MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
             MultiFDCompression_str(params->multifd_compression));
-        monitor_printf(mon, "%s: %" PRIu64 "\n",
+        monitor_printf(mon, "%s: %" PRIu64 " bytes\n",
             MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
             params->xbzrle_cache_size);
         monitor_printf(mon, "%s: %" PRIu64 "\n",
-- 
2.17.1
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Stefano Garzarella 4 years ago 
Hi Mao,

On Fri, Mar 27, 2020 at 03:32:10PM +0800, Mao Zhongyi wrote:
> When running:
> (qemu) info migrate_parameters
> announce-initial: 50 ms
> announce-max: 550 ms
> announce-step: 100 ms
> compress-wait-thread: on
> ...
> max-bandwidth: 33554432 bytes/second
> downtime-limit: 300 milliseconds
> x-checkpoint-delay: 20000
> ...
> xbzrle-cache-size: 67108864
> 
> add units for the parameters 'x-checkpoint-delay' and
> 'xbzrle-cache-size', it's easier to read.
> 
> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
> ---
>  monitor/hmp-cmds.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 2a900a528a..8d22f96e57 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
>              MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
>              params->downtime_limit);
>          assert(params->has_x_checkpoint_delay);
> -        monitor_printf(mon, "%s: %u\n",
> +        monitor_printf(mon, "%s: %u" " milliseconds\n",
                                       ^
here we can remove the space and use a single string "%s: %u milliseconds\n"

I've noticed that we use both ms or milliseconds, if you want to clean up in a
separate patch, maybe we could use one of these everywhere. (I vote for 'ms')

Thanks,
Stefano

>              MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
>              params->x_checkpoint_delay);
>          assert(params->has_block_incremental);
> @@ -453,7 +453,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
>          monitor_printf(mon, "%s: %s\n",
>              MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
>              MultiFDCompression_str(params->multifd_compression));
> -        monitor_printf(mon, "%s: %" PRIu64 "\n",
> +        monitor_printf(mon, "%s: %" PRIu64 " bytes\n",
>              MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
>              params->xbzrle_cache_size);
>          monitor_printf(mon, "%s: %" PRIu64 "\n",
> -- 
> 2.17.1
> 
> 
> 
>
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Dr. David Alan Gilbert 4 years ago 
* Stefano Garzarella (sgarzare@redhat.com) wrote:
> Hi Mao,
> 
> On Fri, Mar 27, 2020 at 03:32:10PM +0800, Mao Zhongyi wrote:
> > When running:
> > (qemu) info migrate_parameters
> > announce-initial: 50 ms
> > announce-max: 550 ms
> > announce-step: 100 ms
> > compress-wait-thread: on
> > ...
> > max-bandwidth: 33554432 bytes/second
> > downtime-limit: 300 milliseconds
> > x-checkpoint-delay: 20000
> > ...
> > xbzrle-cache-size: 67108864
> > 
> > add units for the parameters 'x-checkpoint-delay' and
> > 'xbzrle-cache-size', it's easier to read.
> > 
> > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
> > ---
> >  monitor/hmp-cmds.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> > index 2a900a528a..8d22f96e57 100644
> > --- a/monitor/hmp-cmds.c
> > +++ b/monitor/hmp-cmds.c
> > @@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> >              MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
> >              params->downtime_limit);
> >          assert(params->has_x_checkpoint_delay);
> > -        monitor_printf(mon, "%s: %u\n",
> > +        monitor_printf(mon, "%s: %u" " milliseconds\n",
>                                        ^
> here we can remove the space and use a single string "%s: %u milliseconds\n"

Yes.

> I've noticed that we use both ms or milliseconds, if you want to clean up in a
> separate patch, maybe we could use one of these everywhere. (I vote for 'ms')

I do prefer 'ms', however we do seem to just use milliseconds in
info migrate

so we should probably stick to it.

Dave

> Thanks,
> Stefano
> 
> >              MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
> >              params->x_checkpoint_delay);
> >          assert(params->has_block_incremental);
> > @@ -453,7 +453,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> >          monitor_printf(mon, "%s: %s\n",
> >              MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
> >              MultiFDCompression_str(params->multifd_compression));
> > -        monitor_printf(mon, "%s: %" PRIu64 "\n",
> > +        monitor_printf(mon, "%s: %" PRIu64 " bytes\n",
> >              MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
> >              params->xbzrle_cache_size);
> >          monitor_printf(mon, "%s: %" PRIu64 "\n",
> > -- 
> > 2.17.1
> > 
> > 
> > 
> > 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Stefano Garzarella 4 years ago 
On Fri, Mar 27, 2020 at 11:28:14AM +0000, Dr. David Alan Gilbert wrote:
> * Stefano Garzarella (sgarzare@redhat.com) wrote:
> > Hi Mao,
> > 
> > On Fri, Mar 27, 2020 at 03:32:10PM +0800, Mao Zhongyi wrote:
> > > When running:
> > > (qemu) info migrate_parameters
> > > announce-initial: 50 ms
> > > announce-max: 550 ms
> > > announce-step: 100 ms
> > > compress-wait-thread: on
> > > ...
> > > max-bandwidth: 33554432 bytes/second
> > > downtime-limit: 300 milliseconds
> > > x-checkpoint-delay: 20000
> > > ...
> > > xbzrle-cache-size: 67108864
> > > 
> > > add units for the parameters 'x-checkpoint-delay' and
> > > 'xbzrle-cache-size', it's easier to read.
> > > 
> > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
> > > ---
> > >  monitor/hmp-cmds.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> > > index 2a900a528a..8d22f96e57 100644
> > > --- a/monitor/hmp-cmds.c
> > > +++ b/monitor/hmp-cmds.c
> > > @@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> > >              MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
> > >              params->downtime_limit);
> > >          assert(params->has_x_checkpoint_delay);
> > > -        monitor_printf(mon, "%s: %u\n",
> > > +        monitor_printf(mon, "%s: %u" " milliseconds\n",
> >                                        ^
> > here we can remove the space and use a single string "%s: %u milliseconds\n"
> 
> Yes.
> 
> > I've noticed that we use both ms or milliseconds, if you want to clean up in a
> > separate patch, maybe we could use one of these everywhere. (I vote for 'ms')
> 
> I do prefer 'ms', however we do seem to just use milliseconds in
> info migrate

IIUC, currently with 'info migrate_parameters' we have:
- announce-initial, announce-max, and announce-step with 'ms'
- downtime-limit with 'milliseconds'

Stefano
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Dr. David Alan Gilbert 4 years ago 
* Stefano Garzarella (sgarzare@redhat.com) wrote:
> On Fri, Mar 27, 2020 at 11:28:14AM +0000, Dr. David Alan Gilbert wrote:
> > * Stefano Garzarella (sgarzare@redhat.com) wrote:
> > > Hi Mao,
> > > 
> > > On Fri, Mar 27, 2020 at 03:32:10PM +0800, Mao Zhongyi wrote:
> > > > When running:
> > > > (qemu) info migrate_parameters
> > > > announce-initial: 50 ms
> > > > announce-max: 550 ms
> > > > announce-step: 100 ms
> > > > compress-wait-thread: on
> > > > ...
> > > > max-bandwidth: 33554432 bytes/second
> > > > downtime-limit: 300 milliseconds
> > > > x-checkpoint-delay: 20000
> > > > ...
> > > > xbzrle-cache-size: 67108864
> > > > 
> > > > add units for the parameters 'x-checkpoint-delay' and
> > > > 'xbzrle-cache-size', it's easier to read.
> > > > 
> > > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
> > > > ---
> > > >  monitor/hmp-cmds.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> > > > index 2a900a528a..8d22f96e57 100644
> > > > --- a/monitor/hmp-cmds.c
> > > > +++ b/monitor/hmp-cmds.c
> > > > @@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> > > >              MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
> > > >              params->downtime_limit);
> > > >          assert(params->has_x_checkpoint_delay);
> > > > -        monitor_printf(mon, "%s: %u\n",
> > > > +        monitor_printf(mon, "%s: %u" " milliseconds\n",
> > >                                        ^
> > > here we can remove the space and use a single string "%s: %u milliseconds\n"
> > 
> > Yes.
> > 
> > > I've noticed that we use both ms or milliseconds, if you want to clean up in a
> > > separate patch, maybe we could use one of these everywhere. (I vote for 'ms')
> > 
> > I do prefer 'ms', however we do seem to just use milliseconds in
> > info migrate
> 
> IIUC, currently with 'info migrate_parameters' we have:
> - announce-initial, announce-max, and announce-step with 'ms'
> - downtime-limit with 'milliseconds'

You're right, so we do - in that case I agree, lets just move them all
to 'ms'.

Dave

> Stefano
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by maozy 4 years ago 

On 3/27/20 9:21 PM, Dr. David Alan Gilbert wrote:
> * Stefano Garzarella (sgarzare@redhat.com) wrote:
>> On Fri, Mar 27, 2020 at 11:28:14AM +0000, Dr. David Alan Gilbert wrote:
>>> * Stefano Garzarella (sgarzare@redhat.com) wrote:
>>>> Hi Mao,
>>>>
>>>> On Fri, Mar 27, 2020 at 03:32:10PM +0800, Mao Zhongyi wrote:
>>>>> When running:
>>>>> (qemu) info migrate_parameters
>>>>> announce-initial: 50 ms
>>>>> announce-max: 550 ms
>>>>> announce-step: 100 ms
>>>>> compress-wait-thread: on
>>>>> ...
>>>>> max-bandwidth: 33554432 bytes/second
>>>>> downtime-limit: 300 milliseconds
>>>>> x-checkpoint-delay: 20000
>>>>> ...
>>>>> xbzrle-cache-size: 67108864
>>>>>
>>>>> add units for the parameters 'x-checkpoint-delay' and
>>>>> 'xbzrle-cache-size', it's easier to read.
>>>>>
>>>>> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
>>>>> ---
>>>>>   monitor/hmp-cmds.c | 4 ++--
>>>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
>>>>> index 2a900a528a..8d22f96e57 100644
>>>>> --- a/monitor/hmp-cmds.c
>>>>> +++ b/monitor/hmp-cmds.c
>>>>> @@ -440,7 +440,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
>>>>>               MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
>>>>>               params->downtime_limit);
>>>>>           assert(params->has_x_checkpoint_delay);
>>>>> -        monitor_printf(mon, "%s: %u\n",
>>>>> +        monitor_printf(mon, "%s: %u" " milliseconds\n",
>>>>                                         ^
>>>> here we can remove the space and use a single string "%s: %u milliseconds\n"
>>>
>>> Yes.
>>>
>>>> I've noticed that we use both ms or milliseconds, if you want to clean up in a
>>>> separate patch, maybe we could use one of these everywhere. (I vote for 'ms')
>>>
>>> I do prefer 'ms', however we do seem to just use milliseconds in
>>> info migrate
>>
>> IIUC, currently with 'info migrate_parameters' we have:
>> - announce-initial, announce-max, and announce-step with 'ms'
>> - downtime-limit with 'milliseconds'
> 
> You're right, so we do - in that case I agree, lets just move them all
> to 'ms'.
> 
thanks for your explanation, I got it, will fix it.

Thanks
Mao
> Dave
> 
>> Stefano
>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> 
>
Re: [PATCH] monitor/hmp-cmds: add units for mirate_parameters.
Posted by Eric Blake 4 years ago 
On 3/27/20 2:32 AM, Mao Zhongyi wrote:

In the subject: s/mirate/migrate/

> When running:
> (qemu) info migrate_parameters
> announce-initial: 50 ms
> announce-max: 550 ms
> announce-step: 100 ms
> compress-wait-thread: on
> ...
> max-bandwidth: 33554432 bytes/second
> downtime-limit: 300 milliseconds
> x-checkpoint-delay: 20000
> ...
> xbzrle-cache-size: 67108864
-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.