From nobody Tue Dec 16 08:32:06 2025 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=1597081577; cv=none; d=zohomail.com; s=zohoarc; b=LV5NBAUokIAzvKlsD73mQfUeqEHDuAc2F8GIb2vdRsHybLjaade+agReuDYu++atzYj0sUGnmDwy9J9/OET2ysFKr5yC3lJgEZIPLU4ofjsow2OH1YnG7TrgFliXBlVR94b0dZ3Hgeppy84mSx9NfT4AYcdf3cYBsHPQ5XngmkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081577; 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=rmMco7bsimSDKwwMWSQSGAbPvuy18/qNmWVaCT7T1Uo=; b=MGdAQ2K6ljTOYRkczf/8TORlBmQZflX1+DYjqSx1CmXsgl49M0lYrst0gMxjlqBETxGW3d3h8CNz2Ht0lDz6TUXKZegwx0Wsgxk+tiP4JKOZslQu9DVBnqaZYUZm8h2INOLpMecu+AryRzVL+zJ5ZTeTu/i+AqP9xltR/joNvDI= 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 1597081577951825.248156710291; Mon, 10 Aug 2020 10:46:17 -0700 (PDT) Received: from localhost ([::1]:45184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BsG-0005PI-Ne for importer@patchew.org; Mon, 10 Aug 2020 13:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKQ-0000qK-4P for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:18 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32634 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BKL-00037w-1f for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:17 -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-231-XGLzOhYfOgSgUKSUTTufXQ-1; Mon, 10 Aug 2020 13:11:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9716800465 for ; Mon, 10 Aug 2020 17:11:09 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C68DF5F1E9; Mon, 10 Aug 2020 17:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079472; 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=rmMco7bsimSDKwwMWSQSGAbPvuy18/qNmWVaCT7T1Uo=; b=hlHSj7h/AK/TX27UsjBASFb/FKvJH1zXFlO1Yo/Y+5kvZwq2iEcAIGcCHdKxHyKXyPst3J fTkZDrYaINCKzkcoUddi4VN2gltCasGUMPwVDyEnOHYdvlJh6RGTKA4vXa2XWyQesEGQkm ezJGMjgcTsKpt1wqEm1Td856AC7KIKw= X-MC-Unique: XGLzOhYfOgSgUKSUTTufXQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 072/147] meson: convert dump/ Date: Mon, 10 Aug 2020 19:07:50 +0200 Message-Id: <1597079345-42801-73-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 04:13:00 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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 | 3 +-- Makefile.target | 1 - configure | 4 ++++ dump/Makefile.objs | 3 --- dump/meson.build | 4 ++++ meson.build | 9 +++++++++ 6 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 dump/Makefile.objs create mode 100644 dump/meson.build diff --git a/Makefile.objs b/Makefile.objs index ec15ebc..6657a6c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -48,8 +48,7 @@ storage-daemon-obj-$(CONFIG_POSIX) +=3D os-posix.o # single QEMU executable should support all CPUs and machines. =20 ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y =3D dump/ -common-obj-y +=3D monitor/ +common-obj-y =3D monitor/ common-obj-y +=3D net/ common-obj-$(CONFIG_LINUX) +=3D fsdev/ =20 diff --git a/Makefile.target b/Makefile.target index 5f926e5..c8f7a6c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -156,7 +156,6 @@ endif #CONFIG_BSD_USER ifdef CONFIG_SOFTMMU obj-y +=3D softmmu/ obj-y +=3D gdbstub.o -obj-y +=3D dump/ obj-y +=3D hw/ obj-y +=3D monitor/ obj-y +=3D qapi/ diff --git a/configure b/configure index 5fb5f2a..6f02538 100755 --- a/configure +++ b/configure @@ -2556,6 +2556,7 @@ int main(void) { lzo_version(); return 0; } EOF if compile_prog "" "-llzo2" ; then libs_softmmu=3D"$libs_softmmu -llzo2" + lzo_libs=3D"-llzo2" lzo=3D"yes" else if test "$lzo" =3D "yes"; then @@ -2575,6 +2576,7 @@ int main(void) { snappy_max_compressed_length(4096); = return 0; } EOF if compile_prog "" "-lsnappy" ; then libs_softmmu=3D"$libs_softmmu -lsnappy" + snappy_libs=3D'-lsnappy' snappy=3D"yes" else if test "$snappy" =3D "yes"; then @@ -7396,10 +7398,12 @@ fi =20 if test "$lzo" =3D "yes" ; then echo "CONFIG_LZO=3Dy" >> $config_host_mak + echo "LZO_LIBS=3D$lzo_libs" >> $config_host_mak fi =20 if test "$snappy" =3D "yes" ; then echo "CONFIG_SNAPPY=3Dy" >> $config_host_mak + echo "SNAPPY_LIBS=3D$snappy_libs" >> $config_host_mak fi =20 if test "$bzip2" =3D "yes" ; then diff --git a/dump/Makefile.objs b/dump/Makefile.objs deleted file mode 100644 index d2a5db3..0000000 --- a/dump/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D dump.o -common-obj-y +=3D dump-hmp-cmds.o -obj-$(TARGET_X86_64) +=3D win_dump.o diff --git a/dump/meson.build b/dump/meson.build new file mode 100644 index 0000000..2eff29c --- /dev/null +++ b/dump/meson.build @@ -0,0 +1,4 @@ +softmmu_ss.add(files('dump-hmp-cmds.c')) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy,= lzo]) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true: files(= 'win_dump.c')) diff --git a/meson.build b/meson.build index 3481c5b..dc14a80 100644 --- a/meson.build +++ b/meson.build @@ -288,6 +288,14 @@ if 'CONFIG_FDT' in config_host fdt =3D declare_dependency(compile_args: config_host['FDT_CFLAGS'].split= (), link_args: config_host['FDT_LIBS'].split()) endif +snappy =3D not_found +if 'CONFIG_SNAPPY' in config_host + snappy =3D declare_dependency(link_args: config_host['SNAPPY_LIBS'].spli= t()) +endif +lzo =3D not_found +if 'CONFIG_LZO' in config_host + lzo =3D declare_dependency(link_args: config_host['LZO_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -595,6 +603,7 @@ subdir('io') subdir('chardev') subdir('fsdev') subdir('target') +subdir('dump') =20 block_ss.add(files( 'block.c', --=20 1.8.3.1