| Message ID | 20230208071801.68620-1-shahuang@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 695fa5a64cf52ab1aa2c89c93bbb1fd08995304a |
| Headers | show |
| Series | KVM: selftests: Remove duplicate macro definition | expand |
On Wed, Feb 08, 2023, shahuang@redhat.com wrote: > From: Shaoqin Huang <shahuang@redhat.com> > > The KVM_GUEST_PAGE_TABLE_MIN_PADDR macro has been defined in > include/kvm_util_base.h. So remove the duplicate definition in > lib/kvm_util.c. > > Signed-off-by: Shaoqin Huang <shahuang@redhat.com> > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index f25b3e9b5a07..3ea24a5f4c43 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1942,9 +1942,6 @@ vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min, > return vm_phy_pages_alloc(vm, 1, paddr_min, memslot); > } > > -/* Arbitrary minimum physical address used for virtual translation tables. */ > -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 Huh. There wasn't even a merge conflict or anything, I just added it twice in commit cce0c23dd944 ("KVM: selftests: Add wrapper to allocate page table page"). Anyways, applied to kvm-x86 selftests with a Fixes tag. Thanks! [1/1] KVM: selftests: Remove duplicate macro definition https://github.com/kvm-x86/linux/commit/695fa5a64cf5 -- https://github.com/kvm-x86/linux/tree/next https://github.com/kvm-x86/linux/tree/fixes
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index f25b3e9b5a07..3ea24a5f4c43 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1942,9 +1942,6 @@ vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min, return vm_phy_pages_alloc(vm, 1, paddr_min, memslot); } -/* Arbitrary minimum physical address used for virtual translation tables. */ -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 - vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm) { return vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR,