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=-14.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URG_BIZ,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 5C162C433ED for ; Wed, 14 Apr 2021 12:50:41 +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 A0B3D610CB for ; Wed, 14 Apr 2021 12:50:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0B3D610CB 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]:34030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWeyd-0007pl-Ah for qemu-devel@archiver.kernel.org; Wed, 14 Apr 2021 08:50:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWeXF-0001rY-Ee for qemu-devel@nongnu.org; Wed, 14 Apr 2021 08:22:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWeXB-0008AP-De for qemu-devel@nongnu.org; Wed, 14 Apr 2021 08:22:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618402936; 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: in-reply-to:in-reply-to:references:references; bh=JguuMCagEJ2JhCeSMiNbCaPSNIZ1hjZ3Iik6JmFufyM=; b=AxmS+TGEfhafGeSIVDU807Kozdwi74r7v4dEI1slwq9ypLmQgg7uMCiV7emCZkdfAW5L/e shzW9dTyM8WAze4UTqQnOuA13odGFEbxWf9EcOWgY3SGphk7Qylc2kMTidmLyxijbGoelR Mp5W1D1+fOh2kjjv+/hFXeFpzUQh6l8= 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-215-qOu0IyOlN6KGi_B_Do3lbw-1; Wed, 14 Apr 2021 08:22:14 -0400 X-MC-Unique: qOu0IyOlN6KGi_B_Do3lbw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D18E4881283; Wed, 14 Apr 2021 12:22:12 +0000 (UTC) Received: from work-vm (ovpn-115-158.ams2.redhat.com [10.36.115.158]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49A2910016FD; Wed, 14 Apr 2021 12:22:10 +0000 (UTC) Date: Wed, 14 Apr 2021 13:22:07 +0100 From: "Dr. David Alan Gilbert" To: Thomas Huth Subject: Re: [PATCH for-6.1 2/4] migration: Move populate_vfio_info() into a separate file Message-ID: References: <20210414112004.943383-1-thuth@redhat.com> <20210414112004.943383-3-thuth@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210414112004.943383-3-thuth@redhat.com> User-Agent: Mutt/2.0.6 (2021-03-06) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URG_BIZ=0.573 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: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= , Eduardo Habkost , Juan Quintela , qemu-devel@nongnu.org, Cameron Esfahani , Markus Armbruster , Roman Bolshakov , Colin Xu , Paolo Bonzini , Sunil Muthuswamy , Wenchao Wang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Thomas Huth (thuth@redhat.com) 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 Reviewed-by: Dr. David Alan Gilbert althoguh I wonder if it would be easier to put the populate_vfio_info into hw/vfio and add a stub function? Dave > --- > migration/meson.build | 3 ++- > migration/migration.c | 15 --------------- > migration/migration.h | 2 ++ > migration/target.c | 25 +++++++++++++++++++++++++ > 4 files changed, 29 insertions(+), 16 deletions(-) > create mode 100644 migration/target.c > > diff --git a/migration/meson.build b/migration/meson.build > index 3ecedce94d..f8714dcb15 100644 > --- a/migration/meson.build > +++ b/migration/meson.build > @@ -31,4 +31,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', 'target.c')) > diff --git a/migration/migration.c b/migration/migration.c > index 8ca034136b..db8c378079 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -60,10 +60,6 @@ > #include "qemu/yank.h" > #include "sysemu/cpus.h" > > -#ifdef CONFIG_VFIO > -#include "hw/vfio/vfio-common.h" > -#endif > - > #define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */ > > /* Amount of time to allocate to each "chunk" of bandwidth-throttled > @@ -1059,17 +1055,6 @@ static void populate_disk_info(MigrationInfo *info) > } > } > > -static void populate_vfio_info(MigrationInfo *info) > -{ > -#ifdef CONFIG_VFIO > - if (vfio_mig_active()) { > - info->has_vfio = true; > - info->vfio = g_malloc0(sizeof(*info->vfio)); > - info->vfio->transferred = vfio_mig_bytes_transferred(); > - } > -#endif > -} > - > static void fill_source_migration_info(MigrationInfo *info) > { > MigrationState *s = migrate_get_current(); > diff --git a/migration/migration.h b/migration/migration.h > index db6708326b..2730fa05c0 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -376,4 +376,6 @@ void migration_make_urgent_request(void); > void migration_consume_urgent_request(void); > bool migration_rate_limit(void); > > +void populate_vfio_info(MigrationInfo *info); > + > #endif > diff --git a/migration/target.c b/migration/target.c > new file mode 100644 > index 0000000000..907ebf0a0a > --- /dev/null > +++ b/migration/target.c > @@ -0,0 +1,25 @@ > +/* > + * QEMU live migration - functions that need to be compiled target-specific > + * > + * This work is licensed under the terms of the GNU GPL, version 2 > + * or (at your option) any later version. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/qapi-types-migration.h" > +#include "migration.h" > + > +#ifdef CONFIG_VFIO > +#include "hw/vfio/vfio-common.h" > +#endif > + > +void populate_vfio_info(MigrationInfo *info) > +{ > +#ifdef CONFIG_VFIO > + if (vfio_mig_active()) { > + info->has_vfio = true; > + info->vfio = g_malloc0(sizeof(*info->vfio)); > + info->vfio->transferred = vfio_mig_bytes_transferred(); > + } > +#endif > +} > -- > 2.27.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK