From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Ben Warren" <ben@skyportsystems.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Peter Lieven" <pl@kamp.de>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [PATCH v2 2/8] qapi/misc: Restrict LostTickPolicy enum to machine code
Date: Mon, 25 May 2020 16:12:30 +0200 [thread overview]
Message-ID: <81463e0f-a06a-0693-b6f7-a319f2cfc216@redhat.com> (raw)
In-Reply-To: <20200316000348.29692-3-philmd@redhat.com>
ping?
On 3/16/20 1:03 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> qapi/machine.json | 32 ++++++++++++++++++++++++++++++++
> qapi/misc.json | 32 --------------------------------
> include/hw/rtc/mc146818rtc.h | 2 +-
> hw/core/qdev-properties.c | 1 +
> hw/i386/kvm/i8254.c | 2 +-
> 5 files changed, 35 insertions(+), 34 deletions(-)
>
> diff --git a/qapi/machine.json b/qapi/machine.json
> index de05730704..07ffc07ba2 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -415,6 +415,38 @@
> ##
> { 'command': 'query-target', 'returns': 'TargetInfo' }
>
> +##
> +# @LostTickPolicy:
> +#
> +# Policy for handling lost ticks in timer devices. Ticks end up getting
> +# lost when, for example, the guest is paused.
> +#
> +# @discard: throw away the missed ticks and continue with future injection
> +# normally. The guest OS will see the timer jump ahead by a
> +# potentially quite significant amount all at once, as if the
> +# intervening chunk of time had simply not existed; needless to
> +# say, such a sudden jump can easily confuse a guest OS which is
> +# not specifically prepared to deal with it. Assuming the guest
> +# OS can deal correctly with the time jump, the time in the guest
> +# and in the host should now match.
> +#
> +# @delay: continue to deliver ticks at the normal rate. The guest OS will
> +# not notice anything is amiss, as from its point of view time will
> +# have continued to flow normally. The time in the guest should now
> +# be behind the time in the host by exactly the amount of time during
> +# which ticks have been missed.
> +#
> +# @slew: deliver ticks at a higher rate to catch up with the missed ticks.
> +# The guest OS will not notice anything is amiss, as from its point
> +# of view time will have continued to flow normally. Once the timer
> +# has managed to catch up with all the missing ticks, the time in
> +# the guest and in the host should match.
> +#
> +# Since: 2.0
> +##
> +{ 'enum': 'LostTickPolicy',
> + 'data': ['discard', 'delay', 'slew' ] }
> +
> ##
> # @NumaOptionsType:
> #
> diff --git a/qapi/misc.json b/qapi/misc.json
> index c18fe681fb..2725d835ad 100644
> --- a/qapi/misc.json
> +++ b/qapi/misc.json
> @@ -7,38 +7,6 @@
>
> { 'include': 'common.json' }
>
> -##
> -# @LostTickPolicy:
> -#
> -# Policy for handling lost ticks in timer devices. Ticks end up getting
> -# lost when, for example, the guest is paused.
> -#
> -# @discard: throw away the missed ticks and continue with future injection
> -# normally. The guest OS will see the timer jump ahead by a
> -# potentially quite significant amount all at once, as if the
> -# intervening chunk of time had simply not existed; needless to
> -# say, such a sudden jump can easily confuse a guest OS which is
> -# not specifically prepared to deal with it. Assuming the guest
> -# OS can deal correctly with the time jump, the time in the guest
> -# and in the host should now match.
> -#
> -# @delay: continue to deliver ticks at the normal rate. The guest OS will
> -# not notice anything is amiss, as from its point of view time will
> -# have continued to flow normally. The time in the guest should now
> -# be behind the time in the host by exactly the amount of time during
> -# which ticks have been missed.
> -#
> -# @slew: deliver ticks at a higher rate to catch up with the missed ticks.
> -# The guest OS will not notice anything is amiss, as from its point
> -# of view time will have continued to flow normally. Once the timer
> -# has managed to catch up with all the missing ticks, the time in
> -# the guest and in the host should match.
> -#
> -# Since: 2.0
> -##
> -{ 'enum': 'LostTickPolicy',
> - 'data': ['discard', 'delay', 'slew' ] }
> -
> ##
> # @add_client:
> #
> diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
> index 10c93a096a..58a7748c66 100644
> --- a/include/hw/rtc/mc146818rtc.h
> +++ b/include/hw/rtc/mc146818rtc.h
> @@ -9,7 +9,7 @@
> #ifndef HW_RTC_MC146818RTC_H
> #define HW_RTC_MC146818RTC_H
>
> -#include "qapi/qapi-types-misc.h"
> +#include "qapi/qapi-types-machine.h"
> #include "qemu/queue.h"
> #include "qemu/timer.h"
> #include "hw/isa/isa.h"
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 2047114fca..59380ed761 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -4,6 +4,7 @@
> #include "qapi/error.h"
> #include "hw/pci/pci.h"
> #include "qapi/qapi-types-block.h"
> +#include "qapi/qapi-types-machine.h"
> #include "qapi/qapi-types-misc.h"
> #include "qapi/qmp/qerror.h"
> #include "qemu/ctype.h"
> diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
> index 876f5aa6fa..22ba6149b5 100644
> --- a/hw/i386/kvm/i8254.c
> +++ b/hw/i386/kvm/i8254.c
> @@ -25,7 +25,7 @@
>
> #include "qemu/osdep.h"
> #include <linux/kvm.h>
> -#include "qapi/qapi-types-misc.h"
> +#include "qapi/qapi-types-machine.h"
> #include "qapi/error.h"
> #include "qemu/module.h"
> #include "qemu/timer.h"
>
next prev parent reply other threads:[~2020-05-25 14:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 0:03 [PATCH v2 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
2020-03-16 0:03 ` [PATCH v2 1/8] target/i386: Restrict X86CPUFeatureWord to X86 targets Philippe Mathieu-Daudé
2020-03-16 0:29 ` Aleksandar Markovic
2020-03-16 0:31 ` Aleksandar Markovic
2020-03-16 7:30 ` Philippe Mathieu-Daudé
2020-03-18 8:25 ` Philippe Mathieu-Daudé
2020-03-16 0:03 ` [PATCH v2 2/8] qapi/misc: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
2020-05-25 14:12 ` Philippe Mathieu-Daudé [this message]
2020-05-26 15:00 ` Igor Mammedov
2020-03-16 0:03 ` [PATCH v2 3/8] qapi/misc: Restrict balloon-related commands " Philippe Mathieu-Daudé
2020-03-16 9:05 ` David Hildenbrand
2020-03-17 11:03 ` Philippe Mathieu-Daudé
2020-03-17 11:04 ` David Hildenbrand
2020-03-16 0:03 ` [PATCH v2 4/8] qapi/misc: Move query-uuid command with block code Philippe Mathieu-Daudé
2020-03-16 13:09 ` Igor Mammedov
2020-03-16 13:57 ` Philippe Mathieu-Daudé
2020-03-16 0:03 ` [PATCH v2 5/8] qapi/misc: Restrict query-vm-generation-id command to machine code Philippe Mathieu-Daudé
2020-03-16 12:45 ` Igor Mammedov
2020-03-17 9:44 ` Philippe Mathieu-Daudé
2020-03-17 11:07 ` Igor Mammedov
2020-03-16 0:03 ` [PATCH v2 6/8] qapi/misc: Restrict ACPI commands " Philippe Mathieu-Daudé
2020-03-16 12:47 ` Igor Mammedov
2020-03-16 0:03 ` [PATCH v2 7/8] qapi/misc: Restrict PCI " Philippe Mathieu-Daudé
2020-05-25 14:12 ` Philippe Mathieu-Daudé
2020-03-16 0:03 ` [PATCH v2 8/8] qapi/misc: Restrict device memory " Philippe Mathieu-Daudé
2020-03-16 12:49 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81463e0f-a06a-0693-b6f7-a319f2cfc216@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=ben@skyportsystems.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=ronniesahlberg@gmail.com \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).