* [PATCH] docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer
@ 2020-02-06 22:48 Philippe Mathieu-Daudé
2020-02-06 22:50 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-06 22:48 UTC (permalink / raw)
To: qemu-devel, Andrew Jones
Cc: qemu-trivial, Peter Maydell, qemu-arm, Philippe Mathieu-Daudé
The bold text sounds like 'knock knock'. Only bolding the
second 'not' makes it easier to read.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
docs/arm-cpu-features.rst | 2 +-
target/arm/kvm.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/docs/arm-cpu-features.rst b/docs/arm-cpu-features.rst
index dbf3b7cf42..fc1623aeca 100644
--- a/docs/arm-cpu-features.rst
+++ b/docs/arm-cpu-features.rst
@@ -185,7 +185,7 @@ the list of KVM VCPU features and their descriptions.
kvm-no-adjvtime By default kvm-no-adjvtime is disabled. This
means that by default the virtual time
- adjustment is enabled (vtime is *not not*
+ adjustment is enabled (vtime is not *not*
adjusted).
When virtual time adjustment is enabled each
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 85860e6f95..bcca8c8029 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -194,10 +194,7 @@ static void kvm_no_adjvtime_set(Object *obj, bool value, Error **errp)
/* KVM VCPU properties should be prefixed with "kvm-". */
void kvm_arm_add_vcpu_properties(Object *obj)
{
- if (!kvm_enabled()) {
- return;
- }
-
+ assert(kvm_enabled());
ARM_CPU(obj)->kvm_adjvtime = true;
object_property_add_bool(obj, "kvm-no-adjvtime", kvm_no_adjvtime_get,
kvm_no_adjvtime_set, &error_abort);
--
2.21.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer
2020-02-06 22:48 [PATCH] docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer Philippe Mathieu-Daudé
@ 2020-02-06 22:50 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-06 22:50 UTC (permalink / raw)
To: qemu-devel, Andrew Jones; +Cc: qemu-trivial, Peter Maydell, qemu-arm
On 2/6/20 11:48 PM, Philippe Mathieu-Daudé wrote:
> The bold text sounds like 'knock knock'. Only bolding the
> second 'not' makes it easier to read.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> docs/arm-cpu-features.rst | 2 +-
> target/arm/kvm.c | 5 +----
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/docs/arm-cpu-features.rst b/docs/arm-cpu-features.rst
> index dbf3b7cf42..fc1623aeca 100644
> --- a/docs/arm-cpu-features.rst
> +++ b/docs/arm-cpu-features.rst
> @@ -185,7 +185,7 @@ the list of KVM VCPU features and their descriptions.
>
> kvm-no-adjvtime By default kvm-no-adjvtime is disabled. This
> means that by default the virtual time
> - adjustment is enabled (vtime is *not not*
> + adjustment is enabled (vtime is not *not*
> adjusted).
>
> When virtual time adjustment is enabled each
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index 85860e6f95..bcca8c8029 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -194,10 +194,7 @@ static void kvm_no_adjvtime_set(Object *obj, bool value, Error **errp)
> /* KVM VCPU properties should be prefixed with "kvm-". */
> void kvm_arm_add_vcpu_properties(Object *obj)
> {
> - if (!kvm_enabled()) {
> - return;
> - }
> -
> + assert(kvm_enabled());
Oops, this was not supposed to be committed.
> ARM_CPU(obj)->kvm_adjvtime = true;
> object_property_add_bool(obj, "kvm-no-adjvtime", kvm_no_adjvtime_get,
> kvm_no_adjvtime_set, &error_abort);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-06 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 22:48 [PATCH] docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer Philippe Mathieu-Daudé
2020-02-06 22:50 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.