2022-06-06 02:16:19

by Sean Christopherson

Subject: [PATCH v2 041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test

Use vm_create_without_vcpus() instead of open coding a rough equivalent
in hardware_disable_test.

Signed-off-by: Sean Christopherson <[email protected]>
---
tools/testing/selftests/kvm/hardware_disable_test.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c
index 81ba8645772a..32837207fe4e 100644
--- a/tools/testing/selftests/kvm/hardware_disable_test.c
+++ b/tools/testing/selftests/kvm/hardware_disable_test.c
@@ -104,9 +104,7 @@ static void run_test(uint32_t run)
for (i = 0; i < VCPU_NUM; i++)
CPU_SET(i, &cpu_set);

- vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
- kvm_vm_elf_load(vm, program_invocation_name);
- vm_create_irqchip(vm);
+ vm = vm_create_without_vcpus(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

pr_debug("%s: [%d] start vcpus\n", __func__, run);
for (i = 0; i < VCPU_NUM; ++i) {
--
2.36.1.255.ge46751e96f-goog

2022-06-08 15:16:47

by Andrew Jones

Subject: Re: [PATCH v2 041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test

On Fri, Jun 03, 2022 at 12:41:48AM +0000, Sean Christopherson wrote:
> Use vm_create_without_vcpus() instead of open coding a rough equivalent
> in hardware_disable_test.
>
> Signed-off-by: Sean Christopherson <[email protected]>
> ---
> tools/testing/selftests/kvm/hardware_disable_test.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c
> index 81ba8645772a..32837207fe4e 100644
> --- a/tools/testing/selftests/kvm/hardware_disable_test.c
> +++ b/tools/testing/selftests/kvm/hardware_disable_test.c
> @@ -104,9 +104,7 @@ static void run_test(uint32_t run)
> for (i = 0; i < VCPU_NUM; i++)
> CPU_SET(i, &cpu_set);
>
> - vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
> - kvm_vm_elf_load(vm, program_invocation_name);
> - vm_create_irqchip(vm);
> + vm = vm_create_without_vcpus(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
nit: ^ extra space
>
> pr_debug("%s: [%d] start vcpus\n", __func__, run);
> for (i = 0; i < VCPU_NUM; ++i) {
> --
> 2.36.1.255.ge46751e96f-goog
>

2022-06-08 21:20:49

by Sean Christopherson

Subject: Re: [PATCH v2 041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test

On Wed, Jun 08, 2022, Andrew Jones wrote:
> On Fri, Jun 03, 2022 at 12:41:48AM +0000, Sean Christopherson wrote:
> > Use vm_create_without_vcpus() instead of open coding a rough equivalent
> > in hardware_disable_test.
> >
> > Signed-off-by: Sean Christopherson <[email protected]>
> > ---
> > tools/testing/selftests/kvm/hardware_disable_test.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c
> > index 81ba8645772a..32837207fe4e 100644
> > --- a/tools/testing/selftests/kvm/hardware_disable_test.c
> > +++ b/tools/testing/selftests/kvm/hardware_disable_test.c
> > @@ -104,9 +104,7 @@ static void run_test(uint32_t run)
> > for (i = 0; i < VCPU_NUM; i++)
> > CPU_SET(i, &cpu_set);
> >
> > - vm = vm_create(DEFAULT_GUEST_PHY_PAGES);
> > - kvm_vm_elf_load(vm, program_invocation_name);
> > - vm_create_irqchip(vm);
> > + vm = vm_create_without_vcpus(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
> nit: ^ extra space

Heh, and I managed to carry that to the end of the series. At least I'm consistent?