| Message ID | 20200206224858.23184-1-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer | expand |
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); >
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);
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(-)