From nobody Mon Feb 9 02:27:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596743293; cv=none; d=zohomail.com; s=zohoarc; b=jZYpLAyfIbqHGvPeNEZLzXaURt66RGBsyCJJaOQrN8q4rY23aoiJ57s5uipQmM4AKjpOXDAYe3cjwqs2sRnkm19L5FV7aga3RuKNOPHhl5rhMH3ogOzgMPHQ+eMNcJITv4fkyV297S8cddZILbraxHpB8glmg8XkLakEvx/d7C4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596743293; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vj2wqYxMQOwvyhwWO2LqIwrgRniIYHgXgAT6Vo3UcsA=; b=Na/zYcjFc72x/CJEWNIqnD0Y4sjSTdjt6OO6ydnLLc8CFXI7uZZJ2Mrhjil+zml2BGBkJ4qXLycJ1HPxgSuupyFIy6FHU9q22qeuC+yJvoch6r2koeJrKf0KNq4KHU13N8ZJon+Xc1JJtNAm4LB2m098KsDn8+2Ox3d03VCbtn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596743293649910.1660185311191; Thu, 6 Aug 2020 12:48:13 -0700 (PDT) Received: from localhost ([::1]:46786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3ls4-0002EN-6O for importer@patchew.org; Thu, 06 Aug 2020 15:48:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lPR-00077r-F4 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3lPO-0006en-Ub for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:37 -0400 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-41-8y7a_oPrNjWxl0BtoR141A-1; Thu, 06 Aug 2020 15:18:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 593D7800404 for ; Thu, 6 Aug 2020 19:18:31 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AB9D5F9DC; Thu, 6 Aug 2020 19:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741514; 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=vj2wqYxMQOwvyhwWO2LqIwrgRniIYHgXgAT6Vo3UcsA=; b=KrmLRueEkXArWhQrd9IuHQyNLhrukr3rREQi0M23hHTU9SuBrCohdThhkqPDcakYIZKsd2 yDMfVkN4NnTMsWhYdSRN6S1tOr/okvZo9psa1zr9ncN4MCiJ0V+LIZpGT/6ckL8Jw4wm9i vgDe4jzZJQTXB/gOGXUVg37RtgA23ck= X-MC-Unique: 8y7a_oPrNjWxl0BtoR141A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 075/143] meson: convert migration directory to Meson Date: Thu, 6 Aug 2020 21:15:11 +0200 Message-Id: <1596741379-12902-76-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 12:59:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - Makefile.target | 1 - meson.build | 5 +++++ migration/Makefile.objs | 18 ------------------ migration/meson.build | 29 +++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 20 deletions(-) delete mode 100644 migration/Makefile.objs create mode 100644 migration/meson.build diff --git a/Makefile.objs b/Makefile.objs index 544877a..aabf709 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -42,7 +42,6 @@ common-obj-y =3D net/ common-obj-$(CONFIG_LINUX) +=3D fsdev/ =20 common-obj-y +=3D accel/ -common-obj-y +=3D migration/ =20 common-obj-$(CONFIG_AUDIO_ALSA) +=3D audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) diff --git a/Makefile.target b/Makefile.target index 54a9ef1..4d912df 100644 --- a/Makefile.target +++ b/Makefile.target @@ -158,7 +158,6 @@ obj-y +=3D softmmu/ obj-y +=3D gdbstub.o obj-y +=3D hw/ obj-y +=3D qapi/ -obj-y +=3D migration/ram.o LIBS :=3D $(libs_softmmu) $(LIBS) =20 # Temporary until emulators are linked by Meson diff --git a/meson.build b/meson.build index c592241..f0af36f 100644 --- a/meson.build +++ b/meson.build @@ -291,6 +291,10 @@ lzo =3D not_found if 'CONFIG_LZO' in config_host lzo =3D declare_dependency(link_args: config_host['LZO_LIBS'].split()) endif +rdma =3D not_found +if 'CONFIG_RDMA' in config_host + rdma =3D declare_dependency(link_args: config_host['RDMA_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -628,6 +632,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [fi= les('device_tree.c')]) common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') +subdir('migration') subdir('monitor') subdir('replay') =20 diff --git a/migration/Makefile.objs b/migration/Makefile.objs deleted file mode 100644 index 0fc619e..0000000 --- a/migration/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -common-obj-y +=3D migration.o socket.o fd.o exec.o -common-obj-y +=3D tls.o channel.o savevm.o -common-obj-y +=3D colo.o colo-failover.o -common-obj-y +=3D vmstate.o vmstate-types.o page_cache.o -common-obj-y +=3D qemu-file.o global_state.o -common-obj-y +=3D qemu-file-channel.o -common-obj-y +=3D xbzrle.o postcopy-ram.o -common-obj-y +=3D qjson.o -common-obj-y +=3D block-dirty-bitmap.o -common-obj-y +=3D multifd.o -common-obj-y +=3D multifd-zlib.o -common-obj-$(CONFIG_ZSTD) +=3D multifd-zstd.o - -common-obj-$(CONFIG_RDMA) +=3D rdma.o - -common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) +=3D block.o - -rdma.o-libs :=3D $(RDMA_LIBS) diff --git a/migration/meson.build b/migration/meson.build new file mode 100644 index 0000000..99afbac --- /dev/null +++ b/migration/meson.build @@ -0,0 +1,29 @@ +softmmu_ss.add(files( + 'block-dirty-bitmap.c', + 'channel.c', + 'colo-failover.c', + 'colo.c', + 'exec.c', + 'fd.c', + 'global_state.c', + 'migration.c', + 'multifd.c', + 'multifd-zlib.c', + 'page_cache.c', + 'postcopy-ram.c', + 'qemu-file-channel.c', + 'qemu-file.c', + 'qjson.c', + 'savevm.c', + 'socket.c', + 'tls.c', + 'vmstate-types.c', + 'vmstate.c', + 'xbzrle.c', +)) + +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: 'CONFIG_ZSTD', if_true: files('multifd-zstd.c')) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('ram.c')]) --=20 1.8.3.1