Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5819C636CC for ; Wed, 8 Feb 2023 15:01:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbjBHPBD (ORCPT ); Wed, 8 Feb 2023 10:01:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjBHPA6 (ORCPT ); Wed, 8 Feb 2023 10:00:58 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E6028848 for ; Wed, 8 Feb 2023 07:00:57 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id i2so6148766ple.13 for ; Wed, 08 Feb 2023 07:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9oflZ6zNlZVw9EmQqtsymlsndLRnz7qdnW4kcU4XhjM=; b=TyTWS/m7Pe2sYVsfIBwR88tdeTexgn+w18bj2jrQWwl0SQF29dkYshlSrsV/RQ8eOf xOJ2oFUZxpUeJJGxZgJ86tMlRl4iHU9nCb0FPsYcQkABj007u2lqUSug07Yx4eXQKHdT UDizQVJZy6FaeFNJCSOJH8vp8pB/shodMkYWrWIaopfsQp6zZsGYacJkWZqPILAeZNN9 gGciY+60JeeiSbkUnIX+LRKlxwQD4t3JOAhbe2TwwSgFjZFOG2BX7PJokbnTEOIDkRyE bqIbo4Qn2FSkf+Cy1wc/VVk8TjwRhk6vGj9HgMzbjINIwLN+KXVU4cLJriEgaNAgcnpx fX6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9oflZ6zNlZVw9EmQqtsymlsndLRnz7qdnW4kcU4XhjM=; b=YE4V0DJbrjQMexUKQajkj0kQAAi3x0iIRU9cvKal67GMiqqA/Gvy8Al9Tm0FK7SjnJ wdQ2LtFqgQ7SH2+WP1ojjamYNOyyIaXoHhtczGvx793IMGE9/UtJ6sBiZGTtIYRO8jqI ZFzduVptrtgFF7S7NZDy4FBzBQIGjEbe7u2secZ9ac4TGsF3BSfJYmzcwEyZblK+srX/ RsVRQM4HYQpL77VF9CtMyMlvkyQplY71PHEvI1D6E6534mm75TYn6QVIn5oAizOF05It NhhbLLUi4j1+jfbdfAP409Ypa86WET+IqQYXaDLPmW9MujHN6qTqWDEzxG7JdY9kYZxv XpJg== X-Gm-Message-State: AO0yUKVZvvPsW/6D4vQQyEtqNnIdBXhQiZTWh/HmMDd3neQr/nJo9v9i +7dRZmg4EuFWSnFTz5zfY4OLoQ== X-Google-Smtp-Source: AK7set/Sg1EKZpPnOVhuAt9KhQSjGh52j1FGM0jG+Z5akg4z80ux7gd3rmlDUGrfknhCAucbOTZxkg== X-Received: by 2002:a17:902:e80e:b0:198:af4f:de09 with SMTP id u14-20020a170902e80e00b00198af4fde09mr233575plg.9.1675868457315; Wed, 08 Feb 2023 07:00:57 -0800 (PST) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id p21-20020a056a000a1500b00593d7db7f29sm11340184pfh.216.2023.02.08.07.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 07:00:56 -0800 (PST) Date: Wed, 8 Feb 2023 15:00:53 +0000 From: Sean Christopherson To: shahuang@redhat.com Cc: kvm@vger.kernel.org, Paolo Bonzini , Shuah Khan , Andrew Jones , Marc Zyngier , David Matlack , Ricardo Koller , Ben Gardon , Vipin Sharma , "open list:KERNEL SELFTEST FRAMEWORK" , open list Subject: Re: [PATCH] KVM: selftests: Remove duplicate macro definition Message-ID: References: <20230208071801.68620-1-shahuang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230208071801.68620-1-shahuang@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 08, 2023, shahuang@redhat.com wrote: > From: Shaoqin Huang > > 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 > --- > 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