From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64300C433E0 for ; Tue, 16 Mar 2021 05:14:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA80D64F01 for ; Tue, 16 Mar 2021 05:14:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA80D64F01 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM220-0001We-Q8 for qemu-devel@archiver.kernel.org; Tue, 16 Mar 2021 01:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM21J-00015p-M9 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 01:13:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lM21G-00069s-CJ for qemu-devel@nongnu.org; Tue, 16 Mar 2021 01:13:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615871604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mPh8W1OKzHp5U2fvlkM/UpxXyDwo+jma0dA8zYPMLQ8=; b=Dsxjq0RYT4e6QRN7Gal9d3TKVmlPsKqh71Ze3mcuM6Yvpcib4Q+Nc46jchxKHgdyxE+DVq RbQXGurbptykvOgUZqQSuBed7WItYNGaBltjTi+sLhxHFuUQOqKE4qvhtKaPDv3vOvbl4f WkzNJ1DLTL1jHwN+ydMW5A6UUCYhUS0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-487-JGCkwZZJOwyGIzkbQa9OcA-1; Tue, 16 Mar 2021 01:13:20 -0400 X-MC-Unique: JGCkwZZJOwyGIzkbQa9OcA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A618100C619; Tue, 16 Mar 2021 05:13:19 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-110.ams2.redhat.com [10.36.112.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id A054746; Tue, 16 Mar 2021 05:13:14 +0000 (UTC) Subject: Re: [PATCH] migration: Move populate_vfio_info() into a separate file To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Juan Quintela References: <20210315190756.317710-1-thuth@redhat.com> From: Thomas Huth Message-ID: <2e455379-15de-835c-014f-8ae2c26639a6@redhat.com> Date: Tue, 16 Mar 2021 06:13:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kirti Wankhede , Alex Williamson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 15/03/2021 22.05, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > +Alex > > On 3/15/21 8:07 PM, Thomas Huth wrote: >> The CONFIG_VFIO switch only works in target specific code. Since >> migration/migration.c is common code, the #ifdef does not have >> the intended behavior here. Move the related code to a separate >> file now which gets compiled via specific_ss instead. >> >> Fixes: 3710586caa ("qapi: Add VFIO devices migration stats in Migration stats") >> Signed-off-by: Thomas Huth >> --- >> migration/meson.build | 3 ++- >> migration/migration.c | 15 --------------- >> migration/migration.h | 2 ++ >> migration/special.c | 25 +++++++++++++++++++++++++ >> 4 files changed, 29 insertions(+), 16 deletions(-) >> create mode 100644 migration/special.c >> >> diff --git a/migration/meson.build b/migration/meson.build >> index 9645f44005..e1f72f6ba0 100644 >> --- a/migration/meson.build >> +++ b/migration/meson.build >> @@ -30,4 +30,5 @@ softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) >> softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) >> softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) >> >> -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c', 'ram.c')) >> +specific_ss.add(when: 'CONFIG_SOFTMMU', >> + if_true: files('dirtyrate.c', 'ram.c', 'special.c')) > > Why not simply name this migration/vfio.c? That way we do not start > mixed bag of everything target specific. I don't mind ... well, if we have other small functions there in the future that depend on CONFIG switches, a mixed bag file might not be such a bad idea instead of having lots and lots of small other files ... OTOH, if there is more vfio migration code in the works that might fit here, a name like vfio.c would be better, of course. What do the maintainers think? Thomas