From nobody Mon May 6 10:16:42 2024 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=1597079421; cv=none; d=zohomail.com; s=zohoarc; b=XKN5wHWfMm3G/ECajeQnT4WrHms7iLHBMlE1PLqOKmhQQP75YTAxaVgR1hHD6A2DP+TR9imNUkyOfnQWRGgLHgM1FKP4wlTdtXUYQfo/YBc4klD0xfeP1Fdmsh5UAN13G10X+Qipg/gixsEI5kemjX4VrjCTlnXNeTaquhOLhKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079421; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3WR+7vf5orqhtCW52eKbI13vQ/eSMFjPNRLaT3u15wY=; b=mqbpFM87JHZkG+EW8imiSLQvvpheKu2O7LzsJeH74KWU2Y0Cpl4inZenvYJpmEynB4rYMhWbz10Hpz0A7+B21F8GNSd8lO4gn/k0SSBgA0stPYI1fZ4m765MHNaY4xbwZpQFEK1MNFmyn7lSAt0ZrH0phI+P5nGAEVdyEd9OJFU= 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 1597079421849810.0522641500733; Mon, 10 Aug 2020 10:10:21 -0700 (PDT) Received: from localhost ([::1]:60252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BJU-0006eu-5J for importer@patchew.org; Mon, 10 Aug 2020 13:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIW-0005A9-1g for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:20 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:51267 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 1k5BIT-0002gN-TU for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:19 -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-310-49tKpti4MOWlCzfPYc8hDg-1; Mon, 10 Aug 2020 13:09:15 -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 336F119057A8 for ; Mon, 10 Aug 2020 17:09:14 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7950787D61 for ; Mon, 10 Aug 2020 17:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=3WR+7vf5orqhtCW52eKbI13vQ/eSMFjPNRLaT3u15wY=; b=Ev33jy0gKKB+qcrOgjUqUJ5vi5QsKWrozUj0vWNizwJWzpl9mht1emzcmkLG+pyKl/iYrV x6Ayr+BFpjb4OuGmpStaUJ7Nnf8uzoka7zIg1g1ZGxCRo3tWTQUANmDYXq25s5m9c2+XAj q6nAFTPYcpeDr/9UwBlsh2SaEUTZcfY= X-MC-Unique: 49tKpti4MOWlCzfPYc8hDg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 001/147] oss-fuzz/build: remove LIB_FUZZING_ENGINE Date: Mon, 10 Aug 2020 19:06:39 +0200 Message-Id: <1597079345-42801-2-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Meson build scripts will only include qemu-fuzz-TARGET rules if configured with --enable-fuzzing, and that takes care of adding -fsanitize=3Dfuzzer. Therefore we can just specify the configure option and stop modifying the CFLAGS and CONFIG_FUZZ options in the "make" invocation. Signed-off-by: Paolo Bonzini --- scripts/oss-fuzz/build.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index a07b302..52430cb 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -20,7 +20,7 @@ # e.g. # $CXX $CXXFLAGS -std=3Dc++11 -Iinclude \ # /path/to/name_of_fuzzer.cc -o $OUT/name_of_fuzzer \ -# $LIB_FUZZING_ENGINE /path/to/library.a +# -fsanitize=3Dfuzzer /path/to/library.a =20 fatal () { echo "Error : ${*}, exiting." @@ -54,10 +54,6 @@ mkdir -p $OSS_FUZZ_BUILD_DIR || fatal "mkdir $OSS_FUZZ_B= UILD_DIR failed" cd $OSS_FUZZ_BUILD_DIR || fatal "cd $OSS_FUZZ_BUILD_DIR failed" =20 =20 -if [ -z ${LIB_FUZZING_ENGINE+x} ]; then - LIB_FUZZING_ENGINE=3D"-fsanitize=3Dfuzzer" -fi - if [ -z ${OUT+x} ]; then DEST_DIR=3D$(realpath "./DEST_DIR") else @@ -67,14 +63,12 @@ fi mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here =20 # Build once to get the list of dynamic lib paths, and copy them over -../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" \ +../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" --enable-fuzzing= \ --extra-cflags=3D"$EXTRA_CFLAGS" --target-list=3D"i386-softmmu" =20 -if ! make CONFIG_FUZZ=3Dy CFLAGS=3D"$LIB_FUZZING_ENGINE" "-j$(nproc)" \ - i386-softmmu/fuzz; then +if ! make "-j$(nproc)" i386-softmmu/fuzz; then fatal "Build failed. Please specify a compiler with fuzzing support"\ - "using the \$CC and \$CXX environemnt variables, or specify a"\ - "\$LIB_FUZZING_ENGINE compatible with your compiler"\ + "using the \$CC and \$CXX environemnt variables"\ "\nFor example: CC=3Dclang CXX=3Dclang++ $0" fi =20 @@ -87,7 +81,7 @@ rm ./i386-softmmu/qemu-fuzz-i386 ../configure --bindir=3D"$DEST_DIR" --datadir=3D"$DEST_DIR/data/" --disabl= e-werror \ --cc=3D"$CC" --cxx=3D"$CXX" --extra-cflags=3D"$EXTRA_CFLAGS" \ --extra-ldflags=3D"-Wl,-rpath,'\$\$ORIGIN/lib'" -make CONFIG_FUZZ=3Dy CFLAGS=3D"$LIB_FUZZING_ENGINE" "-j$(nproc)" i386-soft= mmu/fuzz +make "-j$(nproc)" i386-softmmu/fuzz =20 # Copy over the datadir cp -r ../pc-bios/ "$DEST_DIR/pc-bios" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079431; cv=none; d=zohomail.com; s=zohoarc; b=Nz6i0+fbnXz6bIp+rwDUdGUYPksjYqPmCw7hdnan7kmMEbxHk5ouCYPbQdjaGFYLtkyCYUxUnXBysaGIbt4LjHMnE5IRieQ418FcJjC9cLekHQQTcHU+kXL4AxipL+rFYaQDNPCt20vAFu9G2vpJ0AfKWQf/2p2snWFpzNKRHZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079431; 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=7YfJeKoZjmp5EjXaiy91R897KhxVAZLBJndd9VXwKjc=; b=Xykv6Xy0r0Gr31rKLF1IImPpX8xx6xzhP53ldvK0KROKprcocYjxodDlvcJvVFIw6TfzybZ1slFHLOLZq2L1Y9BLmbitibekIsnx7d/IGyHfgbUFMtGNaht+2N7e6KJF6kVQu5aXJK1j3OVI4IVn84ONhmHeew/mntpyZvQxCnE= 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 1597079431075842.7622927888704; Mon, 10 Aug 2020 10:10:31 -0700 (PDT) Received: from localhost ([::1]:60996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BJd-0006z6-MF for importer@patchew.org; Mon, 10 Aug 2020 13:10:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIc-0005GX-4I for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51842 helo=us-smtp-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 1k5BIa-0002hK-4F for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:25 -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-430-48BC0E8RPiKsIaVhCcdCKw-1; Mon, 10 Aug 2020 13:09:19 -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 685E0100CCC0 for ; Mon, 10 Aug 2020 17:09:18 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A002387D64; Mon, 10 Aug 2020 17:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079363; 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=7YfJeKoZjmp5EjXaiy91R897KhxVAZLBJndd9VXwKjc=; b=OXtvcmOsDsFn6CLcqy/t3Bp/tJjoaOirOw/L8ZAC6DsQMzLvlganF7HhjMFWvwduhxx98i 0TLPSbmml+4H38yhZx0vbQucCPNg8OG2+nGJOeEUk7Tfje4ExmuQYYlyBz25EsFd157t97 z7u5G8vyAvFG6e6fwxHXFQo7Aoep/ME= X-MC-Unique: 48BC0E8RPiKsIaVhCcdCKw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 002/147] optionrom: simplify Makefile Date: Mon, 10 Aug 2020 19:06:40 +0200 Message-Id: <1597079345-42801-3-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 Make it independent from the rules.mak, and clean up to use pattern rules. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- pc-bios/optionrom/Makefile | 67 ++++++++++++++++++++++++++++--------------= ---- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index e33a24d..51cb6ca 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -1,13 +1,16 @@ -all: build-all +CURRENT_MAKEFILE :=3D $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFI= LE_LIST))) +SRC_DIR :=3D $(dir $(CURRENT_MAKEFILE)) +TOPSRC_DIR :=3D $(SRC_DIR)/../.. +VPATH =3D $(SRC_DIR) + +all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin # Dummy command so that make thinks it has done something @true =20 include ../../config-host.mak -include $(SRC_PATH)/rules.mak - -$(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) =20 -.PHONY : all clean build-all +quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) +cc-option =3D $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/nu= ll 2>&1 && echo OK), $1, $2) =20 # Compiling with no optimization creates ROMs that are too large ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0) @@ -15,48 +18,60 @@ override CFLAGS +=3D -O2 endif override CFLAGS +=3D -march=3Di486 =20 -# Drop -fstack-protector and the like -QEMU_CFLAGS :=3D $(filter -W%, $(QEMU_CFLAGS)) $(CFLAGS_NOPIE) -ffreestand= ing -QEMU_CFLAGS +=3D $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector) -QEMU_CFLAGS +=3D $(call cc-option, $(QEMU_CFLAGS), -m16) -ifeq ($(filter -m16, $(QEMU_CFLAGS)),) +# Flags for dependency generation +override CPPFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d + +override CFLAGS +=3D $(filter -W%, $(QEMU_CFLAGS)) +override CFLAGS +=3D $(CFLAGS_NOPIE) -ffreestanding -I$(TOPSRC_DIR)/include +override CFLAGS +=3D $(call cc-option, -fno-stack-protector) +override CFLAGS +=3D $(call cc-option, -m16) + +ifeq ($(filter -m16, $(CFLAGS)),) # Attempt to work around compilers that lack -m16 (GCC <=3D 4.8, clang <= =3D ??) # On GCC we add -fno-toplevel-reorder to keep the order of asm blocks with # respect to the rest of the code. clang does not have -fno-toplevel-reor= der, # but it places all asm blocks at the beginning and we're relying on it for # the option ROM header. So just force clang not to use the integrated # assembler, which doesn't support .code16gcc. -QEMU_CFLAGS +=3D $(call cc-option, $(QEMU_CFLAGS), -fno-toplevel-reorder) -QEMU_CFLAGS +=3D $(call cc-option, $(QEMU_CFLAGS), -no-integrated-as) -QEMU_CFLAGS +=3D -m32 -include $(SRC_PATH)/pc-bios/optionrom/code16gcc.h +override CFLAGS +=3D $(call cc-option, -fno-toplevel-reorder) +override CFLAGS +=3D $(call cc-option, -no-integrated-as) +override CFLAGS +=3D -m32 -include $(SRC_DIR)/code16gcc.h endif =20 -QEMU_INCLUDES +=3D -I$(SRC_PATH) - Wa =3D -Wa, -ASFLAGS +=3D -32 -QEMU_CFLAGS +=3D $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32) +override ASFLAGS +=3D -32 +override CFLAGS +=3D $(call cc-option, $(Wa)-32) =20 -build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.= bin =20 -# suppress auto-removal of intermediate files -.SECONDARY: +LD_I386_EMULATION ?=3D elf_i386 +override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +override LDFLAGS +=3D $(LDFLAGS_NOPIE) =20 +all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + +pvh.img: pvh.o pvh_main.o =20 %.o: %.S - $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< |= $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@") + $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o = $@,"AS","$@") =20 -pvh.img: pvh.o pvh_main.o - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(= SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@") +%.o: %.c + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") =20 %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(= SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@") + $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") =20 %.raw: %.img - $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$(TARGE= T_DIR)$@") + $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") =20 %.bin: %.raw - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/signrom.py $< $@,"SIGN= ","$(TARGET_DIR)$@") + $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,"SI= GN","$@") + +include $(wildcard *.d) =20 clean: rm -f *.o *.d *.raw *.img *.bin *~ + +# suppress auto-removal of intermediate files +.SECONDARY: + +.PHONY: all clean --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079544; cv=none; d=zohomail.com; s=zohoarc; b=fN6slP+kZzHR00qKiGiurJIaOGxCT8G2DnosUF0f7tgd3SEvs9+vP2M6K5de4wfP5jBJDVh0lGAWEVrIpMT5ZvMuiWMmbyvhxooaERSOunrWyKyeZlu8DFASP1HBTXUn26GhBuRkesyiMaalZYwLE02d4Yl7rje9RQqlbt6XCHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079544; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=EWTjIxHTAdOqleIgZjeQ/0xElBrMQ3JpG5lLpPzr220=; b=eJkGerfApz2/KhXCqrlSdBvLSeuSIsrZfOzPqFItn8TRW4e6XPG63+JS213mHlqSnVxeM4HEz1cQbvD4iANip3SezT8Grup8XJTvjpWwgnZ3DBBJ3GFnHyHoD+PLZeuhW3NkKDdiMP3sQYilUNzHhDt/xnnPFkn6OtpGGVltdNE= 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 1597079544738754.5357796341443; Mon, 10 Aug 2020 10:12:24 -0700 (PDT) Received: from localhost ([::1]:40506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BLT-000200-AH for importer@patchew.org; Mon, 10 Aug 2020 13:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BId-0005Iu-3b for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:27 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:53815 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 1k5BIa-0002hS-Lt for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:26 -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-224-vlLRVn62P2CF9FuFmjjS7A-1; Mon, 10 Aug 2020 13:09:20 -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 C823980BCA7 for ; Mon, 10 Aug 2020 17:09:19 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4F0F5F1E9; Mon, 10 Aug 2020 17:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=EWTjIxHTAdOqleIgZjeQ/0xElBrMQ3JpG5lLpPzr220=; b=iS7zKYrZFrVHW3TJypa0PmzEC+soAGBWj4PZDlakxRE96o2ArDPEwequ6tRgNtfjoxR9Wn GS3bhKb5Uv4/A+QneRGrMuV5IdRuFYd/30SXV4/aYOguFHzC9xIU9KuE4eNeim7nLwFscg rJpefM6G3ZphQQZ6LFuO+yHhCUyNGIU= X-MC-Unique: vlLRVn62P2CF9FuFmjjS7A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 003/147] pc-bios/s390-ccw: do not use rules.mak Date: Mon, 10 Aug 2020 19:06:41 +0200 Message-Id: <1597079345-42801-4-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Signed-off-by: Paolo Bonzini Acked-by: Cornelia Huck --- pc-bios/s390-ccw/Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 50bc880..cc0f77b 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -3,10 +3,26 @@ all: build-all @true =20 include ../../config-host.mak -include $(SRC_PATH)/rules.mak =20 +quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) +cc-option =3D $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null > /dev/n= ull \ + 2>&1 && echo OK), $1, $2) + +VPATH_SUFFIXES =3D %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in +set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) =20 +# Flags for dependency generation +QEMU_DGFLAGS =3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d + +%.o: %.c + $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ + -c -o $@ $<,"CC","$(TARGET_DIR)$@") + +%.o: %.S + $(call quiet-command,$(CCAS) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ + -c -o $@ $<,"CCAS","$(TARGET_DIR)$@") + .PHONY : all clean build-all =20 OBJECTS =3D start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \ --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079579; cv=none; d=zohomail.com; s=zohoarc; b=PTUbhSeQkRHgiySl33ZeAByFBwTjp3PXF2gg2l/ngFjJW8VkRbaN+7OgFFQleAsObFT1JAw1h448foyKQk/txKHeArUtO4A9BgP23QbUEExK05Sn4YhklrIc1ARw+b67IiwE/huQgHqQ8fLuVnkSiJfplgjOPJbn/sgV1iYDz7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079579; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=PqSWjBcq5dhW0mz/MCtTYx+DuuPSU8oclQBz9IPKkrU=; b=NKnP17Cdy59ySyuRToRO3wK63J2xxE+D0g35OSYtVQGDU/gTqOf/Z0Zo9LxeUEerXWtDmVh9wmMUFeII+OQ5CzVasIhLHz+feQOMhazv3QVkXcFH0/2uKBvRUBaVaDST5v/lyuAN5TPAf47wZebSHhjxcQiSjNrdn2YKC/Hn8UI= 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 1597079579283222.997597897868; Mon, 10 Aug 2020 10:12:59 -0700 (PDT) Received: from localhost ([::1]:42272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BM1-0002mA-Sh for importer@patchew.org; Mon, 10 Aug 2020 13:12:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIf-0005Oj-MH for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32283 helo=us-smtp-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 1k5BIb-0002ha-VT for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:29 -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-74-EWV8Zlw_NWi8tbjAXnoL8Q-1; Mon, 10 Aug 2020 13:09:21 -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 ECCDF100CCCC for ; Mon, 10 Aug 2020 17:09:20 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42A305F1E9 for ; Mon, 10 Aug 2020 17:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=PqSWjBcq5dhW0mz/MCtTYx+DuuPSU8oclQBz9IPKkrU=; b=F0y9Fj8T8Uzfb73qH8Cntj3izOM/I5f4qbjEHwQ1qriqF9l5VjAS39Z29Co+5jG1ocCcBI mh8jDQyvxwpJ42cGipK2EzwOHdWBOU6ehy0Xu4vmKNfnqXyLMt0W9PFtxAfRgYRMlGIM4r LbpWetRendi9ymx0ql/mEak+lvt8teI= X-MC-Unique: EWV8Zlw_NWi8tbjAXnoL8Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 004/147] trace: switch position of headers to what Meson requires Date: Mon, 10 Aug 2020 19:06:42 +0200 Message-Id: <1597079345-42801-5-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Meson doesn't enjoy the same flexibility we have with Make in choosing the include path. In particular the tracing headers are using $(build_root)/$( --- .gitignore | 1 - Makefile | 46 +++++++++++++++++++---------= ---- Makefile.objs | 1 - accel/kvm/trace.h | 1 + accel/tcg/cputlb.c | 2 +- accel/tcg/trace.h | 1 + accel/tcg/user-exec.c | 2 +- audio/trace.h | 1 + authz/trace.h | 1 + backends/tpm/trace.h | 1 + backends/trace.h | 1 + block/trace.h | 1 + chardev/trace.h | 1 + crypto/trace.h | 1 + dma-helpers.c | 2 +- exec.c | 2 +- gdbstub.c | 2 +- hw/9pfs/trace.h | 1 + hw/acpi/trace.h | 1 + hw/alpha/trace.h | 1 + hw/arm/trace.h | 1 + hw/audio/trace.h | 1 + hw/block/dataplane/trace.h | 1 + hw/block/trace.h | 1 + hw/char/trace.h | 1 + hw/core/cpu.c | 2 +- hw/core/trace.h | 1 + hw/display/trace.h | 1 + hw/dma/trace.h | 1 + hw/gpio/trace.h | 1 + hw/hppa/trace.h | 1 + hw/hyperv/trace.h | 1 + hw/i2c/trace.h | 1 + hw/i386/trace.h | 1 + hw/i386/xen/trace.h | 1 + hw/ide/trace.h | 1 + hw/input/trace.h | 1 + hw/intc/trace.h | 1 + hw/isa/trace.h | 1 + hw/mem/trace.h | 1 + hw/mips/trace.h | 1 + hw/misc/macio/trace.h | 1 + hw/misc/trace.h | 1 + hw/net/trace.h | 1 + hw/nvram/trace.h | 1 + hw/pci-host/trace.h | 1 + hw/pci/trace.h | 1 + hw/ppc/trace.h | 1 + hw/rdma/trace.h | 1 + hw/rdma/vmw/trace.h | 1 + hw/riscv/trace.h | 1 + hw/rtc/trace.h | 1 + hw/s390x/trace.h | 1 + hw/scsi/trace.h | 1 + hw/sd/trace.h | 1 + hw/sparc/trace.h | 1 + hw/sparc64/trace.h | 1 + hw/ssi/trace.h | 1 + hw/timer/trace.h | 1 + hw/tpm/trace.h | 1 + hw/usb/trace.h | 1 + hw/vfio/trace.h | 1 + hw/virtio/trace.h | 1 + hw/watchdog/trace.h | 1 + hw/xen/trace.h | 1 + include/user/syscall-trace.h | 2 +- io/trace.h | 1 + job-qmp.c | 2 +- job.c | 2 +- linux-user/trace.h | 1 + migration/trace.h | 1 + monitor/trace.h | 1 + nbd/trace.h | 1 + net/trace.h | 1 + qapi/trace.h | 1 + qom/trace.h | 1 + scripts/tracetool/format/c.py | 5 +--- scripts/tracetool/format/tcg_h.py | 2 +- scripts/tracetool/format/tcg_helper_c.py | 2 +- scsi/trace.h | 1 + softmmu/balloon.c | 2 +- softmmu/ioport.c | 2 +- softmmu/memory.c | 2 +- softmmu/vl.c | 2 +- target/arm/trace.h | 1 + target/hppa/trace.h | 1 + target/i386/trace.h | 1 + target/mips/trace.h | 1 + target/ppc/trace.h | 1 + target/riscv/trace.h | 1 + target/s390x/trace.h | 1 + target/sparc/trace.h | 1 + trace/control-target.c | 2 +- trace/control.c | 2 +- ui/trace.h | 1 + util/trace.h | 1 + 96 files changed, 121 insertions(+), 41 deletions(-) create mode 100644 accel/kvm/trace.h create mode 100644 accel/tcg/trace.h create mode 100644 audio/trace.h create mode 100644 authz/trace.h create mode 100644 backends/tpm/trace.h create mode 100644 backends/trace.h create mode 100644 block/trace.h create mode 100644 chardev/trace.h create mode 100644 crypto/trace.h create mode 100644 hw/9pfs/trace.h create mode 100644 hw/acpi/trace.h create mode 100644 hw/alpha/trace.h create mode 100644 hw/arm/trace.h create mode 100644 hw/audio/trace.h create mode 100644 hw/block/dataplane/trace.h create mode 100644 hw/block/trace.h create mode 100644 hw/char/trace.h create mode 100644 hw/core/trace.h create mode 100644 hw/display/trace.h create mode 100644 hw/dma/trace.h create mode 100644 hw/gpio/trace.h create mode 100644 hw/hppa/trace.h create mode 100644 hw/hyperv/trace.h create mode 100644 hw/i2c/trace.h create mode 100644 hw/i386/trace.h create mode 100644 hw/i386/xen/trace.h create mode 100644 hw/ide/trace.h create mode 100644 hw/input/trace.h create mode 100644 hw/intc/trace.h create mode 100644 hw/isa/trace.h create mode 100644 hw/mem/trace.h create mode 100644 hw/mips/trace.h create mode 100644 hw/misc/macio/trace.h create mode 100644 hw/misc/trace.h create mode 100644 hw/net/trace.h create mode 100644 hw/nvram/trace.h create mode 100644 hw/pci-host/trace.h create mode 100644 hw/pci/trace.h create mode 100644 hw/ppc/trace.h create mode 100644 hw/rdma/trace.h create mode 100644 hw/rdma/vmw/trace.h create mode 100644 hw/riscv/trace.h create mode 100644 hw/rtc/trace.h create mode 100644 hw/s390x/trace.h create mode 100644 hw/scsi/trace.h create mode 100644 hw/sd/trace.h create mode 100644 hw/sparc/trace.h create mode 100644 hw/sparc64/trace.h create mode 100644 hw/ssi/trace.h create mode 100644 hw/timer/trace.h create mode 100644 hw/tpm/trace.h create mode 100644 hw/usb/trace.h create mode 100644 hw/vfio/trace.h create mode 100644 hw/virtio/trace.h create mode 100644 hw/watchdog/trace.h create mode 100644 hw/xen/trace.h create mode 100644 io/trace.h create mode 100644 linux-user/trace.h create mode 100644 migration/trace.h create mode 100644 monitor/trace.h create mode 100644 nbd/trace.h create mode 100644 net/trace.h create mode 100644 qapi/trace.h create mode 100644 qom/trace.h create mode 100644 scsi/trace.h create mode 100644 target/arm/trace.h create mode 100644 target/hppa/trace.h create mode 100644 target/i386/trace.h create mode 100644 target/mips/trace.h create mode 100644 target/ppc/trace.h create mode 100644 target/riscv/trace.h create mode 100644 target/s390x/trace.h create mode 100644 target/sparc/trace.h create mode 100644 ui/trace.h create mode 100644 util/trace.h diff --git a/.gitignore b/.gitignore index 2992d15..656e390 100644 --- a/.gitignore +++ b/.gitignore @@ -146,7 +146,6 @@ docker-src.* *~ *.ast_raw *.depend_raw -trace.h trace.c trace-ust.h trace-ust.h diff --git a/Makefile b/Makefile index 13dd708..00cadeb 100644 --- a/Makefile +++ b/Makefile @@ -159,8 +159,8 @@ generated-files-$(CONFIG_TRACE_UST) +=3D trace-ust-all.c =20 generated-files-y +=3D module_block.h =20 -TRACE_HEADERS =3D trace-root.h $(trace-events-subdirs:%=3D%/trace.h) -TRACE_SOURCES =3D trace-root.c $(trace-events-subdirs:%=3D%/trace.c) +TRACE_HEADERS =3D trace/trace-root.h +TRACE_SOURCES =3D trace/trace-root.c TRACE_DTRACE =3D ifdef CONFIG_TRACE_DTRACE TRACE_HEADERS +=3D trace-dtrace-root.h $(trace-events-subdirs:%=3D%/trace-= dtrace.h) @@ -170,33 +170,37 @@ ifdef CONFIG_TRACE_UST TRACE_HEADERS +=3D trace-ust-root.h $(trace-events-subdirs:%=3D%/trace-ust= .h) endif =20 -generated-files-y +=3D $(TRACE_HEADERS) -generated-files-y +=3D $(TRACE_SOURCES) generated-files-y +=3D $(BUILD_DIR)/trace-events-all generated-files-y +=3D .git-submodule-status =20 trace-group-name =3D $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') +trace-group-suffix =3D $(shell echo $1 | sed -e 's/[^a-zA-Z0-9]/_/g') =20 tracetool-y =3D $(SRC_PATH)/scripts/tracetool.py tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") =20 -%/trace.h: %/trace.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR= )/config-host.mak +define __trace_rules +TRACE_HEADERS +=3D trace/trace-$2.h +TRACE_SOURCES +=3D trace/trace-$2.c +trace-obj-y +=3D trace/trace-$2.o +trace/trace-$2.h: trace/trace-$2.h-timestamp + @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@ +trace/trace-$2.h-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(B= UILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ - --group=3D$(call trace-group-name,$@) \ + --group=3D$2 \ --format=3Dh \ --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") + $$< > $$@,"GEN","$$(@:%-timestamp=3D%)") =20 -%/trace.c: %/trace.c-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR= )/config-host.mak +trace/trace-$2.c: trace/trace-$2.c-timestamp + @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@ +trace/trace-$2.c-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(B= UILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ - --group=3D$(call trace-group-name,$@) \ + --group=3D$2 \ --format=3Dc \ --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") + $$< > $$@,"GEN","$$(@:%-timestamp=3D%)") +endef =20 %/trace-ust.h: %/trace-ust.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ @@ -222,18 +226,18 @@ tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tra= cetool -name "*.py") %/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y) =20 =20 -trace-root.h: trace-root.h-timestamp +trace/trace-root.h: trace/trace-root.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DI= R)/config-host.mak +trace/trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BU= ILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ --format=3Dh \ --backends=3D$(TRACE_BACKENDS) \ $< > $@,"GEN","$(@:%-timestamp=3D%)") =20 -trace-root.c: trace-root.c-timestamp +trace/trace-root.c: trace/trace-root.c-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DI= R)/config-host.mak +trace/trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BU= ILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ --format=3Dc \ @@ -477,6 +481,12 @@ dummy :=3D $(call unnest-vars,, \ common-obj-m \ trace-obj-y) =20 +dummy :=3D $(foreach DIR,$(trace-events-subdirs),$(eval $(call __trace_rul= es,$(DIR),$(call trace-group-suffix,$(DIR))))) + +generated-files-y +=3D $(TRACE_HEADERS) +generated-files-y +=3D $(TRACE_SOURCES) + + include $(SRC_PATH)/tests/Makefile.include =20 all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules $(vhost-user-json-y) diff --git a/Makefile.objs b/Makefile.objs index d22b3b4..3823463 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -209,7 +209,6 @@ trace-events-subdirs +=3D util trace-events-files =3D $(SRC_PATH)/trace-events $(trace-events-subdirs:%= =3D$(SRC_PATH)/%/trace-events) =20 trace-obj-y =3D trace-root.o -trace-obj-y +=3D $(trace-events-subdirs:%=3D%/trace.o) trace-obj-$(CONFIG_TRACE_UST) +=3D trace-ust-all.o trace-obj-$(CONFIG_TRACE_DTRACE) +=3D trace-dtrace-root.o trace-obj-$(CONFIG_TRACE_DTRACE) +=3D $(trace-events-subdirs:%=3D%/trace-d= trace.o) diff --git a/accel/kvm/trace.h b/accel/kvm/trace.h new file mode 100644 index 0000000..67c935a --- /dev/null +++ b/accel/kvm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_kvm.h" diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5698292..5349ee6 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -34,7 +34,7 @@ #include "qemu/atomic.h" #include "qemu/atomic128.h" #include "translate-all.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/mem.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin-memory.h" diff --git a/accel/tcg/trace.h b/accel/tcg/trace.h new file mode 100644 index 0000000..db61fad --- /dev/null +++ b/accel/tcg/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_tcg.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index d8b027f..1d34c57 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -26,7 +26,7 @@ #include "translate-all.h" #include "exec/helper-proto.h" #include "qemu/atomic128.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/mem.h" =20 #undef EAX diff --git a/audio/trace.h b/audio/trace.h new file mode 100644 index 0000000..4072a11 --- /dev/null +++ b/audio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-audio.h" diff --git a/authz/trace.h b/authz/trace.h new file mode 100644 index 0000000..3176c12 --- /dev/null +++ b/authz/trace.h @@ -0,0 +1 @@ +#include "trace/trace-authz.h" diff --git a/backends/tpm/trace.h b/backends/tpm/trace.h new file mode 100644 index 0000000..40c4729 --- /dev/null +++ b/backends/tpm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-backends_tpm.h" diff --git a/backends/trace.h b/backends/trace.h new file mode 100644 index 0000000..77fe57f3 --- /dev/null +++ b/backends/trace.h @@ -0,0 +1 @@ +#include "trace/trace-backends.h" diff --git a/block/trace.h b/block/trace.h new file mode 100644 index 0000000..3a436e6 --- /dev/null +++ b/block/trace.h @@ -0,0 +1 @@ +#include "trace/trace-block.h" diff --git a/chardev/trace.h b/chardev/trace.h new file mode 100644 index 0000000..eb4f902 --- /dev/null +++ b/chardev/trace.h @@ -0,0 +1 @@ +#include "trace/trace-chardev.h" diff --git a/crypto/trace.h b/crypto/trace.h new file mode 100644 index 0000000..a9af0f3 --- /dev/null +++ b/crypto/trace.h @@ -0,0 +1 @@ +#include "trace/trace-crypto.h" diff --git a/dma-helpers.c b/dma-helpers.c index 2a77b5a..41ef24a 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "qemu/thread.h" #include "qemu/main-loop.h" #include "sysemu/cpus.h" diff --git a/exec.c b/exec.c index 6f381f9..8047bf2 100644 --- a/exec.c +++ b/exec.c @@ -50,7 +50,7 @@ #include "sysemu/hw_accel.h" #include "exec/address-spaces.h" #include "sysemu/xen-mapcache.h" -#include "trace-root.h" +#include "trace/trace-root.h" =20 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE #include diff --git a/gdbstub.c b/gdbstub.c index f3a318c..9dfb6e4 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -30,7 +30,7 @@ #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/module.h" -#include "trace-root.h" +#include "trace/trace-root.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" #else diff --git a/hw/9pfs/trace.h b/hw/9pfs/trace.h new file mode 100644 index 0000000..6104fe2 --- /dev/null +++ b/hw/9pfs/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_9pfs.h" diff --git a/hw/acpi/trace.h b/hw/acpi/trace.h new file mode 100644 index 0000000..a7f7da7 --- /dev/null +++ b/hw/acpi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_acpi.h" diff --git a/hw/alpha/trace.h b/hw/alpha/trace.h new file mode 100644 index 0000000..20fe698 --- /dev/null +++ b/hw/alpha/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_alpha.h" diff --git a/hw/arm/trace.h b/hw/arm/trace.h new file mode 100644 index 0000000..91337aa --- /dev/null +++ b/hw/arm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_arm.h" diff --git a/hw/audio/trace.h b/hw/audio/trace.h new file mode 100644 index 0000000..5c7516a --- /dev/null +++ b/hw/audio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_audio.h" diff --git a/hw/block/dataplane/trace.h b/hw/block/dataplane/trace.h new file mode 100644 index 0000000..240cc59 --- /dev/null +++ b/hw/block/dataplane/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_block_dataplane.h" diff --git a/hw/block/trace.h b/hw/block/trace.h new file mode 100644 index 0000000..cde210a --- /dev/null +++ b/hw/block/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_block.h" diff --git a/hw/char/trace.h b/hw/char/trace.h new file mode 100644 index 0000000..c2df66a --- /dev/null +++ b/hw/char/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_char.h" diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 594441a..22bc3f9 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -31,7 +31,7 @@ #include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/qdev-properties.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "qemu/plugin.h" =20 CPUInterruptHandler cpu_interrupt_handler; diff --git a/hw/core/trace.h b/hw/core/trace.h new file mode 100644 index 0000000..23dfd61 --- /dev/null +++ b/hw/core/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_core.h" diff --git a/hw/display/trace.h b/hw/display/trace.h new file mode 100644 index 0000000..4ed0e91 --- /dev/null +++ b/hw/display/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_display.h" diff --git a/hw/dma/trace.h b/hw/dma/trace.h new file mode 100644 index 0000000..4bcb28b --- /dev/null +++ b/hw/dma/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_dma.h" diff --git a/hw/gpio/trace.h b/hw/gpio/trace.h new file mode 100644 index 0000000..8b13907 --- /dev/null +++ b/hw/gpio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_gpio.h" diff --git a/hw/hppa/trace.h b/hw/hppa/trace.h new file mode 100644 index 0000000..4e8b52d --- /dev/null +++ b/hw/hppa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_hppa.h" diff --git a/hw/hyperv/trace.h b/hw/hyperv/trace.h new file mode 100644 index 0000000..7f2a888 --- /dev/null +++ b/hw/hyperv/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_hyperv.h" diff --git a/hw/i2c/trace.h b/hw/i2c/trace.h new file mode 100644 index 0000000..4843a8d --- /dev/null +++ b/hw/i2c/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i2c.h" diff --git a/hw/i386/trace.h b/hw/i386/trace.h new file mode 100644 index 0000000..37a9f67 --- /dev/null +++ b/hw/i386/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i386.h" diff --git a/hw/i386/xen/trace.h b/hw/i386/xen/trace.h new file mode 100644 index 0000000..a02bf75 --- /dev/null +++ b/hw/i386/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i386_xen.h" diff --git a/hw/ide/trace.h b/hw/ide/trace.h new file mode 100644 index 0000000..e060e0a --- /dev/null +++ b/hw/ide/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_ide.h" diff --git a/hw/input/trace.h b/hw/input/trace.h new file mode 100644 index 0000000..d1cc5d9 --- /dev/null +++ b/hw/input/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_input.h" diff --git a/hw/intc/trace.h b/hw/intc/trace.h new file mode 100644 index 0000000..02394ae --- /dev/null +++ b/hw/intc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_intc.h" diff --git a/hw/isa/trace.h b/hw/isa/trace.h new file mode 100644 index 0000000..501205c --- /dev/null +++ b/hw/isa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_isa.h" diff --git a/hw/mem/trace.h b/hw/mem/trace.h new file mode 100644 index 0000000..2f2c945 --- /dev/null +++ b/hw/mem/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_mem.h" diff --git a/hw/mips/trace.h b/hw/mips/trace.h new file mode 100644 index 0000000..8d1fd7c --- /dev/null +++ b/hw/mips/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_mips.h" diff --git a/hw/misc/macio/trace.h b/hw/misc/macio/trace.h new file mode 100644 index 0000000..34a3cf1 --- /dev/null +++ b/hw/misc/macio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_misc_macio.h" diff --git a/hw/misc/trace.h b/hw/misc/trace.h new file mode 100644 index 0000000..1ab6923 --- /dev/null +++ b/hw/misc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_misc.h" diff --git a/hw/net/trace.h b/hw/net/trace.h new file mode 100644 index 0000000..93249af --- /dev/null +++ b/hw/net/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_net.h" diff --git a/hw/nvram/trace.h b/hw/nvram/trace.h new file mode 100644 index 0000000..88fa900 --- /dev/null +++ b/hw/nvram/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_nvram.h" diff --git a/hw/pci-host/trace.h b/hw/pci-host/trace.h new file mode 100644 index 0000000..93ec814 --- /dev/null +++ b/hw/pci-host/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_pci_host.h" diff --git a/hw/pci/trace.h b/hw/pci/trace.h new file mode 100644 index 0000000..3dd773e --- /dev/null +++ b/hw/pci/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_pci.h" diff --git a/hw/ppc/trace.h b/hw/ppc/trace.h new file mode 100644 index 0000000..87c4198 --- /dev/null +++ b/hw/ppc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_ppc.h" diff --git a/hw/rdma/trace.h b/hw/rdma/trace.h new file mode 100644 index 0000000..b3fa8eb --- /dev/null +++ b/hw/rdma/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_rdma.h" diff --git a/hw/rdma/vmw/trace.h b/hw/rdma/vmw/trace.h new file mode 100644 index 0000000..3ebc9fb --- /dev/null +++ b/hw/rdma/vmw/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_rdma_vmw.h" diff --git a/hw/riscv/trace.h b/hw/riscv/trace.h new file mode 100644 index 0000000..8c0e3ca --- /dev/null +++ b/hw/riscv/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_riscv.h" diff --git a/hw/rtc/trace.h b/hw/rtc/trace.h new file mode 100644 index 0000000..cfd5d6e --- /dev/null +++ b/hw/rtc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_rtc.h" diff --git a/hw/s390x/trace.h b/hw/s390x/trace.h new file mode 100644 index 0000000..d6568b3 --- /dev/null +++ b/hw/s390x/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_s390x.h" diff --git a/hw/scsi/trace.h b/hw/scsi/trace.h new file mode 100644 index 0000000..4ce2673 --- /dev/null +++ b/hw/scsi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_scsi.h" diff --git a/hw/sd/trace.h b/hw/sd/trace.h new file mode 100644 index 0000000..f3d0c58 --- /dev/null +++ b/hw/sd/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sd.h" diff --git a/hw/sparc/trace.h b/hw/sparc/trace.h new file mode 100644 index 0000000..625d60c --- /dev/null +++ b/hw/sparc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sparc.h" diff --git a/hw/sparc64/trace.h b/hw/sparc64/trace.h new file mode 100644 index 0000000..b6ef6e6 --- /dev/null +++ b/hw/sparc64/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sparc64.h" diff --git a/hw/ssi/trace.h b/hw/ssi/trace.h new file mode 100644 index 0000000..0c1de26 --- /dev/null +++ b/hw/ssi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_ssi.h" diff --git a/hw/timer/trace.h b/hw/timer/trace.h new file mode 100644 index 0000000..5f72c44 --- /dev/null +++ b/hw/timer/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_timer.h" diff --git a/hw/tpm/trace.h b/hw/tpm/trace.h new file mode 100644 index 0000000..9827c12 --- /dev/null +++ b/hw/tpm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_tpm.h" diff --git a/hw/usb/trace.h b/hw/usb/trace.h new file mode 100644 index 0000000..f3962f2 --- /dev/null +++ b/hw/usb/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_usb.h" diff --git a/hw/vfio/trace.h b/hw/vfio/trace.h new file mode 100644 index 0000000..5a343aa --- /dev/null +++ b/hw/vfio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_vfio.h" diff --git a/hw/virtio/trace.h b/hw/virtio/trace.h new file mode 100644 index 0000000..5d70970 --- /dev/null +++ b/hw/virtio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_virtio.h" diff --git a/hw/watchdog/trace.h b/hw/watchdog/trace.h new file mode 100644 index 0000000..5d84957 --- /dev/null +++ b/hw/watchdog/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_watchdog.h" diff --git a/hw/xen/trace.h b/hw/xen/trace.h new file mode 100644 index 0000000..adba31a --- /dev/null +++ b/hw/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_xen.h" diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h index 79fd3e5..42e3b48 100644 --- a/include/user/syscall-trace.h +++ b/include/user/syscall-trace.h @@ -10,7 +10,7 @@ #ifndef _SYSCALL_TRACE_H_ #define _SYSCALL_TRACE_H_ =20 -#include "trace-root.h" +#include "trace/trace-root.h" =20 /* * These helpers just provide a common place for the various diff --git a/io/trace.h b/io/trace.h new file mode 100644 index 0000000..92d63a5 --- /dev/null +++ b/io/trace.h @@ -0,0 +1 @@ +#include "trace/trace-io.h" diff --git a/job-qmp.c b/job-qmp.c index f9a5883..645601b 100644 --- a/job-qmp.c +++ b/job-qmp.c @@ -27,7 +27,7 @@ #include "qemu/job.h" #include "qapi/qapi-commands-job.h" #include "qapi/error.h" -#include "trace-root.h" +#include "trace/trace-root.h" =20 /* Get a job using its ID and acquire its AioContext */ static Job *find_job(const char *id, AioContext **aio_context, Error **err= p) diff --git a/job.c b/job.c index 53be57a..8fecf38 100644 --- a/job.c +++ b/job.c @@ -29,7 +29,7 @@ #include "qemu/id.h" #include "qemu/main-loop.h" #include "block/aio-wait.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "qapi/qapi-events-job.h" =20 static QLIST_HEAD(, Job) jobs =3D QLIST_HEAD_INITIALIZER(jobs); diff --git a/linux-user/trace.h b/linux-user/trace.h new file mode 100644 index 0000000..05518e4 --- /dev/null +++ b/linux-user/trace.h @@ -0,0 +1 @@ +#include "trace/trace-linux_user.h" diff --git a/migration/trace.h b/migration/trace.h new file mode 100644 index 0000000..e1a0f4f --- /dev/null +++ b/migration/trace.h @@ -0,0 +1 @@ +#include "trace/trace-migration.h" diff --git a/monitor/trace.h b/monitor/trace.h new file mode 100644 index 0000000..f216e31 --- /dev/null +++ b/monitor/trace.h @@ -0,0 +1 @@ +#include "trace/trace-monitor.h" diff --git a/nbd/trace.h b/nbd/trace.h new file mode 100644 index 0000000..233d08f --- /dev/null +++ b/nbd/trace.h @@ -0,0 +1 @@ +#include "trace/trace-nbd.h" diff --git a/net/trace.h b/net/trace.h new file mode 100644 index 0000000..18d42c2 --- /dev/null +++ b/net/trace.h @@ -0,0 +1 @@ +#include "trace/trace-net.h" diff --git a/qapi/trace.h b/qapi/trace.h new file mode 100644 index 0000000..5c3fb67 --- /dev/null +++ b/qapi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-qapi.h" diff --git a/qom/trace.h b/qom/trace.h new file mode 100644 index 0000000..f2895e6 --- /dev/null +++ b/qom/trace.h @@ -0,0 +1 @@ +#include "trace/trace-qom.h" diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 23d82ea..c390c18 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -19,10 +19,7 @@ def generate(events, backend, group): active_events =3D [e for e in events if "disable" not in e.properties] =20 - if group =3D=3D "root": - header =3D "trace-root.h" - else: - header =3D "trace.h" + header =3D "trace-" + group + ".h" =20 out('/* This file is autogenerated by tracetool, do not edit. */', '', diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/t= cg_h.py index 33cf6a3..4d84440 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -28,7 +28,7 @@ def vcpu_transform_args(args): =20 def generate(events, backend, group): if group =3D=3D "root": - header =3D "trace-root.h" + header =3D "trace/trace-root.h" else: header =3D "trace.h" =20 diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/f= ormat/tcg_helper_c.py index 2db6317..72576e6 100644 --- a/scripts/tracetool/format/tcg_helper_c.py +++ b/scripts/tracetool/format/tcg_helper_c.py @@ -41,7 +41,7 @@ def vcpu_transform_args(args, mode): =20 def generate(events, backend, group): if group =3D=3D "root": - header =3D "trace-root.h" + header =3D "trace/trace-root.h" else: header =3D "trace.h" =20 diff --git a/scsi/trace.h b/scsi/trace.h new file mode 100644 index 0000000..3e4d89a --- /dev/null +++ b/scsi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-scsi.h" diff --git a/softmmu/balloon.c b/softmmu/balloon.c index 354408c..b89646f 100644 --- a/softmmu/balloon.c +++ b/softmmu/balloon.c @@ -28,7 +28,7 @@ #include "qemu/atomic.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qmp/qerror.h" diff --git a/softmmu/ioport.c b/softmmu/ioport.c index 04e360e..a799697 100644 --- a/softmmu/ioport.c +++ b/softmmu/ioport.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/ioport.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "exec/memory.h" #include "exec/address-spaces.h" =20 diff --git a/softmmu/memory.c b/softmmu/memory.c index af25987..70b9310 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -24,7 +24,7 @@ #include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "qom/object.h" -#include "trace-root.h" +#include "trace/trace-root.h" =20 #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/softmmu/vl.c b/softmmu/vl.c index 4eb9d1f..0cc86b0 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -90,7 +90,7 @@ =20 #include "disas/disas.h" =20 -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" diff --git a/target/arm/trace.h b/target/arm/trace.h new file mode 100644 index 0000000..60372d8 --- /dev/null +++ b/target/arm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_arm.h" diff --git a/target/hppa/trace.h b/target/hppa/trace.h new file mode 100644 index 0000000..810cc09 --- /dev/null +++ b/target/hppa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_hppa.h" diff --git a/target/i386/trace.h b/target/i386/trace.h new file mode 100644 index 0000000..781e8ec --- /dev/null +++ b/target/i386/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_i386.h" diff --git a/target/mips/trace.h b/target/mips/trace.h new file mode 100644 index 0000000..f25b88c --- /dev/null +++ b/target/mips/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_mips.h" diff --git a/target/ppc/trace.h b/target/ppc/trace.h new file mode 100644 index 0000000..a9e8962 --- /dev/null +++ b/target/ppc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_ppc.h" diff --git a/target/riscv/trace.h b/target/riscv/trace.h new file mode 100644 index 0000000..03a89fc --- /dev/null +++ b/target/riscv/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_riscv.h" diff --git a/target/s390x/trace.h b/target/s390x/trace.h new file mode 100644 index 0000000..d7d59d4 --- /dev/null +++ b/target/s390x/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_s390x.h" diff --git a/target/sparc/trace.h b/target/sparc/trace.h new file mode 100644 index 0000000..3b2f5a8 --- /dev/null +++ b/target/sparc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_sparc.h" diff --git a/trace/control-target.c b/trace/control-target.c index ceb55c7..e293eee 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/control.h" =20 =20 diff --git a/trace/control.c b/trace/control.c index 6558b5c..c63a4de 100644 --- a/trace/control.c +++ b/trace/control.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "monitor/monitor.h" -#include "trace-root.h" +#include "trace/trace-root.h" =20 int trace_events_enabled_count; =20 diff --git a/ui/trace.h b/ui/trace.h new file mode 100644 index 0000000..a89d769 --- /dev/null +++ b/ui/trace.h @@ -0,0 +1 @@ +#include "trace/trace-ui.h" diff --git a/util/trace.h b/util/trace.h new file mode 100644 index 0000000..86ff7a3 --- /dev/null +++ b/util/trace.h @@ -0,0 +1 @@ +#include "trace/trace-util.h" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079680; cv=none; d=zohomail.com; s=zohoarc; b=AVeOCyC5EOFuJQXgn8OITcuayzeOT5d2IWm5kJVW70vd5yXwH9Zl3CsgJl27XdiHcPLQsLuM7/jQdGU13bjfEYMoP6f5Yh9qWqlzmF2fgnqinEQIe2cjR27E2dO/vEoQ+WN7Zk/er5M3sk3dxG81dYNrYl+9QTNQIxtFQ1qAT2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079680; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=RFLnPqNKmzotlWEsfNCCMdomt8UhXSpqFfmgTAwVeR4=; b=d3uI4QtzXwYSBIoPVpdGFp+vL0AAr74x3XST1W1/Ndw/J7b2xxPdFPKrlaQW9/F/zKUwVCREGnuk0oJNezfEdSTA7NW5xuWot9Xt9KHlUZhmEwvuxAl45AAuoCMeDut4n8vcuazGlYDQiT/Liu6tcbMUgfrWBq2tqXy0sBvaIy4= 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 1597079680312158.5085595247374; Mon, 10 Aug 2020 10:14:40 -0700 (PDT) Received: from localhost ([::1]:50074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BNe-00062q-PI for importer@patchew.org; Mon, 10 Aug 2020 13:14:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIi-0005VN-87 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38053 helo=us-smtp-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 1k5BIc-0002hX-1D for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:31 -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-547-Uf59eXW8M1imd3uc1pUvZQ-1; Mon, 10 Aug 2020 13:09:22 -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 17C84800477 for ; Mon, 10 Aug 2020 17:09:22 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 585B45F1E9 for ; Mon, 10 Aug 2020 17:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=RFLnPqNKmzotlWEsfNCCMdomt8UhXSpqFfmgTAwVeR4=; b=Nub5KPLwUsOlc7fHYSOubyJJgPxBfpOYv+oq2diat6EqHz4qQPU9k0DzAX6ZAix8UzJiAw 6wGkA91YemAOjzJaRiaJFeQEpFj57WTIDecc0bb2sZdrBAIO8n74fREVDW3qw9YPZ3SiV8 ljPqWN6Vdb9X2ZwPW+iSMICu2Ii7Ips= X-MC-Unique: Uf59eXW8M1imd3uc1pUvZQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 005/147] meson: rename .inc.c files to .inc Date: Mon, 10 Aug 2020 19:06:43 +0200 Message-Id: <1597079345-42801-6-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- .gitignore | 4 +-- Makefile | 36 +++++++++---------- .../tcg/{atomic_common.inc.c =3D> atomic_common.inc} | 0 accel/tcg/cputlb.c | 2 +- accel/tcg/user-exec.c | 2 +- contrib/gitdm/filetypes.txt | 2 +- exec.c | 4 +-- ...t-specialize.inc.c =3D> softfloat-specialize.inc} | 0 fpu/softfloat.c | 2 +- include/tcg/tcg.h | 2 +- memory_ldst.inc.c =3D> memory_ldst.inc | 0 scripts/clean-includes | 2 +- target/arm/Makefile.objs | 40 +++++++++++-------= ---- .../{translate-neon.inc.c =3D> translate-neon.inc} | 6 ++-- target/arm/translate-sve.c | 2 +- .../arm/{translate-vfp.inc.c =3D> translate-vfp.inc} | 4 +-- target/arm/translate.c | 12 +++---- target/avr/Makefile.objs | 4 +-- target/avr/disas.c | 2 +- target/avr/translate.c | 2 +- target/cris/translate.c | 2 +- .../{translate_v10.inc.c =3D> translate_v10.inc} | 0 target/hppa/Makefile.objs | 4 +-- target/hppa/translate.c | 2 +- target/mips/translate.c | 2 +- .../{translate_init.inc.c =3D> translate_init.inc} | 0 target/openrisc/Makefile.objs | 6 ++-- target/openrisc/disas.c | 2 +- target/openrisc/translate.c | 2 +- target/ppc/int_helper.c | 2 +- target/ppc/{mfrom_table.inc.c =3D> mfrom_table.inc} | 0 target/ppc/translate.c | 22 ++++++------ .../ppc/translate/{dfp-impl.inc.c =3D> dfp-impl.inc} | 0 .../ppc/translate/{dfp-ops.inc.c =3D> dfp-ops.inc} | 0 .../ppc/translate/{fp-impl.inc.c =3D> fp-impl.inc} | 0 target/ppc/translate/{fp-ops.inc.c =3D> fp-ops.inc} | 0 .../ppc/translate/{spe-impl.inc.c =3D> spe-impl.inc} | 0 .../ppc/translate/{spe-ops.inc.c =3D> spe-ops.inc} | 0 .../ppc/translate/{vmx-impl.inc.c =3D> vmx-impl.inc} | 0 .../ppc/translate/{vmx-ops.inc.c =3D> vmx-ops.inc} | 0 .../ppc/translate/{vsx-impl.inc.c =3D> vsx-impl.inc} | 0 .../ppc/translate/{vsx-ops.inc.c =3D> vsx-ops.inc} | 0 .../{translate_init.inc.c =3D> translate_init.inc} | 0 target/riscv/Makefile.objs | 8 ++--- ...trans_privileged.inc.c =3D> trans_privileged.inc} | 0 .../insn_trans/{trans_rva.inc.c =3D> trans_rva.inc} | 0 .../insn_trans/{trans_rvd.inc.c =3D> trans_rvd.inc} | 0 .../insn_trans/{trans_rvf.inc.c =3D> trans_rvf.inc} | 0 .../insn_trans/{trans_rvh.inc.c =3D> trans_rvh.inc} | 0 .../insn_trans/{trans_rvi.inc.c =3D> trans_rvi.inc} | 0 .../insn_trans/{trans_rvm.inc.c =3D> trans_rvm.inc} | 0 .../insn_trans/{trans_rvv.inc.c =3D> trans_rvv.inc} | 0 target/riscv/translate.c | 20 +++++------ target/rx/Makefile.objs | 6 ++-- target/rx/disas.c | 2 +- target/rx/translate.c | 2 +- target/s390x/translate.c | 2 +- .../s390x/{translate_vx.inc.c =3D> translate_vx.inc} | 0 target/xtensa/core-dc232b.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-dc233c.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-de212.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-fsf.c | 2 +- .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-sample_controller.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-test_kc705_be.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-test_mmuhifi_c3.c | 4 +-- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 .../{xtensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/import_core.sh | 8 ++--- tcg/README | 2 +- tcg/aarch64/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/arm/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/i386/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/mips/{tcg-target.inc.c =3D> tcg-target.inc} | 2 +- tcg/ppc/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/riscv/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/s390/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +-- tcg/sparc/{tcg-target.inc.c =3D> tcg-target.inc} | 2 +- tcg/{tcg-ldst.inc.c =3D> tcg-ldst.inc} | 0 tcg/{tcg-pool.inc.c =3D> tcg-pool.inc} | 2 +- tcg/tcg.c | 6 ++-- tcg/tci/README | 4 +-- tcg/tci/{tcg-target.inc.c =3D> tcg-target.inc} | 0 tests/fp/fp-test.c | 2 +- tests/fp/{wrap.inc.c =3D> wrap.inc} | 0 ui/input-keymap.c | 34 +++++++++--------- ui/vnc-enc-zrle.c | 22 ++++++------ ui/{vnc-enc-zrle.inc.c =3D> vnc-enc-zrle.inc} | 0 98 files changed, 173 insertions(+), 173 deletions(-) rename accel/tcg/{atomic_common.inc.c =3D> atomic_common.inc} (100%) rename fpu/{softfloat-specialize.inc.c =3D> softfloat-specialize.inc} (100= %) rename memory_ldst.inc.c =3D> memory_ldst.inc (100%) rename target/arm/{translate-neon.inc.c =3D> translate-neon.inc} (99%) rename target/arm/{translate-vfp.inc.c =3D> translate-vfp.inc} (99%) rename target/cris/{translate_v10.inc.c =3D> translate_v10.inc} (100%) rename target/mips/{translate_init.inc.c =3D> translate_init.inc} (100%) rename target/ppc/{mfrom_table.inc.c =3D> mfrom_table.inc} (100%) rename target/ppc/translate/{dfp-impl.inc.c =3D> dfp-impl.inc} (100%) rename target/ppc/translate/{dfp-ops.inc.c =3D> dfp-ops.inc} (100%) rename target/ppc/translate/{fp-impl.inc.c =3D> fp-impl.inc} (100%) rename target/ppc/translate/{fp-ops.inc.c =3D> fp-ops.inc} (100%) rename target/ppc/translate/{spe-impl.inc.c =3D> spe-impl.inc} (100%) rename target/ppc/translate/{spe-ops.inc.c =3D> spe-ops.inc} (100%) rename target/ppc/translate/{vmx-impl.inc.c =3D> vmx-impl.inc} (100%) rename target/ppc/translate/{vmx-ops.inc.c =3D> vmx-ops.inc} (100%) rename target/ppc/translate/{vsx-impl.inc.c =3D> vsx-impl.inc} (100%) rename target/ppc/translate/{vsx-ops.inc.c =3D> vsx-ops.inc} (100%) rename target/ppc/{translate_init.inc.c =3D> translate_init.inc} (100%) rename target/riscv/insn_trans/{trans_privileged.inc.c =3D> trans_privileg= ed.inc} (100%) rename target/riscv/insn_trans/{trans_rva.inc.c =3D> trans_rva.inc} (100%) rename target/riscv/insn_trans/{trans_rvd.inc.c =3D> trans_rvd.inc} (100%) rename target/riscv/insn_trans/{trans_rvf.inc.c =3D> trans_rvf.inc} (100%) rename target/riscv/insn_trans/{trans_rvh.inc.c =3D> trans_rvh.inc} (100%) rename target/riscv/insn_trans/{trans_rvi.inc.c =3D> trans_rvi.inc} (100%) rename target/riscv/insn_trans/{trans_rvm.inc.c =3D> trans_rvm.inc} (100%) rename target/riscv/insn_trans/{trans_rvv.inc.c =3D> trans_rvv.inc} (100%) rename target/s390x/{translate_vx.inc.c =3D> translate_vx.inc} (100%) rename target/xtensa/core-dc232b/{gdb-config.inc.c =3D> gdb-config.inc} (1= 00%) rename target/xtensa/core-dc232b/{xtensa-modules.inc.c =3D> xtensa-modules= .inc} (100%) rename target/xtensa/core-dc233c/{gdb-config.inc.c =3D> gdb-config.inc} (1= 00%) rename target/xtensa/core-dc233c/{xtensa-modules.inc.c =3D> xtensa-modules= .inc} (100%) rename target/xtensa/core-de212/{gdb-config.inc.c =3D> gdb-config.inc} (10= 0%) rename target/xtensa/core-de212/{xtensa-modules.inc.c =3D> xtensa-modules.= inc} (100%) rename target/xtensa/core-fsf/{xtensa-modules.inc.c =3D> xtensa-modules.in= c} (100%) rename target/xtensa/core-sample_controller/{gdb-config.inc.c =3D> gdb-con= fig.inc} (100%) rename target/xtensa/core-sample_controller/{xtensa-modules.inc.c =3D> xte= nsa-modules.inc} (100%) rename target/xtensa/core-test_kc705_be/{gdb-config.inc.c =3D> gdb-config.= inc} (100%) rename target/xtensa/core-test_kc705_be/{xtensa-modules.inc.c =3D> xtensa-= modules.inc} (100%) rename target/xtensa/core-test_mmuhifi_c3/{gdb-config.inc.c =3D> gdb-confi= g.inc} (100%) rename target/xtensa/core-test_mmuhifi_c3/{xtensa-modules.inc.c =3D> xtens= a-modules.inc} (100%) rename tcg/aarch64/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/arm/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/i386/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/mips/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/ppc/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/riscv/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/s390/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/sparc/{tcg-target.inc.c =3D> tcg-target.inc} (99%) rename tcg/{tcg-ldst.inc.c =3D> tcg-ldst.inc} (100%) rename tcg/{tcg-pool.inc.c =3D> tcg-pool.inc} (99%) rename tcg/tci/{tcg-target.inc.c =3D> tcg-target.inc} (100%) rename tests/fp/{wrap.inc.c =3D> wrap.inc} (100%) rename ui/{vnc-enc-zrle.inc.c =3D> vnc-enc-zrle.inc} (100%) diff --git a/.gitignore b/.gitignore index 656e390..2424131 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h /ui/shader/texture-blit-flip-vert.h -/ui/input-keymap-*.c +/ui/input-keymap-*.inc *-timestamp /*-softmmu /*-darwin-user @@ -161,4 +161,4 @@ trace-dtrace-root.h trace-dtrace-root.dtrace trace-ust-all.h trace-ust-all.c -/target/arm/decode-sve.inc.c +/target/arm/decode-sve.inc diff --git a/Makefile b/Makefile index 00cadeb..f237ff8 100644 --- a/Makefile +++ b/Makefile @@ -289,28 +289,28 @@ KEYCODEMAP_GEN =3D $(SRC_PATH)/ui/keycodemapdb/tools/= keymap-gen KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv =20 KEYCODEMAP_FILES =3D \ - ui/input-keymap-atset1-to-qcode.c \ - ui/input-keymap-linux-to-qcode.c \ - ui/input-keymap-qcode-to-atset1.c \ - ui/input-keymap-qcode-to-atset2.c \ - ui/input-keymap-qcode-to-atset3.c \ - ui/input-keymap-qcode-to-linux.c \ - ui/input-keymap-qcode-to-qnum.c \ - ui/input-keymap-qcode-to-sun.c \ - ui/input-keymap-qnum-to-qcode.c \ - ui/input-keymap-usb-to-qcode.c \ - ui/input-keymap-win32-to-qcode.c \ - ui/input-keymap-x11-to-qcode.c \ - ui/input-keymap-xorgevdev-to-qcode.c \ - ui/input-keymap-xorgkbd-to-qcode.c \ - ui/input-keymap-xorgxquartz-to-qcode.c \ - ui/input-keymap-xorgxwin-to-qcode.c \ - ui/input-keymap-osx-to-qcode.c \ + ui/input-keymap-atset1-to-qcode.inc \ + ui/input-keymap-linux-to-qcode.inc \ + ui/input-keymap-qcode-to-atset1.inc \ + ui/input-keymap-qcode-to-atset2.inc \ + ui/input-keymap-qcode-to-atset3.inc \ + ui/input-keymap-qcode-to-linux.inc \ + ui/input-keymap-qcode-to-qnum.inc \ + ui/input-keymap-qcode-to-sun.inc \ + ui/input-keymap-qnum-to-qcode.inc \ + ui/input-keymap-usb-to-qcode.inc \ + ui/input-keymap-win32-to-qcode.inc \ + ui/input-keymap-x11-to-qcode.inc \ + ui/input-keymap-xorgevdev-to-qcode.inc \ + ui/input-keymap-xorgkbd-to-qcode.inc \ + ui/input-keymap-xorgxquartz-to-qcode.inc \ + ui/input-keymap-xorgxwin-to-qcode.inc \ + ui/input-keymap-osx-to-qcode.inc \ $(NULL) =20 generated-files-$(CONFIG_SOFTMMU) +=3D $(KEYCODEMAP_FILES) =20 -ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Ma= kefile.objs +ui/input-keymap-%.inc: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/= Makefile.objs $(call quiet-command,\ stem=3D$* && src=3D$${stem%-to-*} dst=3D$${stem#*-to-} && \ test -e $(KEYCODEMAP_GEN) && \ diff --git a/accel/tcg/atomic_common.inc.c b/accel/tcg/atomic_common.inc similarity index 100% rename from accel/tcg/atomic_common.inc.c rename to accel/tcg/atomic_common.inc diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5349ee6..ca4c982 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2354,7 +2354,7 @@ void cpu_stq_le_data(CPUArchState *env, target_ulong = ptr, uint64_t val) #define ATOMIC_MMU_CLEANUP #define ATOMIC_MMU_IDX get_mmuidx(oi) =20 -#include "atomic_common.inc.c" +#include "atomic_common.inc" =20 #define DATA_SIZE 1 #include "atomic_template.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 1d34c57..e219ecc 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -1189,7 +1189,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, tar= get_ulong addr, #define ATOMIC_NAME(X) HELPER(glue(glue(atomic_ ## X, SUFFIX), END)) #define EXTRA_ARGS =20 -#include "atomic_common.inc.c" +#include "atomic_common.inc" =20 #define DATA_SIZE 1 #include "atomic_template.h" diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt index 2d5002f..e8e2628 100644 --- a/contrib/gitdm/filetypes.txt +++ b/contrib/gitdm/filetypes.txt @@ -42,7 +42,7 @@ order build,interface,tests,code,documentation,devel-doc,= blobs # (most common languages first # filetype code \.c$ # C -filetype code \.inc.c$ # C +filetype code \.inc$ # C filetype code \.C$ # C++ filetype code \.cpp$ # C++ filetype code \.c\+\+$ # C++ diff --git a/exec.c b/exec.c index 8047bf2..f5915ce 100644 --- a/exec.c +++ b/exec.c @@ -3659,7 +3659,7 @@ void cpu_physical_memory_unmap(void *buffer, hwaddr l= en, #define TRANSLATE(...) address_space_translate(as, __VA_ARGS__) #define RCU_READ_LOCK(...) rcu_read_lock() #define RCU_READ_UNLOCK(...) rcu_read_unlock() -#include "memory_ldst.inc.c" +#include "memory_ldst.inc" =20 int64_t address_space_cache_init(MemoryRegionCache *cache, AddressSpace *as, @@ -3795,7 +3795,7 @@ address_space_write_cached_slow(MemoryRegionCache *ca= che, hwaddr addr, #define TRANSLATE(...) address_space_translate_cached(cache, __V= A_ARGS__) #define RCU_READ_LOCK() ((void)0) #define RCU_READ_UNLOCK() ((void)0) -#include "memory_ldst.inc.c" +#include "memory_ldst.inc" =20 /* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, diff --git a/fpu/softfloat-specialize.inc.c b/fpu/softfloat-specialize.inc similarity index 100% rename from fpu/softfloat-specialize.inc.c rename to fpu/softfloat-specialize.inc diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 79be4f5..7fb1f3b 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -621,7 +621,7 @@ static inline float64 float64_pack_raw(FloatParts p) | are propagated from function inputs to output. These details are target- | specific. *-------------------------------------------------------------------------= ---*/ -#include "softfloat-specialize.inc.c" +#include "softfloat-specialize.inc" =20 /* Canonicalize EXP and FRAC, setting CLS. */ static FloatParts sf_canonicalize(FloatParts part, const FloatFmt *parm, diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index e63450a..89fa9cf 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -636,7 +636,7 @@ struct TCGContext { /* Track which vCPU triggers events */ CPUState *cpu; /* *_trans */ =20 - /* These structures are private to tcg-target.inc.c. */ + /* These structures are private to tcg-target.inc. */ #ifdef TCG_TARGET_NEED_LDST_LABELS QSIMPLEQ_HEAD(, TCGLabelQemuLdst) ldst_labels; #endif diff --git a/memory_ldst.inc.c b/memory_ldst.inc similarity index 100% rename from memory_ldst.inc.c rename to memory_ldst.inc diff --git a/scripts/clean-includes b/scripts/clean-includes index 795b3be..ff2dbe8 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -113,7 +113,7 @@ EOT =20 for f in "$@"; do case "$f" in - *.inc.c) + *.inc) # These aren't standalone C source files echo "SKIPPING $f (not a standalone source file)" continue diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index fa39fd7..4a177ad 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -13,66 +13,66 @@ obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o =20 DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py =20 -target/arm/decode-sve.inc.c: $(SRC_PATH)/target/arm/sve.decode $(DECODETRE= E) +target/arm/decode-sve.inc: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --decode disas_sve -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-neon-shared.inc.c: $(SRC_PATH)/target/arm/neon-shared.de= code $(DECODETREE) +target/arm/decode-neon-shared.inc: $(SRC_PATH)/target/arm/neon-shared.deco= de $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_neon_shared -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-neon-dp.inc.c: $(SRC_PATH)/target/arm/neon-dp.decode $(D= ECODETREE) +target/arm/decode-neon-dp.inc: $(SRC_PATH)/target/arm/neon-dp.decode $(DEC= ODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_neon_dp -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-neon-ls.inc.c: $(SRC_PATH)/target/arm/neon-ls.decode $(D= ECODETREE) +target/arm/decode-neon-ls.inc: $(SRC_PATH)/target/arm/neon-ls.decode $(DEC= ODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_neon_ls -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-vfp.inc.c: $(SRC_PATH)/target/arm/vfp.decode $(DECODETRE= E) +target/arm/decode-vfp.inc: $(SRC_PATH)/target/arm/vfp.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_vfp -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-vfp-uncond.inc.c: $(SRC_PATH)/target/arm/vfp-uncond.deco= de $(DECODETREE) +target/arm/decode-vfp-uncond.inc: $(SRC_PATH)/target/arm/vfp-uncond.decode= $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-a32.inc.c: $(SRC_PATH)/target/arm/a32.decode $(DECODETRE= E) +target/arm/decode-a32.inc: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_a32 -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-a32-uncond.inc.c: $(SRC_PATH)/target/arm/a32-uncond.deco= de $(DECODETREE) +target/arm/decode-a32-uncond.inc: $(SRC_PATH)/target/arm/a32-uncond.decode= $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_a32_uncond -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-t32.inc.c: $(SRC_PATH)/target/arm/t32.decode $(DECODETRE= E) +target/arm/decode-t32.inc: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --static-decode disas_t32 -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/decode-t16.inc.c: $(SRC_PATH)/target/arm/t16.decode $(DECODETRE= E) +target/arm/decode-t16.inc: $(SRC_PATH)/target/arm/t16.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) -w 16 --static-decode disas_t16 -o $@ $<,\ "GEN", $(TARGET_DIR)$@) =20 -target/arm/translate-sve.o: target/arm/decode-sve.inc.c -target/arm/translate.o: target/arm/decode-neon-shared.inc.c -target/arm/translate.o: target/arm/decode-neon-dp.inc.c -target/arm/translate.o: target/arm/decode-neon-ls.inc.c -target/arm/translate.o: target/arm/decode-vfp.inc.c -target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c -target/arm/translate.o: target/arm/decode-a32.inc.c -target/arm/translate.o: target/arm/decode-a32-uncond.inc.c -target/arm/translate.o: target/arm/decode-t32.inc.c -target/arm/translate.o: target/arm/decode-t16.inc.c +target/arm/translate-sve.o: target/arm/decode-sve.inc +target/arm/translate.o: target/arm/decode-neon-shared.inc +target/arm/translate.o: target/arm/decode-neon-dp.inc +target/arm/translate.o: target/arm/decode-neon-ls.inc +target/arm/translate.o: target/arm/decode-vfp.inc +target/arm/translate.o: target/arm/decode-vfp-uncond.inc +target/arm/translate.o: target/arm/decode-a32.inc +target/arm/translate.o: target/arm/decode-a32-uncond.inc +target/arm/translate.o: target/arm/decode-t32.inc +target/arm/translate.o: target/arm/decode-t16.inc =20 obj-y +=3D tlb_helper.o debug_helper.o obj-y +=3D translate.o op_helper.o diff --git a/target/arm/translate-neon.inc.c b/target/arm/translate-neon.inc similarity index 99% rename from target/arm/translate-neon.inc.c rename to target/arm/translate-neon.inc index f6cb921..ac0ddcc 100644 --- a/target/arm/translate-neon.inc.c +++ b/target/arm/translate-neon.inc @@ -50,9 +50,9 @@ static inline int rsub_8(DisasContext *s, int x) } =20 /* Include the generated Neon decoder */ -#include "decode-neon-dp.inc.c" -#include "decode-neon-ls.inc.c" -#include "decode-neon-shared.inc.c" +#include "decode-neon-dp.inc" +#include "decode-neon-ls.inc" +#include "decode-neon-shared.inc" =20 /* Return the offset of a 2**SIZE piece of a NEON register, at index ELE, * where 0 is the least significant end of the register. diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 88a2fb2..60c0716 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -100,7 +100,7 @@ static inline int msz_dtype(DisasContext *s, int msz) * Include the generated decoder. */ =20 -#include "decode-sve.inc.c" +#include "decode-sve.inc" =20 /* * Implement all of the translator functions referenced by the decoder. diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc similarity index 99% rename from target/arm/translate-vfp.inc.c rename to target/arm/translate-vfp.inc index afa8a5f..1f518b4 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc @@ -27,8 +27,8 @@ */ =20 /* Include the generated VFP decoder */ -#include "decode-vfp.inc.c" -#include "decode-vfp-uncond.inc.c" +#include "decode-vfp.inc" +#include "decode-vfp-uncond.inc" =20 /* * The imm8 encodes the sign bit, enough bits to represent an exponent in diff --git a/target/arm/translate.c b/target/arm/translate.c index c39a929..3128fa6 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -1176,8 +1176,8 @@ static TCGv_ptr vfp_reg_ptr(bool dp, int reg) #define ARM_CP_RW_BIT (1 << 20) =20 /* Include the VFP and Neon decoders */ -#include "translate-vfp.inc.c" -#include "translate-neon.inc.c" +#include "translate-vfp.inc" +#include "translate-neon.inc" =20 static inline void iwmmxt_load_reg(TCGv_i64 var, int reg) { @@ -5217,10 +5217,10 @@ static int t16_pop_list(DisasContext *s, int x) * Include the generated decoders. */ =20 -#include "decode-a32.inc.c" -#include "decode-a32-uncond.inc.c" -#include "decode-t32.inc.c" -#include "decode-t16.inc.c" +#include "decode-a32.inc" +#include "decode-a32-uncond.inc" +#include "decode-t32.inc" +#include "decode-t16.inc" =20 /* Helpers to swap operands for reverse-subtract. */ static void gen_rsb(TCGv_i32 dst, TCGv_i32 a, TCGv_i32 b) diff --git a/target/avr/Makefile.objs b/target/avr/Makefile.objs index 6e35ba2..81d9bcd 100644 --- a/target/avr/Makefile.objs +++ b/target/avr/Makefile.objs @@ -21,12 +21,12 @@ DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py decode-y =3D $(SRC_PATH)/target/avr/insn.decode =20 -target/avr/decode_insn.inc.c: $(decode-y) $(DECODETREE) +target/avr/decode_insn.inc: $(decode-y) $(DECODETREE) $(call quiet-command, \ $(PYTHON) $(DECODETREE) -o $@ --decode decode_insn --insnwidth 16 $<, \ "GEN", $(TARGET_DIR)$@) =20 -target/avr/translate.o: target/avr/decode_insn.inc.c +target/avr/translate.o: target/avr/decode_insn.inc =20 obj-y +=3D translate.o cpu.o helper.o obj-y +=3D gdbstub.o diff --git a/target/avr/disas.c b/target/avr/disas.c index 8e1bac4..c45ab2c 100644 --- a/target/avr/disas.c +++ b/target/avr/disas.c @@ -60,7 +60,7 @@ static int append_16(DisasContext *ctx, int x) =20 /* Include the auto-generated decoder. */ static bool decode_insn(DisasContext *ctx, uint16_t insn); -#include "decode_insn.inc.c" +#include "decode_insn.inc" =20 #define output(mnemonic, format, ...) \ (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ diff --git a/target/avr/translate.c b/target/avr/translate.c index 648dcd5..8deb126 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -198,7 +198,7 @@ static bool avr_have_feature(DisasContext *ctx, int fea= ture) } =20 static bool decode_insn(DisasContext *ctx, uint16_t insn); -#include "decode_insn.inc.c" +#include "decode_insn.inc" =20 /* * Arithmetic Instructions diff --git a/target/cris/translate.c b/target/cris/translate.c index aaa46b5..a0d4b1c 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -3037,7 +3037,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env= , DisasContext *dc) return insn_len; } =20 -#include "translate_v10.inc.c" +#include "translate_v10.inc" =20 /* * Delay slots on QEMU/CRIS. diff --git a/target/cris/translate_v10.inc.c b/target/cris/translate_v10.inc similarity index 100% rename from target/cris/translate_v10.inc.c rename to target/cris/translate_v10.inc diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs index 174f50a..40dcb86 100644 --- a/target/hppa/Makefile.objs +++ b/target/hppa/Makefile.objs @@ -4,8 +4,8 @@ obj-$(CONFIG_SOFTMMU) +=3D machine.o =20 DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py =20 -target/hppa/decode.inc.c: $(SRC_PATH)/target/hppa/insns.decode $(DECODETRE= E) +target/hppa/decode.inc: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) =20 -target/hppa/translate.o: target/hppa/decode.inc.c +target/hppa/translate.o: target/hppa/decode.inc diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 4bd22d4..31e2926 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -334,7 +334,7 @@ static int expand_shl11(DisasContext *ctx, int val) =20 =20 /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode.inc" =20 /* We are not using a goto_tb (for whatever reason), but have updated the iaq (for whatever reason), so don't do it again on exit. */ diff --git a/target/mips/translate.c b/target/mips/translate.c index 9fad58e..221a42e 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -31322,7 +31322,7 @@ void mips_tcg_init(void) #endif } =20 -#include "translate_init.inc.c" +#include "translate_init.inc" =20 void cpu_mips_realize_env(CPUMIPSState *env) { diff --git a/target/mips/translate_init.inc.c b/target/mips/translate_init.= inc similarity index 100% rename from target/mips/translate_init.inc.c rename to target/mips/translate_init.inc diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs index b5432f4..0f2fcff 100644 --- a/target/openrisc/Makefile.objs +++ b/target/openrisc/Makefile.objs @@ -6,10 +6,10 @@ obj-y +=3D gdbstub.o =20 DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py =20 -target/openrisc/decode.inc.c: \ +target/openrisc/decode.inc: \ $(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) =20 -target/openrisc/translate.o: target/openrisc/decode.inc.c -target/openrisc/disas.o: target/openrisc/decode.inc.c +target/openrisc/translate.o: target/openrisc/decode.inc +target/openrisc/disas.o: target/openrisc/decode.inc diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c index ce11264..3f75316 100644 --- a/target/openrisc/disas.c +++ b/target/openrisc/disas.c @@ -25,7 +25,7 @@ typedef disassemble_info DisasContext; =20 /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode.inc" =20 #define output(mnemonic, format, ...) \ (info->fprintf_func(info->stream, "%-9s " format, \ diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 52323a1..a119be2 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -65,7 +65,7 @@ static inline bool is_user(DisasContext *dc) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode.inc" =20 static TCGv cpu_sr; static TCGv cpu_regs[32]; diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index d8bd3c2..eff3c0d 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -398,7 +398,7 @@ target_ulong helper_divso(CPUPPCState *env, target_ulon= g arg1, target_ulong helper_602_mfrom(target_ulong arg) { if (likely(arg < 602)) { -#include "mfrom_table.inc.c" +#include "mfrom_table.inc" return mfrom_ROM_table[arg]; } else { return 0; diff --git a/target/ppc/mfrom_table.inc.c b/target/ppc/mfrom_table.inc similarity index 100% rename from target/ppc/mfrom_table.inc.c rename to target/ppc/mfrom_table.inc diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4ce3d66..95d9080 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -6900,15 +6900,15 @@ static inline void set_avr64(int regno, TCGv_i64 sr= c, bool high) tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high)); } =20 -#include "translate/fp-impl.inc.c" +#include "translate/fp-impl.inc" =20 -#include "translate/vmx-impl.inc.c" +#include "translate/vmx-impl.inc" =20 -#include "translate/vsx-impl.inc.c" +#include "translate/vsx-impl.inc" =20 -#include "translate/dfp-impl.inc.c" +#include "translate/dfp-impl.inc" =20 -#include "translate/spe-impl.inc.c" +#include "translate/spe-impl.inc" =20 /* Handles lfdp, lxsd, lxssp */ static void gen_dform39(DisasContext *ctx) @@ -7587,19 +7587,19 @@ GEN_HANDLER2_E(treclaim, "treclaim", 0x1F, 0x0E, 0x= 1D, 0x03E0F800, \ GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F, 0x03FFF800, \ PPC_NONE, PPC2_TM), =20 -#include "translate/fp-ops.inc.c" +#include "translate/fp-ops.inc" =20 -#include "translate/vmx-ops.inc.c" +#include "translate/vmx-ops.inc" =20 -#include "translate/vsx-ops.inc.c" +#include "translate/vsx-ops.inc" =20 -#include "translate/dfp-ops.inc.c" +#include "translate/dfp-ops.inc" =20 -#include "translate/spe-ops.inc.c" +#include "translate/spe-ops.inc" }; =20 #include "helper_regs.h" -#include "translate_init.inc.c" +#include "translate_init.inc" =20 /*************************************************************************= ****/ /* Misc PowerPC helpers */ diff --git a/target/ppc/translate/dfp-impl.inc.c b/target/ppc/translate/dfp= -impl.inc similarity index 100% rename from target/ppc/translate/dfp-impl.inc.c rename to target/ppc/translate/dfp-impl.inc diff --git a/target/ppc/translate/dfp-ops.inc.c b/target/ppc/translate/dfp-= ops.inc similarity index 100% rename from target/ppc/translate/dfp-ops.inc.c rename to target/ppc/translate/dfp-ops.inc diff --git a/target/ppc/translate/fp-impl.inc.c b/target/ppc/translate/fp-i= mpl.inc similarity index 100% rename from target/ppc/translate/fp-impl.inc.c rename to target/ppc/translate/fp-impl.inc diff --git a/target/ppc/translate/fp-ops.inc.c b/target/ppc/translate/fp-op= s.inc similarity index 100% rename from target/ppc/translate/fp-ops.inc.c rename to target/ppc/translate/fp-ops.inc diff --git a/target/ppc/translate/spe-impl.inc.c b/target/ppc/translate/spe= -impl.inc similarity index 100% rename from target/ppc/translate/spe-impl.inc.c rename to target/ppc/translate/spe-impl.inc diff --git a/target/ppc/translate/spe-ops.inc.c b/target/ppc/translate/spe-= ops.inc similarity index 100% rename from target/ppc/translate/spe-ops.inc.c rename to target/ppc/translate/spe-ops.inc diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx= -impl.inc similarity index 100% rename from target/ppc/translate/vmx-impl.inc.c rename to target/ppc/translate/vmx-impl.inc diff --git a/target/ppc/translate/vmx-ops.inc.c b/target/ppc/translate/vmx-= ops.inc similarity index 100% rename from target/ppc/translate/vmx-ops.inc.c rename to target/ppc/translate/vmx-ops.inc diff --git a/target/ppc/translate/vsx-impl.inc.c b/target/ppc/translate/vsx= -impl.inc similarity index 100% rename from target/ppc/translate/vsx-impl.inc.c rename to target/ppc/translate/vsx-impl.inc diff --git a/target/ppc/translate/vsx-ops.inc.c b/target/ppc/translate/vsx-= ops.inc similarity index 100% rename from target/ppc/translate/vsx-ops.inc.c rename to target/ppc/translate/vsx-ops.inc diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc similarity index 100% rename from target/ppc/translate_init.inc.c rename to target/ppc/translate_init.inc diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs index ff38df6..1a66d8a 100644 --- a/target/riscv/Makefile.objs +++ b/target/riscv/Makefile.objs @@ -14,15 +14,15 @@ decode16-y =3D $(SRC_PATH)/target/riscv/insn16.decode decode16-$(TARGET_RISCV32) +=3D $(SRC_PATH)/target/riscv/insn16-32.decode decode16-$(TARGET_RISCV64) +=3D $(SRC_PATH)/target/riscv/insn16-64.decode =20 -target/riscv/decode_insn32.inc.c: $(decode32-y) $(DECODETREE) +target/riscv/decode_insn32.inc: $(decode32-y) $(DECODETREE) $(call quiet-command, \ $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \ $(decode32-y), "GEN", $(TARGET_DIR)$@) =20 -target/riscv/decode_insn16.inc.c: $(decode16-y) $(DECODETREE) +target/riscv/decode_insn16.inc: $(decode16-y) $(DECODETREE) $(call quiet-command, \ $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn16 \ --insnwidth 16 $(decode16-y), "GEN", $(TARGET_DIR)$@) =20 -target/riscv/translate.o: target/riscv/decode_insn32.inc.c \ - target/riscv/decode_insn16.inc.c +target/riscv/translate.o: target/riscv/decode_insn32.inc \ + target/riscv/decode_insn16.inc diff --git a/target/riscv/insn_trans/trans_privileged.inc.c b/target/riscv/= insn_trans/trans_privileged.inc similarity index 100% rename from target/riscv/insn_trans/trans_privileged.inc.c rename to target/riscv/insn_trans/trans_privileged.inc diff --git a/target/riscv/insn_trans/trans_rva.inc.c b/target/riscv/insn_tr= ans/trans_rva.inc similarity index 100% rename from target/riscv/insn_trans/trans_rva.inc.c rename to target/riscv/insn_trans/trans_rva.inc diff --git a/target/riscv/insn_trans/trans_rvd.inc.c b/target/riscv/insn_tr= ans/trans_rvd.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvd.inc.c rename to target/riscv/insn_trans/trans_rvd.inc diff --git a/target/riscv/insn_trans/trans_rvf.inc.c b/target/riscv/insn_tr= ans/trans_rvf.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvf.inc.c rename to target/riscv/insn_trans/trans_rvf.inc diff --git a/target/riscv/insn_trans/trans_rvh.inc.c b/target/riscv/insn_tr= ans/trans_rvh.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvh.inc.c rename to target/riscv/insn_trans/trans_rvh.inc diff --git a/target/riscv/insn_trans/trans_rvi.inc.c b/target/riscv/insn_tr= ans/trans_rvi.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvi.inc.c rename to target/riscv/insn_trans/trans_rvi.inc diff --git a/target/riscv/insn_trans/trans_rvm.inc.c b/target/riscv/insn_tr= ans/trans_rvm.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvm.inc.c rename to target/riscv/insn_trans/trans_rvm.inc diff --git a/target/riscv/insn_trans/trans_rvv.inc.c b/target/riscv/insn_tr= ans/trans_rvv.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvv.inc.c rename to target/riscv/insn_trans/trans_rvv.inc diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 9632e79..aa7f56d 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -583,7 +583,7 @@ static int ex_rvc_shifti(DisasContext *ctx, int imm) } =20 /* Include the auto-generated decoder for 32 bit insn */ -#include "decode_insn32.inc.c" +#include "decode_insn32.inc" =20 static bool gen_arith_imm_fn(DisasContext *ctx, arg_i *a, void (*func)(TCGv, TCGv, target_long)) @@ -718,17 +718,17 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, } =20 /* Include insn module translation function */ -#include "insn_trans/trans_rvi.inc.c" -#include "insn_trans/trans_rvm.inc.c" -#include "insn_trans/trans_rva.inc.c" -#include "insn_trans/trans_rvf.inc.c" -#include "insn_trans/trans_rvd.inc.c" -#include "insn_trans/trans_rvh.inc.c" -#include "insn_trans/trans_rvv.inc.c" -#include "insn_trans/trans_privileged.inc.c" +#include "insn_trans/trans_rvi.inc" +#include "insn_trans/trans_rvm.inc" +#include "insn_trans/trans_rva.inc" +#include "insn_trans/trans_rvf.inc" +#include "insn_trans/trans_rvd.inc" +#include "insn_trans/trans_rvh.inc" +#include "insn_trans/trans_rvv.inc" +#include "insn_trans/trans_privileged.inc" =20 /* Include the auto-generated decoder for 16 bit insn */ -#include "decode_insn16.inc.c" +#include "decode_insn16.inc" =20 static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opc= ode) { diff --git a/target/rx/Makefile.objs b/target/rx/Makefile.objs index a0018d5..eddc62a 100644 --- a/target/rx/Makefile.objs +++ b/target/rx/Makefile.objs @@ -2,10 +2,10 @@ obj-y +=3D translate.o op_helper.o helper.o cpu.o gdbstub= .o disas.o =20 DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py =20 -target/rx/decode.inc.c: \ +target/rx/decode.inc: \ $(SRC_PATH)/target/rx/insns.decode $(DECODETREE) $(call quiet-command,\ $(PYTHON) $(DECODETREE) --varinsnwidth 32 -o $@ $<, "GEN", $(TARGET_DIR= )$@) =20 -target/rx/translate.o: target/rx/decode.inc.c -target/rx/disas.o: target/rx/decode.inc.c +target/rx/translate.o: target/rx/decode.inc +target/rx/disas.o: target/rx/decode.inc diff --git a/target/rx/disas.c b/target/rx/disas.c index 6dee7a0..6450892 100644 --- a/target/rx/disas.c +++ b/target/rx/disas.c @@ -100,7 +100,7 @@ static int bdsp_s(DisasContext *ctx, int d) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode.inc" =20 static void dump_bytes(DisasContext *ctx) { diff --git a/target/rx/translate.c b/target/rx/translate.c index 61e8665..272619c 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -124,7 +124,7 @@ static int bdsp_s(DisasContext *ctx, int d) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode.inc" =20 void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4f6f1e3..4c6452f 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -5120,7 +5120,7 @@ static DisasJumpType op_mpcifc(DisasContext *s, Disas= Ops *o) } #endif =20 -#include "translate_vx.inc.c" +#include "translate_vx.inc" =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ /* The "Cc OUTput" generators. Given the generated output (and in some ca= ses diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.inc similarity index 100% rename from target/s390x/translate_vx.inc.c rename to target/s390x/translate_vx.inc diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c index 7851bcb..bc4c866 100644 --- a/target/xtensa/core-dc232b.c +++ b/target/xtensa/core-dc232b.c @@ -35,13 +35,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_dc232b -#include "core-dc232b/xtensa-modules.inc.c" +#include "core-dc232b/xtensa-modules.inc" =20 static XtensaConfig dc232b __attribute__((unused)) =3D { .name =3D "dc232b", .gdb_regmap =3D { .reg =3D { -#include "core-dc232b/gdb-config.inc.c" +#include "core-dc232b/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-dc232b/gdb-config.inc.c b/target/xtensa/cor= e-dc232b/gdb-config.inc similarity index 100% rename from target/xtensa/core-dc232b/gdb-config.inc.c rename to target/xtensa/core-dc232b/gdb-config.inc diff --git a/target/xtensa/core-dc232b/xtensa-modules.inc.c b/target/xtensa= /core-dc232b/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-dc232b/xtensa-modules.inc.c rename to target/xtensa/core-dc232b/xtensa-modules.inc diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c index f8204f7..8341925 100644 --- a/target/xtensa/core-dc233c.c +++ b/target/xtensa/core-dc233c.c @@ -34,13 +34,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_dc233c -#include "core-dc233c/xtensa-modules.inc.c" +#include "core-dc233c/xtensa-modules.inc" =20 static XtensaConfig dc233c __attribute__((unused)) =3D { .name =3D "dc233c", .gdb_regmap =3D { .reg =3D { -#include "core-dc233c/gdb-config.inc.c" +#include "core-dc233c/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-dc233c/gdb-config.inc.c b/target/xtensa/cor= e-dc233c/gdb-config.inc similarity index 100% rename from target/xtensa/core-dc233c/gdb-config.inc.c rename to target/xtensa/core-dc233c/gdb-config.inc diff --git a/target/xtensa/core-dc233c/xtensa-modules.inc.c b/target/xtensa= /core-dc233c/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-dc233c/xtensa-modules.inc.c rename to target/xtensa/core-dc233c/xtensa-modules.inc diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c index a061158..eda095d 100644 --- a/target/xtensa/core-de212.c +++ b/target/xtensa/core-de212.c @@ -34,13 +34,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_de212 -#include "core-de212/xtensa-modules.inc.c" +#include "core-de212/xtensa-modules.inc" =20 static XtensaConfig de212 __attribute__((unused)) =3D { .name =3D "de212", .gdb_regmap =3D { .reg =3D { -#include "core-de212/gdb-config.inc.c" +#include "core-de212/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-de212/gdb-config.inc.c b/target/xtensa/core= -de212/gdb-config.inc similarity index 100% rename from target/xtensa/core-de212/gdb-config.inc.c rename to target/xtensa/core-de212/gdb-config.inc diff --git a/target/xtensa/core-de212/xtensa-modules.inc.c b/target/xtensa/= core-de212/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-de212/xtensa-modules.inc.c rename to target/xtensa/core-de212/xtensa-modules.inc diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c index 1221a29..3398f3b 100644 --- a/target/xtensa/core-fsf.c +++ b/target/xtensa/core-fsf.c @@ -34,7 +34,7 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_fsf -#include "core-fsf/xtensa-modules.inc.c" +#include "core-fsf/xtensa-modules.inc" =20 static XtensaConfig fsf __attribute__((unused)) =3D { .name =3D "fsf", diff --git a/target/xtensa/core-fsf/xtensa-modules.inc.c b/target/xtensa/co= re-fsf/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-fsf/xtensa-modules.inc.c rename to target/xtensa/core-fsf/xtensa-modules.inc diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sa= mple_controller.c index a1d220b..1523ef5 100644 --- a/target/xtensa/core-sample_controller.c +++ b/target/xtensa/core-sample_controller.c @@ -34,13 +34,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_sample_controller -#include "core-sample_controller/xtensa-modules.inc.c" +#include "core-sample_controller/xtensa-modules.inc" =20 static XtensaConfig sample_controller __attribute__((unused)) =3D { .name =3D "sample_controller", .gdb_regmap =3D { .reg =3D { -#include "core-sample_controller/gdb-config.inc.c" +#include "core-sample_controller/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-sample_controller/gdb-config.inc.c b/target= /xtensa/core-sample_controller/gdb-config.inc similarity index 100% rename from target/xtensa/core-sample_controller/gdb-config.inc.c rename to target/xtensa/core-sample_controller/gdb-config.inc diff --git a/target/xtensa/core-sample_controller/xtensa-modules.inc.c b/ta= rget/xtensa/core-sample_controller/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-sample_controller/xtensa-modules.inc.c rename to target/xtensa/core-sample_controller/xtensa-modules.inc diff --git a/target/xtensa/core-test_kc705_be.c b/target/xtensa/core-test_k= c705_be.c index ab73c38..60e9a7d 100644 --- a/target/xtensa/core-test_kc705_be.c +++ b/target/xtensa/core-test_kc705_be.c @@ -34,13 +34,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_test_kc705_be -#include "core-test_kc705_be/xtensa-modules.inc.c" +#include "core-test_kc705_be/xtensa-modules.inc" =20 static XtensaConfig test_kc705_be __attribute__((unused)) =3D { .name =3D "test_kc705_be", .gdb_regmap =3D { .reg =3D { -#include "core-test_kc705_be/gdb-config.inc.c" +#include "core-test_kc705_be/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-test_kc705_be/gdb-config.inc.c b/target/xte= nsa/core-test_kc705_be/gdb-config.inc similarity index 100% rename from target/xtensa/core-test_kc705_be/gdb-config.inc.c rename to target/xtensa/core-test_kc705_be/gdb-config.inc diff --git a/target/xtensa/core-test_kc705_be/xtensa-modules.inc.c b/target= /xtensa/core-test_kc705_be/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-test_kc705_be/xtensa-modules.inc.c rename to target/xtensa/core-test_kc705_be/xtensa-modules.inc diff --git a/target/xtensa/core-test_mmuhifi_c3.c b/target/xtensa/core-test= _mmuhifi_c3.c index 089ed7d..0a297f5 100644 --- a/target/xtensa/core-test_mmuhifi_c3.c +++ b/target/xtensa/core-test_mmuhifi_c3.c @@ -35,13 +35,13 @@ #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_test_mmuhifi_c3 -#include "core-test_mmuhifi_c3/xtensa-modules.inc.c" +#include "core-test_mmuhifi_c3/xtensa-modules.inc" =20 static XtensaConfig test_mmuhifi_c3 __attribute__((unused)) =3D { .name =3D "test_mmuhifi_c3", .gdb_regmap =3D { .reg =3D { -#include "core-test_mmuhifi_c3/gdb-config.inc.c" +#include "core-test_mmuhifi_c3/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/target/xtensa/core-test_mmuhifi_c3/gdb-config.inc.c b/target/x= tensa/core-test_mmuhifi_c3/gdb-config.inc similarity index 100% rename from target/xtensa/core-test_mmuhifi_c3/gdb-config.inc.c rename to target/xtensa/core-test_mmuhifi_c3/gdb-config.inc diff --git a/target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc.c b/targ= et/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc similarity index 100% rename from target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc.c rename to target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index 8f844cf..a2e422b 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -23,7 +23,7 @@ tar -xf "$OVERLAY" -C "$TARGET" --strip-components=3D2 \ xtensa/config/core-isa.h \ xtensa/config/core-matmap.h tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \ - sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c + sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc # # Fix up known issues in the xtensa-modules.c # @@ -35,7 +35,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \ -e '/^#include "ansidecl.h"/d' \ -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/= s/^ return 0;$/ return XTENSA_UNDEFINED;/' \ -e 's/#include /#include "xtensa-isa.h"/' \ - > "$TARGET"/xtensa-modules.inc.c + > "$TARGET"/xtensa-modules.inc =20 cat < "${TARGET}.c" #include "qemu/osdep.h" @@ -49,13 +49,13 @@ cat < "${TARGET}.c" #include "overlay_tool.h" =20 #define xtensa_modules xtensa_modules_$NAME -#include "core-$NAME/xtensa-modules.inc.c" +#include "core-$NAME/xtensa-modules.inc" =20 static XtensaConfig $NAME __attribute__((unused)) =3D { .name =3D "$NAME", .gdb_regmap =3D { .reg =3D { -#include "core-$NAME/gdb-config.inc.c" +#include "core-$NAME/gdb-config.inc" } }, .isa_internal =3D &xtensa_modules, diff --git a/tcg/README b/tcg/README index a64f678..fdf6ee5 100644 --- a/tcg/README +++ b/tcg/README @@ -652,7 +652,7 @@ function tcg_gen_xxx(args). =20 4) Backend =20 -tcg-target.h contains the target specific definitions. tcg-target.inc.c +tcg-target.h contains the target specific definitions. tcg-target.inc contains the target specific code; it is #included by tcg/tcg.c, rather than being a standalone C file. =20 diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc similarity index 99% rename from tcg/aarch64/tcg-target.inc.c rename to tcg/aarch64/tcg-target.inc index 760b0e7..000f7e6 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory for details. */ =20 -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" #include "qemu/bitops.h" =20 /* We're going to re-use TCGType in setting of the SF bit, which controls @@ -1542,7 +1542,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, = TCGReg d, } =20 #ifdef CONFIG_SOFTMMU -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc similarity index 99% rename from tcg/arm/tcg-target.inc.c rename to tcg/arm/tcg-target.inc index 6aa7757..42c2601 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc @@ -23,7 +23,7 @@ */ =20 #include "elf.h" -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" =20 int arm_arch =3D __ARM_ARCH; =20 @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGA= rg *args, } =20 #ifdef CONFIG_SOFTMMU -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc similarity index 99% rename from tcg/i386/tcg-target.inc.c rename to tcg/i386/tcg-target.inc index ae02282..c8d5ff7 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n) } =20 #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc similarity index 99% rename from tcg/mips/tcg-target.inc.c rename to tcg/mips/tcg-target.inc index 4d32ebc..5459818 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit= *arg) } =20 #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 static void * const qemu_ld_helpers[16] =3D { [MO_UB] =3D helper_ret_ldub_mmu, diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc similarity index 99% rename from tcg/ppc/tcg-target.inc.c rename to tcg/ppc/tcg-target.inc index c8d1e76..7f13849 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc @@ -23,7 +23,7 @@ */ =20 #include "elf.h" -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" =20 #if defined _CALL_DARWIN || defined __APPLE__ #define TCG_TARGET_CALL_DARWIN @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] =3D { }; =20 #if defined (CONFIG_SOFTMMU) -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc similarity index 99% rename from tcg/riscv/tcg-target.inc.c rename to tcg/riscv/tcg-target.inc index 3c11ab8..d666c79 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc @@ -27,7 +27,7 @@ * THE SOFTWARE. */ =20 -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { @@ -919,7 +919,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) */ =20 #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc similarity index 99% rename from tcg/s390/tcg-target.inc.c rename to tcg/s390/tcg-target.inc index b07e9ff..c313a08 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc @@ -29,7 +29,7 @@ #error "unsupported code generation mode" #endif =20 -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" #include "elf.h" =20 /* ??? The translation blocks produced by TCG are generally small enough to @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, Mem= Op opc, TCGReg data, } =20 #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.inc.c" +#include "../tcg-ldst.inc" =20 /* We're expecting to use a 20-bit negative offset on the tlb memory ops. = */ QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0); diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc similarity index 99% rename from tcg/sparc/tcg-target.inc.c rename to tcg/sparc/tcg-target.inc index 65fddb3..e6aecd9 100644 --- a/tcg/sparc/tcg-target.inc.c +++ b/tcg/sparc/tcg-target.inc @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "../tcg-pool.inc.c" +#include "../tcg-pool.inc" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { diff --git a/tcg/tcg-ldst.inc.c b/tcg/tcg-ldst.inc similarity index 100% rename from tcg/tcg-ldst.inc.c rename to tcg/tcg-ldst.inc diff --git a/tcg/tcg-pool.inc.c b/tcg/tcg-pool.inc similarity index 99% rename from tcg/tcg-pool.inc.c rename to tcg/tcg-pool.inc index 4eaa84b..7390173 100644 --- a/tcg/tcg-pool.inc.c +++ b/tcg/tcg-pool.inc @@ -118,7 +118,7 @@ static inline void new_pool_l8(TCGContext *s, int rtype= , tcg_insn_unit *label, new_pool_insert(s, n); } =20 -/* To be provided by cpu/tcg-target.inc.c. */ +/* To be provided by cpu/tcg-target.inc. */ static void tcg_out_nop_fill(tcg_insn_unit *p, int count); =20 static int tcg_out_pool_finalize(TCGContext *s) diff --git a/tcg/tcg.c b/tcg/tcg.c index 1362bc6..5af2ce4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -65,7 +65,7 @@ #include "exec/log.h" #include "sysemu/sysemu.h" =20 -/* Forward declarations for functions declared in tcg-target.inc.c and +/* Forward declarations for functions declared in tcg-target.inc and used here. */ static void tcg_target_init(TCGContext *s); static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode); @@ -101,7 +101,7 @@ static void tcg_register_jit_int(void *buf, size_t size, size_t debug_frame_size) __attribute__((unused)); =20 -/* Forward declarations for functions declared and used in tcg-target.inc.= c. */ +/* Forward declarations for functions declared and used in tcg-target.inc.= */ static const char *target_parse_constraint(TCGArgConstraint *ct, const char *ct_str, TCGType typ= e); static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg= 1, @@ -341,7 +341,7 @@ static void set_jmp_reset_offset(TCGContext *s, int whi= ch) assert(s->tb_jmp_reset_offset[which] =3D=3D off); } =20 -#include "tcg-target.inc.c" +#include "tcg-target.inc" =20 /* compare a pointer @ptr and a tb_tc @s */ static int ptr_cmp_tb_tc(const void *ptr, const struct tb_tc *s) diff --git a/tcg/tci/README b/tcg/tci/README index 386c3c7..63ce297 100644 --- a/tcg/tci/README +++ b/tcg/tci/README @@ -21,7 +21,7 @@ This is what TCI (Tiny Code Interpreter) does. 2) Implementation =20 Like each TCG host frontend, TCI implements the code generator in -tcg-target.inc.c, tcg-target.h. Both files are in directory tcg/tci. +tcg-target.inc, tcg-target.h. Both files are in directory tcg/tci. =20 The additional file tcg/tci.c adds the interpreter. =20 @@ -123,7 +123,7 @@ u1 =3D linux-user-test works would also improve speed for hosts which support byte alignment). =20 * A better disassembler for the pseudo code would be nice (a very primitive - disassembler is included in tcg-target.inc.c). + disassembler is included in tcg-target.inc). =20 * It might be useful to have a runtime option which selects the native TCG or TCI, so QEMU would have to include two TCGs. Today, selecting TCI diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc similarity index 100% rename from tcg/tci/tcg-target.inc.c rename to tcg/tci/tcg-target.inc diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c index 43ef962..6fe2402 100644 --- a/tests/fp/fp-test.c +++ b/tests/fp/fp-test.c @@ -116,7 +116,7 @@ static void usage_complete(int argc, char *argv[]) } =20 /* keep wrappers separate but do not bother defining headers for all of th= em */ -#include "wrap.inc.c" +#include "wrap.inc" =20 static void not_implemented(void) { diff --git a/tests/fp/wrap.inc.c b/tests/fp/wrap.inc similarity index 100% rename from tests/fp/wrap.inc.c rename to tests/fp/wrap.inc diff --git a/ui/input-keymap.c b/ui/input-keymap.c index c430185..cfe2c44 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -4,23 +4,23 @@ =20 #include "standard-headers/linux/input.h" =20 -#include "ui/input-keymap-atset1-to-qcode.c" -#include "ui/input-keymap-linux-to-qcode.c" -#include "ui/input-keymap-qcode-to-atset1.c" -#include "ui/input-keymap-qcode-to-atset2.c" -#include "ui/input-keymap-qcode-to-atset3.c" -#include "ui/input-keymap-qcode-to-linux.c" -#include "ui/input-keymap-qcode-to-qnum.c" -#include "ui/input-keymap-qcode-to-sun.c" -#include "ui/input-keymap-qnum-to-qcode.c" -#include "ui/input-keymap-usb-to-qcode.c" -#include "ui/input-keymap-win32-to-qcode.c" -#include "ui/input-keymap-x11-to-qcode.c" -#include "ui/input-keymap-xorgevdev-to-qcode.c" -#include "ui/input-keymap-xorgkbd-to-qcode.c" -#include "ui/input-keymap-xorgxquartz-to-qcode.c" -#include "ui/input-keymap-xorgxwin-to-qcode.c" -#include "ui/input-keymap-osx-to-qcode.c" +#include "ui/input-keymap-atset1-to-qcode.inc" +#include "ui/input-keymap-linux-to-qcode.inc" +#include "ui/input-keymap-qcode-to-atset1.inc" +#include "ui/input-keymap-qcode-to-atset2.inc" +#include "ui/input-keymap-qcode-to-atset3.inc" +#include "ui/input-keymap-qcode-to-linux.inc" +#include "ui/input-keymap-qcode-to-qnum.inc" +#include "ui/input-keymap-qcode-to-sun.inc" +#include "ui/input-keymap-qnum-to-qcode.inc" +#include "ui/input-keymap-usb-to-qcode.inc" +#include "ui/input-keymap-win32-to-qcode.inc" +#include "ui/input-keymap-x11-to-qcode.inc" +#include "ui/input-keymap-xorgevdev-to-qcode.inc" +#include "ui/input-keymap-xorgkbd-to-qcode.inc" +#include "ui/input-keymap-xorgxquartz-to-qcode.inc" +#include "ui/input-keymap-xorgxwin-to-qcode.inc" +#include "ui/input-keymap-osx-to-qcode.inc" =20 int qemu_input_linux_to_qcode(unsigned int lnx) { diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c index b4f71e3..98d5002 100644 --- a/ui/vnc-enc-zrle.c +++ b/ui/vnc-enc-zrle.c @@ -199,56 +199,56 @@ static void zrle_write_u8(VncState *vs, uint8_t value) =20 #define ZRLE_BPP 8 #define ZYWRLE_ENDIAN ENDIAN_NO -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" #undef ZRLE_BPP =20 #define ZRLE_BPP 15 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_LITTLE -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_BIG -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZRLE_BPP #define ZRLE_BPP 16 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_LITTLE -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_BIG -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZRLE_BPP #define ZRLE_BPP 32 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_LITTLE -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_BIG -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #define ZRLE_COMPACT_PIXEL 24a #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_LITTLE -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_BIG -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZRLE_COMPACT_PIXEL #define ZRLE_COMPACT_PIXEL 24b #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_LITTLE -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" =20 #undef ZYWRLE_ENDIAN #define ZYWRLE_ENDIAN ENDIAN_BIG -#include "vnc-enc-zrle.inc.c" +#include "vnc-enc-zrle.inc" #undef ZRLE_COMPACT_PIXEL #undef ZRLE_BPP =20 diff --git a/ui/vnc-enc-zrle.inc.c b/ui/vnc-enc-zrle.inc similarity index 100% rename from ui/vnc-enc-zrle.inc.c rename to ui/vnc-enc-zrle.inc --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079476; cv=none; d=zohomail.com; s=zohoarc; b=OWfDmGqP0nu9u6UjW7lynbwKi1BUrCZMy0jEGXAOEK1qyohu/YFHnmCUf0jPIRG0ONs97O6+bpIlYecBdF6h7NMzgWEGlTW04Yjq7XC+BrL6jC83eRH0ru46xiXhi3lkxYJtKT71RcgysXkVAZlcqEsahi+CLxzS5sbWCJdWeBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079476; 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=1hAbhzSh3Of1OroaoMTOffSLnwzMbKxgc2GVyidkceo=; b=V3lATCAtb71oZD/N2ZEMh3C+OqtHFZ4pqr+dlMr4Lw/++smNCdKrqaT/mFi2DXWhH3imCxBhen7vln87UKjbY+xVdlzkQGzKxhbdHXrcODJsWcxtOgW4JAQj2tPqNeKSqS5o1K55nc/fnGxCTG2COlHx1epcyCSorj1tO0GG5kU= 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 1597079476235848.5290802254731; Mon, 10 Aug 2020 10:11:16 -0700 (PDT) Received: from localhost ([::1]:35908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BKM-0008PE-QM for importer@patchew.org; Mon, 10 Aug 2020 13:11:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIf-0005NT-4i for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BId-0002hk-2X for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:28 -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-16-mugax5zJMJC9uR_1SVUJIg-1; Mon, 10 Aug 2020 13:09:24 -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 680B6102C7ED for ; Mon, 10 Aug 2020 17:09:23 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 754C35F1E9; Mon, 10 Aug 2020 17:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079365; 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=1hAbhzSh3Of1OroaoMTOffSLnwzMbKxgc2GVyidkceo=; b=azc764dQUQ8VvK2WNRgRogG/EFrSZRDdKortR6zAM0pAU9BOcIb6fXE1u+Z3Pxlti7gPRh drdG9pGVS3aeJ6sbvSZbJ4vJl0k0AsSr7rFU/MylJE6Rg04CVTJA/lCxIqc165ubixsRBr ZSovhe0DbMTqDN/jGthOUWYa/RTYsko= X-MC-Unique: mugax5zJMJC9uR_1SVUJIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 006/147] build-sys hack: ensure target directory is there Date: Mon, 10 Aug 2020 19:06:44 +0200 Message-Id: <1597079345-42801-7-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=63.128.21.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/10 13:09:25 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 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 By removing some unnest-vars calls, we miss some directory creation that may be required by some/dir/object.d. This will go away once everything is converted to Meson. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- rules.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/rules.mak b/rules.mak index 694865b..56ba540 100644 --- a/rules.mak +++ b/rules.mak @@ -66,6 +66,7 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ $(filter-out %.o %.mo,$1)) =20 %.o: %.c + @mkdir -p $(dir $@) $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ -c -o $@ $<,"CC","$(TARGET_DIR)$@") --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079565; cv=none; d=zohomail.com; s=zohoarc; b=XuUmX70fW0wquvn0a2fpG0dIoBHAlFjqOc7fBytR3jXvQIfLbRSftFBnsEVMLBWU8LJojhs0yN4sbzMQUXh2ARdsk84YKggoyipxIly1d6SDVmraNqq6gY1fh5eAvfgjAMujwH9VsBVbxMqcQNoNxl5jRYa4d7Cx6h0A1dlPIEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079565; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=zSsJPgb3owpK5mhxN+giHBBhWSkqmltgEiV+7a8Ptec=; b=a9xfpeTxz3mIHeQwDizKcjE+hW6Lkeh9tLB6JYlrk122aYC9sVYz7CsxEzy4j4mK6uNu8lT11YQ9zc9+EgWzI27nIUBYZOP83ODEVpfmycr73V/Fy/K2mA0qi9k/cVYfe4m6CG5ai7g+TH7S+4tpQf90cQK2ZNxYiKn2sPdSQyY= 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 1597079565986812.5421425813621; Mon, 10 Aug 2020 10:12:45 -0700 (PDT) Received: from localhost ([::1]:41142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BLo-0002Hz-I5 for importer@patchew.org; Mon, 10 Aug 2020 13:12:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIg-0005Qw-I5 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:30 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53708 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 1k5BIe-0002hu-Fm for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:30 -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-89-Izp96i4VPPamdPh-osKYvQ-1; Mon, 10 Aug 2020 13:09:25 -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 8ECF1107ACCA for ; Mon, 10 Aug 2020 17:09:24 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4C525F1E9 for ; Mon, 10 Aug 2020 17:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=zSsJPgb3owpK5mhxN+giHBBhWSkqmltgEiV+7a8Ptec=; b=bFX7HMWY1KB8wL0Evyvpmhqyfkot3YOMIyoiZS6iA6UK+uLxrigi5yHAPk9tVuZOjrSahX SXe28vrTcR6ahME+c2H0nLHS6dxGgqEUFy51vsCcWLxys5/oq8reXJGibuBtisHcQi8FMI M5VMmqJ5tflVpPrrhGzARgTpQJ5Uo30= X-MC-Unique: Izp96i4VPPamdPh-osKYvQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 007/147] tests/vm: do not pollute configure with --efi-aarch64 Date: Mon, 10 Aug 2020 19:06:45 +0200 Message-Id: <1597079345-42801-8-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> 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 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Just make EFI_AARCH64 a variable in the makefile that defaults to the efi firmware included with QEMU. It can be redefined on the "make" command line. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Robert Foley --- configure | 19 ------------------- tests/vm/Makefile.include | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 2acc4d1..1c17a0f 100755 --- a/configure +++ b/configure @@ -418,7 +418,6 @@ prefix=3D"/usr/local" mandir=3D"\${prefix}/share/man" datadir=3D"\${prefix}/share" firmwarepath=3D"\${prefix}/share/qemu-firmware" -efi_aarch64=3D"" qemu_docdir=3D"\${prefix}/share/doc/qemu" bindir=3D"\${prefix}/bin" libdir=3D"\${prefix}/lib" @@ -1109,8 +1108,6 @@ for opt do ;; --firmwarepath=3D*) firmwarepath=3D"$optarg" ;; - --efi-aarch64=3D*) efi_aarch64=3D"$optarg" - ;; --host=3D*|--build=3D*|\ --disable-dependency-tracking|\ --sbindir=3D*|--sharedstatedir=3D*|\ @@ -3650,20 +3647,6 @@ EOF fi fi =20 -############################################ -# efi-aarch64 probe -# Check for efi files needed by aarch64 VMs. -# By default we will use the efi included with QEMU. -# Allow user to override the path for efi also. -if ! test -f "$efi_aarch64"; then - if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then - # valid after build - efi_aarch64=3D$PWD/pc-bios/edk2-aarch64-code.fd - else - efi_aarch64=3D"" - fi -fi - ########################################## # libcap-ng library probe if test "$cap_ng" !=3D "no" ; then @@ -6861,7 +6844,6 @@ if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi echo "genisoimage $genisoimage" -echo "efi_aarch64 $efi_aarch64" echo "python_yaml $python_yaml" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then @@ -7963,7 +7945,6 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak -echo "EFI_AARCH64=3D$efi_aarch64" >> $config_host_mak echo "PYTHON_YAML=3D$python_yaml" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index f21948c..a599d19 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,6 +2,8 @@ =20 .PHONY: vm-build-all vm-clean-all =20 +EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) + IMAGES :=3D freebsd netbsd openbsd centos fedora ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079661; cv=none; d=zohomail.com; s=zohoarc; b=Dlwgj1DvKgYE9NCwIltaDHhheZGe2+hZ14pqRFvTxxF0v17859fzsY+0DHHJkMHWqYMmLNxj8wlqozO5ebmhOgi+wBB4jHkoJkGmJFT5zTtOu5zi3QHpjiXhfkkLIz/j7z+2qt7malVQc53g06JpqADQ67yiMs5Yi7WsUeug8Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079661; h=Content-Type:Content-Transfer-Encoding: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=GVUx8s3GrxgCUDYrC6d7HIRDaaT67UUg72N6J3lfv5Y=; b=RgPRDz0re79Eoh3v4xpuEnnRYVQPniFXl2fQhqf7dLtOcuEY2+V5ijUkzaxnj0HWyDNfYqUB5WnfFd+QyTRK5H7p7BcTIqTdedSS0iRMXlcHUcW9xaF9qu2vRRCpFS26+YDlgKhWUlkNcfVVgOIT6u856mcSULac/qDe25CchuM= 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 1597079661319346.62524409543937; Mon, 10 Aug 2020 10:14:21 -0700 (PDT) Received: from localhost ([::1]:48866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BNL-0005ZK-Jh for importer@patchew.org; Mon, 10 Aug 2020 13:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIi-0005WB-JR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:51850 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 1k5BIf-0002i1-7l for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -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-556-YHR-jA_nPkWhT2YsJ1lY2g-1; Mon, 10 Aug 2020 13:09:26 -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 B480219057A0 for ; Mon, 10 Aug 2020 17:09:25 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0695D5F1E9 for ; Mon, 10 Aug 2020 17:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GVUx8s3GrxgCUDYrC6d7HIRDaaT67UUg72N6J3lfv5Y=; b=X2Hmhk2wUnAGrvXjS61TFJHDcV4l6rqX3B1Mq34lYGovgvWMA7FnVC91WqfYBam3bvuZCU 9Ex/gMKfwoisRsRjzVCX+ad/TBiUtERpdiEbFG72KMXsiI55bEwrsF+3gGry7VyKANVzdX /s0mRfGbSZTIG/cqR6RwY3K5Qn6wthg= X-MC-Unique: YHR-jA_nPkWhT2YsJ1lY2g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 008/147] tests/vm: check for Python YAML parser in the Makefile Date: Mon, 10 Aug 2020 19:06:46 +0200 Message-Id: <1597079345-42801-9-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) No need to do it in the configure file if it is only used for a help messag= e. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 9 --------- tests/vm/Makefile.include | 4 +++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 1c17a0f..625c14c 100755 --- a/configure +++ b/configure @@ -959,13 +959,6 @@ do fi done =20 -# Check for existence of python3 yaml, needed to -# import yaml config files into vm-build. -python_yaml=3D"no" -if $(python3 -c "import yaml" 2> /dev/null); then - python_yaml=3D"yes" -fi - : ${smbd=3D${SMBD-/usr/sbin/smbd}} =20 # Default objcc to clang if available, otherwise use CC @@ -6844,7 +6837,6 @@ if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi echo "genisoimage $genisoimage" -echo "python_yaml $python_yaml" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then echo "smbd $smbd" @@ -7945,7 +7937,6 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak -echo "PYTHON_YAML=3D$python_yaml" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a599d19..257e2ed 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -17,6 +17,8 @@ IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(IMA= GES)) =20 .PRECIOUS: $(IMAGE_FILES) =20 +HAVE_PYTHON_YAML =3D $(shell $(PYTHON) -c "import yaml" 2> /dev/null && ec= ho yes) + # 'vm-help' target was historically named 'vm-test' vm-help vm-test: @echo "vm-help: Test QEMU in preconfigured virtual machines" @@ -56,7 +58,7 @@ endif @echo " QEMU_LOCAL=3D1 - Use QEMU binary local to this= build." @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" @echo " QEMU_IMG=3D/path/to/qemu-img - Change path to qemu-img tool" -ifeq ($(PYTHON_YAML),yes) +ifeq ($(HAVE_PYTHON_YAML),yes) @echo " QEMU_CONFIG=3D/path/conf.yml - Change path to VM configurati= on .yml file." else @echo " (install python3-yaml to enable support for yaml file to confi= gure a VM.)" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079696; cv=none; d=zohomail.com; s=zohoarc; b=X/qmOnVjP15w+oe+ceB4iHHN9GjgS39vpMhtM4xKrxFx1vD5LYEBXtdoDekT6shV9h6q7SoMuIu8N3HDSR/g5GsA4OQIz7VbR2BCUk2w8PXZwjC5MUa6qj/F+4G5d5If3SEHeoxg7vLoZtJar965G8Xe6yA+eMZQ3iYNzDvoSH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079696; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fmBNVvuZ6i8RWnrpkbk/zA4aYLSsrA5fNfjRgl12UO4=; b=JRwR5VMV6Zhe+vUVbUDemZ/bWE8NSzOlDOSVemBy/RDtPzoJCXHQqKf3k00i3GQEYmWPZP96OgZNrmLrFniQX3cYzbLOw7gE5RKfs8aGfeD0G1nt3i6uESWDEg/bzgbS3h7wv3sMykDZi5K9D95JGGlDlItM8obkmY0rOsZUmmY= 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 1597079696991796.2480745982319; Mon, 10 Aug 2020 10:14:56 -0700 (PDT) Received: from localhost ([::1]:50846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BNv-0006Mi-Qe for importer@patchew.org; Mon, 10 Aug 2020 13:14:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIh-0005Th-Js for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:39929 helo=us-smtp-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 1k5BIg-0002iD-0f for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:31 -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-306-Vm2D8iTGOFqJk2vt3p1-2w-1; Mon, 10 Aug 2020 13:09:27 -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 D990119057A3 for ; Mon, 10 Aug 2020 17:09:26 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B8FD5F1E9 for ; Mon, 10 Aug 2020 17:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=fmBNVvuZ6i8RWnrpkbk/zA4aYLSsrA5fNfjRgl12UO4=; b=OribmkD+07WY7FPG0LTLEZsLyGr2G+R8gzLu1azb22wUMI0a7jXfbFer2aDIuSRCQthmXB O13IpoQ5rAbyx+3dIFSMYzvBd0UkHuu3P0j+R6J8P/qaGKB/g5ccMW6ywAgneFOztUR57Z DUCpHeR6NabsGAMMxlBhUu0RX2s2r/U= X-MC-Unique: Vm2D8iTGOFqJk2vt3p1-2w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 009/147] tests/docker: add test script for static linux-user builds Date: Mon, 10 Aug 2020 19:06:47 +0200 Message-Id: <1597079345-42801-10-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- tests/docker/test-static | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 tests/docker/test-static diff --git a/tests/docker/test-static b/tests/docker/test-static new file mode 100755 index 0000000..372ef6f --- /dev/null +++ b/tests/docker/test-static @@ -0,0 +1,24 @@ +#!/bin/bash -e +# +# Compile QEMU user mode emulators as static binaries on Linux. +# +# Copyright (c) 2020 Red Hat Inc. +# +# Authors: +# Paolo Bonzini +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or (at your option) any later version. See the COPYING file in +# the top-level directory. + +. common.rc + +cd "$BUILD_DIR" + +build_qemu \ + --disable-system \ + --disable-tools \ + --disable-guest-agent \ + --disable-docs \ + --static +install_qemu --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079852; cv=none; d=zohomail.com; s=zohoarc; b=WYfIALT+Zf+345XD4BFpZFoQgcSLoVdMCczTcMj+08mu5Zww2yN6nmH4pK1cufpJIS7SqHWcFegyYpPYTp75fybzI4O3cNUftdYhx2bU2mp+x3PwYGadMPrIKwgcJsvukPTmBG+q3FYBPP227qsmJqqMQ3arkCf66E6C+QDYtiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079852; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=xyg2tgiWB6JmFmvllZCzSpCGsu2mkSQ8xFMhSgN8skU=; b=myg2dYZmlDq6KmyEbHbINpBakxYzvZFA/WlqsGuGC0EqNpT9aBVGPfC5r9u6lCq97Pcr9ZYHnvprGHVxEXcdFT4nWqTywlpJOJMmnLazdP4kie5KS/ilICm3nr51HJQph8UngIoNrfzFjgZsvc8Eygn447JrP4wuDcBE/0/PcVE= 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 1597079852806283.10524818905446; Mon, 10 Aug 2020 10:17:32 -0700 (PDT) Received: from localhost ([::1]:33658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BQR-0002Zj-DH for importer@patchew.org; Mon, 10 Aug 2020 13:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIj-0005XV-3M for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40383 helo=us-smtp-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 1k5BIh-0002jV-D3 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -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-377-WrQ3IgiMNSu-L2NGcu9wsA-1; Mon, 10 Aug 2020 13:09:28 -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 0A7358014D7 for ; Mon, 10 Aug 2020 17:09:28 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51E895F1E9 for ; Mon, 10 Aug 2020 17:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=xyg2tgiWB6JmFmvllZCzSpCGsu2mkSQ8xFMhSgN8skU=; b=eOSCtS1mVNgAxZPRQDv/GdAPIzYVa/QhqRSYAIpMblZtxXgEoUum9J4Zp5hLaJJQ4GGs22 sq1lGqTjtmaZDL/+wXZFVNwxjqbiIq+SOd/rLyVlzpAeGzs7qux79Wz34vugq3OBvZNwh3 W7fq/Ng9l23zvCwIhwT39U3VaQddRpw= X-MC-Unique: WrQ3IgiMNSu-L2NGcu9wsA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 010/147] nsis: use "make DESTDIR=" instead of "make prefix=" Date: Mon, 10 Aug 2020 19:06:48 +0200 Message-Id: <1597079345-42801-11-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The next patch will prevent modifying the prefix on "make install". Adjust= the creation of the installer. Signed-off-by: Paolo Bonzini --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f237ff8..9d94782 100644 --- a/Makefile +++ b/Makefile @@ -1188,16 +1188,16 @@ installer: $(INSTALLER) =20 INSTDIR=3D/tmp/qemu-nsis =20 -$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi - $(MAKE) install prefix=3D${INSTDIR} +$(INSTALLER): $(SRC_PATH)/qemu.nsi + $(MAKE) install DESTDIR=3D${INSTDIR} ifdef SIGNCODE - (cd ${INSTDIR}; \ + (cd ${INSTDIR}/${bindir}; \ for i in *.exe; do \ $(SIGNCODE) $${i}; \ done \ ) endif # SIGNCODE - (cd ${INSTDIR}; \ + (cd ${INSTDIR}/${bindir}; \ for i in qemu-system-*.exe; do \ arch=3D$${i%.exe}; \ arch=3D$${arch#qemu-system-}; \ @@ -1206,11 +1206,11 @@ endif # SIGNCODE echo File \"\$${BINDIR}\\$$i\"; \ echo SectionEnd; \ done \ - ) >${INSTDIR}/system-emulations.nsh + ) >${INSTDIR}/${bindir}/system-emulations.nsh makensis $(nsisflags) \ $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION=3D"y") \ $(if $(CONFIG_GTK),-DCONFIG_GTK=3D"y") \ - -DBINDIR=3D"${INSTDIR}" \ + -DBINDIR=3D"${INSTDIR}/${bindir}" \ $(if $(DLL_PATH),-DDLLDIR=3D"$(DLL_PATH)") \ -DSRCDIR=3D"$(SRC_PATH)" \ -DOUTFILE=3D"$(INSTALLER)" \ --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079943; cv=none; d=zohomail.com; s=zohoarc; b=ZkX9l4K0lPwIaDngTkNBsu1HpW43ysFkW2pEBQa4z1ZBaqmZ7TnRaFkBxZKJ5QOqcHrBWSHagJPPTi/VDVw05aS7Qc7JUvTWQVwOJd86D6Z9GFcIcKnKQOxW0C2zUL/lGf5hzrlKW7+LN8DPg+pXH33pQbSlwA2aHschxTI7Thc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079943; h=Content-Type:Content-Transfer-Encoding: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=/oUhf6nPpTorR/M4CAuiJTRJ8DqpfAfN3wFaBW772jM=; b=cPPhmxs1Psr90g/bxWC2BrpE0D5jNhl41eLgrdSjmz+TOSJ+Xc1FOez1ibeAgzie/jhrB5ln+Y0nx6U/fRcoUWBebywDylxpNQEjLqJOxUiYWAkZeLG7CfV3une6OKZ0C6DNKggSRnTVgJP5PANlp/UrcCTNRt/g5QvySi6CLtw= 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 1597079943895806.2383654027052; Mon, 10 Aug 2020 10:19:03 -0700 (PDT) Received: from localhost ([::1]:41676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BRu-0005rN-Ki for importer@patchew.org; Mon, 10 Aug 2020 13:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIk-0005b5-I8 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:34 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28951 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 1k5BIi-0002ji-JQ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:34 -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-354-fkPAOMFWOkaAHBTKkFXpMQ-1; Mon, 10 Aug 2020 13:09:30 -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 30A7F102C7E9 for ; Mon, 10 Aug 2020 17:09:29 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 770A45F1E9 for ; Mon, 10 Aug 2020 17:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/oUhf6nPpTorR/M4CAuiJTRJ8DqpfAfN3wFaBW772jM=; b=Vld3TBE+6d3XYv62GoUt3YarufCFvOGN2RMuTrXANgPjZuNlEbOcEFGGl6d1njemkj4b6w 9rDIcvYJgSkAGLK8j2l1ppwsGeVoZ+rMoiqnTVxn5L/EOUpS7UYLTFKS8DRMMC40+eWte9 AjORahmoCYV0x4uQd1i+VEDwClSx8ZM= X-MC-Unique: fkPAOMFWOkaAHBTKkFXpMQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 011/147] configure: do not include $(...) variables in config-host.mak Date: Mon, 10 Aug 2020 19:06:49 +0200 Message-Id: <1597079345-42801-12-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) This ensures that Meson will be able to reuse the results of the tests that are performed in the configure script. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 625c14c..606c327 100755 --- a/configure +++ b/configure @@ -610,8 +610,8 @@ QEMU_CFLAGS=3D"-fno-strict-aliasing -fno-common -fwrapv= -std=3Dgnu99 $QEMU_CFLAGS" QEMU_CFLAGS=3D"-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CF= LAGS" QEMU_CFLAGS=3D"-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS=3D"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE = $QEMU_CFLAGS" -QEMU_INCLUDES=3D"-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel= /tcg -iquote \$(SRC_PATH)/include" -QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl" +QEMU_INCLUDES=3D"-iquote . -iquote ${source_path} -iquote ${source_path}/a= ccel/tcg -iquote ${source_path}/include" +QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl" if test "$debug_info" =3D "yes"; then CFLAGS=3D"-g $CFLAGS" fi @@ -911,7 +911,7 @@ Linux) linux=3D"yes" linux_user=3D"yes" kvm=3D"yes" - QEMU_INCLUDES=3D"-isystem \$(SRC_PATH)/linux-headers -isystem $PWD/linux= -headers $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I$PWD/linux-head= ers $QEMU_INCLUDES" supported_os=3D"yes" libudev=3D"yes" ;; @@ -4397,8 +4397,8 @@ EOF if [ "$pwd_is_source_path" !=3D "y" ] ; then symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi - fdt_cflags=3D"-I\$(SRC_PATH)/dtc/libfdt" - fdt_ldflags=3D"-L\$(BUILD_DIR)/dtc/libfdt" + fdt_cflags=3D"-I${source_path}/dtc/libfdt" + fdt_ldflags=3D"-L$PWD/dtc/libfdt" fdt_libs=3D"$fdt_libs" elif test "$fdt" =3D "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5385,13 +5385,13 @@ case "$capstone" in git_submodules=3D"${git_submodules} capstone" fi mkdir -p capstone - QEMU_CFLAGS=3D"$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include" + QEMU_CFLAGS=3D"$QEMU_CFLAGS -I${source_path}/capstone/include" if test "$mingw32" =3D "yes"; then LIBCAPSTONE=3Dcapstone.lib else LIBCAPSTONE=3Dlibcapstone.a fi - libs_cpu=3D"-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu" + libs_cpu=3D"-L$PWD/capstone -lcapstone $libs_cpu" ;; =20 system) @@ -6414,8 +6414,8 @@ case "$slirp" in git_submodules=3D"${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags=3D"-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" - slirp_libs=3D"-L\$(BUILD_DIR)/slirp -lslirp" + slirp_cflags=3D"-I${source_path}/slirp/src -I$PWD/slirp/src" + slirp_libs=3D"-L$PWD/slirp -lslirp" if test "$mingw32" =3D "yes" ; then slirp_libs=3D"$slirp_libs -lws2_32 -liphlpapi" fi @@ -7909,19 +7909,19 @@ if test "$secret_keyring" =3D "yes" ; then fi =20 if test "$tcg_interpreter" =3D "yes"; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/tci $QEMU_INCLUDES" elif test "$ARCH" =3D "sparc64" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/sparc $QEMU_INCLUDES" elif test "$ARCH" =3D "s390x" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/s390 $QEMU_INCLUDES" elif test "$ARCH" =3D "x86_64" || test "$ARCH" =3D "x32" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/i386 $QEMU_INCLUDES" elif test "$ARCH" =3D "ppc64" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/ppc $QEMU_INCLUDES" elif test "$ARCH" =3D "riscv32" || test "$ARCH" =3D "riscv64" ; then - QEMU_INCLUDES=3D"-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-I${source_path}/tcg/riscv $QEMU_INCLUDES" else - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES" fi =20 echo "HELPERS=3D$helpers" >> $config_host_mak --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079782; cv=none; d=zohomail.com; s=zohoarc; b=VGAI8Iwlj2b6f5/r69j3DlfhKbm72ahRzCM5l6hrC2PuMDuVmh77Zc9qTMAWe6zyYl9aaBX4EAaEjrdJV0ql1jrMYcUqCCETwCkhOVIlRCuY3SnX1AjdUadcMOdj1GnwMjksJwhvcfb93/v+5jhhobwBAqvp/ExU+zAOPxVQDWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079782; 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=RB16TkvXhLvFPihuq4ukJeWY99r3fvG59MAW5QDNv6c=; b=UeUujM1jHb/yr/2OaB5W89UbJHUDfORXK6Fgf2f6m20/LKEZrPir85FXBAUgVwqt8sN+qO4DJ1vQ9tDm9nG0Fc4WJtrnWRAe113DOBCx9MDAfM+wY1TuyxgqQa3AhwG7hUF7195I5UH99a4it2Mu9sLIKPOkg16HHoarC1tBXWk= 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 1597079782366226.9681402466672; Mon, 10 Aug 2020 10:16:22 -0700 (PDT) Received: from localhost ([::1]:56996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BPJ-0000Wb-5q for importer@patchew.org; Mon, 10 Aug 2020 13:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIl-0005di-JG for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BIj-0002jz-Qq for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:35 -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-506-WOCYkhHiPTuzwapTdEN3rw-1; Mon, 10 Aug 2020 13:09:31 -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 8E5B480183C for ; Mon, 10 Aug 2020 17:09:30 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D1215F1E9; Mon, 10 Aug 2020 17:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079372; 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=RB16TkvXhLvFPihuq4ukJeWY99r3fvG59MAW5QDNv6c=; b=afgT3uqWYqvT4tmwwde0kD2XWbHDF4FI6aYMHco3lF+M077Smay5tnVYH3cELqW0yhNf1W zmSVXsSC/hBkx5Zm0TZPn93KzMi+tU+v3fgu9+Q/F4iviFpTmZg5d4bDk5atZKwiDw0yTv Gqms9D/I6AIT+sdLg9jKKBi8nrTjRMU= X-MC-Unique: WOCYkhHiPTuzwapTdEN3rw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 012/147] configure: expand path variables for meson configure Date: Mon, 10 Aug 2020 19:06:50 +0200 Message-Id: <1597079345-42801-13-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=63.128.21.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/10 13:09:25 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 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 --- configure | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 606c327..373bb22 100755 --- a/configure +++ b/configure @@ -415,16 +415,7 @@ LDFLAGS_SHARED=3D"-shared" modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" -mandir=3D"\${prefix}/share/man" -datadir=3D"\${prefix}/share" firmwarepath=3D"\${prefix}/share/qemu-firmware" -qemu_docdir=3D"\${prefix}/share/doc/qemu" -bindir=3D"\${prefix}/bin" -libdir=3D"\${prefix}/lib" -libexecdir=3D"\${prefix}/libexec" -includedir=3D"\${prefix}/include" -sysconfdir=3D"\${prefix}/etc" -local_statedir=3D"\${prefix}/var" confsuffix=3D"/qemu" slirp=3D"" oss_lib=3D"" @@ -979,12 +970,6 @@ if test "$mingw32" =3D "yes" ; then LIBS=3D"-liberty $LIBS" fi prefix=3D"c:/Program Files/QEMU" - mandir=3D"\${prefix}" - datadir=3D"\${prefix}" - qemu_docdir=3D"\${prefix}" - bindir=3D"\${prefix}" - sysconfdir=3D"\${prefix}" - local_statedir=3D confsuffix=3D"" libs_qga=3D"-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi = -lnetapi32 $libs_qga" fi @@ -1638,6 +1623,26 @@ for opt do esac done =20 +libdir=3D"${libdir:-$prefix/lib}" +libexecdir=3D"${libexecdir:-$prefix/libexec}" +includedir=3D"${includedir:-$prefix/include}" + +if test "$mingw32" =3D "yes" ; then + mandir=3D"$prefix" + datadir=3D"$prefix" + qemu_docdir=3D"$prefix" + bindir=3D"$prefix" + sysconfdir=3D"$prefix" + local_statedir=3D +else + mandir=3D"${mandir:-$prefix/share/man}" + datadir=3D"${datadir:-$prefix/share}" + qemu_docdir=3D"${qemu_docdir:-$prefix/share/doc/qemu}" + bindir=3D"${bindir:-$prefix/bin}" + sysconfdir=3D"${sysconfdir:-$prefix/etc}" + local_statedir=3D"${local_statedir:-$prefix/var}" +fi + case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079885; cv=none; d=zohomail.com; s=zohoarc; b=e7ItfkmHXdfTB9ZAHtAUPTTWASDcJlwpyFbYOpftR5F0zq6MdvYj9oLUBeeOrgk3FzMNDd9zBWoEcTjNQYp1jxU6lCTfOtiBI1W/KOovL9+hMFCNRIe8/MoeUxU7UzZ+H1LjLSfDHJkvMaiBaGBcjBDyh3ty8EhFMx9cLGanq1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079885; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=PbewHvOxTCZhTIWc9tLEspi3uCE5PjzTMJxP2G9k/bM=; b=Yk6S5p85nCNQoGJmC/OUIGttVAcmDVx4ZAR4xivN8jxBO9L++hKAA1iZ3TCAG5p9LAodsepErSjakiNfoIdblBpuQcMZfuUApZAhs5MPaCI/cQTxHslOeT7Gdf2CP15rbUTfU63dSj/XXH45HXxyHLKWm/R42tSuQehDSW7YMv0= 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 1597079885042445.0268705244375; Mon, 10 Aug 2020 10:18:05 -0700 (PDT) Received: from localhost ([::1]:36776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BQx-0003qp-Nc for importer@patchew.org; Mon, 10 Aug 2020 13:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIn-0005hd-06 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BIl-0002kA-1S for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:36 -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-222-WyrXcmhsOtmyNhXb2ChGXg-1; Mon, 10 Aug 2020 13:09:32 -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 B4B6319057A0 for ; Mon, 10 Aug 2020 17:09:31 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 076A05F1E9 for ; Mon, 10 Aug 2020 17:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=PbewHvOxTCZhTIWc9tLEspi3uCE5PjzTMJxP2G9k/bM=; b=eXoucSSJ6oG1Yxv5gdbsH33SRqZk796DqdR29yk6UCoa1/MF8tL5IRZ19+xV2PB3KuI3bw GZHZZLf9+f/EMAPqucmu7NCZLrJ3uzjbS6nXljl1jHN3Dhz9+tMa0bgf/Hdk2Rjz7LOAfq 4h9XRP//hme1iJ5Jb4hSjV4k7NUCWII= X-MC-Unique: WyrXcmhsOtmyNhXb2ChGXg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 013/147] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson Date: Mon, 10 Aug 2020 19:06:51 +0200 Message-Id: <1597079345-42801-14-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> 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 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=63.128.21.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/10 13:09:25 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Split between CFLAGS/QEMU_CFLAGS and CXXFLAGS/QEMU_CXXFLAGS so that we will use CFLAGS and CXXFLAGS for flags that we do not want to pass to add_project_arguments. Signed-off-by: Paolo Bonzini --- configure | 46 ++++++++++++++++++++++++---------------------- rules.mak | 4 ++-- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 373bb22..9ce1189 100755 --- a/configure +++ b/configure @@ -107,15 +107,12 @@ update_cxxflags() { # options which some versions of GCC's C++ compiler complain about # because they only make sense for C programs. QEMU_CXXFLAGS=3D"$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTAN= T_MACROS -D__STDC_FORMAT_MACROS" - + CXXFLAGS=3D$(echo "$CFLAGS" | sed s/-std=3Dgnu99/-std=3Dgnu++11/) for arg in $QEMU_CFLAGS; do case $arg in -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\ -Wold-style-declaration|-Wold-style-definition|-Wredundant-dec= ls) ;; - -std=3Dgnu99) - QEMU_CXXFLAGS=3D${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }"-std=3Dg= nu++98" - ;; *) QEMU_CXXFLAGS=3D${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg ;; @@ -125,13 +122,13 @@ update_cxxflags() { =20 compile_object() { local_cflags=3D"$1" - do_cc $QEMU_CFLAGS $local_cflags -c -o $TMPO $TMPC + do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -c -o $TMPO $TMPC } =20 compile_prog() { local_cflags=3D"$1" local_ldflags=3D"$2" - do_cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $QEMU_LDFLAGS $local_ldf= lags + do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $QEMU_L= DFLAGS $local_ldflags } =20 # symbolically link $1 to $2. Portable version of "ln -sf". @@ -597,15 +594,14 @@ ARFLAGS=3D"${ARFLAGS-rv}" # left shift of signed integers is well defined and has the expected # 2s-complement style results. (Both clang and gcc agree that it # provides these semantics.) -QEMU_CFLAGS=3D"-fno-strict-aliasing -fno-common -fwrapv -std=3Dgnu99 $QEMU= _CFLAGS" -QEMU_CFLAGS=3D"-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CF= LAGS" +QEMU_CFLAGS=3D"-fno-strict-aliasing -fno-common -fwrapv $QEMU_CFLAGS" +QEMU_CFLAGS=3D"-Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" QEMU_CFLAGS=3D"-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS=3D"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE = $QEMU_CFLAGS" QEMU_INCLUDES=3D"-iquote . -iquote ${source_path} -iquote ${source_path}/a= ccel/tcg -iquote ${source_path}/include" QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl" -if test "$debug_info" =3D "yes"; then - CFLAGS=3D"-g $CFLAGS" -fi +CFLAGS=3D"-std=3Dgnu99 -Wall" + =20 # running configure in the source tree? # we know that's the case if configure is there. @@ -886,7 +882,6 @@ SunOS) QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" - QEMU_CFLAGS=3D"-std=3Dgnu99 $QEMU_CFLAGS" solarisnetlibs=3D"-lsocket -lnsl -lresolv" LIBS=3D"$solarisnetlibs $LIBS" libs_qga=3D"$solarisnetlibs $libs_qga" @@ -2109,7 +2104,7 @@ EOF for flag in $gcc_flags; do # We need to check both a compile and a link, since some compiler # setups fail only on a .c->.o compile and some only at link time - if do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC && + if compile_object "-Werror $flag" && compile_prog "-Werror $flag" ""; then QEMU_CFLAGS=3D"$QEMU_CFLAGS $flag" QEMU_LDFLAGS=3D"$QEMU_LDFLAGS $flag" @@ -2184,7 +2179,7 @@ fi =20 if test "$static" =3D "yes"; then if test "$pie" !=3D "no" && compile_prog "-Werror -fPIE -DPIE" "-static-= pie"; then - QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" + CFLAGS=3D"-fPIE -DPIE $CFLAGS" QEMU_LDFLAGS=3D"-static-pie $QEMU_LDFLAGS" pie=3D"yes" elif test "$pie" =3D "yes"; then @@ -2194,11 +2189,11 @@ if test "$static" =3D "yes"; then pie=3D"no" fi elif test "$pie" =3D "no"; then - QEMU_CFLAGS=3D"$CFLAGS_NOPIE $QEMU_CFLAGS" - QEMU_LDFLAGS=3D"$LDFLAGS_NOPIE $QEMU_LDFLAGS" + CFLAGS=3D"$CFLAGS_NOPIE $CFLAGS" + LDFLAGS=3D"$LDFLAGS_NOPIE $LDFLAGS" elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then - QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" - QEMU_LDFLAGS=3D"-pie $QEMU_LDFLAGS" + CFLAGS=3D"-fPIE -DPIE $CFLAGS" + LDFLAGS=3D"-pie $LDFLAGS" pie=3D"yes" elif test "$pie" =3D "yes"; then error_exit "PIE not available due to missing toolchain support" @@ -3981,7 +3976,7 @@ EOF if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then if cc_has_warning_flag "-Wno-unknown-attributes"; then glib_cflags=3D"-Wno-unknown-attributes $glib_cflags" - CFLAGS=3D"-Wno-unknown-attributes $CFLAGS" + QEMU_CFLAGS=3D"-Wno-unknown-attributes $CFLAGS" fi fi =20 @@ -6506,10 +6501,16 @@ if test "$gcov" =3D "yes" ; then QEMU_CFLAGS=3D"-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS" elif test "$fortify_source" =3D "yes" ; then - CFLAGS=3D"-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $CFLAGS" -elif test "$debug" =3D "no"; then + QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" + debug=3Dno +fi +if test "$debug" =3D "no"; then CFLAGS=3D"-O2 $CFLAGS" fi +if test "$debug_info" =3D "yes"; then + CFLAGS=3D"-g $CFLAGS" + LDFLAGS=3D"-g $LDFLAGS" +fi =20 if test "$have_asan" =3D "yes"; then QEMU_CFLAGS=3D"-fsanitize=3Daddress $QEMU_CFLAGS" @@ -7874,7 +7875,7 @@ if test "$fuzzing" =3D "yes" ; then if test "$have_fuzzer" =3D "yes"; then FUZZ_LDFLAGS=3D" -fsanitize=3Dfuzzer" FUZZ_CFLAGS=3D" -fsanitize=3Dfuzzer" - CFLAGS=3D"$CFLAGS -fsanitize=3Dfuzzer-no-link" + QEMU_CFLAGS=3D"$QEMU_CFLAGS -fsanitize=3Dfuzzer-no-link" else error_exit "Your compiler doesn't support -fsanitize=3Dfuzzer" exit 1 @@ -7961,6 +7962,7 @@ echo "NM=3D$nm" >> $config_host_mak echo "PKG_CONFIG=3D$pkg_config_exe" >> $config_host_mak echo "WINDRES=3D$windres" >> $config_host_mak echo "CFLAGS=3D$CFLAGS" >> $config_host_mak +echo "CXXFLAGS=3D$CXXFLAGS" >> $config_host_mak echo "CFLAGS_NOPIE=3D$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 56ba540..e79a400 100644 --- a/rules.mak +++ b/rules.mak @@ -88,12 +88,12 @@ LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $(= QEMU_LDFLAGS) -o $@ \ =20 %.o: %.cc $(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ + $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \ -c -o $@ $<,"CXX","$(TARGET_DIR)$@") =20 %.o: %.cpp $(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ + $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \ -c -o $@ $<,"CXX","$(TARGET_DIR)$@") =20 %.o: %.m --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079600; cv=none; d=zohomail.com; s=zohoarc; b=Hvd+IA9hA17DkfqDd8SSeqK90+LDVknW82lo5f0k2YhyRmCkVZ0GI5rFUCbLzlhElrQhUNnMVCFNNqo+Lt/8n2y5m+6T3PXzi8E1VAi97T7O44LDmtHtuaL0nYfhR5SLOh7tHIveZfQLcVUaCqKhRRCzsRilLS6RVBM+cAwZHMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079600; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UrSwDkPgGhedoZk8uAsSqPZsW0Yj5KtsdiJaF9EI/lY=; b=mn2IGp3/3uDnBph+6vEHh1IHenD6ozknVGjIOe+gXIBg7AgxZrZokczpTMPd3TKPk6QTr+QVjgNcYakEtPN9opX/N99cBII38XEqDJEPgD/5FMcUW2ZG2Ko1rlM5EmTsHeT6DRFYjBnKVLlSCPRQ3XpvSLQ+ToOR3w94wV0WONU= 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 1597079600255299.92526404705904; Mon, 10 Aug 2020 10:13:20 -0700 (PDT) Received: from localhost ([::1]:44320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BMN-0003hS-0x for importer@patchew.org; Mon, 10 Aug 2020 13:13:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIn-0005jb-S3 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54099 helo=us-smtp-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 1k5BIm-0002kK-BU for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09: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-69-dnLgfsu4N7K_StgYI_zTzw-1; Mon, 10 Aug 2020 13:09:33 -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 DA70C79EC0 for ; Mon, 10 Aug 2020 17:09:32 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CCCB5F1E9 for ; Mon, 10 Aug 2020 17:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=UrSwDkPgGhedoZk8uAsSqPZsW0Yj5KtsdiJaF9EI/lY=; b=TGPTA7+RNZcFbPNe/5KTri3Km3Vp++NX5OIHW5kun+oLPMep1XnxsclyvlPSmY8i26A7Vm D1F8INtHNNXSDy9hM9xXjbGpUI5RaWG9Miyi4ImjtQIomI1uPG0HFFQ4u7IGAcNWYBKxdR eK6h7RipyzL8d4XrdmwWWite9IiuCCY= X-MC-Unique: dnLgfsu4N7K_StgYI_zTzw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 014/147] tests/vm: include setuptools Date: Mon, 10 Aug 2020 19:06:52 +0200 Message-Id: <1597079345-42801-15-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" They are a dependency of Meson, so install them. Signed-off-by: Paolo Bonzini --- tests/vm/freebsd | 1 + tests/vm/netbsd | 1 + tests/vm/openbsd | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 29252fa..b34b14f 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,6 +33,7 @@ class FreeBSDVM(basevm.BaseVM): "pkgconf", "bzip2", "python37", + "py37-setuptools", =20 # gnu tools "bash", diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 2e87199..93d48b6 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -31,6 +31,7 @@ class NetBSDVM(basevm.BaseVM): "pkgconf", "xz", "python37", + "py37-setuptools", =20 # gnu tools "bash", diff --git a/tests/vm/openbsd b/tests/vm/openbsd index dfe633e..7e27fda 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -30,6 +30,7 @@ class OpenBSDVM(basevm.BaseVM): "git", "pkgconf", "bzip2", "xz", + "py3-setuptools", =20 # gnu tools "bash", --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079980; cv=none; d=zohomail.com; s=zohoarc; b=lM0tWF8pEqzBGeNCeLt6Kxah12aKN2m3xV2j4sGg/GGOwj4yu2iaYOgcvmvGDsMYChHpNssER9ZTOvYV1V913MtOfayHfKrIqLt4etv+H9TRkRFo2/IDdQwy7T7cNgmgAh6rHGdWXsiqFi32eQwmU+qdegA342fDecwXedsbLKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079980; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ah9FppqO4MgloXSfPpxClyCTQ7Y29f47VkpYo8VXP5Q=; b=LKrdXXPBTEYxWYi5ocM/v4PYY8LQG32sCHQdlqzrAm2D4hLQuBh1tK/voApAseOBvr5CkOsO2e1FQIZ4zqb0+hWayDXYEAWhg8h2NHB2LXV0K9RZN9gfPQgKM5bkJigtL19BGOafaSd51db19gCs59kI6nhkJw8bgkRyfW+dgVw= 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 1597079980821104.16490340139012; Mon, 10 Aug 2020 10:19:40 -0700 (PDT) Received: from localhost ([::1]:45192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BSU-0007KU-QV for importer@patchew.org; Mon, 10 Aug 2020 13:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIt-0005zI-VF for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40566 helo=us-smtp-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 1k5BIp-0002kY-VV for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:43 -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-360-hE0aeXI-NDCbbf4ZguOZ9Q-1; Mon, 10 Aug 2020 13:09:34 -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 0A92B8015CE for ; Mon, 10 Aug 2020 17:09:34 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 532AB5F1E9 for ; Mon, 10 Aug 2020 17:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ah9FppqO4MgloXSfPpxClyCTQ7Y29f47VkpYo8VXP5Q=; b=P56dIGKx1zT4G3l1bneJaKcFk8C3xRF0+a3UwXW/IHrSkWBprOqkZ6AvhAQe78qSSSk/WX 5gaYaKt4zTc+5yQECs2qeAj7KKjtaGd7dIAc/7bcgSZ7MTf8ILTWRKs0+xUwdorH2PP9G0 nC4dy1JDrOdyVxHwunyLGi44P82fnh0= X-MC-Unique: hE0aeXI-NDCbbf4ZguOZ9Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 015/147] configure: integrate Meson in the build system Date: Mon, 10 Aug 2020 19:06:53 +0200 Message-Id: <1597079345-42801-16-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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, PDS_OTHER_BAD_TLD=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Meson build system is integrated in the existing configure/make steps by invoking Meson from the configure script and converting Meson's build.ni= nja rules to an included Makefile. build.ninja already provides tags/ctags/cscope rules, so they are removed. Signed-off-by: Paolo Bonzini --- Makefile | 28 +- configure | 38 +- meson.build | 20 + scripts/ninjatool.py | 1010 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 1078 insertions(+), 18 deletions(-) create mode 100644 meson.build create mode 100755 scripts/ninjatool.py diff --git a/Makefile b/Makefile index 9d94782..f42cbdb 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,15 @@ git-submodule-update: endif endif =20 +export NINJA=3D./ninjatool +Makefile.ninja: build.ninja ninjatool + ./ninjatool -t ninja2make --clean --omit dist uninstall < $< > $@ +-include Makefile.ninja + +ninjatool: ninjatool.stamp +ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak + $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@ + .git-submodule-status: git-submodule-update config-host.mak =20 # Check that we're not trying to do an out-of-tree build from @@ -68,6 +77,8 @@ CONFIG_ALL=3Dy -include config-all-devices.mak -include config-all-disas.mak =20 +build.ninja: meson-private/coredata.dat +meson-private/coredata.dat: config-host.mak config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VER= SION @echo $@ is out-of-date, running configure @./config.status @@ -933,6 +944,8 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 install-includedir: $(INSTALL_DIR) "$(DESTDIR)$(includedir)" =20 +# Needed by "meson install" +export DESTDIR install: all $(if $(BUILD_DOCS),install-doc) \ install-datadir install-localstatedir install-includedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ @@ -1006,21 +1019,6 @@ endif done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/= trace-events-all" =20 -.PHONY: ctags -ctags: - rm -f tags - find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} + - -.PHONY: TAGS -TAGS: - rm -f TAGS - find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} + - -cscope: - rm -f "$(SRC_PATH)"/cscope.* - find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PAT= H)/cscope.files" - cscope -b -i"$(SRC_PATH)/cscope.files" - # opengl shader programs ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shade= rinclude.pl @mkdir -p $(dir $@) diff --git a/configure b/configure index 9ce1189..ad5bd1a 100755 --- a/configure +++ b/configure @@ -506,6 +506,7 @@ fuzzing=3D"no" rng_none=3D"no" secret_keyring=3D"" libdaxctl=3D"" +meson=3Dmeson =20 supported_cpu=3D"no" supported_os=3D"no" @@ -1002,6 +1003,8 @@ for opt do ;; --sphinx-build=3D*) sphinx_build=3D"$optarg" ;; + --meson=3D*) meson=3D"$optarg" + ;; --gcov=3D*) gcov_tool=3D"$optarg" ;; --smbd=3D*) smbd=3D"$optarg" @@ -1767,6 +1770,7 @@ Advanced options (experts only): --install=3DINSTALL use specified install [$install] --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] + --meson=3DMESON use specified meson [$meson] --smbd=3DSMBD use specified smbd [$smbd] --with-git=3DGIT use specified git [$git] --static enable static build [$static] @@ -1974,6 +1978,12 @@ python_version=3D$($python -c 'import sys; print("%d= .%d.%d" % (sys.version_info[0] # Suppress writing compiled files python=3D"$python -B" =20 +if ! has "$meson" +then + error_exit "Meson not found. Use --meson=3D/path/to/meson" +fi +meson=3D$(command -v $meson) + # Check that the C compiler works. Doing this here before testing # the host CPU ensures that we had a valid CC to autodetect the # $cpu var (and we should bail right here if that's not the case). @@ -6504,13 +6514,13 @@ elif test "$fortify_source" =3D "yes" ; then QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" debug=3Dno fi -if test "$debug" =3D "no"; then - CFLAGS=3D"-O2 $CFLAGS" -fi if test "$debug_info" =3D "yes"; then CFLAGS=3D"-g $CFLAGS" LDFLAGS=3D"-g $LDFLAGS" fi +if test "$debug" =3D "no"; then + CFLAGS=3D"-O2 $CFLAGS" +fi =20 if test "$have_asan" =3D "yes"; then QEMU_CFLAGS=3D"-fsanitize=3Daddress $QEMU_CFLAGS" @@ -7943,6 +7953,7 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak +echo "MESON=3D$meson" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak @@ -8571,6 +8582,27 @@ echo "# Automatically generated by configure - do no= t modify" > "$iotests_common echo >> "$iotests_common_env" echo "export PYTHON=3D'$python'" >> "$iotests_common_env" =20 +rm -rf meson-private/ meson-logs/ meson-info/ +NINJA=3D$PWD/ninjatool $meson setup \ + --prefix "$prefix" \ + --libdir "$libdir" \ + --libexecdir "$libexecdir" \ + --bindir "$bindir" \ + --includedir "$includedir" \ + --datadir "$datadir" \ + --mandir "$mandir" \ + --sysconfdir "$sysconfdir" \ + --localstatedir "$local_statedir" \ + -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ + -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ + -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ + -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ + "$PWD" "$source_path" + +if test "$?" -ne 0 ; then + error_exit "meson setup failed" +fi + # Save the configure command line for later reuse. cat <config.status #!/bin/sh diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..4ed1566 --- /dev/null +++ b/meson.build @@ -0,0 +1,20 @@ +project('qemu', ['c', 'cpp'], meson_version: '>=3D0.55.0', + default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_lundef=3Dfalse'], + version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) + +not_found =3D dependency('', required: false) +keyval =3D import('unstable-keyval') +config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') + +add_project_arguments(config_host['QEMU_CFLAGS'].split(), + language: ['c', 'objc']) +add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), + language: 'cpp') +add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), + language: ['c', 'cpp', 'objc']) +add_project_arguments(config_host['QEMU_INCLUDES'].split(), + language: ['c', 'cpp', 'objc']) + +configure_file(input: files('scripts/ninjatool.py'), + output: 'ninjatool', + configuration: config_host) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py new file mode 100755 index 0000000..e27413f --- /dev/null +++ b/scripts/ninjatool.py @@ -0,0 +1,1010 @@ +#! /bin/sh + +# Python module for parsing and processing .ninja files. +# +# Author: Paolo Bonzini +# +# Copyright (C) 2019 Red Hat, Inc. + + +# We don't want to put "#! @PYTHON@" as the shebang and +# make the file executable, so instead we make this a +# Python/shell polyglot. The first line below starts a +# multiline string literal for Python, while it is just +# ":" for bash. The closing of the multiline string literal +# is never parsed by bash since it exits before. + +'''': +case "$0" in + /*) me=3D$0 ;; + *) me=3D$(command -v "$0") ;; +esac +python=3D"@PYTHON@" +case $python in + @*) python=3Dpython3 ;; +esac +exec $python "$me" "$@" +exit 1 +''' + + +from collections import namedtuple, defaultdict +import sys +import os +import re +import json +import argparse +import shutil + + +class InvalidArgumentError(Exception): + pass + +# faster version of os.path.normpath: do nothing unless there is a double +# slash or a "." or ".." component. The filter does not have to be super +# precise, but it has to be fast. os.path.normpath is the hottest function +# for ninja2make without this optimization! +if os.path.sep =3D=3D '/': + def normpath(path, _slow_re=3Dre.compile('/[./]')): + return os.path.normpath(path) if _slow_re.search(path) or path[0] = =3D=3D '.' else path +else: + normpath =3D os.path.normpath + + +# ---- lexer and parser ---- + +PATH_RE =3D r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" + +SIMPLE_PATH_RE =3D re.compile(r"[^$\s:|]+") +IDENT_RE =3D re.compile(r"[a-zA-Z0-9_.-]+$") +STRING_RE =3D re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") +TOPLEVEL_RE =3D re.compile(r"([=3D:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|= .") +VAR_RE=3Dre.compile(r'\$\$|\$\{([^}]*)\}') + +BUILD =3D 1 +POOL =3D 2 +RULE =3D 3 +DEFAULT =3D 4 +EQUALS =3D 5 +COLON =3D 6 +PIPE =3D 7 +PIPE2 =3D 8 +IDENT =3D 9 +INCLUDE =3D 10 +INDENT =3D 11 +EOL =3D 12 + + +class LexerError(Exception): + pass + + +class ParseError(Exception): + pass + + +class NinjaParserEvents(object): + def __init__(self, parser): + self.parser =3D parser + + def dollar_token(self, word, in_path=3DFalse): + return '$$' if word =3D=3D '$' else word + + def variable_expansion_token(self, varname): + return '${%s}' % varname + + def variable(self, name, arg): + pass + + def begin_file(self): + pass + + def end_file(self): + pass + + def end_scope(self): + pass + + def begin_pool(self, name): + pass + + def begin_rule(self, name): + pass + + def begin_build(self, out, iout, rule, in_, iin, orderdep): + pass + + def default(self, targets): + pass + + +class NinjaParser(object): + + InputFile =3D namedtuple('InputFile', 'filename iter lineno') + + def __init__(self, filename, input): + self.stack =3D [] + self.top =3D None + self.iter =3D None + self.lineno =3D None + self.match_keyword =3D False + self.push(filename, input) + + def file_changed(self): + self.iter =3D self.top.iter + self.lineno =3D self.top.lineno + if self.top.filename is not None: + os.chdir(os.path.dirname(self.top.filename) or '.') + + def push(self, filename, input): + if self.top: + self.top.lineno =3D self.lineno + self.top.iter =3D self.iter + self.stack.append(self.top) + self.top =3D self.InputFile(filename=3Dfilename or 'stdin', + iter=3Dself._tokens(input), lineno=3D0) + self.file_changed() + + def pop(self): + if len(self.stack): + self.top =3D self.stack[-1] + self.stack.pop() + self.file_changed() + else: + self.top =3D self.iter =3D None + + def next_line(self, input): + line =3D next(input).rstrip() + self.lineno +=3D 1 + while len(line) and line[-1] =3D=3D '$': + line =3D line[0:-1] + next(input).strip() + self.lineno +=3D 1 + return line + + def print_token(self, tok): + if tok =3D=3D EOL: + return "end of line" + if tok =3D=3D BUILD: + return '"build"' + if tok =3D=3D POOL: + return '"pool"' + if tok =3D=3D RULE: + return '"rule"' + if tok =3D=3D DEFAULT: + return '"default"' + if tok =3D=3D EQUALS: + return '"=3D"' + if tok =3D=3D COLON: + return '":"' + if tok =3D=3D PIPE: + return '"|"' + if tok =3D=3D PIPE2: + return '"||"' + if tok =3D=3D INCLUDE: + return '"include"' + if tok =3D=3D IDENT: + return 'identifier' + return '"%s"' % tok + + def error(self, msg): + raise LexerError("%s:%d: %s" % (self.stack[-1].filename, self.line= no, msg)) + + def parse_error(self, msg): + raise ParseError("%s:%d: %s" % (self.stack[-1].filename, self.line= no, msg)) + + def expected(self, expected, tok): + msg =3D "found %s, expected " % (self.print_token(tok), ) + for i, exp_tok in enumerate(expected): + if i > 0: + msg =3D msg + (' or ' if i =3D=3D len(expected) - 1 else '= , ') + msg =3D msg + self.print_token(exp_tok) + self.parse_error(msg) + + def _variable_tokens(self, value): + for m in STRING_RE.finditer(value): + match =3D m.group(1) + if not match: + self.error("unexpected '%s'" % (m.group(0), )) + yield match + + def _tokens(self, input): + while True: + try: + line =3D self.next_line(input) + except StopIteration: + return + for m in TOPLEVEL_RE.finditer(line): + match =3D m.group(1) + if not match: + self.error("unexpected '%s'" % (m.group(0), )) + if match =3D=3D ':': + yield COLON + continue + if match =3D=3D '|': + yield PIPE + continue + if match =3D=3D '||': + yield PIPE2 + continue + if match[0] =3D=3D ' ': + yield INDENT + continue + if match[0] =3D=3D '=3D': + yield EQUALS + value =3D line[m.start() + 1:].lstrip() + yield from self._variable_tokens(value) + break + if match[0] =3D=3D '#': + break + + # identifier + if self.match_keyword: + if match =3D=3D 'build': + yield BUILD + continue + if match =3D=3D 'pool': + yield POOL + continue + if match =3D=3D 'rule': + yield RULE + continue + if match =3D=3D 'default': + yield DEFAULT + continue + if match =3D=3D 'include': + filename =3D line[m.start() + 8:].strip() + self.push(filename, open(filename, 'r')) + break + if match =3D=3D 'subninja': + self.error('subninja is not supported') + yield match + yield EOL + + def parse(self, events): + global_var =3D True + + def look_for(*expected): + # The last token in the token stream is always EOL. This + # is exploited to avoid catching StopIteration everywhere. + tok =3D next(self.iter) + if tok not in expected: + self.expected(expected, tok) + return tok + + def look_for_ident(*expected): + tok =3D next(self.iter) + if isinstance(tok, str): + if not IDENT_RE.match(tok): + self.parse_error('variable expansion not allowed') + elif tok not in expected: + self.expected(expected + (IDENT,), tok) + return tok + + def parse_assignment_rhs(gen, expected, in_path): + tokens =3D [] + for tok in gen: + if not isinstance(tok, str): + if tok in expected: + break + self.expected(expected + (IDENT,), tok) + if tok[0] !=3D '$': + tokens.append(tok) + elif tok =3D=3D '$ ' or tok =3D=3D '$$' or tok =3D=3D '$:': + tokens.append(events.dollar_token(tok[1], in_path)) + else: + var =3D tok[2:-1] if tok[1] =3D=3D '{' else tok[1:] + tokens.append(events.variable_expansion_token(var)) + else: + # gen must have raised StopIteration + tok =3D None + + if tokens: + # Fast path avoiding str.join() + value =3D tokens[0] if len(tokens) =3D=3D 1 else ''.join(t= okens) + else: + value =3D None + return value, tok + + def look_for_path(*expected): + # paths in build rules are parsed one space-separated token + # at a time and expanded + token =3D next(self.iter) + if not isinstance(token, str): + return None, token + # Fast path if there are no dollar and variable expansion + if SIMPLE_PATH_RE.match(token): + return token, None + gen =3D self._variable_tokens(token) + return parse_assignment_rhs(gen, expected, True) + + def parse_assignment(tok): + name =3D tok + assert isinstance(name, str) + look_for(EQUALS) + value, tok =3D parse_assignment_rhs(self.iter, (EOL,), False) + assert tok =3D=3D EOL + events.variable(name, value) + + def parse_build(): + # parse outputs + out =3D [] + iout =3D [] + while True: + value, tok =3D look_for_path(COLON, PIPE) + if value is None: + break + out.append(value) + if tok =3D=3D PIPE: + while True: + value, tok =3D look_for_path(COLON) + if value is None: + break + iout.append(value) + + # parse rule + assert tok =3D=3D COLON + rule =3D look_for_ident() + + # parse inputs and dependencies + in_ =3D [] + iin =3D [] + orderdep =3D [] + while True: + value, tok =3D look_for_path(PIPE, PIPE2, EOL) + if value is None: + break + in_.append(value) + if tok =3D=3D PIPE: + while True: + value, tok =3D look_for_path(PIPE2, EOL) + if value is None: + break + iin.append(value) + if tok =3D=3D PIPE2: + while True: + value, tok =3D look_for_path(EOL) + if value is None: + break + orderdep.append(value) + assert tok =3D=3D EOL + events.begin_build(out, iout, rule, in_, iin, orderdep) + nonlocal global_var + global_var =3D False + + def parse_pool(): + # pool declarations are ignored. Just gobble all the variables + ident =3D look_for_ident() + look_for(EOL) + events.begin_pool(ident) + nonlocal global_var + global_var =3D False + + def parse_rule(): + ident =3D look_for_ident() + look_for(EOL) + events.begin_rule(ident) + nonlocal global_var + global_var =3D False + + def parse_default(): + idents =3D [] + while True: + ident =3D look_for_ident(EOL) + if ident =3D=3D EOL: + break + idents.append(ident) + events.default(idents) + + def parse_declaration(tok): + if tok =3D=3D EOL: + return + + nonlocal global_var + if tok =3D=3D INDENT: + if global_var: + self.parse_error('indented line outside rule or edge') + tok =3D look_for_ident(EOL) + if tok =3D=3D EOL: + return + parse_assignment(tok) + return + + if not global_var: + events.end_scope() + global_var =3D True + if tok =3D=3D POOL: + parse_pool() + elif tok =3D=3D BUILD: + parse_build() + elif tok =3D=3D RULE: + parse_rule() + elif tok =3D=3D DEFAULT: + parse_default() + elif isinstance(tok, str): + parse_assignment(tok) + else: + self.expected((POOL, BUILD, RULE, INCLUDE, DEFAULT, IDENT)= , tok) + + events.begin_file() + while self.iter: + try: + self.match_keyword =3D True + token =3D next(self.iter) + self.match_keyword =3D False + parse_declaration(token) + except StopIteration: + self.pop() + events.end_file() + + +# ---- variable handling ---- + +def expand(x, rule_vars=3DNone, build_vars=3DNone, global_vars=3DNone): + if x is None: + return None + changed =3D True + have_dollar_replacement =3D False + while changed: + changed =3D False + matches =3D list(VAR_RE.finditer(x)) + if not matches: + break + + # Reverse the match so that expanding later matches does not + # invalidate m.start()/m.end() for earlier ones. Do not reduce $$= to $ + # until all variables are dealt with. + for m in reversed(matches): + name =3D m.group(1) + if not name: + have_dollar_replacement =3D True + continue + changed =3D True + if build_vars and name in build_vars: + value =3D build_vars[name] + elif rule_vars and name in rule_vars: + value =3D rule_vars[name] + elif name in global_vars: + value =3D global_vars[name] + else: + value =3D '' + x =3D x[:m.start()] + value + x[m.end():] + return x.replace('$$', '$') if have_dollar_replacement else x + + +class Scope(object): + def __init__(self, events): + self.events =3D events + + def on_left_scope(self): + pass + + def on_variable(self, key, value): + pass + + +class BuildScope(Scope): + def __init__(self, events, out, iout, rule, in_, iin, orderdep, rule_v= ars): + super().__init__(events) + self.rule =3D rule + self.out =3D [events.expand_and_normalize(x) for x in out] + self.in_ =3D [events.expand_and_normalize(x) for x in in_] + self.iin =3D [events.expand_and_normalize(x) for x in iin] + self.orderdep =3D [events.expand_and_normalize(x) for x in orderde= p] + self.iout =3D [events.expand_and_normalize(x) for x in iout] + self.rule_vars =3D rule_vars + self.build_vars =3D dict() + self._define_variable('out', ' '.join(self.out)) + self._define_variable('in', ' '.join(self.in_)) + + def expand(self, x): + return self.events.expand(x, self.rule_vars, self.build_vars) + + def on_left_scope(self): + self.events.variable('out', self.build_vars['out']) + self.events.variable('in', self.build_vars['in']) + self.events.end_build(self, self.out, self.iout, self.rule, self.i= n_, + self.iin, self.orderdep) + + def _define_variable(self, key, value): + # The value has been expanded already, quote it for further + # expansion from rule variables + value =3D value.replace('$', '$$') + self.build_vars[key] =3D value + + def on_variable(self, key, value): + # in and out are at the top of the lookup order and cannot + # be overridden. Also, unlike what the manual says, build + # variables only lookup global variables. They never lookup + # rule variables, earlier build variables, or in/out. + if key not in ('in', 'in_newline', 'out'): + self._define_variable(key, self.events.expand(value)) + + +class RuleScope(Scope): + def __init__(self, events, name, vars_dict): + super().__init__(events) + self.name =3D name + self.vars_dict =3D vars_dict + self.generator =3D False + + def on_left_scope(self): + self.events.end_rule(self, self.name) + + def on_variable(self, key, value): + self.vars_dict[key] =3D value + if key =3D=3D 'generator': + self.generator =3D True + + +class NinjaParserEventsWithVars(NinjaParserEvents): + def __init__(self, parser): + super().__init__(parser) + self.rule_vars =3D defaultdict(lambda: dict()) + self.global_vars =3D dict() + self.scope =3D None + + def variable(self, name, value): + if self.scope: + self.scope.on_variable(name, value) + else: + self.global_vars[name] =3D self.expand(value) + + def begin_build(self, out, iout, rule, in_, iin, orderdep): + if rule !=3D 'phony' and rule not in self.rule_vars: + self.parser.parse_error("undefined rule '%s'" % rule) + + self.scope =3D BuildScope(self, out, iout, rule, in_, iin, orderde= p, self.rule_vars[rule]) + + def begin_pool(self, name): + # pool declarations are ignored. Just gobble all the variables + self.scope =3D Scope(self) + + def begin_rule(self, name): + if name in self.rule_vars: + self.parser.parse_error("duplicate rule '%s'" % name) + self.scope =3D RuleScope(self, name, self.rule_vars[name]) + + def end_scope(self): + self.scope.on_left_scope() + self.scope =3D None + + # utility functions: + + def expand(self, x, rule_vars=3DNone, build_vars=3DNone): + return expand(x, rule_vars, build_vars, self.global_vars) + + def expand_and_normalize(self, x): + return normpath(self.expand(x)) + + # extra events not present in the superclass: + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + pass + + def end_rule(self, scope, name): + pass + + +# ---- test client that just prints back whatever it parsed ---- + +class Writer(NinjaParserEvents): + ARGS =3D argparse.ArgumentParser(description=3D'Rewrite input build.ni= nja to stdout.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output =3D output + self.indent =3D '' + self.had_vars =3D False + + def dollar_token(self, word, in_path=3DFalse): + return '$' + word + + def print(self, *args, **kwargs): + if len(args): + self.output.write(self.indent) + print(*args, **kwargs, file=3Dself.output) + + def variable(self, name, value): + self.print('%s =3D %s' % (name, value)) + self.had_vars =3D True + + def begin_scope(self): + self.indent =3D ' ' + self.had_vars =3D False + + def end_scope(self): + if self.had_vars: + self.print() + self.indent =3D '' + self.had_vars =3D False + + def begin_pool(self, name): + self.print('pool %s' % name) + self.begin_scope() + + def begin_rule(self, name): + self.print('rule %s' % name) + self.begin_scope() + + def begin_build(self, outputs, implicit_outputs, rule, inputs, implici= t, order_only): + all_outputs =3D list(outputs) + all_inputs =3D list(inputs) + + if implicit: + all_inputs.append('|') + all_inputs.extend(implicit) + if order_only: + all_inputs.append('||') + all_inputs.extend(order_only) + if implicit_outputs: + all_outputs.append('|') + all_outputs.extend(implicit_outputs) + + self.print('build %s: %s' % (' '.join(all_outputs), + ' '.join([rule] + all_inputs))) + self.begin_scope() + + def default(self, targets): + self.print('default %s' % ' '.join(targets)) + + +# ---- emit compile_commands.json ---- + +class Compdb(NinjaParserEventsWithVars): + ARGS =3D argparse.ArgumentParser(description=3D'Emit compile_commands.= json.') + ARGS.add_argument('rules', nargs=3D'*', + help=3D'The ninja rules to emit compilation commands= for.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output =3D output + self.rules =3D args.rules + self.sep =3D '' + + def begin_file(self): + self.output.write('[') + self.directory =3D os.getcwd() + + def print_entry(self, **entry): + entry['directory'] =3D self.directory + self.output.write(self.sep + json.dumps(entry)) + self.sep =3D ',\n' + + def begin_build(self, out, iout, rule, in_, iin, orderdep): + if in_ and rule in self.rules: + super().begin_build(out, iout, rule, in_, iin, orderdep) + else: + self.scope =3D Scope(self) + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + self.print_entry(command=3Dscope.expand('${command}'), file=3Din_[= 0]) + + def end_file(self): + self.output.write(']\n') + + +# ---- clean output files ---- + +class Clean(NinjaParserEventsWithVars): + ARGS =3D argparse.ArgumentParser(description=3D'Remove output build fi= les.') + ARGS.add_argument('-g', dest=3D'generator', action=3D'store_true', + help=3D'clean generated files too') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.dry_run =3D args.dry_run + self.verbose =3D args.verbose or args.dry_run + self.generator =3D args.generator + + def begin_file(self): + print('Cleaning... ', end=3D(None if self.verbose else ''), flush= =3DTrue) + self.cnt =3D 0 + + def end_file(self): + print('%d files' % self.cnt) + + def do_clean(self, *files): + for f in files: + if self.dry_run: + if os.path.exists(f): + self.cnt +=3D 1 + print('Would remove ' + f) + continue + else: + try: + if os.path.isdir(f): + shutil.rmtree(f) + else: + os.unlink(f) + self.cnt +=3D 1 + if self.verbose: + print('Removed ' + f) + except FileNotFoundError: + pass + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + if rule =3D=3D 'phony': + return + if self.generator: + rspfile =3D scope.expand('${rspfile}') + if rspfile: + self.do_clean(rspfile) + if self.generator or not scope.expand('${generator}'): + self.do_clean(*out, *iout) + depfile =3D scope.expand('${depfile}') + if depfile: + self.do_clean(depfile) + + +# ---- convert build.ninja to makefile ---- + +class Ninja2Make(NinjaParserEventsWithVars): + ARGS =3D argparse.ArgumentParser(description=3D'Convert build.ninja to= a Makefile.') + ARGS.add_argument('--clean', dest=3D'emit_clean', action=3D'store_true= ', + help=3D'Emit clean/distclean rules.') + ARGS.add_argument('--doublecolon', action=3D'store_true', + help=3D'Emit double-colon rules for phony targets.') + ARGS.add_argument('--omit', metavar=3D'TARGET', nargs=3D'+', + help=3D'Targets to omit.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output =3D output + + self.emit_clean =3D args.emit_clean + self.doublecolon =3D args.doublecolon + self.omit =3D set(args.omit) + + if self.emit_clean: + self.omit.update(['clean', 'distclean']) + + # Lists of targets are kept in memory and emitted only at the + # end because appending is really inefficient in GNU make. + # We only do it when it's O(#rules) or O(#variables), but + # never when it could be O(#targets). + self.depfiles =3D list() + self.rspfiles =3D list() + self.build_vars =3D defaultdict(lambda: dict()) + self.rule_targets =3D defaultdict(lambda: list()) + self.num_stamp =3D defaultdict(lambda: 0) + self.all_outs =3D set() + self.all_ins =3D set() + self.all_phony =3D set() + self.seen_default =3D False + + def print(self, *args, **kwargs): + print(*args, **kwargs, file=3Dself.output) + + def dollar_token(self, word, in_path=3DFalse): + if in_path and word =3D=3D ' ': + self.parser.parse_error('Make does not support spaces in filen= ames') + return '$$' if word =3D=3D '$' else word + + def print_phony(self, outs, ins): + targets =3D ' '.join(outs).replace('$', '$$') + deps =3D ' '.join(ins).replace('$', '$$') + deps =3D deps.strip() + if self.doublecolon: + self.print(targets + '::' + (' ' if deps else '') + deps + ';@= :') + else: + self.print(targets + ':' + (' ' if deps else '') + deps) + self.all_phony.update(outs) + + def begin_file(self): + self.print(r'# This is an automatically generated file, and it sho= ws.') + self.print(r'ninja-default:') + self.print(r'.PHONY: ninja-default') + if self.emit_clean: + self.print(r'ninja-clean:: ninja-clean-start; $(if $V,,@)rm -f= ${ninja-depfiles}') + self.print(r'ninja-clean-start:; $(if $V,,@echo Cleaning...)') + self.print(r'ninja-distclean:: clean; $(if $V,,@)rm -f ${ninja= -rspfiles}') + self.print(r'.PHONY: ninja-clean ninja-clean-start ninja-distc= lean') + self.print_phony(['clean'], ['ninja-clean']) + self.print_phony(['distclean'], ['ninja-distclean']) + self.print(r'vpath') + self.print(r'NULL :=3D') + self.print(r'SPACE :=3D ${NULL} #') + self.print(r'MAKEFLAGS +=3D -rR') + self.print(r'define NEWLINE') + self.print(r'') + self.print(r'endef') + self.print(r'.var.in_newline =3D $(subst $(SPACE),$(NEWLINE),${.va= r.in})') + self.print(r"ninja-command =3D $(if $V,,$(if ${.var.description},@= printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.command}") + self.print(r"ninja-command-restat =3D $(if $V,,$(if ${.var.descrip= tion},@printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.comm= and} && if test -e $(firstword ${.var.out}); then printf '%s\n' ${.var.out}= > $@; fi") + + def mangle_vars_for_make(self, x): + matches =3D list(VAR_RE.finditer(x)) + + # Reverse the match so that expanding later matches does not + # invalidate m.span() for earlier ones. + matches.reverse() + for m in matches: + match =3D m.group(1) + if not match: + continue + value =3D '${.var.' + match + '}' + x =3D x[:m.start()] + value + x[m.end():] + return x + + def end_file(self): + def natural_sort_key(s, _nsre=3Dre.compile('([0-9]+)')): + return [int(text) if text.isdigit() else text.lower() + for text in _nsre.split(s)] + + self.print() + self.print('ninja-outputdirs :=3D') + for rule in self.rule_vars: + if rule =3D=3D 'phony': + continue + self.print('ninja-targets-%s :=3D %s' % (rule, ' '.join(self.r= ule_targets[rule]))) + for name, value in self.rule_vars[rule].items(): + self.print('$(ninja-targets-%s): .var.%s =3D %s' % (rule, = name, self.mangle_vars_for_make(value))) + self.print('ninja-outputdirs +=3D $(sort $(dir ${ninja-targets= -%s}))' % rule) + self.print() + self.print('dummy :=3D $(shell mkdir -p . $(sort $(ninja-outputdir= s)))') + self.print('ninja-depfiles :=3D' + ' '.join(self.depfiles)) + self.print('ninja-rspfiles :=3D' + ' '.join(self.rspfiles)) + self.print('-include ${ninja-depfiles}') + self.print() + for targets in self.build_vars: + for name, value in self.build_vars[targets].items(): + self.print('%s: .var.%s :=3D %s' % (targets, name, value)) + self.print() + if not self.seen_default: + default_targets =3D sorted(self.all_outs - self.all_ins, key= =3Dnatural_sort_key) + self.print('ninja-default: ' + ' '.join(default_targets)) + + # This is a hack... Meson declares input meson.build files as + # phony, because Ninja does not have an equivalent of Make's + # "path/to/file:" declaration that ignores "path/to/file" even + # if it is absent. However, Makefile.ninja wants to depend on + # build.ninja, which in turn depends on these phony targets which + # would cause Makefile.ninja to be rebuilt in a loop. + phony_targets =3D sorted(self.all_phony - self.all_ins, key=3Dnatu= ral_sort_key) + self.print('.PHONY: ' + ' '.join(phony_targets)) + + def variable(self, name, value): + super().variable(name, value) + if self.scope is None: + self.global_vars[name] =3D self.expand(value) + self.print('.var.%s :=3D %s' % (name, self.global_vars[name])) + + def begin_build(self, out, iout, rule, in_, iin, orderdep): + if any(x in self.omit for x in out): + self.scope =3D Scope(self) + return + + super().begin_build(out, iout, rule, in_, iin, orderdep) + self.current_targets =3D ' '.join(self.scope.out + self.scope.iout= ).replace('$', '$$') + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + self.rule_targets[rule] +=3D self.scope.out + self.rule_targets[rule] +=3D self.scope.iout + + self.all_outs.update(self.scope.iout) + self.all_outs.update(self.scope.out) + self.all_ins.update(self.scope.in_) + self.all_ins.update(self.scope.iin) + + targets =3D self.current_targets + self.current_targets =3D None + if rule =3D=3D 'phony': + # Phony rules treat order-only dependencies as normal deps + self.print_phony(out + iout, in_ + iin + orderdep) + return + + inputs =3D ' '.join(in_ + iin).replace('$', '$$') + orderonly =3D ' '.join(orderdep).replace('$', '$$') + + rspfile =3D scope.expand('${rspfile}') + if rspfile: + rspfile_content =3D scope.expand('${rspfile_content}') + with open(rspfile, 'w') as f: + f.write(rspfile_content) + inputs +=3D ' ' + rspfile + self.rspfiles.append(rspfile) + + restat =3D 'restat' in self.scope.build_vars or 'restat' in self.r= ule_vars[rule] + if restat: + if len(out) =3D=3D 1: + stamp =3D out[0] + '.stamp' + else: + stamp =3D '%s%d.stamp' %(rule, self.num_stamp[rule]) + self.num_stamp[rule] +=3D 1 + self.print('%s: %s; @:' % (targets, stamp)) + self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, in= puts, orderonly)) + self.rule_targets[rule].append(stamp) + self.build_vars[stamp] =3D self.scope.build_vars + else: + self.print('%s: %s | %s; ${ninja-command}' % (targets, inputs,= orderonly)) + self.build_vars[targets] =3D self.scope.build_vars + + depfile =3D scope.expand('${depfile}') + if depfile: + self.depfiles.append(depfile) + + def end_rule(self, scope, name): + if self.emit_clean: + # Note that the generator pseudo-variable could also be attach= ed + # to a build block rather than a rule. This is not handled he= re + # in order to reduce the number of "rm" invocations. However, + # "ninjatool.py -t clean" does that correctly. + self.print('ninja-%s:: ; $(if $V,,@)rm -rf ${ninja-targets-%s}= ' % ( + 'distclean' if scope.generator else 'clean', + name)) + + def default(self, targets): + self.print("ninja-default: " + ' '.join(targets)) + self.seen_default =3D True + + +# ---- command line parsing ---- + +# we cannot use subparsers because tools are chosen through the "-t" +# option. + +class ToolAction(argparse.Action): + def __init__(self, option_strings, dest, choices, metavar=3D'TOOL', na= rgs=3DNone, **kwargs): + if nargs is not None: + raise ValueError("nargs not allowed") + super().__init__(option_strings, dest, required=3DTrue, choices=3D= choices, + metavar=3Dmetavar, **kwargs) + + def __call__(self, parser, namespace, value, option_string): + tool =3D self.choices[value] + setattr(namespace, self.dest, tool) + tool.ARGS.prog =3D '%s %s %s' % (parser.prog, option_string, value) + + +class ToolHelpAction(argparse.Action): + def __init__(self, option_strings, dest, nargs=3DNone, **kwargs): + if nargs is not None: + raise ValueError("nargs not allowed") + super().__init__(option_strings, dest, nargs=3D0, **kwargs) + + def __call__(self, parser, namespace, values, option_string=3DNone): + if namespace.tool: + namespace.tool.ARGS.print_help() + else: + parser.print_help() + parser.exit() + + +tools =3D { + 'test': Writer, + 'ninja2make': Ninja2Make, + 'compdb': Compdb, + 'clean': Clean, +} + +parser =3D argparse.ArgumentParser(description=3D'Process and transform bu= ild.ninja files.', + add_help=3DFalse) +parser.add_argument('-C', metavar=3D'DIR', dest=3D'dir', default=3D'.', + help=3D'change to DIR before doing anything else') +parser.add_argument('-f', metavar=3D'FILE', dest=3D'file', default=3D'buil= d.ninja', + help=3D'specify input build file [default=3Dbuild.ninj= a]') +parser.add_argument('-n', dest=3D'dry_run', action=3D'store_true', + help=3D'do not actually do anything') +parser.add_argument('-v', dest=3D'verbose', action=3D'store_true', + help=3D'be more verbose') + +parser.add_argument('-t', dest=3D'tool', choices=3Dtools, action=3DToolAct= ion, + help=3D'choose the tool to run') +parser.add_argument('-h', '--help', action=3DToolHelpAction, + help=3D'show this help message and exit') + +if len(sys.argv) >=3D 2 and sys.argv[1] =3D=3D '--version': + print('1.8') + sys.exit(0) + +args, tool_args =3D parser.parse_known_args() +args.tool.ARGS.parse_args(tool_args, args) + +os.chdir(args.dir) +with open(args.file, 'r') as f: + parser =3D NinjaParser(args.file, f) + try: + events =3D args.tool(sys.stdout, parser, args) + except InvalidArgumentError as e: + parser.error(str(e)) + parser.parse(events) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079813; cv=none; d=zohomail.com; s=zohoarc; b=P6Zq1d/d1o8fLJFwNmXDAZkH8J5oPnsK6vfsrRhkPPVAxJTsTSZXvf60nQ2fhSj3NXKcvTseYeAT0l1xXvkcNglGRbA6rDrOtGbNI96ewzVlHrU6x5X7647vUIpJMOhGutsbQmP6qEC64k8Rd0ebLdffwrqT99QKjcxDq9JSoyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079813; 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=f1N4ofAFt8gge/A1hpgmW713jHeM+0oHS9zGyfXW/vA=; b=RPnoObQSnzDtE2alD3QK9+RfBYb5nAr2AbYm6ed7ihcp8uv9KJdRaPkoAIGvt7Dgd9Tc1CVOZ2dNJ6nIdYVeHZcFePuB1vClCSkEdw9RVkuvY5hw27lmFBpNcH2uAAnBrbg3K4i2+g+hzljQFGk1Ox3rg2UrxwtuWOxYdKoapvU= 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 1597079813059459.40706800217515; Mon, 10 Aug 2020 10:16:53 -0700 (PDT) Received: from localhost ([::1]:59102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BPn-0001OK-Nw for importer@patchew.org; Mon, 10 Aug 2020 13:16:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIu-000607-BU for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BIr-0002kg-Al for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:43 -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-489-0UyTpUyYPCi9KBP5bNT_0A-1; Mon, 10 Aug 2020 13:09:38 -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 27A4B80BCAB for ; Mon, 10 Aug 2020 17:09:38 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 693645F1E9; Mon, 10 Aug 2020 17:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079380; 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=f1N4ofAFt8gge/A1hpgmW713jHeM+0oHS9zGyfXW/vA=; b=C4qcwZVBIlu5drWRhTIoym6oRd0ZcD7Yja7pcOdhq6BMJ2ku5eC9lKJ+j7oBEQamcpNCJs MYyAvvapHe/YXz19fAvaKReovzcowMmBZOqGzmCwJGjniZRc4knr5fTVD2Nz78ulgo/31v qe2pASYFwORlTs9rJjLIoWHCdlY7M9c= X-MC-Unique: 0UyTpUyYPCi9KBP5bNT_0A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 016/147] configure: generate Meson cross file Date: Mon, 10 Aug 2020 19:06:54 +0200 Message-Id: <1597079345-42801-17-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=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/10 11:11:16 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 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 --- configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/configure b/configure index ad5bd1a..f38c783 100755 --- a/configure +++ b/configure @@ -8582,6 +8582,49 @@ echo "# Automatically generated by configure - do no= t modify" > "$iotests_common echo >> "$iotests_common_env" echo "export PYTHON=3D'$python'" >> "$iotests_common_env" =20 +cross=3D"config-meson.cross" +cross_arg=3D + +if test -n "$cross_prefix"; then + echo "# Automatically generated by configure - do not modify" > $cross + echo "[binaries]" >> $cross + echo "c =3D '$cc'" >> $cross + echo "cpp =3D '$cxx'" >> $cross + echo "ar =3D '$ar'" >> $cross + echo "nm =3D '$nm'" >> $cross + echo "pkgconfig =3D '$pkg_config_exe'" >> $cross + echo "ranlib =3D '$ranlib'" >> $cross + echo "strip =3D '$strip'" >> $cross + echo "windres =3D '$windres'" >> $cross + + echo "[properties]" >> $cross + echo "root =3D '$prefix'" >> $cross + + echo "[host_machine]" >> $cross +if test "$mingw32" =3D "yes" ; then + echo "system =3D 'windows'" >> $cross +fi +case "$ARCH" in + i386|x86_64) + echo "cpu_family =3D 'x86'" >> $cross + ;; + ppc64le) + echo "cpu_family =3D 'ppc64'" >> $cross + ;; + *) + echo "cpu_family =3D '$ARCH'" >> $cross + ;; +esac + echo "cpu =3D '$cpu'" >> $cross +if test "$bigendian" =3D "yes" ; then + echo "endian =3D 'big'" >> $cross +else + echo "endian =3D 'little'" >> $cross +fi + + cross_arg=3D"--cross-file=3D$cross" +fi + rm -rf meson-private/ meson-logs/ meson-info/ NINJA=3D$PWD/ninjatool $meson setup \ --prefix "$prefix" \ @@ -8597,11 +8640,13 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ + $cross_arg \ "$PWD" "$source_path" =20 if test "$?" -ne 0 ; then error_exit "meson setup failed" fi +touch ninjatool.stamp =20 # Save the configure command line for later reuse. cat <config.status --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080023; cv=none; d=zohomail.com; s=zohoarc; b=b/lB2MZQzUAKIX87jS+YG4Qqcg/v9fsFnN8G/rX4w0ilq2gVzBmZ/XtEmrV1YT/MsJH1iMFvVD5XRgwY4iOENw1wQTGQ95VROiEymzjdvxXcuTV6TgmpSbPJ4pG3lHJD+9GM7Nm+Xi5EKd0uq6uncvBsEbnyDhbtrgtITIT/7mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080023; 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=sLitUbpbM6irG8a+7TtGiqB3QI3hJzEWoxne18gjXGA=; b=m3uOG2F/YAjDT38SsnH81pkcuaGxaYpnswFTjD0nsCn4hijq7+lSKjktXj2ooHzIzGxsorpy95k6TOYxw1wU4pVu9/Iu9LS2nx8PSAT/wcTnVtInjy7GwJdACJ5q1OcNmlRsKS/KWmF6tiiLHvSUv9QUGGeIILyyB5ZV4G9KbY4= 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 1597080023230595.8455251217131; Mon, 10 Aug 2020 10:20:23 -0700 (PDT) Received: from localhost ([::1]:49632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BTB-0000jI-Mv for importer@patchew.org; Mon, 10 Aug 2020 13:20:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIu-00060C-D1 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42380 helo=us-smtp-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 1k5BIs-0002km-Hx for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:44 -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-547-bYfuge8SPZSaWKvy_ObeYA-1; Mon, 10 Aug 2020 13:09:40 -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 85C4779EC0 for ; Mon, 10 Aug 2020 17:09:39 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92B525F1E9; Mon, 10 Aug 2020 17:09:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079381; 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=sLitUbpbM6irG8a+7TtGiqB3QI3hJzEWoxne18gjXGA=; b=Gso+xKpunmRDyVi9Alv8IH4IV1vo9FqBtF28uBdWFlBsU+M2gOD//5QLX0jPwBSSCB10JR WXQlBTUpLVMBGZHT70e9VGry0pNq0Lm+J+p+u+l28SbYms8XWoYXBQBI0cTbH1W+DlJcvJ gMPfWbELYfTDDZb6wn6fKojVHRL/djE= X-MC-Unique: bYfuge8SPZSaWKvy_ObeYA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 017/147] build-sys hack: link with whole .fa archives Date: Mon, 10 Aug 2020 19:06:55 +0200 Message-Id: <1597079345-42801-18-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 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 In order to link the *-obj-y files into tests, we will make static libraries of them in Meson, and then link them as whole archives into the tests. To separate regular static libraries from link-whole libraries, give them a different file extension. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- rules.mak | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/rules.mak b/rules.mak index e79a400..5ab42de 100644 --- a/rules.mak +++ b/rules.mak @@ -39,6 +39,13 @@ find-symbols =3D $(if $1, $(sort $(shell $(NM) -P -g $1 = | $2))) defined-symbols =3D $(call find-symbols,$1,awk '$$2!=3D"U"{print $$1}') undefined-symbols =3D $(call find-symbols,$1,awk '$$2=3D=3D"U"{print $$1}') =20 +WL :=3D -Wl, +ifdef CONFIG_DARWIN +whole-archive =3D $(WL)-force_load,$1 +else +whole-archive =3D $(WL)--whole-archive $1 $(WL)--no-whole-archive +endif + # All the .mo objects in -m variables are also added into corresponding -y # variable in unnest-vars, but filtered out here, when LINK is called. # @@ -54,11 +61,12 @@ undefined-symbols =3D $(call find-symbols,$1,awk '$$2= =3D=3D"U"{print $$1}') # This is necessary because the exectuable itself may not use the function= , in # which case the function would not be linked in. Then the DSO loading will # fail because of the missing symbol. -process-archive-undefs =3D $(filter-out %.a %.mo,$1) \ +process-archive-undefs =3D $(filter-out %.a %.fa %.mo,$1) \ $(addprefix $(WL_U), \ - $(filter $(call defined-symbols,$(filter %.a, $1)), \ + $(filter $(call defined-symbols,$(filter %.a %.fa, $1= )), \ $(call undefined-symbols,$(filter %.mo,$1)))= ) \ - $(filter %.a,$1) + $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ + $(filter %.a,$1) =20 extract-libs =3D $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs))) expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ @@ -122,7 +130,7 @@ LD_REL :=3D $(CC) -nostdlib $(LD_REL_FLAGS) modules: =20 %$(EXESUF): %.o - $(call LINK,$(filter %.o %.a %.mo, $^)) + $(call LINK,$(filter %.o %.a %.mo %.fa, $^)) =20 %.a: $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@") @@ -378,7 +386,7 @@ define unnest-vars $(error $o added in $v but $o-objs is not set))) $(shell mkdir -p ./ $(sort $(dir $($v)))) # Include all the .d files - $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$($v)))) + $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.= o,$($v))))) $(eval $v :=3D $(filter-out %/,$($v)))) endef =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079719; cv=none; d=zohomail.com; s=zohoarc; b=XctmqHcHFLtnLaEmwr1h7vP3cSrf6p1C2cTrTwxQ8NKcmjvmBMkskoXrNvU9h6X8uQw9Jf5fHjVtqepGI4IOmtqQfuaWD++nVB+NLWzr6VR5xfCVIGnwrLufzM+M5y7VATLdRJUbnQYnjPivYVWkx+BJ8/jFP8kksloSM5UoZnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079719; 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=O7cxn5J4sGqTvFBek06hM8KZMfta5GjJogEHUyghwho=; b=emm7j5Y4+uwAHNtX30R3xqIeyp6/YCT89Np1EljFDzEqsGuuCaTiuaZ9O3nAI5r5wrraArbBX3PWIfXXEmbAn0jT+hgBkssuwOQEHMOnWfSuXdMi3KbYjlDVKO8zlsMEnadkQXK/hl0hCK0OS25Qn8e22b7aAPnJis3RZUJOC3Q= 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 1597079719531924.0928563611199; Mon, 10 Aug 2020 10:15:19 -0700 (PDT) Received: from localhost ([::1]:52488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BOI-00072O-21 for importer@patchew.org; Mon, 10 Aug 2020 13:15:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIx-00068B-K9 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:47 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49895 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 1k5BIv-0002lC-DS for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:47 -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-538-Nx6-JlKrNey-oMavMassxQ-1; Mon, 10 Aug 2020 13:09:41 -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 E41CB107ACCA for ; Mon, 10 Aug 2020 17:09:40 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1C7D5F1E9; Mon, 10 Aug 2020 17:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079384; 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=O7cxn5J4sGqTvFBek06hM8KZMfta5GjJogEHUyghwho=; b=P8An2HjFXqV2+1AWBvPHEgojWr3x/CYlwBr3S78pFEFaHXDZo9pbV8okTemjbOQ3SdJz/1 R7inp2Ry7XSe9+UGbjTq/+ccSsj8ToWnvq4S4VdemyySuf+kQo32A1ZVduVnx8HFD430WK NrO5+pbRKmREhlbWh+4sXmNNiaCSTEI= X-MC-Unique: Nx6-JlKrNey-oMavMassxQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 018/147] build-sys: add meson submodule Date: Mon, 10 Aug 2020 19:06:56 +0200 Message-Id: <1597079345-42801-19-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- .gitmodules | 3 +++ configure | 53 ++++++++++++++++++++++++++++++++++++++++++-= ---- meson | 1 + scripts/archive-source.sh | 3 ++- 4 files changed, 54 insertions(+), 6 deletions(-) create mode 160000 meson diff --git a/.gitmodules b/.gitmodules index 9c0501a..ce97939 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "roms/qboot"] path =3D roms/qboot url =3D https://github.com/bonzini/qboot +[submodule "meson"] + path =3D meson + url =3D https://github.com/mesonbuild/meson/ diff --git a/configure b/configure index f38c783..5806f92 100755 --- a/configure +++ b/configure @@ -174,6 +174,25 @@ path_of() { return 1 } =20 +version_ge () { + local_ver1=3D`echo $1 | tr . ' '` + local_ver2=3D`echo $2 | tr . ' '` + while true; do + set x $local_ver1 + local_first=3D${2-0} + # shift 2 does nothing if there are less than 2 arguments + shift; shift + local_ver1=3D$* + set x $local_ver2 + # the second argument finished, the first must be greater or equal + test $# =3D 1 && return 0 + test $local_first -lt $2 && return 1 + test $local_first -gt $2 && return 0 + shift; shift + local_ver2=3D$* + done +} + have_backend () { echo "$trace_backends" | grep "$1" >/dev/null } @@ -506,7 +525,7 @@ fuzzing=3D"no" rng_none=3D"no" secret_keyring=3D"" libdaxctl=3D"" -meson=3Dmeson +meson=3D"" =20 supported_cpu=3D"no" supported_os=3D"no" @@ -1978,11 +1997,35 @@ python_version=3D$($python -c 'import sys; print("%= d.%d.%d" % (sys.version_info[0] # Suppress writing compiled files python=3D"$python -B" =20 -if ! has "$meson" -then - error_exit "Meson not found. Use --meson=3D/path/to/meson" +if test -z "$meson" ; then + if has meson && version_ge "$(meson --version)" 0.55.0; then + meson=3Dmeson + elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then + meson=3Dgit + elif test -e "${source_path}/meson/meson.py" ; then + meson=3Dinternal + fi +fi + +if test "$meson" =3D git; then + git_submodules=3D"${git_submodules} meson" fi -meson=3D$(command -v $meson) +if test "$git_update" =3D yes; then + (cd "${source_path}" && GIT=3D"$git" "./scripts/git-submodule.sh" upda= te "$git_submodules") +fi + +case "$meson" in + git | internal) + meson=3D${source_path}/meson/meson.py + ;; + *) + meson=3D$(command -v meson) + if ! has "$meson" ; then + error_exit "Meson not found. Use --meson=3D/path/to/meson|git|= internal" + fi + ;; +esac +meson=3D"$python $meson" =20 # Check that the C compiler works. Doing this here before testing # the host CPU ensures that we had a valid CC to autodetect the diff --git a/meson b/meson new file mode 160000 index 0000000..d0c68dc --- /dev/null +++ b/meson @@ -0,0 +1 @@ +Subproject commit d0c68dc11507a47b9b85de508e023d9590d60565 diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index fb5d6b3..c6169db 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,8 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 test= s/fp/berkeley-testfloat-3" +submodules=3D"dtc slirp meson ui/keycodemapdb" +submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 function cleanup() { --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079840; cv=none; d=zohomail.com; s=zohoarc; b=Y51Zg5iMu/rCDK/fKiJNbLPUin/ba0ys9wQWAq3nM4C22v9oBKkfPwQK34qh9AX1ERkcGtJGQnBy0o3brgEGzouYIi6hYIWoOXU+tkZaX2Rb5wv//GWCnLgn4PEI+t5Jgfm3zPePmCSvBgEieZUrDLSISwUGrZw/s+lnBlhJatM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079840; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+lRvOk8N6wMg+BIJtIWSOwS3W99WAVdKijhLPNVFO6A=; b=hVDv0wPsUAoumBMxM1rwwEz2DCBp65J5lsBMQz2fvHZadJBV8//Ga6/CAZ/SA+tCQ87kVHQw9P1uOo8SBovPsv12I+EYJD6tQb+SFrlt6ea9rLo2/PW88siUfNJ8BgF3k6TEKjPgZksgjKDrz6s9i7Kss/PthGcPovr9qoq0AQU= 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 1597079840730340.9746705892869; Mon, 10 Aug 2020 10:17:20 -0700 (PDT) Received: from localhost ([::1]:60670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BQF-00022A-E5 for importer@patchew.org; Mon, 10 Aug 2020 13:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIy-0006Cn-VB for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:59844 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 1k5BIv-0002lG-OL for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:48 -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-192-VZ8ePay7PuW7BTGW9C-E0A-1; Mon, 10 Aug 2020 13:09:42 -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 13A75102C7F1 for ; Mon, 10 Aug 2020 17:09:42 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C6F45F1E9 for ; Mon, 10 Aug 2020 17:09:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+lRvOk8N6wMg+BIJtIWSOwS3W99WAVdKijhLPNVFO6A=; b=aEDgtBPOO+5lU2m4fYnJzEsCHK7Kt1iwDskq4+Ymk+B5L9O2D5YPJ3H6qjEymUMBUL/nMV pNuPkpe+cTFQu5YxtMASBhIXfk3VZHN9swkNFPSGiurym625nETT9ibJLfUQT5TUeJo1Sr 3rlI/0EHz3lMGyPZEb1Zpocm4WTye+o= X-MC-Unique: VZ8ePay7PuW7BTGW9C-E0A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 019/147] meson: move summary to meson.build Date: Mon, 10 Aug 2020 19:06:57 +0200 Message-Id: <1597079345-42801-20-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 235 --------------------------------------------------------- meson.build | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 247 insertions(+), 235 deletions(-) diff --git a/configure b/configure index 5806f92..9b6f0d9 100755 --- a/configure +++ b/configure @@ -527,8 +527,6 @@ secret_keyring=3D"" libdaxctl=3D"" meson=3D"" =20 -supported_cpu=3D"no" -supported_os=3D"no" bogus_os=3D"no" malloc_trim=3D"" =20 @@ -767,35 +765,27 @@ ARCH=3D # Note that this case should only have supported host CPUs, not guests. case "$cpu" in ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64) - supported_cpu=3D"yes" ;; ppc64le) ARCH=3D"ppc64" - supported_cpu=3D"yes" ;; i386|i486|i586|i686|i86pc|BePC) cpu=3D"i386" - supported_cpu=3D"yes" ;; x86_64|amd64) cpu=3D"x86_64" - supported_cpu=3D"yes" ;; armv*b|armv*l|arm) cpu=3D"arm" - supported_cpu=3D"yes" ;; aarch64) cpu=3D"aarch64" - supported_cpu=3D"yes" ;; mips*) cpu=3D"mips" - supported_cpu=3D"yes" ;; sparc|sun4[cdmuv]) cpu=3D"sparc" - supported_cpu=3D"yes" ;; *) # This will result in either an error or falling back to TCI later @@ -823,7 +813,6 @@ MINGW32*) audio_drv_list=3D"" fi supported_os=3D"yes" - pie=3D"no" ;; GNU/kFreeBSD) bsd=3D"yes" @@ -841,7 +830,6 @@ FreeBSD) libs_qga=3D"-lutil $libs_qga" netmap=3D"" # enable netmap autodetect HOST_VARIANT_DIR=3D"freebsd" - supported_os=3D"yes" ;; DragonFly) bsd=3D"yes" @@ -858,7 +846,6 @@ NetBSD) audio_possible_drivers=3D"oss sdl" oss_lib=3D"-lossaudio" HOST_VARIANT_DIR=3D"netbsd" - supported_os=3D"yes" ;; OpenBSD) bsd=3D"yes" @@ -866,7 +853,6 @@ OpenBSD) audio_drv_list=3D"try-sdl" audio_possible_drivers=3D"sdl" HOST_VARIANT_DIR=3D"openbsd" - supported_os=3D"yes" ;; Darwin) bsd=3D"yes" @@ -887,7 +873,6 @@ Darwin) # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" HOST_VARIANT_DIR=3D"darwin" - supported_os=3D"yes" ;; SunOS) solaris=3D"yes" @@ -918,7 +903,6 @@ Linux) linux_user=3D"yes" kvm=3D"yes" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I$PWD/linux-head= ers $QEMU_INCLUDES" - supported_os=3D"yes" libudev=3D"yes" ;; esac @@ -6860,225 +6844,6 @@ QEMU_CFLAGS=3D"$pixman_cflags $fdt_cflags $QEMU_CFL= AGS" QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" libs_softmmu=3D"$pixman_libs $libs_softmmu" =20 -echo "Install prefix $prefix" -echo "BIOS directory $(eval echo $qemu_datadir)" -echo "firmware path $(eval echo $firmwarepath)" -echo "binary directory $(eval echo $bindir)" -echo "library directory $(eval echo $libdir)" -echo "module directory $(eval echo $qemu_moddir)" -echo "libexec directory $(eval echo $libexecdir)" -echo "include directory $(eval echo $includedir)" -echo "config directory $(eval echo $sysconfdir)" -if test "$mingw32" =3D "no" ; then -echo "local state directory $(eval echo $local_statedir)" -echo "Manual directory $(eval echo $mandir)" -echo "ELF interp prefix $interp_prefix" -else -echo "local state directory queried at runtime" -echo "Windows SDK $win_sdk" -fi -echo "Build directory $(pwd)" -echo "Source path $source_path" -echo "GIT binary $git" -echo "GIT submodules $git_submodules" -echo "C compiler $cc" -echo "Host C compiler $host_cc" -echo "C++ compiler $cxx" -echo "Objective-C compiler $objcc" -echo "ARFLAGS $ARFLAGS" -echo "CFLAGS $CFLAGS" -echo "QEMU_CFLAGS $QEMU_CFLAGS" -echo "QEMU_LDFLAGS $QEMU_LDFLAGS" -echo "make $make" -echo "install $install" -echo "python $python ($python_version)" -if test "$docs" !=3D "no"; then - echo "sphinx-build $sphinx_build" -fi -echo "genisoimage $genisoimage" -echo "slirp support $slirp $(echo_version $slirp $slirp_version)" -if test "$slirp" !=3D "no" ; then - echo "smbd $smbd" -fi -echo "module support $modules" -echo "alt path mod load $module_upgrades" -echo "host CPU $cpu" -echo "host big endian $bigendian" -echo "target list $target_list" -echo "gprof enabled $gprof" -echo "sparse enabled $sparse" -echo "strip binaries $strip_opt" -echo "profiler $profiler" -echo "static build $static" -echo "safe stack $safe_stack" -if test "$darwin" =3D "yes" ; then - echo "Cocoa support $cocoa" -fi -echo "SDL support $sdl $(echo_version $sdl $sdlversion)" -echo "SDL image support $sdl_image" -echo "GTK support $gtk $(echo_version $gtk $gtk_version)" -echo "GTK GL support $gtk_gl" -echo "VTE support $vte $(echo_version $vte $vteversion)" -echo "TLS priority $tls_priority" -echo "GNUTLS support $gnutls" -echo "libgcrypt $gcrypt" -if test "$gcrypt" =3D "yes" -then - echo " hmac $gcrypt_hmac" - echo " XTS $gcrypt_xts" -fi -echo "nettle $nettle $(echo_version $nettle $nettle_version)" -if test "$nettle" =3D "yes" -then - echo " XTS $nettle_xts" -fi -echo "libtasn1 $tasn1" -echo "PAM $auth_pam" -echo "iconv support $iconv" -echo "curses support $curses" -echo "virgl support $virglrenderer $(echo_version $virglrenderer $virg= l_version)" -echo "curl support $curl" -echo "mingw32 support $mingw32" -echo "Audio drivers $audio_drv_list" -echo "Block whitelist (rw) $block_drv_rw_whitelist" -echo "Block whitelist (ro) $block_drv_ro_whitelist" -echo "VirtFS support $virtfs" -echo "Multipath support $mpath" -echo "VNC support $vnc" -if test "$vnc" =3D "yes" ; then - echo "VNC SASL support $vnc_sasl" - echo "VNC JPEG support $vnc_jpeg" - echo "VNC PNG support $vnc_png" -fi -echo "xen support $xen" -if test "$xen" =3D "yes" ; then - echo "xen ctrl version $xen_ctrl_version" -fi -echo "brlapi support $brlapi" -echo "Documentation $docs" -echo "PIE $pie" -echo "vde support $vde" -echo "netmap support $netmap" -echo "Linux AIO support $linux_aio" -echo "Linux io_uring support $linux_io_uring" -echo "ATTR/XATTR support $attr" -echo "Install blobs $blobs" -echo "KVM support $kvm" -echo "HAX support $hax" -echo "HVF support $hvf" -echo "WHPX support $whpx" -echo "TCG support $tcg" -if test "$tcg" =3D "yes" ; then - echo "TCG debug enabled $debug_tcg" - echo "TCG interpreter $tcg_interpreter" -fi -echo "malloc trim support $malloc_trim" -echo "RDMA support $rdma" -echo "PVRDMA support $pvrdma" -echo "fdt support $fdt" -echo "membarrier $membarrier" -echo "preadv support $preadv" -echo "fdatasync $fdatasync" -echo "madvise $madvise" -echo "posix_madvise $posix_madvise" -echo "posix_memalign $posix_memalign" -echo "libcap-ng support $cap_ng" -echo "vhost-net support $vhost_net" -echo "vhost-crypto support $vhost_crypto" -echo "vhost-scsi support $vhost_scsi" -echo "vhost-vsock support $vhost_vsock" -echo "vhost-user support $vhost_user" -echo "vhost-user-fs support $vhost_user_fs" -echo "vhost-vdpa support $vhost_vdpa" -echo "Trace backends $trace_backends" -if have_backend "simple"; then -echo "Trace output file $trace_file-" -fi -echo "spice support $spice $(echo_version $spice $spice_protocol_versi= on/$spice_server_version)" -echo "rbd support $rbd" -echo "xfsctl support $xfs" -echo "smartcard support $smartcard" -echo "libusb $libusb" -echo "usb net redir $usb_redir" -echo "OpenGL support $opengl" -echo "OpenGL dmabufs $opengl_dmabuf" -echo "libiscsi support $libiscsi" -echo "libnfs support $libnfs" -echo "build guest agent $guest_agent" -echo "QGA VSS support $guest_agent_with_vss" -echo "QGA w32 disk info $guest_agent_ntddscsi" -echo "QGA MSI support $guest_agent_msi" -echo "seccomp support $seccomp" -echo "coroutine backend $coroutine" -echo "coroutine pool $coroutine_pool" -echo "debug stack usage $debug_stack_usage" -echo "mutex debugging $debug_mutex" -echo "crypto afalg $crypto_afalg" -echo "GlusterFS support $glusterfs" -echo "gcov $gcov_tool" -echo "gcov enabled $gcov" -echo "TPM support $tpm" -echo "libssh support $libssh" -echo "QOM debugging $qom_cast_debug" -echo "Live block migration $live_block_migration" -echo "lzo support $lzo" -echo "snappy support $snappy" -echo "bzip2 support $bzip2" -echo "lzfse support $lzfse" -echo "zstd support $zstd" -echo "NUMA host support $numa" -echo "libxml2 $libxml2" -echo "tcmalloc support $tcmalloc" -echo "jemalloc support $jemalloc" -echo "avx2 optimization $avx2_opt" -echo "avx512f optimization $avx512f_opt" -echo "replication support $replication" -echo "bochs support $bochs" -echo "cloop support $cloop" -echo "dmg support $dmg" -echo "qcow v1 support $qcow1" -echo "vdi support $vdi" -echo "vvfat support $vvfat" -echo "qed support $qed" -echo "parallels support $parallels" -echo "sheepdog support $sheepdog" -echo "capstone $capstone" -echo "libpmem support $libpmem" -echo "libdaxctl support $libdaxctl" -echo "libudev $libudev" -echo "default devices $default_devices" -echo "plugin support $plugins" -echo "fuzzing support $fuzzing" -echo "gdb $gdb_bin" -echo "rng-none $rng_none" -echo "Linux keyring $secret_keyring" - -if test "$supported_cpu" =3D "no"; then - echo - echo "WARNING: SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEAS= ES!" - echo - echo "CPU host architecture $cpu support is not currently maintained." - echo "The QEMU project intends to remove support for this host CPU in" - echo "a future release if nobody volunteers to maintain it and to" - echo "provide a build host for our continuous integration setup." - echo "configure has succeeded and you can continue to build, but" - echo "if you care about QEMU on this platform you should contact" - echo "us upstream at qemu-devel@nongnu.org." -fi - -if test "$supported_os" =3D "no"; then - echo - echo "WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEASE= S!" - echo - echo "Host OS $targetos support is not currently maintained." - echo "The QEMU project intends to remove support for this host OS in" - echo "a future release if nobody volunteers to maintain it and to" - echo "provide a build host for our continuous integration setup." - echo "configure has succeeded and you can continue to build, but" - echo "if you care about QEMU on this platform you should contact" - echo "us upstream at qemu-devel@nongnu.org." -fi - config_host_mak=3D"config-host.mak" =20 echo "# Automatically generated by configure - do not modify" >config-all-= disas.mak diff --git a/meson.build b/meson.build index 4ed1566..cc08534 100644 --- a/meson.build +++ b/meson.build @@ -15,6 +15,253 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].= split(), add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: ['c', 'cpp', 'objc']) =20 +python =3D import('python').find_installation(config_host['PYTHON'].split(= )[0]) + +if host_machine.system() =3D=3D 'darwin' + add_languages('objc', required: false) +endif + configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', configuration: config_host) + +supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] +supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv6= 4', 'x86', 'x86_64', + 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] + +cpu =3D host_machine.cpu_family() +targetos =3D host_machine.system() + +summary_info =3D {} +summary_info +=3D {'Install prefix': config_host['prefix']} +summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} +summary_info +=3D {'firmware path': config_host['qemu_firmwarepath']} +summary_info +=3D {'binary directory': config_host['bindir']} +summary_info +=3D {'library directory': config_host['libdir']} +summary_info +=3D {'module directory': config_host['qemu_moddir']} +summary_info +=3D {'libexec directory': config_host['libexecdir']} +summary_info +=3D {'include directory': config_host['includedir']} +summary_info +=3D {'config directory': config_host['sysconfdir']} +if targetos !=3D 'windows' + summary_info +=3D {'local state directory': config_host['qemu_localstate= dir']} + summary_info +=3D {'Manual directory': config_host['mandir']} +else + summary_info +=3D {'local state directory': 'queried at runtime'} +endif +summary_info +=3D {'Build directory': meson.current_build_dir()} +summary_info +=3D {'Source path': meson.current_source_dir()} +summary_info +=3D {'GIT binary': config_host['GIT']} +summary_info +=3D {'GIT submodules': config_host['GIT_SUBMODULES']} +summary_info +=3D {'C compiler': meson.get_compiler('c').cmd_array(= )[0]} +summary_info +=3D {'Host C compiler': meson.get_compiler('c', native: tr= ue).cmd_array()[0]} +summary_info +=3D {'C++ compiler': meson.get_compiler('cpp', native: = true).cmd_array()[0]} +if host_machine.system() =3D=3D 'darwin' + summary_info +=3D {'Objective-C compiler': meson.get_compiler('objc', na= tive: true).cmd_array()[0]} +endif +summary_info +=3D {'ARFLAGS': config_host['ARFLAGS']} +summary_info +=3D {'CFLAGS': config_host['CFLAGS']} +summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} +summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} +summary_info +=3D {'make': config_host['MAKE']} +summary_info +=3D {'install': config_host['INSTALL']} +summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} +summary_info +=3D {'sphinx-build': config_host['SPHINX_BUILD']} +summary_info +=3D {'genisoimage': config_host['GENISOIMAGE']} +# TODO: add back version +summary_info +=3D {'slirp support': config_host.has_key('CONFIG_SLIRP'= )} +if config_host.has_key('CONFIG_SLIRP') + summary_info +=3D {'smbd': config_host['CONFIG_SMBD_COMMAND']} +endif +summary_info +=3D {'module support': config_host.has_key('CONFIG_MODULE= S')} +if config_host.has_key('CONFIG_MODULES') + summary_info +=3D {'alternative module path': config_host.has_key('CONFI= G_MODULE_UPGRADES')} +endif +summary_info +=3D {'host CPU': cpu} +summary_info +=3D {'host endianness': build_machine.endian()} +summary_info +=3D {'target list': config_host['TARGET_DIRS']} +summary_info +=3D {'gprof enabled': config_host.has_key('CONFIG_GPROF'= )} +summary_info +=3D {'sparse enabled': meson.get_compiler('c').cmd_array(= ).contains('cgcc')} +summary_info +=3D {'strip binaries': get_option('strip')} +summary_info +=3D {'profiler': config_host.has_key('CONFIG_PROFIL= ER')} +summary_info +=3D {'static build': config_host.has_key('CONFIG_TOOLS'= )} +if targetos =3D=3D 'darwin' + summary_info +=3D {'Cocoa support': config_host.has_key('CONFIG_COCOA')} +endif +# TODO: add back version +summary_info +=3D {'SDL support': config_host.has_key('CONFIG_SDL')} +summary_info +=3D {'SDL image support': config_host.has_key('CONFIG_SDL_IM= AGE')} +# TODO: add back version +summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} +summary_info +=3D {'GTK GL support': config_host.has_key('CONFIG_GTK_GL= ')} +# TODO: add back version +summary_info +=3D {'VTE support': config_host.has_key('CONFIG_VTE')} +summary_info +=3D {'TLS priority': config_host['CONFIG_TLS_PRIORITY']} +summary_info +=3D {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS= ')} +# TODO: add back version +summary_info +=3D {'libgcrypt': config_host.has_key('CONFIG_GCRYPT= ')} +if config_host.has_key('CONFIG_GCRYPT') + summary_info +=3D {' hmac': config_host.has_key('CONFIG_GCR= YPT_HMAC')} + summary_info +=3D {' XTS': not config_host.has_key('CONFIG= _QEMU_PRIVATE_XTS')} +endif +# TODO: add back version +summary_info +=3D {'nettle': config_host.has_key('CONFIG_NETTLE= ')} +if config_host.has_key('CONFIG_NETTLE') + summary_info +=3D {' XTS': not config_host.has_key('CONFIG= _QEMU_PRIVATE_XTS')} +endif +summary_info +=3D {'libtasn1': config_host.has_key('CONFIG_TASN1'= )} +summary_info +=3D {'PAM': config_host.has_key('CONFIG_AUTH_P= AM')} +summary_info +=3D {'iconv support': config_host.has_key('CONFIG_ICONV'= )} +summary_info +=3D {'curses support': config_host.has_key('CONFIG_CURSES= ')} +# TODO: add back version +summary_info +=3D {'virgl support': config_host.has_key('CONFIG_VIRGL'= )} +summary_info +=3D {'curl support': config_host.has_key('CONFIG_CURL')} +summary_info +=3D {'mingw32 support': targetos =3D=3D 'windows'} +summary_info +=3D {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS'= ]} +summary_info +=3D {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHI= TELIST']} +summary_info +=3D {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHI= TELIST']} +summary_info +=3D {'VirtFS support': config_host.has_key('CONFIG_VIRTFS= ')} +summary_info +=3D {'Multipath support': config_host.has_key('CONFIG_MPATH'= )} +summary_info +=3D {'VNC support': config_host.has_key('CONFIG_VNC')} +if config_host.has_key('CONFIG_VNC') + summary_info +=3D {'VNC SASL support': config_host.has_key('CONFIG_VNC_= SASL')} + summary_info +=3D {'VNC JPEG support': config_host.has_key('CONFIG_VNC_= JPEG')} + summary_info +=3D {'VNC PNG support': config_host.has_key('CONFIG_VNC_= PNG')} +endif +summary_info +=3D {'xen support': config_host.has_key('CONFIG_XEN_BA= CKEND')} +if config_host.has_key('CONFIG_XEN_BACKEND') + summary_info +=3D {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INT= ERFACE_VERSION']} +endif +summary_info +=3D {'brlapi support': config_host.has_key('CONFIG_BRLAPI= ')} +summary_info +=3D {'Documentation': config_host.has_key('BUILD_DOCS')} +summary_info +=3D {'PIE': get_option('b_pie')} +summary_info +=3D {'vde support': config_host.has_key('CONFIG_VDE')} +summary_info +=3D {'netmap support': config_host.has_key('CONFIG_NETMAP= ')} +summary_info +=3D {'Linux AIO support': config_host.has_key('CONFIG_LINUX_= AIO')} +summary_info +=3D {'Linux io_uring support': config_host.has_key('CONFIG_L= INUX_IO_URING')} +summary_info +=3D {'ATTR/XATTR support': config_host.has_key('CONFIG_ATTR'= )} +summary_info +=3D {'Install blobs': config_host.has_key('INSTALL_BLOBS= ')} +# TODO: add back KVM/HAX/HVF/WHPX/TCG +#summary_info +=3D {'KVM support': have_kvm'} +#summary_info +=3D {'HAX support': have_hax'} +#summary_info +=3D {'HVF support': have_hvf'} +#summary_info +=3D {'WHPX support': have_whpx'} +#summary_info +=3D {'TCG support': have_tcg'} +#if get_option('tcg') +# summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEB= UG_TCG')} +# summary_info +=3D {'TCG interpreter': config_host.has_key('CONFIG_TCG= _INTERPRETER')} +#endif +summary_info +=3D {'malloc trim support': config_host.has_key('CONFIG_MALL= OC_TRIM')} +summary_info +=3D {'RDMA support': config_host.has_key('CONFIG_RDMA')} +summary_info +=3D {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA= ')} +summary_info +=3D {'fdt support': config_host.has_key('CONFIG_FDT')} +summary_info +=3D {'membarrier': config_host.has_key('CONFIG_MEMBAR= RIER')} +summary_info +=3D {'preadv support': config_host.has_key('CONFIG_PREADV= ')} +summary_info +=3D {'fdatasync': config_host.has_key('CONFIG_FDATAS= YNC')} +summary_info +=3D {'madvise': config_host.has_key('CONFIG_MADVIS= E')} +summary_info +=3D {'posix_madvise': config_host.has_key('CONFIG_POSIX_= MADVISE')} +summary_info +=3D {'posix_memalign': config_host.has_key('CONFIG_POSIX_= MEMALIGN')} +summary_info +=3D {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP= _NG')} +summary_info +=3D {'vhost-net support': config_host.has_key('CONFIG_VHOST_= NET')} +summary_info +=3D {'vhost-crypto support': config_host.has_key('CONFIG_VHO= ST_CRYPTO')} +summary_info +=3D {'vhost-scsi support': config_host.has_key('CONFIG_VHOST= _SCSI')} +summary_info +=3D {'vhost-vsock support': config_host.has_key('CONFIG_VHOS= T_VSOCK')} +summary_info +=3D {'vhost-user support': config_host.has_key('CONFIG_VHOST= _KERNEL')} +summary_info +=3D {'vhost-user-fs support': config_host.has_key('CONFIG_VH= OST_USER_FS')} +summary_info +=3D {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST= _VDPA')} +summary_info +=3D {'Trace backends': config_host['TRACE_BACKENDS']} +if config_host['TRACE_BACKENDS'].split().contains('simple') + summary_info +=3D {'Trace output file': config_host['CONFIG_TRACE_FILE']= + '-'} +endif +# TODO: add back protocol and server version +summary_info +=3D {'spice support': config_host.has_key('CONFIG_SPICE'= )} +summary_info +=3D {'rbd support': config_host.has_key('CONFIG_RBD')} +summary_info +=3D {'xfsctl support': config_host.has_key('CONFIG_XFS')} +summary_info +=3D {'smartcard support': config_host.has_key('CONFIG_SMARTC= ARD')} +summary_info +=3D {'libusb': config_host.has_key('CONFIG_USB_LI= BUSB')} +summary_info +=3D {'usb net redir': config_host.has_key('CONFIG_USB_RE= DIR')} +summary_info +=3D {'OpenGL support': config_host.has_key('CONFIG_OPENGL= ')} +summary_info +=3D {'OpenGL dmabufs': config_host.has_key('CONFIG_OPENGL= _DMABUF')} +summary_info +=3D {'libiscsi support': config_host.has_key('CONFIG_LIBISC= SI')} +summary_info +=3D {'libnfs support': config_host.has_key('CONFIG_LIBNFS= ')} +summary_info +=3D {'build guest agent': config_host.has_key('CONFIG_GUEST_= AGENT')} +if targetos =3D=3D 'windows' + if 'WIN_SDK' in config_host + summary_info +=3D {'Windows SDK': config_host['WIN_SDK']} + endif + summary_info +=3D {'QGA VSS support': config_host.has_key('CONFIG_QGA_= VSS')} + summary_info +=3D {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_= NTDDSCSI')} + summary_info +=3D {'QGA MSI support': config_host.has_key('CONFIG_QGA_= MSI_ENABLED')} +endif +summary_info +=3D {'seccomp support': config_host.has_key('CONFIG_SECCOM= P')} +summary_info +=3D {'coroutine backend': config_host['CONFIG_COROUTINE_BACK= END']} +summary_info +=3D {'coroutine pool': config_host['CONFIG_COROUTINE_POOL= '] =3D=3D '1'} +summary_info +=3D {'debug stack usage': config_host.has_key('CONFIG_DEBUG_= STACK_USAGE')} +summary_info +=3D {'mutex debugging': config_host.has_key('CONFIG_DEBUG_= MUTEX')} +summary_info +=3D {'crypto afalg': config_host.has_key('CONFIG_AF_ALG= ')} +summary_info +=3D {'GlusterFS support': config_host.has_key('CONFIG_GLUSTE= RFS')} +summary_info +=3D {'gcov': config_host.has_key('CONFIG_GCOV')} +summary_info +=3D {'TPM support': config_host.has_key('CONFIG_TPM')} +summary_info +=3D {'libssh support': config_host.has_key('CONFIG_LIBSSH= ')} +summary_info +=3D {'QOM debugging': config_host.has_key('CONFIG_QOM_CA= ST_DEBUG')} +summary_info +=3D {'Live block migration': config_host.has_key('CONFIG_LIV= E_BLOCK_MIGRATION')} +summary_info +=3D {'lzo support': config_host.has_key('CONFIG_LZO')} +summary_info +=3D {'snappy support': config_host.has_key('CONFIG_SNAPPY= ')} +summary_info +=3D {'bzip2 support': config_host.has_key('CONFIG_BZIP2'= )} +summary_info +=3D {'lzfse support': config_host.has_key('CONFIG_LZFSE'= )} +summary_info +=3D {'zstd support': config_host.has_key('CONFIG_ZSTD')} +summary_info +=3D {'NUMA host support': config_host.has_key('CONFIG_NUMA')} +summary_info +=3D {'libxml2': config_host.has_key('CONFIG_LIBXML= 2')} +summary_info +=3D {'tcmalloc support': config_host.has_key('CONFIG_TCMALL= OC')} +summary_info +=3D {'jemalloc support': config_host.has_key('CONFIG_JEMALL= OC')} +summary_info +=3D {'avx2 optimization': config_host.has_key('CONFIG_AVX2_O= PT')} +summary_info +=3D {'avx512f optimization': config_host.has_key('CONFIG_AVX= 512F_OPT')} +summary_info +=3D {'replication support': config_host.has_key('CONFIG_REPL= ICATION')} +summary_info +=3D {'bochs support': config_host.has_key('CONFIG_BOCHS'= )} +summary_info +=3D {'cloop support': config_host.has_key('CONFIG_CLOOP'= )} +summary_info +=3D {'dmg support': config_host.has_key('CONFIG_DMG')} +summary_info +=3D {'qcow v1 support': config_host.has_key('CONFIG_QCOW1'= )} +summary_info +=3D {'vdi support': config_host.has_key('CONFIG_VDI')} +summary_info +=3D {'vvfat support': config_host.has_key('CONFIG_VVFAT'= )} +summary_info +=3D {'qed support': config_host.has_key('CONFIG_QED')} +summary_info +=3D {'parallels support': config_host.has_key('CONFIG_PARALL= ELS')} +summary_info +=3D {'sheepdog support': config_host.has_key('CONFIG_SHEEPD= OG')} +summary_info +=3D {'capstone': config_host.has_key('CONFIG_CAPSTO= NE')} +summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} +summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} +summary_info +=3D {'libudev': config_host.has_key('CONFIG_LIBUDE= V')} +summary_info +=3D {'default devices': config_host['CONFIG_MINIKCONF_MODE= '] =3D=3D '--defconfig'} +summary_info +=3D {'plugin support': config_host.has_key('CONFIG_PLUGIN= ')} +summary_info +=3D {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} +if config_host.has_key('HAVE_GDB_BIN') + summary_info +=3D {'gdb': config_host['HAVE_GDB_BIN']} +endif +summary_info +=3D {'thread sanitizer': config_host.has_key('CONFIG_TSAN')} +summary_info +=3D {'rng-none': config_host.has_key('CONFIG_RNG_NO= NE')} +summary_info +=3D {'Linux keyring': config_host.has_key('CONFIG_SECRET= _KEYRING')} +summary(summary_info, bool_yn: true) + +if not supported_cpus.contains(cpu) + message() + warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!') + message() + message('CPU host architecture ' + cpu + ' support is not currently main= tained.') + message('The QEMU project intends to remove support for this host CPU in= ') + message('a future release if nobody volunteers to maintain it and to') + message('provide a build host for our continuous integration setup.') + message('configure has succeeded and you can continue to build, but') + message('if you care about QEMU on this platform you should contact') + message('us upstream at qemu-devel@nongnu.org.') +endif + +if not supported_oses.contains(targetos) + message() + warning('WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEAS= ES!') + message() + message('Host OS ' + targetos + 'support is not currently maintained.') + message('The QEMU project intends to remove support for this host OS in') + message('a future release if nobody volunteers to maintain it and to') + message('provide a build host for our continuous integration setup.') + message('configure has succeeded and you can continue to build, but') + message('if you care about QEMU on this platform you should contact') + message('us upstream at qemu-devel@nongnu.org.') +endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080127; cv=none; d=zohomail.com; s=zohoarc; b=S8E03T1CXtkU97Ws3UDZtPjIag0zB9cofMB/BE5ySc+oxeUABm+tx59mWMIYXBtzVa8LMo+uIH+3+f11Z3jUyPbDAn0xx74cR7Kd2LJ622pRCBRSvrrNz/t3u+IpEaAoHygeBbC286Oro3hpMQwgyYLohhxbkivELO7V0NFKVmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080127; 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=BC3pDfJp/EY/WNb9hcLQauRRnmR1nN1Ek6FzE36t8pw=; b=JENF2FxlaBNnTle3hoAfnhPo7gAz44RlZtu/QM51GEch4JTdOT4pVFZRb+yQdQch6IN78Wh5NVeu1wFBWRMxI3nOtUvRiD5e/W/C2n3hLx12Hi0+nyEVh6zNO44lj4nLwbRhKPbTUihM5/PhQenTsoYQ6/cRO1sM6UxqjHl+3q8= 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 1597080127760894.8208274820462; Mon, 10 Aug 2020 10:22:07 -0700 (PDT) Received: from localhost ([::1]:57852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BUs-0004AB-JV for importer@patchew.org; Mon, 10 Aug 2020 13:22:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIy-0006A1-An for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:38561 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 1k5BIw-0002lS-O2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:48 -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-306-LW9NAtlsOsmXcU6C0zXIuw-1; Mon, 10 Aug 2020 13:09:44 -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 65D74800465 for ; Mon, 10 Aug 2020 17:09:43 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72BD05F1E9; Mon, 10 Aug 2020 17:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079386; 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=BC3pDfJp/EY/WNb9hcLQauRRnmR1nN1Ek6FzE36t8pw=; b=ZZ7Imvci9OTub+YULiZv9Bhc6B6qHhkm9kW45lnbtp3xhY/ZaQzADZiROkLpMpVd4BJHeD 1Zssc18pYztqmv3WmHtTKbT8ZvBIjcJJFfAMQGWJ/h6eY8/YWF9cL5uF9g9OdZd84jd2Aw W/nZmMyH7Tv9aMYaUQGdJqLn/rCzdLs= X-MC-Unique: LW9NAtlsOsmXcU6C0zXIuw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 020/147] meson: enable pie Date: Mon, 10 Aug 2020 19:06:58 +0200 Message-Id: <1597079345-42801-21-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: =?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 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 9b6f0d9..91f518a 100755 --- a/configure +++ b/configure @@ -8448,6 +8448,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ + -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ $cross_arg \ "$PWD" "$source_path" =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080080; cv=none; d=zohomail.com; s=zohoarc; b=VMgx4vO6BlroB4lf7b24rJIJuvR2nsVf4jJoOb+vJhT2C9PsX1U9fwIt+4G1v8UMq0f0LLYU+8cf6PJjWTbHvGVFHN57PyyEchmkPM02b9xt3cOnx4RjOnCEsvM1J7PbtbROWzkCYXn6OqiEE5q1qpZvluSfXbN75Ouh0ETh3KY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080080; 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=eo8sar5sUdTBwQCRv5o456H0dVW4NAA7E/b3CrAgMsc=; b=B5G4pNeBkXIFPAZV04gvxXDnmjQY7VhwGirfgjJ2cv8IgS9hdoJeJeqQaCCsDRx8y6B4E3sqYxLGJIN3Wrp6LhyWWkGvrhB5CYDYAn7+7vLQV+VimUZsqYRIL9hfCtDBat+rEmWLGcK1ETDZzAleBCQ+3Y0Phfoi6yjXduEjDxk= 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 1597080080078285.45497995702954; Mon, 10 Aug 2020 10:21:20 -0700 (PDT) Received: from localhost ([::1]:53746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BU6-0002Wb-PT for importer@patchew.org; Mon, 10 Aug 2020 13:21:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ0-0006HB-Rg for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:50 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:50034 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 1k5BIy-0002lb-LA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:50 -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-239-43roD7OcOMm5XxG9k7QLyw-1; Mon, 10 Aug 2020 13:09:45 -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 C4A47100CCC0 for ; Mon, 10 Aug 2020 17:09:44 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1C9B5F1E9; Mon, 10 Aug 2020 17:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079387; 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=eo8sar5sUdTBwQCRv5o456H0dVW4NAA7E/b3CrAgMsc=; b=PFMgfrRGTvlx8FCjFxwrm14Uvx0g/HCisCApHdbiBWPRQSzaipd7rdCWV3HSBwHzfLkXY3 g7I5xcZuDDthpqlcuYN1fd28irUgr/9N8q/Eaj08uzNru1YEE0tGQvc/Nf1MFzYrMk/yCI RXU0HicfqIWoBi50wbn+6pNBI2jmPt0= X-MC-Unique: 43roD7OcOMm5XxG9k7QLyw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 021/147] meson: use coverage option Date: Mon, 10 Aug 2020 19:06:59 +0200 Message-Id: <1597079345-42801-22-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 | 14 -------------- Makefile.target | 16 ---------------- configure | 9 ++------- docs/devel/testing.rst | 7 +++---- meson.build | 2 +- 5 files changed, 6 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index f42cbdb..1da5927 100644 --- a/Makefile +++ b/Makefile @@ -765,14 +765,6 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_blo= ck.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") =20 -ifdef CONFIG_GCOV -.PHONY: clean-coverage -clean-coverage: - $(call quiet-command, \ - find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \ - "CLEAN", "coverage files") -endif - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h @@ -1275,9 +1267,6 @@ endif echo '') @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) -ifdef CONFIG_GCOV - $(call print-help,clean-coverage,Remove coverage files) -endif $(call print-help,distclean,Remove all generated files) $(call print-help,dist,Build a distributable tarball) @echo '' @@ -1288,9 +1277,6 @@ endif @echo '' @echo 'Documentation targets:' $(call print-help,html info pdf txt,Build documentation in specified form= at) -ifdef CONFIG_GCOV - $(call print-help,coverage-report,Create code coverage report) -endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/Makefile.target b/Makefile.target index ffa2657..d61a6a9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -269,19 +269,3 @@ endif =20 generated-files-y +=3D config-target.h Makefile: $(generated-files-y) - -# Reports/Analysis -# -# The target specific coverage report only cares about target specific -# blobs and not the shared code. -# - -%/coverage-report.html: - @mkdir -p $* - $(call quiet-command,\ - gcovr -r $(SRC_PATH) --object-directory $(CURDIR) \ - -p --html --html-details -o $@, \ - "GEN", "coverage-report.html") - -.PHONY: coverage-report -coverage-report: $(CURDIR)/reports/coverage/coverage-report.html diff --git a/configure b/configure index 91f518a..94cf0a3 100755 --- a/configure +++ b/configure @@ -424,7 +424,6 @@ tcg_interpreter=3D"no" bigendian=3D"no" mingw32=3D"no" gcov=3D"no" -gcov_tool=3D"gcov" EXESUF=3D"" DSOSUF=3D".so" LDFLAGS_SHARED=3D"-shared" @@ -1008,8 +1007,6 @@ for opt do ;; --meson=3D*) meson=3D"$optarg" ;; - --gcov=3D*) gcov_tool=3D"$optarg" - ;; --smbd=3D*) smbd=3D"$optarg" ;; --extra-cflags=3D*) @@ -1816,7 +1813,6 @@ Advanced options (experts only): --with-coroutine=3DBACKEND coroutine backend. Supported options: ucontext, sigaltstack, windows --enable-gcov enable test coverage analysis with gcov - --gcov=3DGCOV use specified gcov [$gcov_tool] --disable-blobs disable installing provided firmware blobs --with-vss-sdk=3DSDK-path enable Windows VSS support in QEMU Guest Agent --with-win-sdk=3DSDK-path path to Windows Platform SDK (to build VSS .t= lb) @@ -6535,8 +6531,7 @@ fi write_c_skeleton =20 if test "$gcov" =3D "yes" ; then - QEMU_CFLAGS=3D"-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS" - QEMU_LDFLAGS=3D"-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS" + : elif test "$fortify_source" =3D "yes" ; then QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" debug=3Dno @@ -7809,7 +7804,6 @@ echo "TASN1_CFLAGS=3D$tasn1_cflags" >> $config_host_m= ak echo "POD2MAN=3D$POD2MAN" >> $config_host_mak if test "$gcov" =3D "yes" ; then echo "CONFIG_GCOV=3Dy" >> $config_host_mak - echo "GCOV=3D$gcov_tool" >> $config_host_mak fi =20 if test "$libudev" !=3D "no"; then @@ -8449,6 +8443,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ + -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index c1ff243..a426469 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -164,13 +164,12 @@ instrumenting the tested code. To use it, configure Q= EMU with ``--enable-gcov`` option and build. Then run ``make check`` as usual. =20 If you want to gather coverage information on a single test the ``make -clean-coverage`` target can be used to delete any existing coverage +clean-gcda`` target can be used to delete any existing coverage information before running a single test. =20 You can generate a HTML coverage report by executing ``make -coverage-report`` which will create -./reports/coverage/coverage-report.html. If you want to create it -elsewhere simply execute ``make /foo/bar/baz/coverage-report.html``. +coverage-html`` which will create +``meson-logs/coveragereport/index.html``. =20 Further analysis can be conducted by running the ``gcov`` command directly on the various .gcda output files. Please read the ``gcov`` diff --git a/meson.build b/meson.build index cc08534..b368929 100644 --- a/meson.build +++ b/meson.build @@ -199,7 +199,7 @@ summary_info +=3D {'debug stack usage': config_host.has= _key('CONFIG_DEBUG_STACK_US summary_info +=3D {'mutex debugging': config_host.has_key('CONFIG_DEBUG_= MUTEX')} summary_info +=3D {'crypto afalg': config_host.has_key('CONFIG_AF_ALG= ')} summary_info +=3D {'GlusterFS support': config_host.has_key('CONFIG_GLUSTE= RFS')} -summary_info +=3D {'gcov': config_host.has_key('CONFIG_GCOV')} +summary_info +=3D {'gcov': get_option('b_coverage')} summary_info +=3D {'TPM support': config_host.has_key('CONFIG_TPM')} summary_info +=3D {'libssh support': config_host.has_key('CONFIG_LIBSSH= ')} summary_info +=3D {'QOM debugging': config_host.has_key('CONFIG_QOM_CA= ST_DEBUG')} --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079934; cv=none; d=zohomail.com; s=zohoarc; b=bLuJVE6/IHf7qMMq7+qsHWaNYsSDkYc9uzViRtz5xUacGEm/VA8uU9p4OTpvAE3bmpjLrGZk59xhEhtDKg4M0d9JQoT1rRK7RY7ZM8U4/X3MlaFFqjAORUPtwTnXpKpDGyifzAp5TodE/kzlOo0r1VT4FbNPiiuJZOPlTv7JZO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079934; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=/eKDAppMzHly2kSxSsBozLIEil9XqJkWiigiUyZJgOg=; b=NQfQXsfDQZz28cBvB/WGpkV3Axv8tCZ1NFC5s6yl0QrOpfYd6yvP+CS2GVaYBgZ7gOpMRK5v0Av67Fsu6oRmHoyYzqEQqmXW01KS5lq+HHTPBFlEjQgIxQy64zAAnjj0gTzEdKyUC/KEB9FGN/YEPCDbf7WodwSqKEByGMktUgk= 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 1597079934331744.1542032323028; Mon, 10 Aug 2020 10:18:54 -0700 (PDT) Received: from localhost ([::1]:40662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BRl-0005S6-3x for importer@patchew.org; Mon, 10 Aug 2020 13:18:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ1-0006I2-7W for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46895 helo=us-smtp-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 1k5BIz-0002ll-BA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:50 -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-423-YtuHCoBSMYOXNxY6oEtG0Q-1; Mon, 10 Aug 2020 13:09:46 -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 EB51919057A0 for ; Mon, 10 Aug 2020 17:09:45 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D0925F1E9 for ; Mon, 10 Aug 2020 17:09:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=/eKDAppMzHly2kSxSsBozLIEil9XqJkWiigiUyZJgOg=; b=MVr0btPJrL0ZSrBZlPJC4bLOowYe4Y8H0NJf0nu31wRza6b5JDTBXdKPo8cc4Mxg9ysl8y NDMOSI30xJ0/9ICQguJUlcIrmJ1p6FyaPj8tlJIW4tm42lv7gPm7ZmcZ/0j1nFRBO6tJR8 saMaQtOL6JN7qQcTJWo9NPOj5UG6c1M= X-MC-Unique: YtuHCoBSMYOXNxY6oEtG0Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 022/147] meson: add sparse support Date: Mon, 10 Aug 2020 19:07:00 +0200 Message-Id: <1597079345-42801-23-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not use cgcc; instead, extract compilation commands from compile_command= s.json and invoke sparse directly. Signed-off-by: Paolo Bonzini --- Makefile | 1 + configure | 8 ++------ meson.build | 7 +++++++ scripts/check_sparse.py | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 scripts/check_sparse.py diff --git a/Makefile b/Makefile index 1da5927..12c68a2 100644 --- a/Makefile +++ b/Makefile @@ -1245,6 +1245,7 @@ endif $(call print-help,install,Install QEMU, documentation and tools) $(call print-help,ctags/TAGS,Generate tags file for editors) $(call print-help,cscope,Generate cscope index) + $(call print-help,sparse,Run sparse on the QEMU source) @echo '' @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ diff --git a/configure b/configure index 94cf0a3..53527f6 100755 --- a/configure +++ b/configure @@ -2991,7 +2991,7 @@ fi ########################################## # Sparse probe if test "$sparse" !=3D "no" ; then - if has cgcc; then + if has sparse; then sparse=3Dyes else if test "$sparse" =3D "yes" ; then @@ -7782,11 +7782,7 @@ echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_INCLUDES=3D$QEMU_INCLUDES" >> $config_host_mak if test "$sparse" =3D "yes" ; then - echo "CC :=3D REAL_CC=3D\"\$(CC)\" cgcc" >> $config_host= _mak - echo "CPP :=3D REAL_CC=3D\"\$(CPP)\" cgcc" >> $config_host= _mak - echo "CXX :=3D REAL_CC=3D\"\$(CXX)\" cgcc" >> $config_host= _mak - echo "HOST_CC :=3D REAL_CC=3D\"\$(HOST_CC)\" cgcc" >> $config_host= _mak - echo "QEMU_CFLAGS +=3D -Wbitwise -Wno-transparent-union -Wno-old-initia= lizer -Wno-non-pointer-null" >> $config_host_mak + echo "SPARSE_CFLAGS =3D -Wbitwise -Wno-transparent-union -Wno-old-initia= lizer -Wno-non-pointer-null" >> $config_host_mak fi echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak diff --git a/meson.build b/meson.build index b368929..e227b43 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,13 @@ add_project_arguments(config_host['QEMU_INCLUDES'].split= (), =20 python =3D import('python').find_installation(config_host['PYTHON'].split(= )[0]) =20 +if 'SPARSE_CFLAGS' in config_host + run_target('sparse', + command: [find_program('scripts/check_sparse.py'), + config_host['SPARSE_CFLAGS'].split(), + 'compile_commands.json']) +endif + if host_machine.system() =3D=3D 'darwin' add_languages('objc', required: false) endif diff --git a/scripts/check_sparse.py b/scripts/check_sparse.py new file mode 100644 index 0000000..0de7aa5 --- /dev/null +++ b/scripts/check_sparse.py @@ -0,0 +1,25 @@ +#! /usr/bin/env python3 + +# Invoke sparse based on the contents of compile_commands.json + +import json +import subprocess +import sys +import shlex + +def extract_cflags(shcmd): + cflags =3D shlex.split(shcmd) + return [x for x in cflags + if x.startswith('-D') or x.startswith('-I') or x.startswith('-= W') + or x.startswith('-std=3D')] + +cflags =3D sys.argv[1:-1] +with open(sys.argv[-1], 'r') as fd: + compile_commands =3D json.load(fd) + +for cmd in compile_commands: + cmd =3D ['sparse'] + cflags + extract_cflags(cmd['command']) + [cmd['f= ile']] + print(' '.join((shlex.quote(x) for x in cmd))) + r =3D subprocess.run(cmd) + if r.returncode !=3D 0: + sys.exit(r.returncode) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597079946; cv=none; d=zohomail.com; s=zohoarc; b=CspEhWAf0S+CINCL79kr+vQnr84lu0rfe8m185eJM/WgXlS1HP8o5/ncAWkQZV2bYYxgHHMWqvLt8osDiNm1t6qdzsvEvXsb3UVcONARgpM2Z+ye6LF6aUa7UtdKx69pK/Nxh7syKNVXTcmLqMz/6TdHXTe4IYwevtWQuh73Mow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079946; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wIXgQmLTIkxvZV5wgdewkTMjaZouOcqQ0K9ICz8g8zw=; b=KtCyUkRrgJDQA0Mis7Abmbl/ThXnSQPDGqYlT0gwQe7gwV+K4XPywuX5SHtxOBS/dBEqwrNCP5oDwBVpSDCzNfEeAR3fwFpnLmqC8NvLcWD7JOsr/RLYtugysquDWBZmfLd0qULwY2qyTYVg4kcoqOy9vlhVoegKhnoPu+rFN9c= 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 1597079946365541.3186596881768; Mon, 10 Aug 2020 10:19:06 -0700 (PDT) Received: from localhost ([::1]:41934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BRx-0005y0-7i for importer@patchew.org; Mon, 10 Aug 2020 13:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ2-0006MZ-Kr for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:52 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30101 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 1k5BJ0-0002lr-FN for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:52 -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-440-H8G5Ki-vP4W1SwcXrICVbw-1; Mon, 10 Aug 2020 13:09:47 -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 1F368800472 for ; Mon, 10 Aug 2020 17:09:47 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 640D05F1E9 for ; Mon, 10 Aug 2020 17:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=wIXgQmLTIkxvZV5wgdewkTMjaZouOcqQ0K9ICz8g8zw=; b=WPzCbqNwnM9Ulf/3GJJrtxp3rkZbQE8TiylKbdea1MgfsYSIQoZLNcszwBz5LJYH8k/HsH AVpUGEUucUbqePdb6NyNc5THMuOHA+OnYtpUWwApKb8YtOCtFURroBkn6YHd04YxLPsYUU +4GoSPkcIz3t3ClLdq2eskqZkWsKg2E= X-MC-Unique: H8G5Ki-vP4W1SwcXrICVbw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 023/147] meson: add testsuite Makefile generator Date: Mon, 10 Aug 2020 19:07:01 +0200 Message-Id: <1597079345-42801-24-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rules to execute tests are generated by a simple Python program that integrates into the existing "make check" mechanism. This provides familiarity for developers, and also allows piecewise conversion of the testsuite Makefiles to meson. The generated rules are based on QEMU's existing test harness Makefile and TAP parser. Signed-off-by: Paolo Bonzini --- Makefile | 4 ++ scripts/mtest2make.py | 102 +++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/Makefile.include | 1 - 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 scripts/mtest2make.py diff --git a/Makefile b/Makefile index 12c68a2..7d9d4e5 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,10 @@ ninjatool: ninjatool.stamp ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@ =20 +Makefile.mtest: build.ninja scripts/mtest2make.py + $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@ +-include Makefile.mtest + .git-submodule-status: git-submodule-update config-host.mak =20 # Check that we're not trying to do an out-of-tree build from diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py new file mode 100644 index 0000000..45f271b --- /dev/null +++ b/scripts/mtest2make.py @@ -0,0 +1,102 @@ +#! /usr/bin/env python3 + +# Create Makefile targets to run tests, from Meson's test introspection da= ta. +# +# Author: Paolo Bonzini + +from collections import defaultdict +import json +import os +import shlex +import sys + +class Suite(object): + def __init__(self): + self.tests =3D list() + self.slow_tests =3D list() + self.executables =3D set() + +print(''' +SPEED =3D quick + +# $1 =3D test command, $2 =3D test name +.test-human-tap =3D $1 < /dev/null | ./scripts/tap-driver.pl --test-name= =3D"$2" $(if $(V),,--show-failures-only) +.test-human-exitcode =3D $1 < /dev/null $(if $(V),,> /dev/null) +.test-tap-tap =3D $1 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $2/" || tr= ue +.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 < /dev/null > /dev/null ||= echo "not "`ok 1 $2" +.test.print =3D echo $(if $(V),'$1','Running test $2') >&3 +.test.env =3D MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 2= 55 + 1))} + +# $1 =3D test name, $2 =3D test target (human or tap) +.test.run =3D $(call .test.print,$(.test.cmd.$1),$(.test.name.$1)) && $(ca= ll .test-$2-$(.test.driver.$1),$(.test.cmd.$1),$(.test.name.$1)) + +define .test.human_k + @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ + exit $$rc +endef +define .test.human_no_k + $(foreach TEST, $1, @exec 3>&1; $(call .test.run,$(TEST),human) +) +endef +.test.human =3D \\ + $(if $(findstring k, $(MAKEFLAGS)), $(.test.human_k), $(.test.huma= n_no_k)) + +define .test.tap + @exec 3>&1; { $(foreach TEST, $1, $(call .test.run,$(TEST),tap); )= } \\ + | ./scripts/tap-merge.pl | tee "$@" \\ + | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only) +endef +''') + +suites =3D defaultdict(Suite) +i =3D 0 +for test in json.load(sys.stdin): + env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) + for k, v in test['env'].items())) + executable =3D os.path.relpath(test['cmd'][0]) + if test['workdir'] is not None: + test['cmd'][0] =3D os.path.relpath(test['cmd'][0], test['workdir']) + else: + test['cmd'][0] =3D executable + cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) + if test['workdir'] is not None: + cmd =3D '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd) + driver =3D test['protocol'] if 'protocol' in test else 'exitcode' + + i +=3D 1 + print('.test.name.%d :=3D %s' % (i, test['name'])) + print('.test.driver.%d :=3D %s' % (i, driver)) + print('.test.cmd.%d :=3D %s' % (i, cmd)) + + test_suites =3D test['suite'] or ['default'] + is_slow =3D any(s.endswith('-slow') for s in test_suites) + for s in test_suites: + # The suite name in the introspection info is "PROJECT:SUITE" + s =3D s.split(':')[1] + if s.endswith('-slow'): + s =3D s[:-5] + if is_slow: + suites[s].slow_tests.append(i) + else: + suites[s].tests.append(i) + suites[s].executables.add(executable) + +print('.PHONY: check check-report.tap') +print('check:') +print('check-report.tap:') +print('\t@cat $^ | scripts/tap-merge.pl >$@') +for name, suite in suites.items(): + executables =3D ' '.join(suite.executables) + slow_test_numbers =3D ' '.join((str(x) for x in suite.slow_tests)) + test_numbers =3D ' '.join((str(x) for x in suite.tests)) + print('.test.suite-quick.%s :=3D %s' % (name, test_numbers)) + print('.test.suite-slow.%s :=3D $(.test.suite-quick.%s) %s' % (name, n= ame, slow_test_numbers)) + print('check-build: %s' % executables) + print('.PHONY: check-%s' % name) + print('.PHONY: check-report-%s.tap' % name) + print('check: check-%s' % name) + print('check-%s: all %s' % (name, executables)) + print('\t$(call .test.human, $(.test.suite-$(SPEED).%s))' % (name, )) + print('check-report.tap: check-report-%s.tap' % name) + print('check-report-%s.tap: %s' % (name, executables)) + print('\t$(call .test.tap, $(.test.suite-$(SPEED).%s))' % (name, )) diff --git a/tests/Makefile.include b/tests/Makefile.include index c7e4646..ad54100 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -674,7 +674,6 @@ check-report-unit.tap: $(check-unit-y) # Reports and overall runs =20 check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS))= check-report-unit.tap - $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@") =20 # FPU Emulation tests (aka softfloat) # --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080181; cv=none; d=zohomail.com; s=zohoarc; b=ZKcRHoCn5k3KMSCcMrmWrSL83zpyDvJ4d4oaUV46RPLxzKDKds5GJ6NjI3t2sfrZ/twp7jTQfZp8m8+aQ0cVM544IiGteHmra9Bi0gC0in0uisKKOIOGwoEG0jcK59b0hdFQoDHOTKYt6g9n6lfVKxljMgcdr4BkJZ9rsuIeSBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080181; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=mW3YzSgFQlvK+Z+qclDaFrs0tyYUSf4lyzzm5OaBbTs=; b=SZEqNd0nIvZ801uS/vV852hbnGRhJnIgBAMYHyATiIeUWdKHtmd4Cel29xiu1lgzL0gmFM5LQ4HYwK/wsyK5RalpwSEe7hgAiAROBSTy6uZYDy+60i+bq9Jg6iXNaTUaIkR/MS6eS283ghFaSBosl7j7ux/2uj1XxXenSuD2Jps= 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 1597080181514388.3589736458864; Mon, 10 Aug 2020 10:23:01 -0700 (PDT) Received: from localhost ([::1]:34410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BVk-00063k-5e for importer@patchew.org; Mon, 10 Aug 2020 13:23:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ6-0006XD-PM for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37422) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ2-0002m3-8O for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:56 -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-138-JRnwRmn-M8KLj8a0adlYIw-1; Mon, 10 Aug 2020 13:09:49 -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 4AFF98064A9 for ; Mon, 10 Aug 2020 17:09:48 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B9845F1EA for ; Mon, 10 Aug 2020 17:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=mW3YzSgFQlvK+Z+qclDaFrs0tyYUSf4lyzzm5OaBbTs=; b=HNV0N5Q8cl8N7iqgrkLPp0nSyh7ZakPQLrSE+/XC2WktCS7Ls8uTXt5iIS/+ZQet6MOPcD zGp9a4I4BRnc5KUwktgqgO39yl6ZB8sxMzdVMa7bqj8tK0O2RQMBe5ssYRALzAVupoWh// XaNVvAl9Fem3ngHKca4tPL8os7t1ahU= X-MC-Unique: JRnwRmn-M8KLj8a0adlYIw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 024/147] libqemuutil, qapi, trace: convert to meson Date: Mon, 10 Aug 2020 19:07:02 +0200 Message-Id: <1597079345-42801-25-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> 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 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=63.128.21.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/10 13:09:25 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This shows how to do some "computations" in meson.build using its array and dictionary data structures, and also a basic usage of the sourceset module for conditional compilation. Signed-off-by: Paolo Bonzini --- Makefile | 228 ++++++--------------------------= ---- Makefile.objs | 95 --------------- Makefile.target | 8 +- configure | 8 ++ crypto/Makefile.objs | 6 - crypto/meson.build | 11 ++ docs/devel/tracing.txt | 2 +- meson.build | 194 ++++++++++++++++++++++++++++++ qapi/Makefile.objs | 23 ---- qapi/meson.build | 120 +++++++++++++++++++ qobject/Makefile.objs | 3 - qobject/meson.build | 3 + rules.mak | 2 +- scripts/qapi-gen.py | 0 scripts/tracetool.py | 0 scripts/tracetool/backend/dtrace.py | 2 +- scripts/tracetool/backend/ust.py | 6 +- storage-daemon/Makefile.objs | 4 +- storage-daemon/meson.build | 1 + storage-daemon/qapi/Makefile.objs | 1 - storage-daemon/qapi/meson.build | 10 ++ stubs/Makefile.objs | 56 --------- stubs/meson.build | 50 ++++++++ trace/Makefile.objs | 51 -------- trace/meson.build | 76 ++++++++++++ util/Makefile.objs | 83 ------------- util/meson.build | 68 +++++++++++ 27 files changed, 586 insertions(+), 525 deletions(-) create mode 100644 crypto/meson.build create mode 100644 qapi/meson.build delete mode 100644 qobject/Makefile.objs create mode 100644 qobject/meson.build mode change 100755 =3D> 100644 scripts/qapi-gen.py mode change 100755 =3D> 100644 scripts/tracetool.py create mode 100644 storage-daemon/meson.build delete mode 100644 storage-daemon/qapi/Makefile.objs create mode 100644 storage-daemon/qapi/meson.build delete mode 100644 stubs/Makefile.objs create mode 100644 stubs/meson.build create mode 100644 trace/meson.build delete mode 100644 util/Makefile.objs create mode 100644 util/meson.build diff --git a/Makefile b/Makefile index 7d9d4e5..0811fd5 100644 --- a/Makefile +++ b/Makefile @@ -121,184 +121,60 @@ FULL_VERSION :=3D $(if $(QEMU_PKGVERSION),$(VERSION)= ($(QEMU_PKGVERSION)),$(VERSIO =20 generated-files-y =3D qemu-version.h config-host.h qemu-options.def =20 -GENERATED_QAPI_FILES =3D qapi/qapi-builtin-types.h qapi/qapi-builtin-types= .c -GENERATED_QAPI_FILES +=3D qapi/qapi-types.h qapi/qapi-types.c -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-types-%.h) -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-types-%.c) -GENERATED_QAPI_FILES +=3D qapi/qapi-builtin-visit.h qapi/qapi-builtin-visi= t.c -GENERATED_QAPI_FILES +=3D qapi/qapi-visit.h qapi/qapi-visit.c -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-visit-%.h) -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-visit-%.c) -GENERATED_QAPI_FILES +=3D qapi/qapi-init-commands.h qapi/qapi-init-command= s.c -GENERATED_QAPI_FILES +=3D qapi/qapi-commands.h qapi/qapi-commands.c -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-commands-%.h) -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-commands-%.c) -GENERATED_QAPI_FILES +=3D qapi/qapi-emit-events.h qapi/qapi-emit-events.c -GENERATED_QAPI_FILES +=3D qapi/qapi-events.h qapi/qapi-events.c -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-events-%.h) -GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-events-%.c) -GENERATED_QAPI_FILES +=3D qapi/qapi-introspect.c qapi/qapi-introspect.h -GENERATED_QAPI_FILES +=3D qapi/qapi-doc.texi - -# The following list considers only the storage daemon main module. All ot= her -# modules are currently shared with the main schema, so we don't actually -# generate additional files. - -GENERATED_STORAGE_DAEMON_QAPI_FILES =3D storage-daemon/qapi/qapi-commands.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-commands= .c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-emit-eve= nts.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-emit-eve= nts.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-events.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-events.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-init-com= mands.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-init-com= mands.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-introspe= ct.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-introspe= ct.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-types.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-types.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-visit.h -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-visit.c -GENERATED_STORAGE_DAEMON_QAPI_FILES +=3D storage-daemon/qapi/qapi-doc.texi - -generated-files-y +=3D $(GENERATED_QAPI_FILES) -generated-files-y +=3D $(GENERATED_STORAGE_DAEMON_QAPI_FILES) - generated-files-y +=3D trace/generated-tcg-tracers.h =20 generated-files-y +=3D trace/generated-helpers-wrappers.h generated-files-y +=3D trace/generated-helpers.h generated-files-y +=3D trace/generated-helpers.c =20 -generated-files-$(CONFIG_TRACE_UST) +=3D trace-ust-all.h -generated-files-$(CONFIG_TRACE_UST) +=3D trace-ust-all.c - generated-files-y +=3D module_block.h =20 -TRACE_HEADERS =3D trace/trace-root.h -TRACE_SOURCES =3D trace/trace-root.c -TRACE_DTRACE =3D -ifdef CONFIG_TRACE_DTRACE -TRACE_HEADERS +=3D trace-dtrace-root.h $(trace-events-subdirs:%=3D%/trace-= dtrace.h) -TRACE_DTRACE +=3D trace-dtrace-root.dtrace $(trace-events-subdirs:%=3D%/tr= ace-dtrace.dtrace) -endif -ifdef CONFIG_TRACE_UST -TRACE_HEADERS +=3D trace-ust-root.h $(trace-events-subdirs:%=3D%/trace-ust= .h) -endif - -generated-files-y +=3D $(BUILD_DIR)/trace-events-all generated-files-y +=3D .git-submodule-status =20 -trace-group-name =3D $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') -trace-group-suffix =3D $(shell echo $1 | sed -e 's/[^a-zA-Z0-9]/_/g') - tracetool-y =3D $(SRC_PATH)/scripts/tracetool.py tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") =20 -define __trace_rules -TRACE_HEADERS +=3D trace/trace-$2.h -TRACE_SOURCES +=3D trace/trace-$2.c -trace-obj-y +=3D trace/trace-$2.o -trace/trace-$2.h: trace/trace-$2.h-timestamp - @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@ -trace/trace-$2.h-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(B= UILD_DIR)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=3D$2 \ - --format=3Dh \ - --backends=3D$(TRACE_BACKENDS) \ - $$< > $$@,"GEN","$$(@:%-timestamp=3D%)") - -trace/trace-$2.c: trace/trace-$2.c-timestamp - @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@ -trace/trace-$2.c-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(B= UILD_DIR)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=3D$2 \ - --format=3Dc \ - --backends=3D$(TRACE_BACKENDS) \ - $$< > $$@,"GEN","$$(@:%-timestamp=3D%)") -endef - -%/trace-ust.h: %/trace-ust.h-timestamp +trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-tim= estamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace-ust.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD= _DIR)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=3D$(call trace-group-name,$@) \ - --format=3Dust-events-h \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") - -%/trace-dtrace.dtrace: %/trace-dtrace.dtrace-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace-dtrace.dtrace-timestamp: $(SRC_PATH)/%/trace-events $(BUILD_DIR)/c= onfig-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3D$(call trace-group-name,$@) \ - --format=3Dd \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") - -%/trace-dtrace.h: %/trace-dtrace.dtrace $(tracetool-y) - $(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@") - -%/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y) - - -trace/trace-root.h: trace/trace-root.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BU= ILD_DIR)/config-host.mak +trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(B= UILD_DIR)/config-host.mak $(tracetool-y) + @mkdir -p $(dir $@) $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ - --format=3Dh \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") + --format=3Dtcg-helper-wrapper-h \ + --backend=3D$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") =20 -trace/trace-root.c: trace/trace-root.c-timestamp +trace/generated-helpers.h: trace/generated-helpers.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BU= ILD_DIR)/config-host.mak +trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)= /config-host.mak $(tracetool-y) + @mkdir -p $(dir $@) $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ - --format=3Dc \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") + --format=3Dtcg-helper-h \ + --backend=3D$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") =20 -trace-ust-root.h: trace-ust-root.h-timestamp +trace/generated-helpers.c: trace/generated-helpers.c-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUIL= D_DIR)/config-host.mak +trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)= /config-host.mak $(tracetool-y) + @mkdir -p $(dir $@) $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ - --format=3Dust-events-h \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") - -trace-ust-all.h: trace-ust-all.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DI= R)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dust-events-h \ - --backends=3D$(TRACE_BACKENDS) \ - $(trace-events-files) > $@,"GEN","$(@:%-timestamp=3D%)") + --format=3Dtcg-helper-c \ + --backend=3D$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") =20 -trace-ust-all.c: trace-ust-all.c-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DI= R)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dust-events-c \ - --backends=3D$(TRACE_BACKENDS) \ - $(trace-events-files) > $@,"GEN","$(@:%-timestamp=3D%)") +trace/generated-helpers.o: trace/generated-helpers.c =20 -trace-dtrace-root.dtrace: trace-dtrace-root.dtrace-timestamp +trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-dtrace-root.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/= config-host.mak $(tracetool-y) +trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_= DIR)/config-host.mak $(tracetool-y) + @mkdir -p $(dir $@) $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ - --format=3Dd \ - --backends=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=3D%)") - -trace-dtrace-root.h: trace-dtrace-root.dtrace - $(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@") - -trace-dtrace-root.o: trace-dtrace-root.dtrace + --format=3Dtcg-h \ + --backend=3D$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") =20 KEYCODEMAP_GEN =3D $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv @@ -469,10 +345,8 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - stub-obj-y \ authz-obj-y \ chardev-obj-y \ - util-obj-y \ qga-obj-y \ elf2dmp-obj-y \ ivshmem-client-obj-y \ @@ -493,14 +367,7 @@ dummy :=3D $(call unnest-vars,, \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m \ - trace-obj-y) - -dummy :=3D $(foreach DIR,$(trace-events-subdirs),$(eval $(call __trace_rul= es,$(DIR),$(call trace-group-suffix,$(DIR))))) - -generated-files-y +=3D $(TRACE_HEADERS) -generated-files-y +=3D $(TRACE_SOURCES) - + common-obj-m) =20 include $(SRC_PATH)/tests/Makefile.include =20 @@ -614,8 +481,7 @@ Makefile: $(version-obj-y) ###################################################################### # Build libraries =20 -libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) -libvhost-user.a: $(libvhost-user-obj-y) $(util-obj-y) $(stub-obj-y) +libvhost-user.a: $(libvhost-user-obj-y) =20 ###################################################################### =20 @@ -678,27 +544,6 @@ qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga= /qapi-schema.json $(qapi-p "GEN","$(@:%-timestamp=3D%)") @>$@ =20 -qapi-modules =3D $(SRC_PATH)/qapi/qapi-schema.json \ - $(QAPI_MODULES:%=3D$(SRC_PATH)/qapi/%.json) - -$(GENERATED_QAPI_FILES): qapi-gen-timestamp ; -qapi-gen-timestamp: $(qapi-modules) $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o "qapi" -b $<, \ - "GEN","$(@:%-timestamp=3D%)") - @>$@ - -qapi-modules-storage-daemon =3D \ - $(SRC_PATH)/storage-daemon/qapi/qapi-schema.json \ - $(QAPI_MODULES_STORAGE_DAEMON:%=3D$(SRC_PATH)/qapi/%.json) - -$(GENERATED_STORAGE_DAEMON_QAPI_FILES): storage-daemon/qapi/qapi-gen-times= tamp ; -storage-daemon/qapi/qapi-gen-timestamp: $(qapi-modules-storage-daemon) $(q= api-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o "storage-daemon/qapi" $<, \ - "GEN","$(@:%-timestamp=3D%)") - @>$@ - QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-vi= sit.h qga-qapi-commands.h qga-qapi-init-commands.h) $(qga-obj-y): $(QGALIB_GEN) =20 @@ -736,9 +581,9 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMM= ON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(COMMO= N_LDADDS) $(call LINK, $^) -vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a +vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(COMMON_= LDADDS) $(call LINK, $^) =20 rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" @@ -751,12 +596,12 @@ virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.= a $(COMMON_LDADDS) $(call LINK, $^) endif =20 -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) li= bqemuutil.a +vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) libvhost-user.a $(COMMON_= LDADDS) $(call LINK, $^) =20 ifdef CONFIG_VHOST_USER_INPUT ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a libqe= muutil.a +vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COM= MON_LDADDS) $(call LINK, $^) =20 # build by default, do not install @@ -784,9 +629,6 @@ clean: recurse-clean rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h - @# May not be present in generated-files-y - rm -f trace/generated-tracers-dtrace.dtrace* - rm -f trace/generated-tracers-dtrace.h* rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) rm -f qapi-gen-timestamp rm -f storage-daemon/qapi/qapi-gen-timestamp @@ -1013,7 +855,9 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ done - $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/= trace-events-all" + for d in $(TARGET_DIRS); do \ + $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ + done =20 # opengl shader programs ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shade= rinclude.pl @@ -1224,10 +1068,6 @@ Makefile: $(generated-files-y) endif endif =20 -.SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=3D%-timestamp) \ - $(TRACE_SOURCES) $(TRACE_SOURCES:%=3D%-timestamp) \ - $(TRACE_DTRACE) $(TRACE_DTRACE:%=3D%-timestamp) - # Include automatically generated dependency files # Dependencies in Makefile.objs files come from our recursive subdir rules -include $(wildcard *.d tests/*.d) diff --git a/Makefile.objs b/Makefile.objs index 3823463..e5c9077 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,7 +1,5 @@ ####################################################################### # Common libraries for tools and emulators -stub-obj-y =3D stubs/ -util-obj-y =3D crypto/ util/ qobject/ qapi/ qom-obj-y =3D qom/ =20 ####################################################################### @@ -95,10 +93,6 @@ common-obj-y +=3D disas/ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o =20 ###################################################################### -# tracing -util-obj-y +=3D trace/ - -###################################################################### # guest agent =20 # FIXME: a few definitions from qapi/qapi-types.o and @@ -123,92 +117,3 @@ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ virtiofsd-obj-y =3D tools/virtiofsd/ =20 ###################################################################### -trace-events-subdirs =3D -trace-events-subdirs +=3D accel/kvm -trace-events-subdirs +=3D accel/tcg -trace-events-subdirs +=3D backends -trace-events-subdirs +=3D backends/tpm -trace-events-subdirs +=3D crypto -trace-events-subdirs +=3D monitor -ifeq ($(CONFIG_USER_ONLY),y) -trace-events-subdirs +=3D linux-user -endif -ifeq ($(CONFIG_BLOCK),y) -trace-events-subdirs +=3D authz -trace-events-subdirs +=3D block -trace-events-subdirs +=3D io -trace-events-subdirs +=3D nbd -trace-events-subdirs +=3D scsi -endif -ifeq ($(CONFIG_SOFTMMU),y) -trace-events-subdirs +=3D audio -trace-events-subdirs +=3D chardev -trace-events-subdirs +=3D hw/9pfs -trace-events-subdirs +=3D hw/acpi -trace-events-subdirs +=3D hw/alpha -trace-events-subdirs +=3D hw/arm -trace-events-subdirs +=3D hw/audio -trace-events-subdirs +=3D hw/block -trace-events-subdirs +=3D hw/block/dataplane -trace-events-subdirs +=3D hw/char -trace-events-subdirs +=3D hw/dma -trace-events-subdirs +=3D hw/hppa -trace-events-subdirs +=3D hw/hyperv -trace-events-subdirs +=3D hw/i2c -trace-events-subdirs +=3D hw/i386 -trace-events-subdirs +=3D hw/i386/xen -trace-events-subdirs +=3D hw/ide -trace-events-subdirs +=3D hw/input -trace-events-subdirs +=3D hw/intc -trace-events-subdirs +=3D hw/isa -trace-events-subdirs +=3D hw/mem -trace-events-subdirs +=3D hw/mips -trace-events-subdirs +=3D hw/misc -trace-events-subdirs +=3D hw/misc/macio -trace-events-subdirs +=3D hw/net -trace-events-subdirs +=3D hw/nvram -trace-events-subdirs +=3D hw/pci -trace-events-subdirs +=3D hw/pci-host -trace-events-subdirs +=3D hw/ppc -trace-events-subdirs +=3D hw/rdma -trace-events-subdirs +=3D hw/rdma/vmw -trace-events-subdirs +=3D hw/rtc -trace-events-subdirs +=3D hw/s390x -trace-events-subdirs +=3D hw/scsi -trace-events-subdirs +=3D hw/sd -trace-events-subdirs +=3D hw/sparc -trace-events-subdirs +=3D hw/sparc64 -trace-events-subdirs +=3D hw/ssi -trace-events-subdirs +=3D hw/timer -trace-events-subdirs +=3D hw/tpm -trace-events-subdirs +=3D hw/usb -trace-events-subdirs +=3D hw/vfio -trace-events-subdirs +=3D hw/virtio -trace-events-subdirs +=3D hw/watchdog -trace-events-subdirs +=3D hw/xen -trace-events-subdirs +=3D hw/gpio -trace-events-subdirs +=3D hw/riscv -trace-events-subdirs +=3D migration -trace-events-subdirs +=3D net -trace-events-subdirs +=3D ui -endif -trace-events-subdirs +=3D hw/core -trace-events-subdirs +=3D hw/display -trace-events-subdirs +=3D qapi -trace-events-subdirs +=3D qom -trace-events-subdirs +=3D target/arm -trace-events-subdirs +=3D target/hppa -trace-events-subdirs +=3D target/i386 -trace-events-subdirs +=3D target/mips -trace-events-subdirs +=3D target/ppc -trace-events-subdirs +=3D target/riscv -trace-events-subdirs +=3D target/s390x -trace-events-subdirs +=3D target/sparc -trace-events-subdirs +=3D util - -trace-events-files =3D $(SRC_PATH)/trace-events $(trace-events-subdirs:%= =3D$(SRC_PATH)/%/trace-events) - -trace-obj-y =3D trace-root.o -trace-obj-$(CONFIG_TRACE_UST) +=3D trace-ust-all.o -trace-obj-$(CONFIG_TRACE_DTRACE) +=3D trace-dtrace-root.o -trace-obj-$(CONFIG_TRACE_DTRACE) +=3D $(trace-events-subdirs:%=3D%/trace-d= trace.o) diff --git a/Makefile.target b/Makefile.target index d61a6a9..0b32364 100644 --- a/Makefile.target +++ b/Makefile.target @@ -57,7 +57,7 @@ endif tracetool-y =3D $(SRC_PATH)/scripts/tracetool.py tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") =20 -$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetoo= l-y) $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dstap \ @@ -67,7 +67,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all= $(tracetool-y) --target-type=3D$(TARGET_TYPE) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed") =20 -$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG).stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dstap \ @@ -77,7 +77,7 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(traceto= ol-y) --target-type=3D$(TARGET_TYPE) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp") =20 -$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracet= ool-y) $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dsimpletrace-stap \ @@ -85,7 +85,7 @@ $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-a= ll $(tracetool-y) --probe-prefix=3Dqemu.$(TARGET_TYPE).$(TARGET_NAME) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp") =20 -$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dlog-stap \ diff --git a/configure b/configure index 53527f6..685bd28 100755 --- a/configure +++ b/configure @@ -7170,6 +7170,8 @@ fi echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak if test "$gnutls" =3D "yes" ; then echo "CONFIG_GNUTLS=3Dy" >> $config_host_mak + echo "GNUTLS_CFLAGS=3D$gnutls_cflags" >> $config_host_mak + echo "GNUTLS_LIBS=3D$gnutls_libs" >> $config_host_mak fi if test "$gcrypt" =3D "yes" ; then echo "CONFIG_GCRYPT=3Dy" >> $config_host_mak @@ -7180,6 +7182,8 @@ fi if test "$nettle" =3D "yes" ; then echo "CONFIG_NETTLE=3Dy" >> $config_host_mak echo "CONFIG_NETTLE_VERSION_MAJOR=3D${nettle_version%%.*}" >> $config_ho= st_mak + echo "NETTLE_CFLAGS=3D$nettle_cflags" >> $config_host_mak + echo "NETTLE_LIBS=3D$nettle_libs" >> $config_host_mak fi if test "$qemu_private_xts" =3D "yes" ; then echo "CONFIG_QEMU_PRIVATE_XTS=3Dy" >> $config_host_mak @@ -7556,6 +7560,8 @@ if have_backend "log"; then fi if have_backend "ust"; then echo "CONFIG_TRACE_UST=3Dy" >> $config_host_mak + echo "LTTNG_UST_LIBS=3D$lttng_ust_libs" >> $config_host_mak + echo "URCU_BP_LIBS=3D$urcu_bp_libs" >> $config_host_mak fi if have_backend "dtrace"; then echo "CONFIG_TRACE_DTRACE=3Dy" >> $config_host_mak @@ -7781,6 +7787,8 @@ echo "CFLAGS_NOPIE=3D$CFLAGS_NOPIE" >> $config_host_m= ak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_INCLUDES=3D$QEMU_INCLUDES" >> $config_host_mak +echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak +echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak if test "$sparse" =3D "yes" ; then echo "SPARSE_CFLAGS =3D -Wbitwise -Wno-transparent-union -Wno-old-initia= lizer -Wno-non-pointer-null" >> $config_host_mak fi diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index f1965b1..a988591 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -35,9 +35,3 @@ crypto-obj-$(CONFIG_QEMU_PRIVATE_XTS) +=3D xts.o crypto-obj-y +=3D block.o crypto-obj-y +=3D block-qcow.o crypto-obj-y +=3D block-luks.o - -util-obj-$(CONFIG_GCRYPT) +=3D random-gcrypt.o -util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) +=3D random-gnutls.o -util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,$(CONFIG_RNG_NONE= ))) +=3D random-none.o -util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,$(if $(CONFIG_RNG= _NONE),n,y))) +=3D random-platform.o -util-obj-y +=3D aes.o init.o diff --git a/crypto/meson.build b/crypto/meson.build new file mode 100644 index 0000000..1b24431 --- /dev/null +++ b/crypto/meson.build @@ -0,0 +1,11 @@ +util_ss.add(files('aes.c')) +util_ss.add(files('init.c')) +if 'CONFIG_GCRYPT' in config_host + util_ss.add(files('random-gcrypt.c')) +elif 'CONFIG_GNUTLS' in config_host + util_ss.add(files('random-gnutls.c'), gnutls) +elif 'CONFIG_RNG_NONE' in config_host + util_ss.add(files('random-none.c')) +else + util_ss.add(files('random-platform.c')) +endif diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index cb5f685..6144d99 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -60,7 +60,7 @@ general. It is strongly preferred that all events be decl= ared directly in the sub-directory that uses them. The only exception is where there are so= me shared trace events defined in the top level directory trace-events file. The top level directory generates trace files with a filename prefix of -"trace-root" instead of just "trace". This is to avoid ambiguity between +"trace/trace-root" instead of just "trace". This is to avoid ambiguity bet= ween a trace.h in the current directory, vs the top level directory. =20 =3D=3D=3D Using trace events =3D=3D=3D diff --git a/meson.build b/meson.build index e227b43..e1ea8ce 100644 --- a/meson.build +++ b/meson.build @@ -4,6 +4,9 @@ project('qemu', ['c', 'cpp'], meson_version: '>=3D0.55.0', =20 not_found =3D dependency('', required: false) keyval =3D import('unstable-keyval') +ss =3D import('sourceset') + +cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), @@ -39,6 +42,197 @@ supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64',= 'riscv32', 'riscv64', 'x86 cpu =3D host_machine.cpu_family() targetos =3D host_machine.system() =20 +m =3D cc.find_library('m', required: false) +util =3D cc.find_library('util', required: false) +socket =3D [] +if host_machine.system() =3D=3D 'windows' + socket =3D cc.find_library('ws2_32') +endif +glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), + link_args: config_host['GLIB_LIBS'].split()) +gio =3D not_found +if 'CONFIG_GIO' in config_host + gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), + link_args: config_host['GIO_LIBS'].split()) +endif +lttng =3D not_found +if 'CONFIG_TRACE_UST' in config_host + lttng =3D declare_dependency(link_args: config_host['LTTNG_UST_LIBS'].sp= lit()) +endif +urcubp =3D not_found +if 'CONFIG_TRACE_UST' in config_host + urcubp =3D declare_dependency(link_args: config_host['URCU_BP_LIBS'].spl= it()) +endif +nettle =3D not_found +if 'CONFIG_NETTLE' in config_host + nettle =3D declare_dependency(compile_args: config_host['NETTLE_CFLAGS']= .split(), + link_args: config_host['NETTLE_LIBS'].split(= )) +endif +gnutls =3D not_found +if 'CONFIG_GNUTLS' in config_host + gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), + link_args: config_host['GNUTLS_LIBS'].split(= )) +endif + +target_dirs =3D config_host['TARGET_DIRS'].split() +have_user =3D false +have_system =3D false +foreach target : target_dirs + have_user =3D have_user or target.endswith('-user') + have_system =3D have_system or target.endswith('-softmmu') +endforeach +have_tools =3D 'CONFIG_TOOLS' in config_host +have_block =3D have_system or have_tools + +# Generators + +qapi_gen =3D find_program('scripts/qapi-gen.py') +qapi_gen_depends =3D [ meson.source_root() / 'scripts/qapi/__init__.py', + meson.source_root() / 'scripts/qapi/commands.py', + meson.source_root() / 'scripts/qapi/common.py', + meson.source_root() / 'scripts/qapi/doc.py', + meson.source_root() / 'scripts/qapi/error.py', + meson.source_root() / 'scripts/qapi/events.py', + meson.source_root() / 'scripts/qapi/expr.py', + meson.source_root() / 'scripts/qapi/gen.py', + meson.source_root() / 'scripts/qapi/introspect.py', + meson.source_root() / 'scripts/qapi/parser.py', + meson.source_root() / 'scripts/qapi/schema.py', + meson.source_root() / 'scripts/qapi/source.py', + meson.source_root() / 'scripts/qapi/types.py', + meson.source_root() / 'scripts/qapi/visit.py', + meson.source_root() / 'scripts/qapi/common.py', + meson.source_root() / 'scripts/qapi/doc.py', + meson.source_root() / 'scripts/qapi-gen.py' +] + +tracetool =3D [ + find_program('scripts/tracetool.py'), + '--backend=3D' + config_host['TRACE_BACKENDS'] +] + +# Collect sourcesets. + +util_ss =3D ss.source_set() +stub_ss =3D ss.source_set() +trace_ss =3D ss.source_set() + +############### +# Trace files # +############### + +trace_events_subdirs =3D [ + 'accel/kvm', + 'accel/tcg', + 'crypto', + 'monitor', +] +if have_user + trace_events_subdirs +=3D [ 'linux-user' ] +endif +if have_block + trace_events_subdirs +=3D [ + 'authz', + 'block', + 'io', + 'nbd', + 'scsi', + ] +endif +if have_system + trace_events_subdirs +=3D [ + 'audio', + 'backends', + 'backends/tpm', + 'chardev', + 'hw/9pfs', + 'hw/acpi', + 'hw/alpha', + 'hw/arm', + 'hw/audio', + 'hw/block', + 'hw/block/dataplane', + 'hw/char', + 'hw/display', + 'hw/dma', + 'hw/hppa', + 'hw/hyperv', + 'hw/i2c', + 'hw/i386', + 'hw/i386/xen', + 'hw/ide', + 'hw/input', + 'hw/intc', + 'hw/isa', + 'hw/mem', + 'hw/mips', + 'hw/misc', + 'hw/misc/macio', + 'hw/net', + 'hw/nvram', + 'hw/pci', + 'hw/pci-host', + 'hw/ppc', + 'hw/rdma', + 'hw/rdma/vmw', + 'hw/rtc', + 'hw/s390x', + 'hw/scsi', + 'hw/sd', + 'hw/sparc', + 'hw/sparc64', + 'hw/ssi', + 'hw/timer', + 'hw/tpm', + 'hw/usb', + 'hw/vfio', + 'hw/virtio', + 'hw/watchdog', + 'hw/xen', + 'hw/gpio', + 'hw/riscv', + 'migration', + 'net', + 'ui', + ] +endif +trace_events_subdirs +=3D [ + 'hw/core', + 'qapi', + 'qom', + 'target/arm', + 'target/hppa', + 'target/i386', + 'target/mips', + 'target/ppc', + 'target/riscv', + 'target/s390x', + 'target/sparc', + 'util', +] + +genh =3D [] + +subdir('qapi') +subdir('qobject') +subdir('stubs') +subdir('trace') +subdir('util') +subdir('crypto') +subdir('storage-daemon') + +# Build targets from sourcesets + +stub_ss =3D stub_ss.apply(config_host, strict: false) + +util_ss.add_all(trace_ss) +util_ss =3D util_ss.apply(config_host, strict: false) +libqemuutil =3D static_library('qemuutil', + sources: util_ss.sources() + stub_ss.sources(= ) + genh, + dependencies: [util_ss.dependencies(), m, gli= b, socket]) +qemuutil =3D declare_dependency(link_with: libqemuutil, + sources: genh) + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 4673ab7..c0a31be 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -1,25 +1,4 @@ -util-obj-y =3D qapi-visit-core.o qapi-dealloc-visitor.o qobject-input-visi= tor.o -util-obj-y +=3D qobject-output-visitor.o qmp-registry.o qmp-dispatch.o -util-obj-y +=3D string-input-visitor.o string-output-visitor.o -util-obj-y +=3D opts-visitor.o qapi-clone-visitor.o -util-obj-y +=3D qmp-event.o -util-obj-y +=3D qapi-util.o - -QAPI_COMMON_MODULES =3D audio authz block-core block char common control c= rypto -QAPI_COMMON_MODULES +=3D dump error introspect job machine migration misc -QAPI_COMMON_MODULES +=3D net pragma qdev qom rdma rocker run-state sockets= tpm -QAPI_COMMON_MODULES +=3D trace transaction ui QAPI_TARGET_MODULES =3D machine-target misc-target -QAPI_MODULES =3D $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) - -util-obj-y +=3D qapi-builtin-types.o -util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi-types-%.o) -util-obj-y +=3D qapi-builtin-visit.o -util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi-visit-%.o) -util-obj-y +=3D qapi-emit-events.o -util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi-events-%.o) - -common-obj-y =3D $(QAPI_COMMON_MODULES:%=3Dqapi-commands-%.o) =20 obj-y =3D qapi-introspect.o obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-types-%.o) @@ -34,5 +13,3 @@ obj-y +=3D qapi-init-commands.o =20 QAPI_MODULES_STORAGE_DAEMON =3D block-core char common control crypto QAPI_MODULES_STORAGE_DAEMON +=3D introspect job qom sockets pragma transac= tion - -storage-daemon-obj-y +=3D $(QAPI_MODULES_STORAGE_DAEMON:%=3Dqapi-commands-= %.o) diff --git a/qapi/meson.build b/qapi/meson.build new file mode 100644 index 0000000..51d11ce --- /dev/null +++ b/qapi/meson.build @@ -0,0 +1,120 @@ +util_ss.add(files( + 'opts-visitor.c', + 'qapi-clone-visitor.c', + 'qapi-dealloc-visitor.c', + 'qapi-util.c', + 'qapi-visit-core.c', + 'qmp-dispatch.c', + 'qmp-event.c', + 'qmp-registry.c', + 'qobject-input-visitor.c', + 'qobject-output-visitor.c', + 'string-input-visitor.c', + 'string-output-visitor.c', +)) + +qapi_all_modules =3D [ + 'audio', + 'authz', + 'block-core', + 'block', + 'char', + 'common', + 'control', + 'crypto', + 'dump', + 'error', + 'introspect', + 'job', + 'machine', + 'machine-target', + 'migration', + 'misc', + 'misc-target', + 'net', + 'pragma', + 'qdev', + 'qom', + 'rdma', + 'rocker', + 'run-state', + 'sockets', + 'tpm', + 'trace', + 'transaction', + 'ui', +] + +qapi_storage_daemon_modules =3D [ + 'block-core', + 'char', + 'common', + 'control', + 'crypto', + 'introspect', + 'job', + 'qom', + 'sockets', + 'pragma', + 'transaction', +] + +qapi_nonmodule_outputs =3D [ + 'qapi-introspect.c', 'qapi-introspect.h', + 'qapi-types.c', 'qapi-types.h', + 'qapi-visit.h', 'qapi-visit.c', + 'qapi-commands.h', 'qapi-commands.c', + 'qapi-init-commands.h', 'qapi-init-commands.c', + 'qapi-events.h', 'qapi-events.c', +] + +# First build all sources +qapi_util_outputs =3D [ + 'qapi-builtin-types.c', 'qapi-builtin-visit.c', + 'qapi-emit-events.c', +] + +qapi_inputs =3D [] +qapi_specific_outputs =3D [] +foreach module : qapi_all_modules + qapi_inputs +=3D [ files(module + '.json') ] + qapi_module_outputs =3D [ + 'qapi-types-@0@.c'.format(module), + 'qapi-types-@0@.h'.format(module), + 'qapi-visit-@0@.c'.format(module), + 'qapi-visit-@0@.h'.format(module), + 'qapi-events-@0@.c'.format(module), + 'qapi-events-@0@.h'.format(module), + 'qapi-commands-@0@.c'.format(module), + 'qapi-commands-@0@.h'.format(module), + ] + if module.endswith('-target') + qapi_specific_outputs +=3D qapi_module_outputs + else + qapi_util_outputs +=3D qapi_module_outputs + endif +endforeach + +qapi_files =3D custom_target('shared QAPI source files', + output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outpu= ts + ['qapi-doc.texi'], + input: [ files('qapi-schema.json') ], + command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ], + depend_files: [ qapi_inputs, qapi_gen_depends ]) + +# Now go through all the outputs and add them to the right sourceset. +# These loops must be synchronized with the output of the above custom tar= get. + +i =3D 0 +foreach output : qapi_util_outputs + if output.endswith('.h') + genh +=3D qapi_files[i] + endif + util_ss.add(qapi_files[i]) + i =3D i + 1 +endforeach + +# These are still handled by the Makefile +i +=3D qapi_nonmodule_outputs.length() +i +=3D qapi_specific_outputs.length() + +qapi_doc_texi =3D qapi_files[i] diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs deleted file mode 100644 index 7b12c9c..0000000 --- a/qobject/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -util-obj-y =3D qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o -util-obj-y +=3D qjson.o qobject.o json-lexer.o json-streamer.o json-parser= .o -util-obj-y +=3D block-qdict.o diff --git a/qobject/meson.build b/qobject/meson.build new file mode 100644 index 0000000..bb63c06 --- /dev/null +++ b/qobject/meson.build @@ -0,0 +1,3 @@ +util_ss.add(files('qnull.c', 'qnum.c', 'qstring.c', 'qdict.c', 'qlist.c', = 'qbool.c', + 'qlit.c', 'qjson.c', 'qobject.c', 'json-lexer.c', 'json-streamer.c', 'js= on-parser.c', + 'block-qdict.c')) diff --git a/rules.mak b/rules.mak index 5ab42de..7aefd37 100644 --- a/rules.mak +++ b/rules.mak @@ -32,7 +32,7 @@ QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d # dir, one absolute and the other relative to the compiler working # directory. These are the same for target-independent files, but # different for target-dependent ones. -QEMU_LOCAL_INCLUDES =3D -iquote $(BUILD_DIR)/$(@D) -iquote $(@D) +QEMU_LOCAL_INCLUDES =3D -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -i= quote $(@D) =20 WL_U :=3D -Wl,-u, find-symbols =3D $(if $1, $(sort $(shell $(NM) -P -g $1 | $2))) diff --git a/scripts/qapi-gen.py b/scripts/qapi-gen.py old mode 100755 new mode 100644 diff --git a/scripts/tracetool.py b/scripts/tracetool.py old mode 100755 new mode 100644 diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index fc0c8fc..e17edc9 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -38,7 +38,7 @@ def generate_h_begin(events, group): if group =3D=3D "root": header =3D "trace-dtrace-root.h" else: - header =3D "trace-dtrace.h" + header =3D "trace-dtrace-%s.h" % group =20 # Workaround for ust backend, which also includes and may # require SDT_USE_VARIADIC to be defined. If dtrace includes diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/u= st.py index 6c0a5f8..c857516 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -19,11 +19,7 @@ PUBLIC =3D True =20 =20 def generate_h_begin(events, group): - if group =3D=3D "root": - header =3D "trace-ust-root.h" - else: - header =3D "trace-ust.h" - + header =3D 'trace-ust-' + group + '.h' out('#include ', '#include "%s"' % header, '', diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs index cfe6bee..41c0d02 100644 --- a/storage-daemon/Makefile.objs +++ b/storage-daemon/Makefile.objs @@ -1 +1,3 @@ -storage-daemon-obj-y +=3D qapi/ +storage-daemon-obj-y =3D qapi/libqsd-qapi.fa + +qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/= qapi/qapi-init-commands.h diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build new file mode 100644 index 0000000..35f8949 --- /dev/null +++ b/storage-daemon/meson.build @@ -0,0 +1 @@ +subdir('qapi') diff --git a/storage-daemon/qapi/Makefile.objs b/storage-daemon/qapi/Makefi= le.objs deleted file mode 100644 index 8a4b220..0000000 --- a/storage-daemon/qapi/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -storage-daemon-obj-y +=3D qapi-commands.o qapi-init-commands.o qapi-intros= pect.o diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.bu= ild new file mode 100644 index 0000000..a4e24f3 --- /dev/null +++ b/storage-daemon/qapi/meson.build @@ -0,0 +1,10 @@ +qsd_qapi_files =3D custom_target('QAPI files for qemu-storage-daemon', + output: qapi_nonmodule_outputs, + input: [ files('qapi-schema.json') ], + command: [ qapi_gen, '-o', 'storage-daemon/= qapi', '@INPUT@' ], + depend_files: [ qapi_inputs, qapi_gen_depen= ds ]) + +static_library('qsd-qapi', + qsd_qapi_files.to_list(), + name_suffix: 'fa', + build_by_default: false) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs deleted file mode 100644 index d42046a..0000000 --- a/stubs/Makefile.objs +++ /dev/null @@ -1,56 +0,0 @@ -stub-obj-y +=3D blk-commit-all.o -stub-obj-y +=3D cmos.o -stub-obj-y +=3D cpu-get-clock.o -stub-obj-y +=3D cpu-get-icount.o -stub-obj-y +=3D dump.o -stub-obj-y +=3D error-printf.o -stub-obj-y +=3D fdset.o -stub-obj-y +=3D gdbstub.o -stub-obj-y +=3D iothread-lock.o -stub-obj-y +=3D is-daemonized.o -stub-obj-y +=3D isa-bus.o -stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o -stub-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o -stub-obj-y +=3D monitor-core.o -stub-obj-y +=3D notify-event.o -stub-obj-y +=3D pci-bus.o -stub-obj-y +=3D qmp_memory_device.o -stub-obj-y +=3D qtest.o -stub-obj-y +=3D ramfb.o -stub-obj-y +=3D replay.o -stub-obj-y +=3D runstate-check.o -stub-obj-$(CONFIG_SOFTMMU) +=3D semihost.o -stub-obj-y +=3D set-fd-handler.o -stub-obj-y +=3D sysbus.o -stub-obj-y +=3D tpm.o -stub-obj-y +=3D trace-control.o -stub-obj-y +=3D vmgenid.o -stub-obj-y +=3D vmstate.o -stub-obj-$(CONFIG_SOFTMMU) +=3D win32-kbd-hook.o - -####################################################################### -# code used by both qemu system emulation and qemu-img - -ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) - -stub-obj-y +=3D arch_type.o -stub-obj-y +=3D bdrv-next-monitor-owned.o -stub-obj-y +=3D blockdev-close-all-bdrv-states.o -stub-obj-y +=3D change-state-handler.o -stub-obj-y +=3D clock-warp.o -stub-obj-y +=3D fd-register.o -stub-obj-y +=3D fw_cfg.o -stub-obj-y +=3D get-vm-name.o -stub-obj-y +=3D iothread.o -stub-obj-y +=3D machine-init-done.o -stub-obj-y +=3D migr-blocker.o -stub-obj-y +=3D monitor.o -stub-obj-y +=3D pci-host-piix.o -stub-obj-y +=3D ram-block.o -stub-obj-y +=3D replay-user.o -stub-obj-y +=3D target-get-monitor-def.o -stub-obj-y +=3D target-monitor-defs.o -stub-obj-y +=3D uuid.o -stub-obj-y +=3D vm-stop.o - -endif # CONFIG_SOFTMMU || CONFIG_TOOLS diff --git a/stubs/meson.build b/stubs/meson.build new file mode 100644 index 0000000..019bd79 --- /dev/null +++ b/stubs/meson.build @@ -0,0 +1,50 @@ +stub_ss.add(files('arch_type.c')) +stub_ss.add(files('bdrv-next-monitor-owned.c')) +stub_ss.add(files('blk-commit-all.c')) +stub_ss.add(files('blockdev-close-all-bdrv-states.c')) +stub_ss.add(files('change-state-handler.c')) +stub_ss.add(files('clock-warp.c')) +stub_ss.add(files('cmos.c')) +stub_ss.add(files('cpu-get-clock.c')) +stub_ss.add(files('cpu-get-icount.c')) +stub_ss.add(files('dump.c')) +stub_ss.add(files('error-printf.c')) +stub_ss.add(files('fd-register.c')) +stub_ss.add(files('fdset.c')) +stub_ss.add(files('fw_cfg.c')) +stub_ss.add(files('gdbstub.c')) +stub_ss.add(files('get-vm-name.c')) +stub_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('io_uring.c')) +stub_ss.add(files('iothread.c')) +stub_ss.add(files('iothread-lock.c')) +stub_ss.add(files('isa-bus.c')) +stub_ss.add(files('is-daemonized.c')) +stub_ss.add(when: 'CONFIG_LINUX_AIO', if_true: files('linux-aio.c')) +stub_ss.add(files('machine-init-done.c')) +stub_ss.add(files('migr-blocker.c')) +stub_ss.add(files('monitor.c')) +stub_ss.add(files('monitor-core.c')) +stub_ss.add(files('notify-event.c')) +stub_ss.add(files('pci-bus.c')) +stub_ss.add(files('pci-host-piix.c')) +stub_ss.add(files('qmp_memory_device.c')) +stub_ss.add(files('qtest.c')) +stub_ss.add(files('ram-block.c')) +stub_ss.add(files('ramfb.c')) +stub_ss.add(files('replay.c')) +stub_ss.add(files('replay-user.c')) +stub_ss.add(files('runstate-check.c')) +stub_ss.add(files('set-fd-handler.c')) +stub_ss.add(files('sysbus.c')) +stub_ss.add(files('target-get-monitor-def.c')) +stub_ss.add(files('target-monitor-defs.c')) +stub_ss.add(files('tpm.c')) +stub_ss.add(files('trace-control.c')) +stub_ss.add(files('uuid.c')) +stub_ss.add(files('vmgenid.c')) +stub_ss.add(files('vmstate.c')) +stub_ss.add(files('vm-stop.c')) +stub_ss.add(files('win32-kbd-hook.c')) +if have_system + stub_ss.add(files('semihost.c')) +endif diff --git a/trace/Makefile.objs b/trace/Makefile.objs index c544509..a429474 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -1,59 +1,8 @@ # -*- mode: makefile -*- =20 -$(BUILD_DIR)/trace-events-all: $(trace-events-files) - $(call quiet-command,cat $^ > $@) - =20 ################################################## # Translation level =20 -$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-t= imestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(= BUILD_DIR)/config-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-wrapper-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR= )/config-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -$(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR= )/config-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-c \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -$(obj)/generated-helpers.o: $(obj)/generated-helpers.c - obj-y +=3D generated-helpers.o - - -$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD= _DIR)/config-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - - -###################################################################### -# Backend code - -util-obj-$(CONFIG_TRACE_SIMPLE) +=3D simple.o -util-obj-$(CONFIG_TRACE_FTRACE) +=3D ftrace.o -util-obj-y +=3D control.o obj-y +=3D control-target.o -util-obj-y +=3D qmp.o diff --git a/trace/meson.build b/trace/meson.build new file mode 100644 index 0000000..f0a8d1c --- /dev/null +++ b/trace/meson.build @@ -0,0 +1,76 @@ +trace_events_files =3D [] +foreach dir : [ '.' ] + trace_events_subdirs + trace_events_file =3D meson.source_root() / dir / 'trace-events' + trace_events_files +=3D [ trace_events_file ] + group_name =3D dir =3D=3D '.' ? 'root' : dir.underscorify() + group =3D '--group=3D' + group_name + fmt =3D '@0@-' + group_name + '.@1@' + + trace_h =3D custom_target(fmt.format('trace', 'h'), + output: fmt.format('trace', 'h'), + input: trace_events_file, + command: [ tracetool, group, '--format=3Dh', '@I= NPUT@' ], + capture: true) + genh +=3D trace_h + trace_c =3D custom_target(fmt.format('trace', 'c'), + output: fmt.format('trace', 'c'), + input: trace_events_file, + command: [ tracetool, group, '--format=3Dc', '@I= NPUT@' ], + capture: true) + if 'CONFIG_TRACE_UST' in config_host + trace_ust_h =3D custom_target(fmt.format('trace-ust', 'h'), + output: fmt.format('trace-ust', 'h'), + input: trace_events_file, + command: [ tracetool, group, '--format=3Du= st-events-h', '@INPUT@' ], + capture: true) + trace_ss.add(trace_ust_h, lttng, urcubp) + genh +=3D trace_ust_h + endif + trace_ss.add(trace_h, trace_c) + if 'CONFIG_TRACE_DTRACE' in config_host + trace_dtrace =3D custom_target(fmt.format('trace-dtrace', 'dtrace'), + output: fmt.format('trace-dtrace', 'dtrac= e'), + input: trace_events_file, + command: [ tracetool, group, '--format=3D= d', '@INPUT@' ], + capture: true) + trace_dtrace_h =3D custom_target(fmt.format('trace-dtrace', 'h'), + output: fmt.format('trace-dtrace', 'h'), + input: trace_dtrace, + command: [ 'dtrace', '-o', '@OUTPUT@', = '-h', '-s', '@INPUT@' ]) + trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), + output: fmt.format('trace-dtrace', 'o'), + input: trace_dtrace, + command: [ 'dtrace', '-o', '@OUTPUT@', = '-G', '-s', '@INPUT@' ]) + + trace_ss.add(trace_dtrace_h, trace_dtrace_o) + genh +=3D trace_dtrace_h + endif +endforeach + +custom_target('trace-events-all', + output: 'trace-events-all', + input: trace_events_files, + command: [ 'cat', '@INPUT@' ], + capture: true, + install: true, + install_dir: config_host['qemu_datadir']) + +if 'CONFIG_TRACE_UST' in config_host + trace_ust_all_h =3D custom_target('trace-ust-all.h', + output: 'trace-ust-all.h', + input: trace_events_files, + command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-h', '@INPUT@' ], + capture: true) + trace_ust_all_c =3D custom_target('trace-ust-all.c', + output: 'trace-ust-all.c', + input: trace_events_files, + command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-c', '@INPUT@' ], + capture: true) + trace_ss.add(trace_ust_all_h, trace_ust_all_c) + genh +=3D trace_ust_all_h +endif + +trace_ss.add(when: 'CONFIG_TRACE_SIMPLE', if_true: files('simple.c')) +trace_ss.add(when: 'CONFIG_TRACE_FTRACE', if_true: files('ftrace.c')) +trace_ss.add(files('control.c')) +trace_ss.add(files('qmp.c')) diff --git a/util/Makefile.objs b/util/Makefile.objs deleted file mode 100644 index cc5e371..0000000 --- a/util/Makefile.objs +++ /dev/null @@ -1,83 +0,0 @@ -util-obj-y =3D osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-$(call lnot,$(CONFIG_ATOMIC64)) +=3D atomic64.o -util-obj-$(CONFIG_POSIX) +=3D aio-posix.o -util-obj-$(CONFIG_POSIX) +=3D fdmon-poll.o -util-obj-$(CONFIG_EPOLL_CREATE1) +=3D fdmon-epoll.o -util-obj-$(CONFIG_LINUX_IO_URING) +=3D fdmon-io_uring.o -util-obj-$(CONFIG_POSIX) +=3D compatfd.o -util-obj-$(CONFIG_POSIX) +=3D event_notifier-posix.o -util-obj-$(CONFIG_POSIX) +=3D mmap-alloc.o -util-obj-$(CONFIG_POSIX) +=3D oslib-posix.o -util-obj-$(CONFIG_POSIX) +=3D qemu-openpty.o -util-obj-$(CONFIG_POSIX) +=3D qemu-thread-posix.o -util-obj-$(CONFIG_POSIX) +=3D memfd.o -util-obj-$(CONFIG_WIN32) +=3D aio-win32.o -util-obj-$(CONFIG_WIN32) +=3D event_notifier-win32.o -util-obj-$(CONFIG_WIN32) +=3D oslib-win32.o -util-obj-$(CONFIG_WIN32) +=3D qemu-thread-win32.o -util-obj-y +=3D envlist.o path.o module.o -util-obj-y +=3D host-utils.o -util-obj-y +=3D bitmap.o bitops.o -util-obj-y +=3D fifo8.o -util-obj-y +=3D cacheinfo.o -util-obj-y +=3D error.o qemu-error.o -util-obj-y +=3D qemu-print.o -util-obj-y +=3D id.o -util-obj-y +=3D qemu-config.o notify.o -util-obj-y +=3D qemu-option.o qemu-progress.o -util-obj-y +=3D keyval.o -util-obj-y +=3D crc32c.o -util-obj-y +=3D uuid.o -util-obj-y +=3D getauxval.o -util-obj-y +=3D rcu.o -util-obj-$(CONFIG_MEMBARRIER) +=3D sys_membarrier.o -util-obj-y +=3D log.o -util-obj-y +=3D pagesize.o -util-obj-y +=3D qdist.o -util-obj-y +=3D qht.o -util-obj-y +=3D qsp.o -util-obj-y +=3D range.o -util-obj-y +=3D stats64.o -util-obj-y +=3D systemd.o -util-obj-$(CONFIG_POSIX) +=3D drm.o -util-obj-y +=3D guest-random.o -util-obj-$(CONFIG_GIO) +=3D dbus.o -dbus.o-cflags =3D $(GIO_CFLAGS) -dbus.o-libs =3D $(GIO_LIBS) -util-obj-$(CONFIG_USER_ONLY) +=3D selfmap.o - -####################################################################### -# code used by both qemu system emulation and qemu-img - -ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) - -util-obj-y +=3D aio-wait.o -util-obj-y +=3D aiocb.o -util-obj-y +=3D async.o -util-obj-y +=3D base64.o -util-obj-y +=3D buffer.o -util-obj-y +=3D bufferiszero.o -util-obj-y +=3D coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y +=3D hexdump.o -util-obj-y +=3D lockcnt.o -util-obj-y +=3D iov.o -util-obj-y +=3D iova-tree.o -util-obj-y +=3D hbitmap.o -util-obj-y +=3D main-loop.o -util-obj-y +=3D nvdimm-utils.o -util-obj-y +=3D qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y +=3D qemu-coroutine-sleep.o -util-obj-y +=3D qemu-co-shared-resource.o -util-obj-y +=3D qemu-sockets.o -util-obj-y +=3D qemu-timer.o -util-obj-y +=3D thread-pool.o -util-obj-y +=3D throttle.o -util-obj-y +=3D timed-average.o -util-obj-y +=3D uri.o - -util-obj-$(CONFIG_LINUX) +=3D vfio-helpers.o -util-obj-$(CONFIG_INOTIFY1) +=3D filemonitor-inotify.o -util-obj-$(call lnot,$(CONFIG_INOTIFY1)) +=3D filemonitor-stub.o -util-obj-$(CONFIG_BLOCK) +=3D readline.o - -endif # CONFIG_SOFTMMU || CONFIG_TOOLS diff --git a/util/meson.build b/util/meson.build new file mode 100644 index 0000000..62113ba --- /dev/null +++ b/util/meson.build @@ -0,0 +1,68 @@ +util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c= ')) +util_ss.add(files('bufferiszero.c')) +util_ss.add(files('lockcnt.c')) +util_ss.add(files('aiocb.c', 'async.c', 'aio-wait.c', 'thread-pool.c', 'qe= mu-timer.c')) +util_ss.add(files('main-loop.c')) +util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c')) +util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c')) +util_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('fdmon-io_uring.= c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('mmap-alloc.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('oslib-posix.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: [files('qemu-openpty.c'), util]) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('qemu-thread-posix.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('memfd.c')) +util_ss.add(when: 'CONFIG_WIN32', if_true: files('aio-win32.c')) +util_ss.add(when: 'CONFIG_WIN32', if_true: files('event_notifier-win32.c')) +util_ss.add(when: 'CONFIG_WIN32', if_true: files('oslib-win32.c')) +util_ss.add(when: 'CONFIG_WIN32', if_true: files('qemu-thread-win32.c')) +util_ss.add(when: 'CONFIG_WIN32', if_true: winmm) +util_ss.add(files('envlist.c', 'path.c', 'module.c')) +util_ss.add(files('host-utils.c')) +util_ss.add(files('bitmap.c', 'bitops.c', 'hbitmap.c')) +util_ss.add(files('fifo8.c')) +util_ss.add(files('nvdimm-utils.c')) +util_ss.add(files('cacheinfo.c')) +util_ss.add(files('error.c', 'qemu-error.c')) +util_ss.add(files('qemu-print.c')) +util_ss.add(files('id.c')) +util_ss.add(files('iov.c', 'qemu-config.c', 'qemu-sockets.c', 'uri.c', 'no= tify.c')) +util_ss.add(files('qemu-option.c', 'qemu-progress.c')) +util_ss.add(files('keyval.c')) +util_ss.add(files('hexdump.c')) +util_ss.add(files('crc32c.c')) +util_ss.add(files('uuid.c')) +util_ss.add(files('throttle.c')) +util_ss.add(files('getauxval.c')) +util_ss.add(files('readline.c')) +util_ss.add(files('rcu.c')) +util_ss.add(when: 'CONFIG_MEMBARRIER', if_true: files('sys_membarrier.c')) +util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-corou= tine-io.c')) +util_ss.add(files('qemu-coroutine-sleep.c')) +util_ss.add(files('qemu-co-shared-resource.c')) +util_ss.add(files('coroutine-@0@.c'.format(config_host['CONFIG_COROUTINE_B= ACKEND']))) +util_ss.add(files('buffer.c')) +util_ss.add(files('timed-average.c')) +util_ss.add(files('base64.c')) +util_ss.add(files('log.c')) +util_ss.add(files('pagesize.c')) +util_ss.add(files('qdist.c')) +util_ss.add(files('qht.c')) +util_ss.add(files('qsp.c')) +util_ss.add(files('range.c')) +util_ss.add(files('stats64.c')) +util_ss.add(files('systemd.c')) +util_ss.add(files('iova-tree.c')) +util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify.c= '), + if_false: files('filemonitor-stub.c'= )) +util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c')) +util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c')) +util_ss.add(files('guest-random.c')) +util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio]) + +if have_user then + util_ss.add(files('selfmap.c')) +endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080226; cv=none; d=zohomail.com; s=zohoarc; b=PYe/OA7b4R1Eo9BeQvTdtxZ2wOBVSqIYbbUXLGLoQ6e2467ttamArGCAKUPoC9CAVR7/W4huDnVU45fVyaeZ5NXgxDFZkQA1t/e17syCTS7MVcugNIeW6P+HuuBNg/owPCPcu4Bmnp1zrSgt7f3JMpahb8AWOABjyGIkSx58mCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080226; 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=9EOMO1YxqzdEizCHgH5Q4Zmn4JsTLg3RlJGDTcG4nU8=; b=kZ21l6jmQTqwpjmTF9fHIkpIps4Qf3Epl6+oMVUtj1FQSaBE5TMbYGaIDzOYwpfgGqvplEKZfpqF1QXrnCpFlWfYp6OF6WEuNjInrYPhY93y7LIwvmM6PkzEotJoeiyhbAa9MwsWv7+YYIvEcWbfetaBqHlCTCytd5xQOVL8qCc= 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 1597080226526489.02284941717335; Mon, 10 Aug 2020 10:23:46 -0700 (PDT) Received: from localhost ([::1]:38078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BWT-0007XS-9x for importer@patchew.org; Mon, 10 Aug 2020 13:23:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ5-0006Sn-2d for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:55 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:54620 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 1k5BJ3-0002mA-0K for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:54 -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-167-EpdvqyGANuuCmyusZlIxog-1; Mon, 10 Aug 2020 13:09:50 -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 A2CB8100CCE8 for ; Mon, 10 Aug 2020 17:09:49 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE83987D73; Mon, 10 Aug 2020 17:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079392; 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=9EOMO1YxqzdEizCHgH5Q4Zmn4JsTLg3RlJGDTcG4nU8=; b=HpDkbvZSwmBw817SOjl9pepIvvwI0SLWx8FN4sGUwQPBT78aX7aD9Yph5RW4K7SQHlVy5c 7zFOGnpq9vX4sucyVLkhRYjdfYKy9ETD9JWEkC+iX7RDr9RY/l0RDTD9OpDPuStMkvq00j 4jHA/qskpfQaBPgAYHfhK7ySKppktOk= X-MC-Unique: EpdvqyGANuuCmyusZlIxog-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 025/147] meson: add remaining generated tcg trace helpers Date: Mon, 10 Aug 2020 19:07:03 +0200 Message-Id: <1597079345-42801-26-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 | 51 --------------------------------------------------- trace/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 0811fd5..f2a6397 100644 --- a/Makefile +++ b/Makefile @@ -121,61 +121,10 @@ FULL_VERSION :=3D $(if $(QEMU_PKGVERSION),$(VERSION) = ($(QEMU_PKGVERSION)),$(VERSIO =20 generated-files-y =3D qemu-version.h config-host.h qemu-options.def =20 -generated-files-y +=3D trace/generated-tcg-tracers.h - -generated-files-y +=3D trace/generated-helpers-wrappers.h -generated-files-y +=3D trace/generated-helpers.h -generated-files-y +=3D trace/generated-helpers.c - generated-files-y +=3D module_block.h =20 generated-files-y +=3D .git-submodule-status =20 -tracetool-y =3D $(SRC_PATH)/scripts/tracetool.py -tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") - -trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-tim= estamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(B= UILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-wrapper-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.h: trace/generated-helpers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)= /config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.c: trace/generated-helpers.c-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)= /config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-helper-c \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.o: trace/generated-helpers.c - -trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_= DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=3Droot \ - --format=3Dtcg-h \ - --backend=3D$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - KEYCODEMAP_GEN =3D $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv =20 diff --git a/trace/meson.build b/trace/meson.build index f0a8d1c..cab36a2 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -55,6 +55,20 @@ custom_target('trace-events-all', install: true, install_dir: config_host['qemu_datadir']) =20 +foreach d : [ + ['generated-tcg-tracers.h', 'tcg-h'], + ['generated-helpers.c', 'tcg-helper-c'], + ['generated-helpers.h', 'tcg-helper-h'], + ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], +] + custom_target(d[0], + output: d[0], + input: meson.source_root() / 'trace-events', + command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@' ], + build_by_default: true, # to be removed when added to a ta= rget + capture: true) +endforeach + if 'CONFIG_TRACE_UST' in config_host trace_ust_all_h =3D custom_target('trace-ust-all.h', output: 'trace-ust-all.h', --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080013; cv=none; d=zohomail.com; s=zohoarc; b=KmD2r7WXSzK/mskHVf0Cin3VgcP0NQ9Rg2hi7s+9hku4PHoJr5cVlwZDuGukBmcri10tRXWwHFSq97P8rVrRaQbAUmePCLqb6Qpt4eiZhYAwtaTVSRZFAmseU4d5IauWd0AuZMCZ0VPxtarBwlcerrtnhuoKhaWdgkFKqOwr6nE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080013; 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=CK34GlcmoRCAOoC8u4D9+fOahr9ljPs9xRpHDLDpsPs=; b=jSdvM2/X4s8zKq1yoBhxbaeZtN3WP1kaYKOYpNrxkwKsqKUYh6w16cNBLYfE1fM6uxnfV/3T/VVk4KfI2nW7Qun1Zgz9Fs4yOuiNbu/6aHuN0bfawaDnPMEt1hp/oxEKLL7GcD6XcFMZxst/LB2utiUsh5Gqkk0fEFqZBUp7En0= 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 1597080013013915.3923142199793; Mon, 10 Aug 2020 10:20:13 -0700 (PDT) Received: from localhost ([::1]:48700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BT1-0000LO-Rn for importer@patchew.org; Mon, 10 Aug 2020 13:20:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ8-0006ak-4z for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:58 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:30044 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 1k5BJ6-0002mP-GL for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:57 -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-196-3cHykL7pM6uL3rjIAPbf7w-1; Mon, 10 Aug 2020 13:09:53 -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 E09EE19067EC for ; Mon, 10 Aug 2020 17:09:52 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AAE787D73; Mon, 10 Aug 2020 17:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079395; 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=CK34GlcmoRCAOoC8u4D9+fOahr9ljPs9xRpHDLDpsPs=; b=YUgGIsjvj+VlBin5MtQ3fqYBkpHgpjP4n4G36llcW8rRu/om9x8nxfSXHG7H4lzSjkuENd 79xWKAlUqxaFgMQdmn6An5BVN+zF8ve8+S+B/0LE5Hm4RehHexYocdbbUNddh9Xe8x6etw g4Q4sL/odiZbcC53AllrccxzmgEPz3w= X-MC-Unique: 3cHykL7pM6uL3rjIAPbf7w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 026/147] meson: add version.o Date: Mon, 10 Aug 2020 19:07:04 +0200 Message-Id: <1597079345-42801-27-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e1ea8ce..11b0887 100644 --- a/meson.build +++ b/meson.build @@ -45,8 +45,14 @@ targetos =3D host_machine.system() m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) socket =3D [] +version_res =3D [] if host_machine.system() =3D=3D 'windows' socket =3D cc.find_library('ws2_32') + + win =3D import('windows') + version_res =3D win.compile_resources('version.rc', + depend_files: files('pc-bios/qemu-ns= is.ico'), + include_directories: include_directo= ries('.')) endif glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), link_args: config_host['GLIB_LIBS'].split()) @@ -231,7 +237,7 @@ libqemuutil =3D static_library('qemuutil', sources: util_ss.sources() + stub_ss.sources(= ) + genh, dependencies: [util_ss.dependencies(), m, gli= b, socket]) qemuutil =3D declare_dependency(link_with: libqemuutil, - sources: genh) + sources: genh + version_res) =20 summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080119; cv=none; d=zohomail.com; s=zohoarc; b=Sq4+EyIMsQ2xo/NsHq1gYXnIJE1uDCg9GRWdphNJMcRyS5MRbl3DB+dY/KVvYNrKpACZnNszgZdO74eUOTJFGCz5QW7Zx9mVIiNgrV9vCioaqC66e5quBSmvoMWyvdYH3OU1CERoTZd35ZVWBZnVCbuJWLIqqMM1GLkDLDxo7yI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080119; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ls9Y61+oVbJWQs7e6qAWxF77eP4bmxwfawSV4hi0Nl0=; b=IeO6DkLHRfIKq5ELlPh1hZkGh6xTaj/fwkYJ4wEThaEhtDg004OoQxmZWizUDuQbsG81/HL3Te1jF8aa1SwGwvMx8xq8Vb9JNaoSDuhoFYk2SylkY7wZjLACiKL1DYRC95l1bc1n8rKSWk7IdBg+0WaVtH5mY2tJEn0XJaXg1Sg= 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 1597080119773216.73773095895183; Mon, 10 Aug 2020 10:21:59 -0700 (PDT) Received: from localhost ([::1]:56938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BUk-0003nu-Fn for importer@patchew.org; Mon, 10 Aug 2020 13:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJA-0006hc-OB for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60389 helo=us-smtp-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 1k5BJ8-0002mf-U6 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:00 -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-59-ZdBVeoJAM1Ww2DA98dgyew-1; Mon, 10 Aug 2020 13:09:54 -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 14BF980183C for ; Mon, 10 Aug 2020 17:09:54 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5842287D7E for ; Mon, 10 Aug 2020 17:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=Ls9Y61+oVbJWQs7e6qAWxF77eP4bmxwfawSV4hi0Nl0=; b=WAGdmhmrzkqJ71CLoawCD98+AUwlrb6l25OyG/ne4GIlmrXtfWtONUYogMWWD5MWMVJZvT ME6qwe+WOQjGwvY5jJvzeD2QtY1N0pfuEOMZRiAKrHs5tEb4YeGEAJxCPhnUBCA1rdXdYE uVxVYayQ3MCVT75E4XInseeDcRyz+jY= X-MC-Unique: ZdBVeoJAM1Ww2DA98dgyew-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 027/147] contrib/libvhost-user: convert to Meson Date: Mon, 10 Aug 2020 19:07:05 +0200 Message-Id: <1597079345-42801-28-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since libqemuutil.a has been converted to Meson, the conversion is straightforward. Signed-off-by: Paolo Bonzini --- Makefile | 16 +++++----------- Makefile.objs | 1 - contrib/libvhost-user/Makefile.objs | 1 - contrib/libvhost-user/meson.build | 3 +++ meson.build | 8 ++++++++ 5 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 contrib/libvhost-user/Makefile.objs create mode 100644 contrib/libvhost-user/meson.build diff --git a/Makefile b/Makefile index f2a6397..e189d24 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,6 @@ dummy :=3D $(call unnest-vars,, \ ivshmem-server-obj-y \ virtiofsd-obj-y \ rdmacm-mux-obj-y \ - libvhost-user-obj-y \ vhost-user-scsi-obj-y \ vhost-user-blk-obj-y \ vhost-user-input-obj-y \ @@ -428,11 +427,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-= host.h Makefile: $(version-obj-y) =20 ###################################################################### -# Build libraries - -libvhost-user.a: $(libvhost-user-obj-y) - -###################################################################### =20 COMMON_LDADDS =3D libqemuutil.a =20 @@ -530,9 +524,9 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMM= ON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(COMMO= N_LDADDS) +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/l= ibvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(COMMON_= LDADDS) +vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" @@ -541,16 +535,16 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDA= DDS) =20 # relies on Linux-specific syscalls ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) -virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS) +virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user= .a $(COMMON_LDADDS) $(call LINK, $^) endif =20 -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) libvhost-user.a $(COMMON_= LDADDS) +vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 ifdef CONFIG_VHOST_USER_INPUT ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COM= MON_LDADDS) +vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user= /libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 # build by default, do not install diff --git a/Makefile.objs b/Makefile.objs index e5c9077..9489864 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,7 +106,6 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -libvhost-user-obj-y =3D contrib/libvhost-user/ vhost-user-scsi.o-cflags :=3D $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs :=3D $(LIBISCSI_LIBS) vhost-user-scsi-obj-y =3D contrib/vhost-user-scsi/ diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Ma= kefile.objs deleted file mode 100644 index ef3778e..0000000 --- a/contrib/libvhost-user/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -libvhost-user-obj-y +=3D libvhost-user.o libvhost-user-glib.o diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meso= n.build new file mode 100644 index 0000000..e68dd1a --- /dev/null +++ b/contrib/libvhost-user/meson.build @@ -0,0 +1,3 @@ +libvhost_user =3D static_library('vhost-user', + files('libvhost-user.c', 'libvhost-user-gli= b.c'), + build_by_default: false) diff --git a/meson.build b/meson.build index 11b0887..2a19433 100644 --- a/meson.build +++ b/meson.build @@ -239,6 +239,14 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +# Other build targets + +if have_tools + if 'CONFIG_VHOST_USER' in config_host + subdir('contrib/libvhost-user') + endif +endif + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080203; cv=none; d=zohomail.com; s=zohoarc; b=iizoThY21+y1Y+vQwzc3ZiGL4sRASawgpjOmu5HJtHCb4OQDj/EnVeq+j3YfcTRprh7S6544cTaIt3ZdPTgyVCO4n4q0MZyyi4Z+HqxzQVfobuZp4Wy1dzo1vFTmhOJ46cE+z3E02F+voWzpnUwz1DqMfuZt+631mUYo4wEiGao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080203; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UbJoM8nL0JljaEpUKx9bnee2VZCeZ0/qw6mJCz1ROOU=; b=MCwVYdfuzkPeLXKrrM8Z6kAd/i5R5oULxR6if+0/TyGxN156Qc9jS2g9FFaa8FEYwj5dxfoKNlh88i+Zz3l9SKAJIl+39dcfscmlpFLuyNMcDoXvZoxX+tU7nt36D0E150/tGM8ecFo2482Vp1u2kiqH5WXJWfkmwztqZmiH9DE= 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 1597080203169872.0140385233045; Mon, 10 Aug 2020 10:23:23 -0700 (PDT) Received: from localhost ([::1]:35608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BW5-0006Yz-Oh for importer@patchew.org; Mon, 10 Aug 2020 13:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJE-0006ps-NO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56424 helo=us-smtp-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 1k5BJB-0002mt-2j for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:04 -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-542--QFB5FuOMsuvxQy-1eccJQ-1; Mon, 10 Aug 2020 13:09:57 -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 3784419200E2 for ; Mon, 10 Aug 2020 17:09:55 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EA028BD6F for ; Mon, 10 Aug 2020 17:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=UbJoM8nL0JljaEpUKx9bnee2VZCeZ0/qw6mJCz1ROOU=; b=cM6QFhrZbCl5Fz8vwYa/7Hh1gP/WhEQS7VjBWlmHE0UFgZRkvNVI4vb7R96jbwVKulJK8U SkMfGOJhwYmyvy07vQquVB6WNJ+3lcWS4InIujct3K3omz++IYYWF2gnIUz6pKCOx5Ar+t 3FSI4+m7kx7HSzbHfOM7u5mLBggbWck= X-MC-Unique: -QFB5FuOMsuvxQy-1eccJQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 028/147] tools/virtiofsd: convert to Meson Date: Mon, 10 Aug 2020 19:07:06 +0200 Message-Id: <1597079345-42801-29-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- Makefile | 12 ------------ Makefile.objs | 1 - configure | 1 + meson.build | 11 +++++++++++ tools/meson.build | 10 ++++++++++ tools/virtiofsd/Makefile.objs | 12 ------------ tools/virtiofsd/meson.build | 19 ++++++++++++++++= +++ tools/virtiofsd/passthrough_ll.c | 2 +- tools/virtiofsd/{seccomp.c =3D> passthrough_seccomp.c} | 2 +- tools/virtiofsd/{seccomp.h =3D> passthrough_seccomp.h} | 0 10 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 tools/meson.build delete mode 100644 tools/virtiofsd/Makefile.objs create mode 100644 tools/virtiofsd/meson.build rename tools/virtiofsd/{seccomp.c =3D> passthrough_seccomp.c} (99%) rename tools/virtiofsd/{seccomp.h =3D> passthrough_seccomp.h} (100%) diff --git a/Makefile b/Makefile index e189d24..6a3dfc4 100644 --- a/Makefile +++ b/Makefile @@ -189,11 +189,6 @@ HELPERS-y +=3D vhost-user-gpu$(EXESUF) vhost-user-json-y +=3D contrib/vhost-user-gpu/50-qemu-gpu.json endif =20 -ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)= ,yyyy) -HELPERS-y +=3D virtiofsd$(EXESUF) -vhost-user-json-y +=3D tools/virtiofsd/50-qemu-virtiofsd.json -endif - # Sphinx does not allow building manuals into the same directory as # the source files, so if we're doing an in-tree QEMU build we must # build the manuals into a subdirectory (and then install them from @@ -300,7 +295,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - virtiofsd-obj-y \ rdmacm-mux-obj-y \ vhost-user-scsi-obj-y \ vhost-user-blk-obj-y \ @@ -533,12 +527,6 @@ rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^) =20 -# relies on Linux-specific syscalls -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) -virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user= .a $(COMMON_LDADDS) - $(call LINK, $^) -endif - vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 diff --git a/Makefile.objs b/Makefile.objs index 9489864..fee0f71 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -113,6 +113,5 @@ vhost-user-blk-obj-y =3D contrib/vhost-user-blk/ rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ -virtiofsd-obj-y =3D tools/virtiofsd/ =20 ###################################################################### diff --git a/configure b/configure index 685bd28..86a8c8b 100755 --- a/configure +++ b/configure @@ -6970,6 +6970,7 @@ if test "$gprof" =3D "yes" ; then fi if test "$cap_ng" =3D "yes" ; then echo "CONFIG_LIBCAP_NG=3Dy" >> $config_host_mak + echo "LIBCAP_NG_LIBS=3D$cap_libs" >> $config_host_mak fi echo "CONFIG_AUDIO_DRIVERS=3D$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do diff --git a/meson.build b/meson.build index 2a19433..c6b5292 100644 --- a/meson.build +++ b/meson.build @@ -79,6 +79,15 @@ if 'CONFIG_GNUTLS' in config_host gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), link_args: config_host['GNUTLS_LIBS'].split(= )) endif +seccomp =3D not_found +if 'CONFIG_SECCOMP' in config_host + seccomp =3D declare_dependency(compile_args: config_host['SECCOMP_CFLAGS= '].split(), + link_args: config_host['SECCOMP_LIBS'].spli= t()) +endif +libcap_ng =3D not_found +if 'CONFIG_LIBCAP_NG' in config_host + libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -247,6 +256,8 @@ if have_tools endif endif =20 +subdir('tools') + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/tools/meson.build b/tools/meson.build new file mode 100644 index 0000000..513bd2f --- /dev/null +++ b/tools/meson.build @@ -0,0 +1,10 @@ +have_virtiofsd =3D (have_system and + have_tools and + 'CONFIG_LINUX' in config_host and=20 + 'CONFIG_SECCOMP' in config_host and + 'CONFIG_LIBCAP_NG' in config_host and + 'CONFIG_VHOST_USER' in config_host) + +if have_virtiofsd + subdir('virtiofsd') +endif diff --git a/tools/virtiofsd/Makefile.objs b/tools/virtiofsd/Makefile.objs deleted file mode 100644 index 076f667..0000000 --- a/tools/virtiofsd/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -virtiofsd-obj-y =3D buffer.o \ - fuse_opt.o \ - fuse_log.o \ - fuse_lowlevel.o \ - fuse_signals.o \ - fuse_virtio.o \ - helper.o \ - passthrough_ll.o \ - seccomp.o - -seccomp.o-cflags :=3D $(SECCOMP_CFLAGS) -seccomp.o-libs :=3D $(SECCOMP_LIBS) diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build new file mode 100644 index 0000000..d1e23c5 --- /dev/null +++ b/tools/virtiofsd/meson.build @@ -0,0 +1,19 @@ +executable('virtiofsd', files( + 'buffer.c', + 'fuse_opt.c', + 'fuse_log.c', + 'fuse_lowlevel.c', + 'fuse_signals.c', + 'fuse_virtio.c', + 'helper.c', + 'passthrough_ll.c', + 'passthrough_seccomp.c'), + link_with: libvhost_user, + dependencies: [seccomp, qemuutil, libcap_ng], + install: true, + install_dir: get_option('libexecdir')) + +configure_file(input: '50-qemu-virtiofsd.json.in', + output: '50-qemu-virtiofsd.json', + configuration: config_host, + install_dir: config_host['qemu_datadir'] / 'vhost-user') diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 94e0de2..63d1d00 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -65,7 +65,7 @@ #include =20 #include "passthrough_helpers.h" -#include "seccomp.h" +#include "passthrough_seccomp.h" =20 /* Keep track of inode posix locks for each owner. */ struct lo_inode_plock { diff --git a/tools/virtiofsd/seccomp.c b/tools/virtiofsd/passthrough_seccom= p.c similarity index 99% rename from tools/virtiofsd/seccomp.c rename to tools/virtiofsd/passthrough_seccomp.c index 3b1522a..19fee60 100644 --- a/tools/virtiofsd/seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "seccomp.h" +#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" #include diff --git a/tools/virtiofsd/seccomp.h b/tools/virtiofsd/passthrough_seccom= p.h similarity index 100% rename from tools/virtiofsd/seccomp.h rename to tools/virtiofsd/passthrough_seccomp.h --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080315; cv=none; d=zohomail.com; s=zohoarc; b=dVek68wwRdVFVj83dhfjZEAiKlieDk7cfSMAJ6c7sVRMlIz98kgD+YR7mhO0xjYW/CSVDjh1iWgwv0ZLKUPPKH0B3S3FnrG8uJ5LPgatRBqYhiMRpTDPhN0c7rRgKz5cNDLMyv7Stf4PX/t/J6BjbHlxhm9vSH0YKhXypi9EcwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080315; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=XkwctKtc+BtvrIZU8YC6grAo912qQ0c4qil4FP1Xuew=; b=gK7JKUSl69LV8Ho5e26uapOyQHZ2dyt0jDtXX4ZF/NoJJ8XSox6zG1ilDinHn4IgEj2IHjIEQH0E2BstYsjHmx2tZtNBlDuAFHV212Uamg2xUN/NR9teXumhRhqoD++8lsJtupA4PUPi4zN1aN6axJnGbyRIBkkFVvnVO00h7Ac= 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 1597080315262250.74186606104638; Mon, 10 Aug 2020 10:25:15 -0700 (PDT) Received: from localhost ([::1]:46586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BXt-0002WO-Tc for importer@patchew.org; Mon, 10 Aug 2020 13:25:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJE-0006of-83 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJA-0002mm-Q5 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:03 -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-563-GeS8bGf8MSugb4NiGgKNiA-1; Mon, 10 Aug 2020 13:09:58 -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 5CF858014D7 for ; Mon, 10 Aug 2020 17:09:56 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A54B287D9C for ; Mon, 10 Aug 2020 17:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=XkwctKtc+BtvrIZU8YC6grAo912qQ0c4qil4FP1Xuew=; b=LmD3pSJVemIw6ga06Wtaee8wmzAf5dTuFP9J1nL4PJtNjsPPqCGFyOKUc5BxryXuhgeHFa E5jPRdCJH8UakfidK7rR7FoDM3bx6i9hQ7t6HbNei5S4iKzh2k6O+PwlilwaHyDeSv0WVa M1+VNRaGLzJy40z9vRDBMzVcgGswcO8= X-MC-Unique: GeS8bGf8MSugb4NiGgKNiA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 029/147] contrib/vhost-user-blk: convert to Meson Date: Mon, 10 Aug 2020 19:07:07 +0200 Message-Id: <1597079345-42801-30-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> 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 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/10 11:11:16 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The GLib pkg-config information is extracted from config-host.mak and used to link vhost-user-blk. Signed-off-by: Paolo Bonzini --- Makefile | 3 --- Makefile.objs | 1 - contrib/vhost-user-blk/Makefile.objs | 1 - contrib/vhost-user-blk/meson.build | 5 +++++ meson.build | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 contrib/vhost-user-blk/Makefile.objs create mode 100644 contrib/vhost-user-blk/meson.build diff --git a/Makefile b/Makefile index 6a3dfc4..7317554 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,6 @@ dummy :=3D $(call unnest-vars,, \ ivshmem-server-obj-y \ rdmacm-mux-obj-y \ vhost-user-scsi-obj-y \ - vhost-user-blk-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -520,8 +519,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMM= ON_LDADDS) endif vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/l= ibvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) =20 rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index fee0f71..f69736c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,7 +109,6 @@ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshme= m-server/ vhost-user-scsi.o-cflags :=3D $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs :=3D $(LIBISCSI_LIBS) vhost-user-scsi-obj-y =3D contrib/vhost-user-scsi/ -vhost-user-blk-obj-y =3D contrib/vhost-user-blk/ rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-blk/Makefile.objs b/contrib/vhost-user-blk/= Makefile.objs deleted file mode 100644 index 72e2cdc..0000000 --- a/contrib/vhost-user-blk/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-blk-obj-y =3D vhost-user-blk.o diff --git a/contrib/vhost-user-blk/meson.build b/contrib/vhost-user-blk/me= son.build new file mode 100644 index 0000000..05cbf81 --- /dev/null +++ b/contrib/vhost-user-blk/meson.build @@ -0,0 +1,5 @@ +executable('vhost-user-blk', files('vhost-user-blk.c'), + link_with: libvhost_user, + dependencies: qemuutil, + build_by_default: targetos =3D=3D 'linux', + install: false) diff --git a/meson.build b/meson.build index c6b5292..fc1346a 100644 --- a/meson.build +++ b/meson.build @@ -253,6 +253,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') + subdir('contrib/vhost-user-blk') endif endif =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080026; cv=none; d=zohomail.com; s=zohoarc; b=KHO6VdUWg+fRsZ/xiOAbrf7JYjmLVxvi8tuBIKjdOukqtfBsUHxBF9Ch2JoU0HqS6NMa6FFwmg0GnwTYFcA4ZKvp2BiGnPBSLS+5PawCuSHr/2thnkwAH0aH1ttmK7MRsxj/wx+Kvx667qHNVuJP06mT65cJnkILxnZPUwu5F/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080026; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=LfhaaV0IWW8+d6MiU3ZNGehjzRVw6lRdeh9EZzy4RK4=; b=E975IGt/PII7E/WJiuNRuDmjgIzEyMluNbb0fYkB9eeRc5pbdpzh9w4EM6Km1Lr/Ra38oTYi/PskJ/hDh5jFYHjqFFPnqbF5OgJB1vwn5jeAulUBMvWc0UixKlJQnGrTa5XYycVRYRxqKJScNDxY39tmgZSx6t/9njl0SmJovXU= 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 1597080026145720.226748084474; Mon, 10 Aug 2020 10:20:26 -0700 (PDT) Received: from localhost ([::1]:49910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BTE-0000qF-Va for importer@patchew.org; Mon, 10 Aug 2020 13:20:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJC-0006mF-Nn for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56519 helo=us-smtp-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 1k5BJA-0002mo-Rl for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:02 -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-159-05h4nm9tPAqAHEki7MyfRA-1; Mon, 10 Aug 2020 13:09:58 -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 88F8C10CB427 for ; Mon, 10 Aug 2020 17:09:57 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA0065F1E9 for ; Mon, 10 Aug 2020 17:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=LfhaaV0IWW8+d6MiU3ZNGehjzRVw6lRdeh9EZzy4RK4=; b=GTuTVlVPAH+yRYDdugfABLr7r505M448KzXSdWkUyhxap6+cIL/7vwd699XWz1BcOXYrcQ AylfMNamOGMcZZ5PdzpSo0IGXJrr5N5JRFywpbHYvsGJbmeNUtfiHT1z8m7V81VdKRNcLq W3dfyBMquYfNwXVnZc3rMA80ZX6H3aI= X-MC-Unique: 05h4nm9tPAqAHEki7MyfRA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 030/147] contrib/vhost-user-scsi: convert to Meson Date: Mon, 10 Aug 2020 19:07:08 +0200 Message-Id: <1597079345-42801-31-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The libiscsi pkg-config information is extracted from config-host.mak and used to link vhost-user-blk. Signed-off-by: Paolo Bonzini --- Makefile | 3 --- Makefile.objs | 3 --- contrib/vhost-user-scsi/Makefile.objs | 1 - contrib/vhost-user-scsi/meson.build | 7 +++++++ meson.build | 6 ++++++ 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 contrib/vhost-user-scsi/Makefile.objs create mode 100644 contrib/vhost-user-scsi/meson.build diff --git a/Makefile b/Makefile index 7317554..11716bb 100644 --- a/Makefile +++ b/Makefile @@ -296,7 +296,6 @@ dummy :=3D $(call unnest-vars,, \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ rdmacm-mux-obj-y \ - vhost-user-scsi-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -517,8 +516,6 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMM= ON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/l= ibvhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) =20 rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index f69736c..ab798b0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,9 +106,6 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -vhost-user-scsi.o-cflags :=3D $(LIBISCSI_CFLAGS) -vhost-user-scsi.o-libs :=3D $(LIBISCSI_LIBS) -vhost-user-scsi-obj-y =3D contrib/vhost-user-scsi/ rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-scsi/Makefile.objs b/contrib/vhost-user-scs= i/Makefile.objs deleted file mode 100644 index e83a38a..0000000 --- a/contrib/vhost-user-scsi/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-scsi-obj-y =3D vhost-user-scsi.o diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/= meson.build new file mode 100644 index 0000000..257cbff --- /dev/null +++ b/contrib/vhost-user-scsi/meson.build @@ -0,0 +1,7 @@ +if 'CONFIG_LIBISCSI' in config_host + executable('vhost-user-scsi', files('vhost-user-scsi.c'), + link_with: libvhost_user, + dependencies: [qemuutil, libiscsi], + build_by_default: targetos =3D=3D 'linux', + install: false) +endif diff --git a/meson.build b/meson.build index fc1346a..eb0ae2c 100644 --- a/meson.build +++ b/meson.build @@ -88,6 +88,11 @@ libcap_ng =3D not_found if 'CONFIG_LIBCAP_NG' in config_host libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) endif +libiscsi =3D not_found +if 'CONFIG_LIBISCSI' in config_host + libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), + link_args: config_host['LIBISCSI_LIBS'].sp= lit()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -254,6 +259,7 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') + subdir('contrib/vhost-user-scsi') endif endif =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080289; cv=none; d=zohomail.com; s=zohoarc; b=enHZtXWR0yhiMQC842HvWDfBQppmv3VtcBD538Sn6S4G6FIAZ4SuXBxFbNK6YqIzWz0ZgoXcfsSRQqJJekO/OLoTaSK+884Q/aFLFN+v208MKLeq6puauFbe073Gp98FkbPXnsTHFyckmLyNnhWx3K63k44W9Hn7G3PqW55KBSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080289; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=w1RTZxsIAbWotdvjpZZYdpsZzENGz26urCgmvEAM2Vg=; b=O9WrRbxxIoVAqwI0gBbXPjHBmE8EP28Ex0jftT2uyzOOwyNq0fG8svV3TUq3JG18QN0tjV8rtbgUAy22wHP6HisUtc4nt/p0AzTjMEqhz8W04Qqged47CFLRANF+K5usuClTcUp2Hw83n2gjcZxZnLKSqOSOtSq0OeXVCMUwil4= 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 1597080289755865.9469082801975; Mon, 10 Aug 2020 10:24:49 -0700 (PDT) Received: from localhost ([::1]:44044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BXU-0001U2-IA for importer@patchew.org; Mon, 10 Aug 2020 13:24:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJF-0006rR-B2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24760 helo=us-smtp-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 1k5BJC-0002n6-Q6 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:05 -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-445-96fbRppwO5OgFOi6Ri9GUA-1; Mon, 10 Aug 2020 13:10:00 -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 AF57F8064A9 for ; Mon, 10 Aug 2020 17:09:58 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00C4487D61 for ; Mon, 10 Aug 2020 17:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=w1RTZxsIAbWotdvjpZZYdpsZzENGz26urCgmvEAM2Vg=; b=GO9dkSd+Ykv9/P9oOk9sRHVk9cS+MrYtArgtLcpR6BbMezzRBWmmdbOwJROJDaH7Fqwfjz kZxr9TkG4C1Ab+0IZwRwOhmyUzWialWyyfm7Dyy5MnH2hwCgF/x0sk5jTFVVxIMSfYpHg0 gWDkAYITASeE3nVMJ3gmR2EjtReR8Vs= X-MC-Unique: 96fbRppwO5OgFOi6Ri9GUA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 031/147] contrib/rdmacm-mux: convert to Meson Date: Mon, 10 Aug 2020 19:07:09 +0200 Message-Id: <1597079345-42801-32-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We can use config-host.mak to decide whether the tool has to be built, apart from that the conversion is straightforward. Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 1 - contrib/rdmacm-mux/Makefile.objs | 3 --- contrib/rdmacm-mux/meson.build | 8 ++++++++ meson.build | 2 ++ 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 contrib/rdmacm-mux/Makefile.objs create mode 100644 contrib/rdmacm-mux/meson.build diff --git a/Makefile b/Makefile index 11716bb..404cab7 100644 --- a/Makefile +++ b/Makefile @@ -295,7 +295,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - rdmacm-mux-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -517,10 +516,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COM= MON_LDADDS) $(call LINK, $^) endif =20 -rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" -rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) - vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 diff --git a/Makefile.objs b/Makefile.objs index ab798b0..0f80b63 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,7 +106,6 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ =20 diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile= .objs deleted file mode 100644 index 3df744a..0000000 --- a/contrib/rdmacm-mux/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -ifdef CONFIG_PVRDMA -rdmacm-mux-obj-y =3D main.o -endif diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build new file mode 100644 index 0000000..1a01bb9 --- /dev/null +++ b/contrib/rdmacm-mux/meson.build @@ -0,0 +1,8 @@ +if 'CONFIG_PVRDMA' in config_host + # if not found, CONFIG_PVRDMA should not be set + libumad =3D cc.find_library('ibumad', required: true) + executable('rdmacm-mux', files('main.c'), + dependencies: [glib, libumad], + build_by_default: targetos =3D=3D 'linux', + install: false) +endif diff --git a/meson.build b/meson.build index eb0ae2c..1d55980 100644 --- a/meson.build +++ b/meson.build @@ -256,6 +256,8 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, # Other build targets =20 if have_tools + subdir('contrib/rdmacm-mux') + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080218; cv=none; d=zohomail.com; s=zohoarc; b=PhGrnQJGq46fhcYHZTLE7BJQjZVcwGgby1ra5VZudKKwjykt4qqyakTmf594D2uS/n/UVuHFlAa9Gs8u7mvp1SZjuL26DXt+4IyIU8Wg0wGOUk/CdIaTaSaBeHvvaUWHU+0duS3nrMW8aDzooaYpdONl7l3GM3IvSh357C5fBKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080218; 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=tzD9lzUwpK49IwG4izm5KJPzN76WJ403LiQHde+34hE=; b=TPOa0ZaeGJb0kXRvijoeQlb6M6VAZwxB8Sg6Fy71oTseAEiX5xb+W8UQmjkWSjs+GTtnA6iOApxc5YjGGylZXe6jPrx9ytcrPopCTAfWj2TGLxvZPttoZtAwA9k/VwzlIXV2frODFRxuKYcL57Tn5bw18RcwyZwGlibdljj323A= 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 1597080218966807.8609098659416; Mon, 10 Aug 2020 10:23:38 -0700 (PDT) Received: from localhost ([::1]:37282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BWL-0007E4-PZ for importer@patchew.org; Mon, 10 Aug 2020 13:23:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJJ-00071K-J0 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:09 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:38859 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 1k5BJH-0002nt-JW for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:09 -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-171-mMSa29XCONOGI0QwiQXqlA-1; Mon, 10 Aug 2020 13:10:05 -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 2B4AA8015CE for ; Mon, 10 Aug 2020 17:10:04 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2900F87D6F; Mon, 10 Aug 2020 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079406; 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=tzD9lzUwpK49IwG4izm5KJPzN76WJ403LiQHde+34hE=; b=MRhY1Xj3ZMwe61wa9RsHq7PqhUd5qxhmby2QmRUxHQQnVzqYfPCUEw2W0PEBIrAkpaLTqS z3SevCMCZjB55+tIMOs5RybgkjfRqntHKG0Y+ZseZzOohIv9aEwx9yBZz9dJ/Pm920RmDr jblqiI0A2QRKNFlfkd2zvcrtYC+XKZI= X-MC-Unique: mMSa29XCONOGI0QwiQXqlA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 032/147] contrib/vhost-user-input: convert to meson Date: Mon, 10 Aug 2020 19:07:10 +0200 Message-Id: <1597079345-42801-33-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 | 11 ----------- Makefile.objs | 1 - contrib/vhost-user-input/Makefile.objs | 1 - contrib/vhost-user-input/meson.build | 5 +++++ meson.build | 1 + 5 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 contrib/vhost-user-input/Makefile.objs create mode 100644 contrib/vhost-user-input/meson.build diff --git a/Makefile b/Makefile index 404cab7..dd7b99e 100644 --- a/Makefile +++ b/Makefile @@ -295,7 +295,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ @@ -519,16 +518,6 @@ endif vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 -ifdef CONFIG_VHOST_USER_INPUT -ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user= /libvhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) - -# build by default, do not install -all: vhost-user-input$(EXESUF) -endif -endif - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/Makefile.objs b/Makefile.objs index 0f80b63..0922c3ed 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,7 +106,6 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ =20 ###################################################################### diff --git a/contrib/vhost-user-input/Makefile.objs b/contrib/vhost-user-in= put/Makefile.objs deleted file mode 100644 index b1fad90..0000000 --- a/contrib/vhost-user-input/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-input-obj-y =3D main.o diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-inpu= t/meson.build new file mode 100644 index 0000000..1eeb132 --- /dev/null +++ b/contrib/vhost-user-input/meson.build @@ -0,0 +1,5 @@ +executable('vhost-user-input', files('main.c'), + link_with: libvhost_user, + dependencies: qemuutil, + build_by_default: targetos =3D=3D 'linux', + install: false) diff --git a/meson.build b/meson.build index 1d55980..80966cc 100644 --- a/meson.build +++ b/meson.build @@ -261,6 +261,7 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') + subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080432; cv=none; d=zohomail.com; s=zohoarc; b=LHTXlgDoslLqpViTP7IXjuy4k2KpBdrBK8nS3Nqri8ljFMBZr8q8qjxqr4FCuYhsVIJPxJ9YKSLVNKjWYqBCRcI3WuqGHWOvnWXef0HLVqAUDOnohn5bKLy3bXko+F0P23WeP8tSugLsRitVn8F5PdJq3fTsmi5b4WMGfW84Z4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080432; 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=8IENvS6W6sUTP+SsAb7DRIXJIokhmnNYgULMJ41YEzw=; b=k3Qb1geTbxwmmCRwk4+Y2WbaBfzTRyZo4SbUnROr/gaf1n7o1qXql9/bRM5dimUqLp05JmEjyuQTrnEAIJFhSwwl+RcLh1NnLW2bFsyWmEFbKyL4lrIIU8vwJxWtkeUXfo8YHWxcfi0tvlwpwbw87KX1j4xX5/e10OJae9xJ0eY= 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 1597080432656772.1039953167071; Mon, 10 Aug 2020 10:27:12 -0700 (PDT) Received: from localhost ([::1]:58272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BZn-0007H8-Ff for importer@patchew.org; Mon, 10 Aug 2020 13:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJM-00076q-80 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:12 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33919 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 1k5BJJ-0002o6-Uq for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:11 -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-337-fpthtMIHO168e52SwoZhDg-1; Mon, 10 Aug 2020 13:10:06 -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 85F8C1030C20 for ; Mon, 10 Aug 2020 17:10:05 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 938085F1E9; Mon, 10 Aug 2020 17:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079409; 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=8IENvS6W6sUTP+SsAb7DRIXJIokhmnNYgULMJ41YEzw=; b=Ni1TqXy0FAXith4l8oq47DuTKFhTN3JiRQ57Vk5+XbcAjt+fOHovNUX5HwyAOeN4OGLb70 zc0XT7y/qeCyIc7wLGEapOshLZPEacdN/fC/i+Bh/EaWM+bUYvIEUqlHfnciSFdEmx26o/ HTz6eZFVrlgr5I9jocQoydKurRS6xQs= X-MC-Unique: fpthtMIHO168e52SwoZhDg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 033/147] contrib/vhost-user-gpu: convert to meson Date: Mon, 10 Aug 2020 19:07:11 +0200 Message-Id: <1597079345-42801-34-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 | 18 +----------------- Makefile.objs | 1 - contrib/vhost-user-gpu/Makefile.objs | 10 ---------- contrib/vhost-user-gpu/meson.build | 13 +++++++++++++ meson.build | 15 +++++++++++++++ rules.mak | 7 ------- 6 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 contrib/vhost-user-gpu/Makefile.objs create mode 100644 contrib/vhost-user-gpu/meson.build diff --git a/Makefile b/Makefile index dd7b99e..750598c 100644 --- a/Makefile +++ b/Makefile @@ -179,16 +179,10 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -vhost-user-json-y =3D HELPERS-y =3D $(HELPERS) =20 HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) +=3D qemu-bridge-he= lper$(EXESUF) =20 -ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) -HELPERS-y +=3D vhost-user-gpu$(EXESUF) -vhost-user-json-y +=3D contrib/vhost-user-gpu/50-qemu-gpu.json -endif - # Sphinx does not allow building manuals into the same directory as # the source files, so if we're doing an in-tree QEMU build we must # build the manuals into a subdirectory (and then install them from @@ -295,7 +289,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -309,7 +302,7 @@ dummy :=3D $(call unnest-vars,, \ =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules $(vhost-user-json-y) +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules =20 qemu-version.h: FORCE $(call quiet-command, \ @@ -515,9 +508,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMM= ON_LDADDS) $(call LINK, $^) endif =20 -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ @@ -711,12 +701,6 @@ endif ifneq ($(HELPERS-y),) $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir)) endif -ifneq ($(vhost-user-json-y),) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/" - for x in $(vhost-user-json-y); do \ - $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ - done -endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) endif diff --git a/Makefile.objs b/Makefile.objs index 0922c3ed..2f2d4b2 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,6 +106,5 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ =20 ###################################################################### diff --git a/contrib/vhost-user-gpu/Makefile.objs b/contrib/vhost-user-gpu/= Makefile.objs deleted file mode 100644 index 0929609..0000000 --- a/contrib/vhost-user-gpu/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -vhost-user-gpu-obj-y =3D vhost-user-gpu.o virgl.o vugbm.o - -vhost-user-gpu.o-cflags :=3D $(PIXMAN_CFLAGS) $(GBM_CFLAGS) -vhost-user-gpu.o-libs :=3D $(PIXMAN_LIBS) - -virgl.o-cflags :=3D $(VIRGL_CFLAGS) $(GBM_CFLAGS) -virgl.o-libs :=3D $(VIRGL_LIBS) - -vugbm.o-cflags :=3D $(GBM_CFLAGS) -vugbm.o-libs :=3D $(GBM_LIBS) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build new file mode 100644 index 0000000..6c1459f --- /dev/null +++ b/contrib/vhost-user-gpu/meson.build @@ -0,0 +1,13 @@ +if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \ + and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host + executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm= .c'), + link_with: libvhost_user, + dependencies: [qemuutil, pixman, gbm, virgl], + install: true, + install_dir: get_option('libexecdir')) + + configure_file(input: '50-qemu-gpu.json.in', + output: '50-qemu-gpu.json', + configuration: config_host, + install_dir: config_host['qemu_datadir'] / 'vhost-user') +endif diff --git a/meson.build b/meson.build index 80966cc..3483056 100644 --- a/meson.build +++ b/meson.build @@ -79,6 +79,8 @@ if 'CONFIG_GNUTLS' in config_host gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), link_args: config_host['GNUTLS_LIBS'].split(= )) endif +pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), + link_args: config_host['PIXMAN_LIBS'].split()) seccomp =3D not_found if 'CONFIG_SECCOMP' in config_host seccomp =3D declare_dependency(compile_args: config_host['SECCOMP_CFLAGS= '].split(), @@ -93,6 +95,16 @@ if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), link_args: config_host['LIBISCSI_LIBS'].sp= lit()) endif +gbm =3D not_found +if 'CONFIG_GBM' in config_host + gbm =3D declare_dependency(compile_args: config_host['GBM_CFLAGS'].split= (), + link_args: config_host['GBM_LIBS'].split()) +endif +virgl =3D not_found +if 'CONFIG_VIRGL' in config_host + virgl =3D declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].s= plit(), + link_args: config_host['VIRGL_LIBS'].split()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -261,6 +273,9 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') + if 'CONFIG_LINUX' in config_host + subdir('contrib/vhost-user-gpu') + endif subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif diff --git a/rules.mak b/rules.mak index 7aefd37..1aa6394 100644 --- a/rules.mak +++ b/rules.mak @@ -402,13 +402,6 @@ TEXI2MAN =3D $(call quiet-command, \ %.8: $(call TEXI2MAN) =20 -GEN_SUBST =3D $(call quiet-command, \ - sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \ - "GEN","$@") - -%.json: %.json.in - $(call GEN_SUBST) - # Support for building multiple output files by atomically executing # a single rule which depends on several input files (so the rule # will be executed exactly once, not once per output file, and --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080307; cv=none; d=zohomail.com; s=zohoarc; b=R4eJKnK2/aHhTkG53cCSsyrpYiPNmI1Ifa4PjGa/Ks9ECHFZeT5uv5p0obm09vK1h7a+8sI8M71OS3F3cbRheGVjm/YRThGvXXuBZKNBRDxIh1QA6t3hdqAUXLPnhhvC2w1UxItZSM0rNNeF2EtoqMhtV6yQU+PFwdsO1csL+ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080307; 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=q/dFmAPmWH7fYucZkzDXhVSl8dsrFGhgO5l63DeOvuc=; b=HzbeXTejs4jvEp79jaWHeDuosRTc5RJXgbjrjqxyBDt+dpJ6t9z2X0dLBBTnD0to47nFxV37YhVciBftepLJDymtFRZemVccpUR+83L9T1vgxPBFSh/QFRAC1HpIhOEYKFXvxIEFCTtC830BR1ZFtvAIeHF1FD7ChaNrbEVZe08= 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 1597080307691363.1346415340588; Mon, 10 Aug 2020 10:25:07 -0700 (PDT) Received: from localhost ([::1]:45870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BXm-0002DC-Dp for importer@patchew.org; Mon, 10 Aug 2020 13:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJN-0007Aq-M7 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJK-0002oC-JP for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:13 -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-435-WaNzaBtuMGikrLpt0jcAtA-1; Mon, 10 Aug 2020 13:10:07 -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 E5BE2800494 for ; Mon, 10 Aug 2020 17:10:06 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F324D5F1E9; Mon, 10 Aug 2020 17:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079409; 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=q/dFmAPmWH7fYucZkzDXhVSl8dsrFGhgO5l63DeOvuc=; b=bYzGU4pV5WS2wjwIVJrq1HSETr+2bq6xCrMKEugKVySVprWv7uzU9x1UujRgfyRgXe8EfM pvOKVXe3qHF7eubST9GW67iFDN49eZ+EDZveMGqFoWvXRlwc/mnsODDng4zeEgiMfLYByu S1Gjzo4DaghdqwWbj+0hC34FFIQcrB8= X-MC-Unique: WaNzaBtuMGikrLpt0jcAtA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 034/147] contrib/ivshmem: convert to meson Date: Mon, 10 Aug 2020 19:07:12 +0200 Message-Id: <1597079345-42801-35-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=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/10 11:11:16 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 | 9 --------- Makefile.objs | 2 -- configure | 3 --- contrib/ivshmem-client/Makefile.objs | 1 - contrib/ivshmem-client/meson.build | 4 ++++ contrib/ivshmem-server/Makefile.objs | 1 - contrib/ivshmem-server/meson.build | 4 ++++ meson.build | 5 +++++ 8 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 contrib/ivshmem-client/Makefile.objs create mode 100644 contrib/ivshmem-client/meson.build delete mode 100644 contrib/ivshmem-server/Makefile.objs create mode 100644 contrib/ivshmem-server/meson.build diff --git a/Makefile b/Makefile index 750598c..58ec90d 100644 --- a/Makefile +++ b/Makefile @@ -287,8 +287,6 @@ dummy :=3D $(call unnest-vars,, \ chardev-obj-y \ qga-obj-y \ elf2dmp-obj-y \ - ivshmem-client-obj-y \ - ivshmem-server-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -501,13 +499,6 @@ endif elf2dmp$(EXESUF): $(elf2dmp-obj-y) $(call LINK, $^) =20 -ifdef CONFIG_IVSHMEM -ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) -ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) -endif - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/Makefile.objs b/Makefile.objs index 2f2d4b2..336a684 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -104,7 +104,5 @@ qga-vss-dll-obj-y =3D qga/ ###################################################################### # contrib elf2dmp-obj-y =3D contrib/elf2dmp/ -ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ -ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ =20 ###################################################################### diff --git a/configure b/configure index 86a8c8b..6f7a5aa 100755 --- a/configure +++ b/configure @@ -6652,9 +6652,6 @@ if test "$want_tools" =3D "yes" ; then if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools" fi - if [ "$ivshmem" =3D "yes" ]; then - tools=3D"ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" - fi if [ "$curl" =3D "yes" ]; then tools=3D"elf2dmp\$(EXESUF) $tools" fi diff --git a/contrib/ivshmem-client/Makefile.objs b/contrib/ivshmem-client/= Makefile.objs deleted file mode 100644 index bfab2d2..0000000 --- a/contrib/ivshmem-client/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-client-obj-y =3D ivshmem-client.o main.o diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/me= son.build new file mode 100644 index 0000000..1b171ef --- /dev/null +++ b/contrib/ivshmem-client/meson.build @@ -0,0 +1,4 @@ +executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), + dependencies: glib, + build_by_default: targetos =3D=3D 'linux', + install: false) diff --git a/contrib/ivshmem-server/Makefile.objs b/contrib/ivshmem-server/= Makefile.objs deleted file mode 100644 index c060dd3..0000000 --- a/contrib/ivshmem-server/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-server-obj-y =3D ivshmem-server.o main.o diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/me= son.build new file mode 100644 index 0000000..3a53942 --- /dev/null +++ b/contrib/ivshmem-server/meson.build @@ -0,0 +1,4 @@ +executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), + dependencies: [qemuutil, rt], + build_by_default: targetos =3D=3D 'linux', + install: false) diff --git a/meson.build b/meson.build index 3483056..dc970df 100644 --- a/meson.build +++ b/meson.build @@ -90,6 +90,7 @@ libcap_ng =3D not_found if 'CONFIG_LIBCAP_NG' in config_host libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) endif +rt =3D cc.find_library('rt', required: false) libiscsi =3D not_found if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), @@ -279,6 +280,10 @@ if have_tools subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif + if 'CONFIG_IVSHMEM' in config_host + subdir('contrib/ivshmem-client') + subdir('contrib/ivshmem-server') + endif endif =20 subdir('tools') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080395; cv=none; d=zohomail.com; s=zohoarc; b=bUo6Tgfgpbh5kfLOwuA/JMUzqml/+amm8SK7PC6n2JERo1zfR1hz+2khhnpxgSH9nC0LhJch2smdSJOkYyjxXYgD6HuI3TD+1/xwfsiolzX9BEBROS7g0kJ+AldRmSzGMOPr5BcsbyYP8wVU+ZP3JE+BNKy8EeLhzhERNml2W28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080395; 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=Fo6O0ovTU5D6Q9dGU5S0TBVBQNhgDO+eSN7thZzLfLY=; b=SIOMz5+j0KBF2TdLBz/qmCpwiDdQKa7T7ndYTcEjpFazideF6hwxzBKCOskaxSxe6Ui1JUZaV1HgVmp46M3q4jUqbEsJN+ND7P4O47riCu6ZCOOgrxbeJh0HLiT9/xTY3+P8gApf2T5aqcXpeNpQFQ4Ojj5hwMz/pDNb4jTaoIs= 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 1597080395112974.3554061752083; Mon, 10 Aug 2020 10:26:35 -0700 (PDT) Received: from localhost ([::1]:54220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BZB-0005ds-OA for importer@patchew.org; Mon, 10 Aug 2020 13:26:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJO-0007CR-7x for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34882 helo=us-smtp-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 1k5BJL-0002oP-Lq for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:13 -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-355-pL7hoiZ2Py2oK9pg5KdCKw-1; Mon, 10 Aug 2020 13:10:09 -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 4FC2480048A for ; Mon, 10 Aug 2020 17:10:08 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DA3D5F1E9; Mon, 10 Aug 2020 17:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079410; 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=Fo6O0ovTU5D6Q9dGU5S0TBVBQNhgDO+eSN7thZzLfLY=; b=RsWfnuQ1/fCr+Qkc0MS+TxnMApdfoAFgqkaH2M0bTU5nS4Ivln4bNvjrwQJL7y6bYARX5n BAbDER7DVUjpq/btqj5pFBzyvb+NrQSyrjEHEYfijMBLPsK5+RtZFSlckHkrbGCS+ao8bQ IN/vIPlHknKOlOX05hdXtKwzutFBlQc= X-MC-Unique: pL7hoiZ2Py2oK9pg5KdCKw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 035/147] contrib/elf2dmp: convert to meson Date: Mon, 10 Aug 2020 19:07:13 +0200 Message-Id: <1597079345-42801-36-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 4 ---- Makefile.objs | 6 ------ configure | 3 --- contrib/elf2dmp/Makefile.objs | 4 ---- contrib/elf2dmp/meson.build | 5 +++++ meson.build | 6 ++++++ 6 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 contrib/elf2dmp/Makefile.objs create mode 100644 contrib/elf2dmp/meson.build diff --git a/Makefile b/Makefile index 58ec90d..574435e 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,6 @@ dummy :=3D $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ qga-obj-y \ - elf2dmp-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -496,9 +495,6 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif =20 -elf2dmp$(EXESUF): $(elf2dmp-obj-y) - $(call LINK, $^) - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/Makefile.objs b/Makefile.objs index 336a684..1486254 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -100,9 +100,3 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o # extracted into a QAPI schema module, or perhaps a separate schema. qga-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ - -###################################################################### -# contrib -elf2dmp-obj-y =3D contrib/elf2dmp/ - -###################################################################### diff --git a/configure b/configure index 6f7a5aa..98c413f 100755 --- a/configure +++ b/configure @@ -6652,9 +6652,6 @@ if test "$want_tools" =3D "yes" ; then if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools" fi - if [ "$curl" =3D "yes" ]; then - tools=3D"elf2dmp\$(EXESUF) $tools" - fi fi if test "$softmmu" =3D yes ; then if test "$linux" =3D yes; then diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs deleted file mode 100644 index 1505716..0000000 --- a/contrib/elf2dmp/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -elf2dmp-obj-y =3D main.o addrspace.o download.o pdb.o qemu_elf.o - -download.o-cflags :=3D $(CURL_CFLAGS) -download.o-libs :=3D $(CURL_LIBS) diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build new file mode 100644 index 0000000..b3de173 --- /dev/null +++ b/contrib/elf2dmp/meson.build @@ -0,0 +1,5 @@ +if 'CONFIG_CURL' in config_host + executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.= c', 'qemu_elf.c'), + dependencies: [glib, curl], + install: true) +endif diff --git a/meson.build b/meson.build index dc970df..ed557f1 100644 --- a/meson.build +++ b/meson.build @@ -106,6 +106,11 @@ if 'CONFIG_VIRGL' in config_host virgl =3D declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].s= plit(), link_args: config_host['VIRGL_LIBS'].split()) endif +curl =3D not_found +if 'CONFIG_CURL' in config_host + curl =3D declare_dependency(compile_args: config_host['CURL_CFLAGS'].spl= it(), + link_args: config_host['CURL_LIBS'].split()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -270,6 +275,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, =20 if have_tools subdir('contrib/rdmacm-mux') + subdir('contrib/elf2dmp') =20 if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080458; cv=none; d=zohomail.com; s=zohoarc; b=hZfz8o+AfR4htYcWQaeThYD+hRUdor2py8GlfaG+NDf9J3NydQKvS8IbUvfOyQfdWKvUXF0XQ+1KTztUddPB0+Zq0zujsnrwB5ynH8rgGxlM1PepfLhVM1w3vLuj3/AKluJF5vWpzPFCmtMK4WwvW43QEWSdGeg+pL3S6N5L13s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080458; 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=/wrHDYKz/38g8E2HT7YM+OIl6o5LueRvs12iJ5zUygo=; b=Bx0TFZ1ZmitunkSdQz+j1nri4GQpQ7bseWHnj1suC2cze1UmbThUJZdLbmk+4mFmY8zyrsFEtExGU3xdCL9j2LuZdpY+iaC/Z/8+4ry4kQg/xsWYuAKaLWCVcfUSITeTxcqHmX9cZ4Ckc26YQ8jczumzCofCbu/nxus1F9HCvUQ= 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 1597080458319470.60070587293376; Mon, 10 Aug 2020 10:27:38 -0700 (PDT) Received: from localhost ([::1]:60928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BaC-0008Jm-Vq for importer@patchew.org; Mon, 10 Aug 2020 13:27:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJU-0007Ue-6m for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:20 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56992 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 1k5BJQ-0002p1-2j for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:19 -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-334-K52eUxBMP6iZvbEKcoI3yA-1; Mon, 10 Aug 2020 13:10:11 -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 AFDC21B18BF1 for ; Mon, 10 Aug 2020 17:10:09 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCE3B5F1E9; Mon, 10 Aug 2020 17:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079415; 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=/wrHDYKz/38g8E2HT7YM+OIl6o5LueRvs12iJ5zUygo=; b=MOZ/FFRgLGvhAwoACJsMSFUFTUCoGpvAV91r5LlJR356tl3W70lEADaEo6shX9/J7lJe6U vGV0Q0mXCOKh142xgGqIVTLHqs0M6sEypzkGZ6AhieIWxYtr9Z08do8GhlTv3rA74KRk9V ka5RZxc/xJhgNSj2aoc4erzxfgCWbyo= X-MC-Unique: K52eUxBMP6iZvbEKcoI3yA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 036/147] meson: convert qemu-ga Date: Mon, 10 Aug 2020 19:07:14 +0200 Message-Id: <1597079345-42801-37-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 53 ++++++-------------------------------------= ---- Makefile.objs | 1 - configure | 9 ++++---- meson.build | 8 +++++++ qga/Makefile.objs | 9 -------- qga/installer/qemu-ga.wxs | 2 +- qga/meson.build | 46 ++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 4 ++-- tests/test-qga.c | 8 +++---- 9 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 qga/meson.build diff --git a/Makefile b/Makefile index 574435e..b50e290 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,6 @@ endif dummy :=3D $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ - qga-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -433,52 +432,15 @@ endif qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@= ") =20 -qemu-ga$(EXESUF): LIBS =3D $(LIBS_QGA) -qemu-ga$(EXESUF): QEMU_CFLAGS +=3D -I qga/qapi-generated - qemu-keymap$(EXESUF): LIBS +=3D $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS +=3D $(XKBCOMMON_CFLAGS) =20 -qapi-py =3D $(SRC_PATH)/scripts/qapi/__init__.py \ -$(SRC_PATH)/scripts/qapi/commands.py \ -$(SRC_PATH)/scripts/qapi/common.py \ -$(SRC_PATH)/scripts/qapi/doc.py \ -$(SRC_PATH)/scripts/qapi/error.py \ -$(SRC_PATH)/scripts/qapi/events.py \ -$(SRC_PATH)/scripts/qapi/expr.py \ -$(SRC_PATH)/scripts/qapi/gen.py \ -$(SRC_PATH)/scripts/qapi/introspect.py \ -$(SRC_PATH)/scripts/qapi/parser.py \ -$(SRC_PATH)/scripts/qapi/schema.py \ -$(SRC_PATH)/scripts/qapi/source.py \ -$(SRC_PATH)/scripts/qapi/types.py \ -$(SRC_PATH)/scripts/qapi/visit.py \ -$(SRC_PATH)/scripts/qapi-gen.py - -qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \ -qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h \ -qga/qapi-generated/qga-qapi-commands.h qga/qapi-generated/qga-qapi-command= s.c \ -qga/qapi-generated/qga-qapi-init-commands.h qga/qapi-generated/qga-qapi-in= it-commands.c \ -qga/qapi-generated/qga-qapi-doc.texi: \ -qga/qapi-generated/qapi-gen-timestamp ; -qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(= qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o qga/qapi-generated -p "qga-" $<, \ - "GEN","$(@:%-timestamp=3D%)") - @>$@ - -QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-vi= sit.h qga-qapi-commands.h qga-qapi-init-commands.h) -$(qga-obj-y): $(QGALIB_GEN) - -qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) - ifdef QEMU_GA_MSI_ENABLED QEMU_GA_MSI=3Dqemu-ga-$(ARCH).msi =20 msi: $(QEMU_GA_MSI) =20 -$(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER) +$(QEMU_GA_MSI): qga/qemu-ga.exe $(QGA_VSS_PROVIDER) =20 $(QEMU_GA_MSI): config-host.mak =20 @@ -491,8 +453,8 @@ msi: endif =20 ifneq ($(EXESUF),) -.PHONY: qemu-ga -qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) +.PHONY: qga/qemu-ga +qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif =20 module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak @@ -516,9 +478,6 @@ clean: recurse-clean rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) - rm -f qapi-gen-timestamp - rm -f storage-daemon/qapi/qapi-gen-timestamp - rm -rf qga/qapi-generated rm -f config-all-devices.mak rm -f $(SUBDIR_DEVICES_MAK) =20 @@ -637,7 +596,7 @@ endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1 "$(DESTDIR)$(m= andir)/man1" endif -ifneq (,$(findstring qemu-ga,$(TOOLS))) +ifeq ($(CONFIG_GUEST_AGENT),y) $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)= /man8" $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop" $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/i= nterop" @@ -658,7 +617,7 @@ install-datadir: =20 install-localstatedir: ifdef CONFIG_POSIX -ifneq (,$(findstring qemu-ga,$(TOOLS))) +ifeq ($(CONFIG_GUEST_AGENT),y) $(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run endif endif @@ -850,7 +809,7 @@ $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.h= tml.in qemu-version.h docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ =20 -docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi +docs/interop/qemu-ga-qapi.texi: qga/qga-qapi-doc.texi @cp -p $< $@ =20 html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxd= ocs diff --git a/Makefile.objs b/Makefile.objs index 1486254..259f993 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -98,5 +98,4 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o # FIXME: a few definitions from qapi/qapi-types.o and # qapi/qapi-visit.o are needed by libqemuutil.a. These should be # extracted into a QAPI schema module, or perhaps a separate schema. -qga-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ diff --git a/configure b/configure index 98c413f..ae6929e 100755 --- a/configure +++ b/configure @@ -3954,7 +3954,6 @@ for i in $glib_modules; do glib_libs=3D$($pkg_config --libs $i) QEMU_CFLAGS=3D"$glib_cflags $QEMU_CFLAGS" LIBS=3D"$glib_libs $LIBS" - libs_qga=3D"$glib_libs $libs_qga" else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi @@ -5174,7 +5173,6 @@ if compile_prog "" "" ; then : elif compile_prog "" "-lm" ; then LIBS=3D"-lm $LIBS" - libs_qga=3D"-lm $libs_qga" else error_exit "libm check failed" fi @@ -5199,7 +5197,6 @@ if compile_prog "" "" ; then # we need pthread for static linking. use previous pthread test result elif compile_prog "" "$pthread_lib -lrt" ; then LIBS=3D"$LIBS -lrt" - libs_qga=3D"$libs_qga -lrt" fi =20 # Check whether we need to link libutil for openpty() @@ -6694,7 +6691,6 @@ if [ "$guest_agent" !=3D "no" ]; then if [ "$softmmu" =3D no -a "$want_tools" =3D no ] ; then guest_agent=3Dno elif [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" -o= "$mingw32" =3D "yes" ] ; then - tools=3D"qemu-ga\$(EXESUF) $tools" guest_agent=3Dyes elif [ "$guest_agent" !=3D yes ]; then guest_agent=3Dno @@ -6940,6 +6936,9 @@ fi if test "$want_tools" =3D "yes" ; then echo "CONFIG_TOOLS=3Dy" >> $config_host_mak fi +if test "$guest_agent" =3D "yes" ; then + echo "CONFIG_GUEST_AGENT=3Dy" >> $config_host_mak +fi if test "$slirp" !=3D "no"; then echo "CONFIG_SLIRP=3Dy" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=3D\"$smbd\"" >> $config_host_mak @@ -7797,7 +7796,7 @@ echo "PTHREAD_LIB=3D$PTHREAD_LIB" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak echo "DSOSUF=3D$DSOSUF" >> $config_host_mak echo "LDFLAGS_SHARED=3D$LDFLAGS_SHARED" >> $config_host_mak -echo "LIBS_QGA+=3D$libs_qga" >> $config_host_mak +echo "LIBS_QGA=3D$libs_qga" >> $config_host_mak echo "TASN1_LIBS=3D$tasn1_libs" >> $config_host_mak echo "TASN1_CFLAGS=3D$tasn1_cflags" >> $config_host_mak echo "POD2MAN=3D$POD2MAN" >> $config_host_mak diff --git a/meson.build b/meson.build index ed557f1..e05a440 100644 --- a/meson.build +++ b/meson.build @@ -111,6 +111,10 @@ if 'CONFIG_CURL' in config_host curl =3D declare_dependency(compile_args: config_host['CURL_CFLAGS'].spl= it(), link_args: config_host['CURL_LIBS'].split()) endif +libudev =3D not_found +if 'CONFIG_LIBUDEV' in config_host + libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -273,6 +277,10 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, =20 # Other build targets =20 +if 'CONFIG_GUEST_AGENT' in config_host + subdir('qga') +endif + if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') diff --git a/qga/Makefile.objs b/qga/Makefile.objs index 9c558ae..9ecf249 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -1,10 +1 @@ -commands-posix.o-libs :=3D $(LIBUDEV_LIBS) -qga-obj-y =3D commands.o guest-agent-command-state.o main.o -qga-obj-$(CONFIG_POSIX) +=3D commands-posix.o channel-posix.o -qga-obj-$(CONFIG_WIN32) +=3D commands-win32.o channel-win32.o service-win3= 2.o -qga-obj-$(CONFIG_WIN32) +=3D vss-win32.o -qga-obj-y +=3D qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-vis= it.o -qga-obj-y +=3D qapi-generated/qga-qapi-commands.o -qga-obj-y +=3D qapi-generated/qga-qapi-init-commands.o - qga-vss-dll-obj-$(CONFIG_QGA_VSS) +=3D vss-win32/ diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index f678175..9cb4c3d 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -66,7 +66,7 @@ - + test_dir, "sock", NULL); cwd =3D g_get_current_dir(); - cmd =3D g_strdup_printf("%s%cqemu-ga -m unix-listen -t %s -p %s %s %s", - cwd, G_DIR_SEPARATOR, + cmd =3D g_strdup_printf("%s%cqga%cqemu-ga -m unix-listen -t %s -p %s %= s %s", + cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR, fixture->test_dir, path, getenv("QTEST_LOG") ? "-v" : "", extra_arg ?: ""); @@ -699,8 +699,8 @@ static void test_qga_config(gconstpointer data) GKeyFile *kf; =20 cwd =3D g_get_current_dir(); - cmd =3D g_strdup_printf("%s%cqemu-ga -D", - cwd, G_DIR_SEPARATOR); + cmd =3D g_strdup_printf("%s%cqga%cqemu-ga -D", + cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR); g_free(cwd); g_shell_parse_argv(cmd, NULL, &argv, &error); g_free(cmd); --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080475; cv=none; d=zohomail.com; s=zohoarc; b=ZQ8CGssn/2A5cKZqjgST36DPub4MR7/wbnRk0cAVAZVO1x+4YfjY0xOt21hQ3Tf6Lf7I/aWx0DBS890wKuau+ZpWVPAGb9BJ6xVCmnrbBFtLgSuM5Zg1fDZ4A+jFu1g2xbbUV7jyh9inoEJUGVO+2TvFJ30sowwnPfZm/u/fxwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080475; 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=jYk4CZMOCyT897Paj4S5kATDfsV+8w4YBoAIby868qM=; b=UxWtiGS29a6HpWi0zBNhtn5zpPtpkR60lFnngDaf4410b72DbwSuiGWtQulzdd0cvGjR4MKBS55Vk/v1D3Zj2zsfMHSmRUhd21YzoCFsW7Q+J1Szm4BhCyHbsNx99M3PTM8HZMBIBa9c6RiN1khrA/ykWN17Sh2CHes2dvzY3ks= 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 1597080475077143.3321107691678; Mon, 10 Aug 2020 10:27:55 -0700 (PDT) Received: from localhost ([::1]:34506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BaT-0000bI-RQ for importer@patchew.org; Mon, 10 Aug 2020 13:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJQ-0007LG-VP for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43071 helo=us-smtp-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 1k5BJO-0002ot-Os for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:16 -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-135-9f6sUpqWOm2Easb5um4yKQ-1; Mon, 10 Aug 2020 13:10:12 -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 1AFBE1009634 for ; Mon, 10 Aug 2020 17:10:11 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2826A5F1E9; Mon, 10 Aug 2020 17:10:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079414; 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=jYk4CZMOCyT897Paj4S5kATDfsV+8w4YBoAIby868qM=; b=h6Kygd/sdyl32hs5oPj0HiYCHXsv5xghEU+UYYAUOa3ckgXOcM1IQQ63GKN4WJHdweNcWa kI6M7RajsksOEMLhXiQml7uf0MBnABGvyiJusXM9NrTdlJIl8fbwxI+j8Y2bghZdCsN6ty FTuXk7ZLerTCNE4PAB+RvipQ94HpJPY= X-MC-Unique: 9f6sUpqWOm2Easb5um4yKQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 037/147] meson: convert vss-win32 Date: Mon, 10 Aug 2020 19:07:15 +0200 Message-Id: <1597079345-42801-38-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 1 - Makefile.objs | 8 -------- qga/Makefile.objs | 1 - qga/meson.build | 6 ++++++ qga/vss-win32/Makefile.objs | 23 ----------------------- qga/vss-win32/meson.build | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 33 deletions(-) delete mode 100644 qga/Makefile.objs delete mode 100644 qga/vss-win32/Makefile.objs create mode 100644 qga/vss-win32/meson.build diff --git a/Makefile b/Makefile index b50e290..36e1069 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,6 @@ endif dummy :=3D $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ - qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ storage-daemon-obj-y \ diff --git a/Makefile.objs b/Makefile.objs index 259f993..baf1565 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -91,11 +91,3 @@ common-obj-y +=3D disas/ ###################################################################### # Resource file for Windows executables version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o - -###################################################################### -# guest agent - -# FIXME: a few definitions from qapi/qapi-types.o and -# qapi/qapi-visit.o are needed by libqemuutil.a. These should be -# extracted into a QAPI schema module, or perhaps a separate schema. -qga-vss-dll-obj-y =3D qga/ diff --git a/qga/Makefile.objs b/qga/Makefile.objs deleted file mode 100644 index 9ecf249..0000000 --- a/qga/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -qga-vss-dll-obj-$(CONFIG_QGA_VSS) +=3D vss-win32/ diff --git a/qga/meson.build b/qga/meson.build index 3513a90..948302e 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -44,3 +44,9 @@ qga =3D executable('qemu-ga', qga_ss.sources(), link_args: config_host['LIBS_QGA'].split(), dependencies: [qemuutil, libudev], install: true) + +if host_machine.system() =3D=3D 'windows' + if 'CONFIG_QGA_VSS' in config_host + subdir('vss-win32') + endif +endif diff --git a/qga/vss-win32/Makefile.objs b/qga/vss-win32/Makefile.objs deleted file mode 100644 index c82676a..0000000 --- a/qga/vss-win32/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -# rules to build qga-vss.dll - -qga-vss-dll-obj-y +=3D requester.o provider.o install.o - -obj-qga-vss-dll-obj-y =3D $(addprefix $(obj)/, $(qga-vss-dll-obj-y)) -$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS :=3D $(filter-out -fstack-protecto= r-all -fstack-protector-strong, $(QEMU_CXXFLAGS)) -Wno-unknown-pragmas -Wno= -delete-non-virtual-dtor - -QGA_VSS_LDFLAGS =3D -shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup= -lglib-2.0 -lole32 -loleaut32 -lshlwapi -luuid -lintl -lws2_32 -static -$(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def - $(call quiet-command,$(CXX) -o $@ $(qga-vss-dll-obj-y) $(SRC_PATH)/qga/vs= s-win32/qga-vss.def $(CXXFLAGS) $(QGA_VSS_LDFLAGS),"LINK","$(TARGET_DIR)$@") - - -# rules to build qga-provider.tlb -# Currently, only native build is supported because building .tlb -# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++= ). -MIDL=3D$(WIN_SDK)/Bin/midl - -$(obj)/qga-vss.tlb: $(SRC_PATH)/$(obj)/qga-vss.idl -ifeq ($(WIN_SDK),"") - $(call quiet-command,cp $(dir $<)qga-vss.tlb $@,"COPY","$(TARGET_DIR)$@") -else - $(call quiet-command,$(MIDL) -tlb $@ -I $(WIN_SDK)/Include $<,"MIDL","$(T= ARGET_DIR)$@") -endif diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build new file mode 100644 index 0000000..42c8d31 --- /dev/null +++ b/qga/vss-win32/meson.build @@ -0,0 +1,33 @@ +if add_languages('cpp', required: false) + glib_static =3D dependency('glib-2.0', static: true) + link_args =3D cc.get_supported_link_arguments(['-fstack-protector-all', = '-fstack-protector-strong', + '-Wl,--add-stdcall-alias', = '-Wl,--enable-stdcall-fixup']) + shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'= ], + name_prefix: '', + cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtua= l-dtor', '-Wno-non-virtual-dtor'], + link_args: link_args, + vs_module_defs: 'qga-vss.def', + dependencies: [glib_static, socket, + cc.find_library('ole32'), + cc.find_library('oleaut32'), + cc.find_library('shlwapi'), + cc.find_library('uuid'), + cc.find_library('intl')]) +endif + +# rules to build qga-vss.tlb +# Currently, only native build is supported because building .tlb +# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++= ). +midl =3D find_program('midl', required: false) +if midl.found() + gen_tlb =3D custom_target('gen-tlb', + input: 'qga-vss.idl', + output: 'qga-vss.tlb', + command: [midl, '-tlb', '-I' + config_host['WIN_= SDK'], + '@INPUT@', '@OUTPUT@']) +else + gen_tlb =3D custom_target('gen-tlb', + input: 'qga-vss.tlb', + output: 'qga-vss.tlb', + command: ['cp', '@INPUT@', '@OUTPUT@']) +endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080376; cv=none; d=zohomail.com; s=zohoarc; b=efqU+ZUam4bdzo9OCOc3RqqYlgcmJS0wgBHyq1XWBgRE2soZZIDU9r7ejjpp6ZLJ6I8/1Tp0J5eX0Suu1HT8BtttD+0po4GGFsW0bcJ4OqqHhPRi2IzH+4Vv2DNuwaWWukV2JJhrg6JueoCaPkqqpMAhy17ZF7sTYMYnD8ha/oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080376; 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=7ObhfP1HGAZ7Bt99tb2BZxpa5RrGSHvyX3v3wG5VBoo=; b=eRKpVS7zdZLth7D6sGeEbu1JSCjEwfJqqdUtCXCPLXSQxIFj71kJMObjQKSLVQknJyHqLNLs3fsgLelpZx0CBYNp33O/v+pqVb7y579kAwE8WxNzwjmCmF/K/0all/4g3ZhOZwQtLfvBAyEi18QBHFT063xjq7Jc+whJz8I7Ae0= 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 1597080376207867.6081635269718; Mon, 10 Aug 2020 10:26:16 -0700 (PDT) Received: from localhost ([::1]:52348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BYs-0004tu-V3 for importer@patchew.org; Mon, 10 Aug 2020 13:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJT-0007SC-EM for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:19 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23462 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 1k5BJQ-0002p4-4k for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:19 -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-222-zDfq1l9TMl2vq7w2fb0Z7A-1; Mon, 10 Aug 2020 13:10:13 -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 7CBFC100A8FA for ; Mon, 10 Aug 2020 17:10:12 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 879975F1EA; Mon, 10 Aug 2020 17:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079415; 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=7ObhfP1HGAZ7Bt99tb2BZxpa5RrGSHvyX3v3wG5VBoo=; b=EEKsOt0vbheL9YU6sTB/rn5h/5gGaeLdRJe6oTL2LPs5BtPcyqXEkaMkWlyHh/sns90ebL YuIYkY/T5of3NUZfCzlUboeS3e52Yp0hVOuYHHD/tnGbLFZSmi/XOsMWSMIfCcBxezHU3G h98mKfvIOyKT7Hgse96IupbG33sguQA= X-MC-Unique: zDfq1l9TMl2vq7w2fb0Z7A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 038/147] meson: add msi generation Date: Mon, 10 Aug 2020 19:07:16 +0200 Message-Id: <1597079345-42801-39-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 18 ------------------ qga/meson.build | 25 +++++++++++++++++++++++++ qga/vss-win32/meson.build | 3 ++- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 36e1069..3aeadfb 100644 --- a/Makefile +++ b/Makefile @@ -434,23 +434,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PA= TH)/scripts/hxtool qemu-keymap$(EXESUF): LIBS +=3D $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS +=3D $(XKBCOMMON_CFLAGS) =20 -ifdef QEMU_GA_MSI_ENABLED -QEMU_GA_MSI=3Dqemu-ga-$(ARCH).msi - -msi: $(QEMU_GA_MSI) - -$(QEMU_GA_MSI): qga/qemu-ga.exe $(QGA_VSS_PROVIDER) - -$(QEMU_GA_MSI): config-host.mak - -$(QEMU_GA_MSI): $(SRC_PATH)/qga/installer/qemu-ga.wxs - $(call quiet-command,QEMU_GA_VERSION=3D"$(QEMU_GA_VERSION)" QEMU_GA_MANUF= ACTURER=3D"$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO=3D"$(QEMU_GA_DISTRO)" BU= ILD_DIR=3D"$(BUILD_DIR)" \ - wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MING= W_DLL_PATH) $<,"WIXL","$@") -else -msi: - @echo "MSI build not configured or dependency resolution failed (reconfig= ure with --enable-guest-agent-msi option)" -endif - ifneq ($(EXESUF),) .PHONY: qga/qemu-ga qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) @@ -465,7 +448,6 @@ clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h rm -f qemu-options.def - rm -f *.msi find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]= ' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ diff --git a/qga/meson.build b/qga/meson.build index 948302e..2d33c09 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -48,5 +48,30 @@ qga =3D executable('qemu-ga', qga_ss.sources(), if host_machine.system() =3D=3D 'windows' if 'CONFIG_QGA_VSS' in config_host subdir('vss-win32') + else + gen_tlb =3D [] + endif + + wixl =3D find_program('wixl', required: false) + if wixl.found() + deps =3D [gen_tlb, qga] + if 'QEMU_GA_MSI_WITH_VSS' in config_host + deps +=3D qga_vss + endif + qga_msi =3D custom_target('QGA MSI', + input: files('installer/qemu-ga.wxs'), + output: 'qemu-ga-@0@.msi'.format(config_host['= ARCH']), + depends: deps, + command: [ + 'QEMU_GA_VERSION=3D' + config_host['QEMU_GA_= VERSION'], + 'QEMU_GA_MANUFACTURER=3D' + config_host['QEM= U_GA_MANUFACTURER'], + 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA_D= ISTRO'], + 'BUILD_DIR=3D' + meson.build_root(), + wixl, '-o', '@OUTPUT0@', '@INPUT0@', + config_host['QEMU_GA_MSI_ARCH'].split(), + config_host['QEMU_GA_MSI_WITH_VSS'].split(), + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].sp= lit(), + ]) + alias_target('msi', qga_msi) endif endif diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index 42c8d31..1f39e05 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -2,7 +2,8 @@ if add_languages('cpp', required: false) glib_static =3D dependency('glib-2.0', static: true) link_args =3D cc.get_supported_link_arguments(['-fstack-protector-all', = '-fstack-protector-strong', '-Wl,--add-stdcall-alias', = '-Wl,--enable-stdcall-fixup']) - shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'= ], + + qga_vss =3D shared_module('qga-vss', ['requester.cpp', 'provider.cpp', '= install.cpp'], name_prefix: '', cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtua= l-dtor', '-Wno-non-virtual-dtor'], link_args: link_args, --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080287; cv=none; d=zohomail.com; s=zohoarc; b=daqrws7as8hF/R5Ol/28yRVnX3TKKFmZzR+ZsC9rzxbe5QNwrm4cpOXtTZ2Dvf4Sr9Tq9Qyu201QD/5RP3ASIVm3qpsNBGL1xh4DCvGBnCjUQForUXzMA9mGtsqBKVsogHvD9ffKpXtWSlMCB6FF+/1YDJyisKluax4KMlvwh4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080287; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1BWOI/nEMBAbcdH3Hg9U1VAqfDrfVzd49qKJhFbH1K4=; b=MIZ/Zj6L0LhzP5C8h2tYGP/gcnWz9sTbXBoS5Z3+Yc0aDTr07gSl+LJtjCXz+xNmsOUh17HE227A3MAiXvpLDii1NBVrHLvTZBlaU5pb7l5rL6Lj16f523qY5f7/CjRHIZhEUWiZjRlQLDuiHPb8xQaCI6gnb1UhQHH0cBtSXWY= 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 1597080287077460.6453237742585; Mon, 10 Aug 2020 10:24:47 -0700 (PDT) Received: from localhost ([::1]:43674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BXR-0001L0-B3 for importer@patchew.org; Mon, 10 Aug 2020 13:24:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJV-0007X2-6i for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:21 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42924 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 1k5BJS-0002pT-BG for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:20 -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-336-OK-pLXFWNU6RnRWZK8ibMA-1; Mon, 10 Aug 2020 13:10:14 -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 A1D0D19057AC for ; Mon, 10 Aug 2020 17:10:13 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E79BC71927 for ; Mon, 10 Aug 2020 17:10:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=1BWOI/nEMBAbcdH3Hg9U1VAqfDrfVzd49qKJhFbH1K4=; b=Dw2fD9wgU9J7BMJXGf4YV9zKvDIbN+H98eHCRTlHxQlNhNJP1Mu4msEAvt+wg3Jg704Uz8 d4Shm0X3M44ak7ces6myFBhPtSH7sH6cQeeAUnE6zsXJ/wwToJ3WzxXTOkGftccIXKYtQl gLGAmf1PX7CcNmLC9QPTDvEK0j5oCmQ= X-MC-Unique: OK-pLXFWNU6RnRWZK8ibMA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 039/147] meson: convert dummy Windows qga/qemu-ga target Date: Mon, 10 Aug 2020 19:07:17 +0200 Message-Id: <1597079345-42801-40-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- qga/meson.build | 4 ++++ qga/vss-win32/meson.build | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3aeadfb..b844b06 100644 --- a/Makefile +++ b/Makefile @@ -434,11 +434,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PA= TH)/scripts/hxtool qemu-keymap$(EXESUF): LIBS +=3D $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS +=3D $(XKBCOMMON_CFLAGS) =20 -ifneq ($(EXESUF),) -.PHONY: qga/qemu-ga -qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) -endif - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/qga/meson.build b/qga/meson.build index 2d33c09..7e7174b 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -44,6 +44,7 @@ qga =3D executable('qemu-ga', qga_ss.sources(), link_args: config_host['LIBS_QGA'].split(), dependencies: [qemuutil, libudev], install: true) +all_qga =3D [qga] =20 if host_machine.system() =3D=3D 'windows' if 'CONFIG_QGA_VSS' in config_host @@ -72,6 +73,9 @@ if host_machine.system() =3D=3D 'windows' config_host['QEMU_GA_MSI_WITH_VSS'].split(), config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].sp= lit(), ]) + all_qga +=3D [qga-msi] alias_target('msi', qga_msi) endif endif + +alias_target('qemu-ga', all_qga) diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index 1f39e05..780c461 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -14,6 +14,8 @@ if add_languages('cpp', required: false) cc.find_library('shlwapi'), cc.find_library('uuid'), cc.find_library('intl')]) + + all_qga +=3D qga_vss endif =20 # rules to build qga-vss.tlb --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080561; cv=none; d=zohomail.com; s=zohoarc; b=mnQN6m+dM+Lwj4IOOs9WQgdDKCjWYY1BYkJVPVaFNpphYpsftw1/xlFYyeGGVJZLedWX7cH1f/G/tigzhpx/4rDQxUmPavi/z+tGwlW4Wc9EmpBokYjRb8kBCQ8qrppKUolgYktz3Yk8UTjvzHfYSvSa7XuNeqPeLftMzTYJFR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080561; 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=WZvlnJ9Jj4AqGoZcTwDNkyH0J7VSZJMbTia0qPpJBEs=; b=ViK58XQOf64KdBVg0vOVzYgrBYd1he7j+5sEA03j/2ZDEodfMOhRiYXodzDd44AmYohEp8Q74NpML9jkGljPUaHQc8uQG1Ugw2294ZC/qZvMMANB7l0cp22tjzAYxbwvydlTEStLJDJ09r8UW3dgxuHjW7lUsXnEqQCn17sM2L8= 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 1597080561950580.8688907687157; Mon, 10 Aug 2020 10:29:21 -0700 (PDT) Received: from localhost ([::1]:43028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bbs-00040f-Pn for importer@patchew.org; Mon, 10 Aug 2020 13:29:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJU-0007VO-GO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJS-0002pY-IN for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:20 -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-215-Vzp3KubfN9WGkcYCGif1ig-1; Mon, 10 Aug 2020 13:10:16 -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 0D5E1100CCDD for ; Mon, 10 Aug 2020 17:10:15 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A1455F1EA; Mon, 10 Aug 2020 17:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079417; 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=WZvlnJ9Jj4AqGoZcTwDNkyH0J7VSZJMbTia0qPpJBEs=; b=DiTaZOc2Pu65FInq5jaukeCDTitRUEf5u/w9ELy9NIfIOXTaP1oXKxl1QoW5c4h/FTShz2 8YcQ39A7f9uZeL2pcll7VW1ZFNuTmaKvC8a23Gt/J5haM2R6JHx6LjJ6abs26/i9XFkYzm 5BKQC6B+A6LEW/tlnuNt6XScOoE48XY= X-MC-Unique: Vzp3KubfN9WGkcYCGif1ig-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 040/147] meson: add qemu-bridge-helper Date: Mon, 10 Aug 2020 19:07:18 +0200 Message-Id: <1597079345-42801-41-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=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/10 11:11:16 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 4 ---- meson.build | 9 ++++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b844b06..b4f486b 100644 --- a/Makefile +++ b/Makefile @@ -181,8 +181,6 @@ LIBS+=3D-lz $(LIBS_TOOLS) =20 HELPERS-y =3D $(HELPERS) =20 -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) +=3D qemu-bridge-he= lper$(EXESUF) - # Sphinx does not allow building manuals into the same directory as # the source files, so if we're doing an in-tree QEMU build we must # build the manuals into a subdirectory (and then install them from @@ -415,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-ob= j-y) $(crypto-obj-y) $(io qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) = $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 -qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) - qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS) =20 qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) diff --git a/meson.build b/meson.build index e05a440..7d07aa7 100644 --- a/meson.build +++ b/meson.build @@ -276,7 +276,6 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 # Other build targets - if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif @@ -294,6 +293,14 @@ if have_tools subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif + + if host_machine.system() =3D=3D 'linux' + executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), + dependencies: [qemuutil, libcap_ng], + install: true, + install_dir: get_option('libexecdir')) + endif + if 'CONFIG_IVSHMEM' in config_host subdir('contrib/ivshmem-client') subdir('contrib/ivshmem-server') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080655; cv=none; d=zohomail.com; s=zohoarc; b=L3w3frX1CLlojHR0bfT5xcIXxZTKMxSX6TcmGdw6Xpk6bgdQ0hP4xZmO0h942WXO23fTK3J4qBiUQXMaREdcO/Js3W9Y8thX8MOfTXjaTVr3U21hYn31vz1RuW5anvuOkvkEx9ol9oZ+f5zPJa3/MKrd2AUiob+sCO4Efq36dzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080655; 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=a3NoesOoJDQ5dh4y5TMmirCWk9vEI5OB1H6kTrUeO4g=; b=KqcZavt4+wImGo8HVdnPcdReRgztppfDpWNIN9u1qtT387tGQUbK1NeyFvJzYXJ3R0VGPO+GE5X7992TfWB72hL3wgcRIUek49ANUzCPXCBKxcTKHkRGRnNfsfIZnTXXmKHMk9RD1yVHLx5JrJgylUfqakbq8sbcBJiCHnv1LEM= 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 1597080655154111.21977785845888; Mon, 10 Aug 2020 10:30:55 -0700 (PDT) Received: from localhost ([::1]:51492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BdN-0007PH-Sw for importer@patchew.org; Mon, 10 Aug 2020 13:30:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJW-0007aS-Jq for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:22 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33691 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 1k5BJU-0002q5-Gp for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:22 -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-362-g37tO7PJNCOAWmDMNTgwEQ-1; Mon, 10 Aug 2020 13:10:17 -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 6D002106B25A for ; Mon, 10 Aug 2020 17:10:16 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A55987D6B; Mon, 10 Aug 2020 17:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079419; 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=a3NoesOoJDQ5dh4y5TMmirCWk9vEI5OB1H6kTrUeO4g=; b=Tpg171SqA4mAZHk5TLtJBRSfeZOXkoUE5RXXlRmnWmZWUxFBtQloV0f5AAHHVK0vHPOcGO EyUA6RCD5yUZvBCY0Vj7N6j4px3eTipnDDhBJYtHz+IP26Vh5D88vUNXISTzyMcLnKBLkZ L3xS2G2GjSUuBTzTNzqoa2g8eWJ9rhI= X-MC-Unique: g37tO7PJNCOAWmDMNTgwEQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 041/147] meson: add qemu-keymap Date: Mon, 10 Aug 2020 19:07:19 +0200 Message-Id: <1597079345-42801-42-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 5 ----- configure | 4 +--- meson.build | 10 ++++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b4f486b..0a99cb9 100644 --- a/Makefile +++ b/Makefile @@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-ob= j-y) $(crypto-obj-y) $(io qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) = $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 -qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS) - qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) =20 fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-m= arshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) @@ -427,9 +425,6 @@ endif qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@= ") =20 -qemu-keymap$(EXESUF): LIBS +=3D $(XKBCOMMON_LIBS) -qemu-keymap$(EXESUF): QEMU_CFLAGS +=3D $(XKBCOMMON_CFLAGS) - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/configure b/configure index ae6929e..b786483 100755 --- a/configure +++ b/configure @@ -6680,9 +6680,6 @@ if test "$softmmu" =3D yes ; then fi mpath=3Dno fi - if test "$xkbcommon" =3D "yes"; then - tools=3D"qemu-keymap\$(EXESUF) $tools" - fi fi =20 # Probe for guest agent support/options @@ -6999,6 +6996,7 @@ if test "$vnc_png" =3D "yes" ; then echo "CONFIG_VNC_PNG=3Dy" >> $config_host_mak fi if test "$xkbcommon" =3D "yes" ; then + echo "CONFIG_XKBCOMMON=3Dy" >> $config_host_mak echo "XKBCOMMON_CFLAGS=3D$xkbcommon_cflags" >> $config_host_mak echo "XKBCOMMON_LIBS=3D$xkbcommon_libs" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 7d07aa7..e91ebc3 100644 --- a/meson.build +++ b/meson.build @@ -90,6 +90,11 @@ libcap_ng =3D not_found if 'CONFIG_LIBCAP_NG' in config_host libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) endif +xkbcommon =3D not_found +if 'CONFIG_XKBCOMMON' in config_host + xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), + link_args: config_host['XKBCOMMON_LIBS'].= split()) +endif rt =3D cc.find_library('rt', required: false) libiscsi =3D not_found if 'CONFIG_LIBISCSI' in config_host @@ -284,6 +289,11 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') =20 + if 'CONFIG_XKBCOMMON' in config_host + executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), + dependencies: [qemuutil, xkbcommon], install: true) + endif + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080373; cv=none; d=zohomail.com; s=zohoarc; b=MDplrW5d5/i4boVFREUaUcB9jOoX8caOnv+RrWfpJV/NYeteFuCoUX8ITIcUIZ0cKEPJMRddvWsXoOCY3iOHk6/v7pC7wgJY3Lb0TQarl3mt7uQgfIMLVnuSoofJ07NQW89/AtchfJT9J+WlFsg+qz4xGk+d8cFT6pTvTKUCGis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080373; 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=b3eaTn63Nt7Pr9uDj21ZvhRrgEH8CxOh6c7eoy5YwyM=; b=iVfzGBs1+GKyAyqIemDCr0VMgDmTo3OowvL7od63wmwSjiSuH9H8nfue94M+4CuSLsU9gHmfFigzjgwsyFZ7RI/Ci/A7U1kDPvRLsuNB1mqRBI1Z2gtU5JeGRM+k1X861x/vvMMITbh7XL8vCNGPmye30ChHxW6ivhAbrGyuw98= 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 1597080373193718.8547820378403; Mon, 10 Aug 2020 10:26:13 -0700 (PDT) Received: from localhost ([::1]:52062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BYp-0004lj-UY for importer@patchew.org; Mon, 10 Aug 2020 13:26:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJX-0007cD-CR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJV-0002qQ-7c for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:23 -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-371-eNdVrTSNMeSQScZWN4I9ZQ-1; Mon, 10 Aug 2020 13:10:18 -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 CCEE319067F5 for ; Mon, 10 Aug 2020 17:10:17 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D956987D61; Mon, 10 Aug 2020 17:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079420; 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=b3eaTn63Nt7Pr9uDj21ZvhRrgEH8CxOh6c7eoy5YwyM=; b=WK5qIvy/lg28SiabOFYzS8sK+LrmZqNsXt1UskliQAabPaWFzT6YA+E20jK8ZwkxJGWJ4w vOOYApF7XnLDF4hZUFzKDIK0sGp/eJs08elgciezAiUNtgVY+JOQ8hnQrdn64gJFCmAeS+ kAQ6j8zqR7gMniJI0vhdW2HtH9Iegfs= X-MC-Unique: eNdVrTSNMeSQScZWN4I9ZQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 042/147] meson: add qemu-edid Date: Mon, 10 Aug 2020 19:07:20 +0200 Message-Id: <1597079345-42801-43-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=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/10 11:11:16 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 2 -- configure | 2 +- meson.build | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0a99cb9..6e22245 100644 --- a/Makefile +++ b/Makefile @@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-ob= j-y) $(crypto-obj-y) $(io qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) = $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 -qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) - fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-m= arshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) =20 scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-o= bj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) diff --git a/configure b/configure index b786483..bdd5c48 100755 --- a/configure +++ b/configure @@ -6645,7 +6645,7 @@ fi =20 tools=3D"" if test "$want_tools" =3D "yes" ; then - tools=3D"qemu-img\$(EXESUF) qemu-io\$(EXESUF) qemu-edid\$(EXESUF) $tools" + tools=3D"qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools" fi diff --git a/meson.build b/meson.build index e91ebc3..b5de9f4 100644 --- a/meson.build +++ b/meson.build @@ -294,6 +294,10 @@ if have_tools dependencies: [qemuutil, xkbcommon], install: true) endif =20 + executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c= '), + dependencies: qemuutil, + install: true) + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080546; cv=none; d=zohomail.com; s=zohoarc; b=fCeANqIviatPApvuPd3dt4NST5slH5vZ1FQQNttrEttUyndWicTQMJ8lQkpwz/zzeogD8+kyAmIdr9hvuGY3vyRk01V8v+Brfubm3itl5UARBydcWIih/WV+rm+O0TkdkmbMPgpVN+ubC7NvNF6UttSlpIoRRf9Up+FhLswUTcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080546; 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=WJ6R1HLMwakwNbb1kvTa+tXJgQ90Hx2q/rx0hE7JYug=; b=PfL372tQyGnS/Uv+5zR+aFIXA3iTpsQLvGdBzHNCzXrMJNjcHfqcvGETpsshQV6/P5Z51uChjfC01ZtJJ6i4ahO0M4/VnRMB81f4GN3SmFDRDyhcWr6pLcMY7rCKM+jn1x0vszaqWfaaEmmzvFBBd9IymxiQxDc0ys1xFq0H2BM= 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 1597080546430952.6067686576935; Mon, 10 Aug 2020 10:29:06 -0700 (PDT) Received: from localhost ([::1]:41302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bbd-0003JZ-00 for importer@patchew.org; Mon, 10 Aug 2020 13:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJZ-0007gc-LO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJW-0002qr-Mz for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:25 -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-493-U-1QnunhOa-mtnJaxYZTwg-1; Mon, 10 Aug 2020 13:10:20 -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 37BE819067E1 for ; Mon, 10 Aug 2020 17:10:19 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 454DA87D6B; Mon, 10 Aug 2020 17:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079421; 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=WJ6R1HLMwakwNbb1kvTa+tXJgQ90Hx2q/rx0hE7JYug=; b=CgZM8cUcgIMUEKXAiq/7JdJNw5sNNHjp9l+/Ywwtb2FgL9Nvjt/TN0/v0zh8IbzLG4O3ys yNp1VUA5JLlWGSp2mjfUmsRbfby5nULm6tSTk3droorditfmxBpALC2VKYERA262s8ddui VinnuVMa2bYgMeIJnQG56IYA1bl2eRk= X-MC-Unique: U-1QnunhOa-mtnJaxYZTwg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 043/147] meson: add virtfs-proxy-helper Date: Mon, 10 Aug 2020 19:07:21 +0200 Message-Id: <1597079345-42801-44-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=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/10 11:11:16 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 | 2 -- configure | 7 +++++-- fsdev/meson.build | 8 ++++++++ meson.build | 6 ++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 fsdev/meson.build diff --git a/Makefile b/Makefile index 6e22245..f4e5ecf 100644 --- a/Makefile +++ b/Makefile @@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-ob= j-y) $(crypto-obj-y) $(io qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) = $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 -fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-m= arshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) - scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-o= bj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS +=3D -ludev -lmultipath -lmpathpersist diff --git a/configure b/configure index bdd5c48..76a4658 100755 --- a/configure +++ b/configure @@ -4325,6 +4325,7 @@ fi ########################################## # attr probe =20 +libattr_libs=3D if test "$attr" !=3D "no" ; then cat > $TMPC < @@ -4341,7 +4342,8 @@ EOF # Older distros have , and need -lattr: elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then attr=3Dyes - LIBS=3D"-lattr $LIBS" + libattr_libs=3D"-lattr" + LIBS=3D"$libattr_libs $LIBS" libattr=3Dyes else if test "$attr" =3D "yes" ; then @@ -6644,6 +6646,7 @@ if [ "$eventfd" =3D "yes" ]; then fi =20 tools=3D"" +helpers=3D"" if test "$want_tools" =3D "yes" ; then tools=3D"qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then @@ -6654,7 +6657,6 @@ if test "$softmmu" =3D yes ; then if test "$linux" =3D yes; then if test "$virtfs" !=3D no && test "$cap_ng" =3D yes && test "$attr" = =3D yes ; then virtfs=3Dyes - helpers=3D"$helpers fsdev/virtfs-proxy-helper\$(EXESUF)" else if test "$virtfs" =3D yes; then error_exit "VirtFS requires libcap-ng devel and libattr devel" @@ -7236,6 +7238,7 @@ if test "$linux_io_uring" =3D "yes" ; then fi if test "$attr" =3D "yes" ; then echo "CONFIG_ATTR=3Dy" >> $config_host_mak + echo "LIBATTR_LIBS=3D$libattr_libs" >> $config_host_mak fi if test "$libattr" =3D "yes" ; then echo "CONFIG_LIBATTR=3Dy" >> $config_host_mak diff --git a/fsdev/meson.build b/fsdev/meson.build new file mode 100644 index 0000000..30e2319 --- /dev/null +++ b/fsdev/meson.build @@ -0,0 +1,8 @@ +have_virtfs_proxy_helper =3D have_tools and libattr.found() and libcap_ng.= found() and 'CONFIG_VIRTFS' in config_host +if have_virtfs_proxy_helper + executable('virtfs-proxy-helper', + files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marsha= l.c'), + dependencies: [qemuutil, libattr, libcap_ng], + install: true, + install_dir: get_option('libexecdir')) +endif diff --git a/meson.build b/meson.build index b5de9f4..d71d87d 100644 --- a/meson.build +++ b/meson.build @@ -81,6 +81,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), link_args: config_host['PIXMAN_LIBS'].split()) +libattr =3D not_found +if 'CONFIG_ATTR' in config_host + libattr =3D declare_dependency(link_args: config_host['LIBATTR_LIBS'].sp= lit()) +endif seccomp =3D not_found if 'CONFIG_SECCOMP' in config_host seccomp =3D declare_dependency(compile_args: config_host['SECCOMP_CFLAGS= '].split(), @@ -280,6 +284,8 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +subdir('fsdev') + # Other build targets if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080454; cv=none; d=zohomail.com; s=zohoarc; b=DxHfnBHODGqcN1YgQ/jXtgoP1ro6RJdAyY/Q+DaX0QlsfMGO4VzHBF8ZQvsybvPxAaOFRBJY0xJ9nI2wVvw+uY+gz3cUsj72uud6K0sLboCoSjH+zokfqxd2aaSnf6714Ukqqapk+8SW+rOFhWG/pzhQU6u2o+L5xIi9MaXSEKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080454; 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=k+TbutJ84oJkp/r4ElUEfmom1VA5P+5q0XqZoziFg2o=; b=kmLQJPdeeqLkuHGK8mSxvIxNnEN84SvI5RJ7Ij01XSZdwoGj13r03FFPugE1RJ1A/dVZ06KY3pMX6y1GIvXABGU83G5vtPivrWGK31rhFXWPcX4uJWk5BD9F/L1GHFD0Uqx+dVbNyFYin0fD0lcfN297aHdJTD/Oj9ea/jAPq4U= 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 1597080454427293.62272383865445; Mon, 10 Aug 2020 10:27:34 -0700 (PDT) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Ba9-00088v-11 for importer@patchew.org; Mon, 10 Aug 2020 13:27:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJd-0007ni-Eu for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54201 helo=us-smtp-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 1k5BJa-0002rt-Ul for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:29 -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-386-l0ztJc2CPtykhG_eGI6X6Q-1; Mon, 10 Aug 2020 13:10:24 -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 6D9DE8014D7 for ; Mon, 10 Aug 2020 17:10:23 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3B6987D61; Mon, 10 Aug 2020 17:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079426; 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=k+TbutJ84oJkp/r4ElUEfmom1VA5P+5q0XqZoziFg2o=; b=fLYHqn4U1ZDZoW1GFztd82DPp1uE0WdAA9ehU/rY6gQ7AiIkarlTEIO6MZ2fTY9M/X434O s4az80JgdOFYUQ2+s2X09e9EeuAtauSv744pyI508zmDc+o09gDFCmAIB3CKOopu5Yp//b tWC9zMr4buFktgpiLMjmiUQfBXmaRNQ= X-MC-Unique: l0ztJc2CPtykhG_eGI6X6Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 044/147] meson: keymap-gen Date: Mon, 10 Aug 2020 19:07:22 +0200 Message-Id: <1597079345-42801-45-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 | 38 -------------------------------------- meson.build | 1 + ui/meson.build | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 ui/meson.build diff --git a/Makefile b/Makefile index f4e5ecf..d5e43a0 100644 --- a/Makefile +++ b/Makefile @@ -125,44 +125,6 @@ generated-files-y +=3D module_block.h =20 generated-files-y +=3D .git-submodule-status =20 -KEYCODEMAP_GEN =3D $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen -KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv - -KEYCODEMAP_FILES =3D \ - ui/input-keymap-atset1-to-qcode.inc \ - ui/input-keymap-linux-to-qcode.inc \ - ui/input-keymap-qcode-to-atset1.inc \ - ui/input-keymap-qcode-to-atset2.inc \ - ui/input-keymap-qcode-to-atset3.inc \ - ui/input-keymap-qcode-to-linux.inc \ - ui/input-keymap-qcode-to-qnum.inc \ - ui/input-keymap-qcode-to-sun.inc \ - ui/input-keymap-qnum-to-qcode.inc \ - ui/input-keymap-usb-to-qcode.inc \ - ui/input-keymap-win32-to-qcode.inc \ - ui/input-keymap-x11-to-qcode.inc \ - ui/input-keymap-xorgevdev-to-qcode.inc \ - ui/input-keymap-xorgkbd-to-qcode.inc \ - ui/input-keymap-xorgxquartz-to-qcode.inc \ - ui/input-keymap-xorgxwin-to-qcode.inc \ - ui/input-keymap-osx-to-qcode.inc \ - $(NULL) - -generated-files-$(CONFIG_SOFTMMU) +=3D $(KEYCODEMAP_FILES) - -ui/input-keymap-%.inc: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/= Makefile.objs - $(call quiet-command,\ - stem=3D$* && src=3D$${stem%-to-*} dst=3D$${stem#*-to-} && \ - test -e $(KEYCODEMAP_GEN) && \ - $(PYTHON) $(KEYCODEMAP_GEN) \ - --lang glib2 \ - --varname qemu_input_map_$${src}_to_$${dst} \ - code-map $(KEYCODEMAP_CSV) $${src} $${dst} \ - > $@ || rm -f $@, "GEN", "$@") - -$(KEYCODEMAP_GEN): .git-submodule-status -$(KEYCODEMAP_CSV): .git-submodule-status - edk2-decompressed =3D $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2 $(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<) diff --git a/meson.build b/meson.build index d71d87d..4ea7fbb 100644 --- a/meson.build +++ b/meson.build @@ -271,6 +271,7 @@ subdir('trace') subdir('util') subdir('crypto') subdir('storage-daemon') +subdir('ui') =20 # Build targets from sourcesets =20 diff --git a/ui/meson.build b/ui/meson.build new file mode 100644 index 0000000..daacd2f --- /dev/null +++ b/ui/meson.build @@ -0,0 +1,34 @@ +keymaps =3D [ + ['atset1', 'qcode'], + ['linux', 'qcode'], + ['qcode', 'atset1'], + ['qcode', 'atset2'], + ['qcode', 'atset3'], + ['qcode', 'linux'], + ['qcode', 'qnum'], + ['qcode', 'sun'], + ['qnum', 'qcode'], + ['usb', 'qcode'], + ['win32', 'qcode'], + ['x11', 'qcode'], + ['xorgevdev', 'qcode'], + ['xorgkbd', 'qcode'], + ['xorgxquartz', 'qcode'], + ['xorgxwin', 'qcode'], + ['osx', 'qcode'], +] + +if have_system + foreach e : keymaps + output =3D 'input-keymap-@0@-to-@1@.inc'.format(e[0], e[1]) + genh +=3D custom_target(output, + output: output, + capture: true, + build_by_default: true, # to be removed when added to a = target + input: files('keycodemapdb/data/keymaps.csv'), + command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), + '--lang', 'glib2', + '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), + 'code-map', '@INPUT0@', e[0], e[1]]) + endforeach +endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080635; cv=none; d=zohomail.com; s=zohoarc; b=DFQb+Albg2hG9aW62DLPDeLMM7xPxStlXOjPlcRUZAYVX1Em4qGUpV2W7/VZDpsXVDXKXwnwDBAdhkLbYfo5VMD5aawFBouxCvTsTN7ZlvkKQEYgns9BvFUyFrVt7Ao3l3/InXqsfbJxbTXxjFJ+NtL3IKFWDMsl3GE2NQd598Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080635; 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=Fbtc3wi63iSDR/DRBtbuLdvl9oB7/ret4wblyCKVl0A=; b=TqLtQRTwiUqFudjL45jWcvlNzoVwebPx2/yKTz2+CXML9+lJqYqp2yRlYR/SczCZ1Zrhw1kxtNNx9HPeeG8ux57qnnioCn+cOYqDbZLBVRtls4m4aOFCKH/Dy2NCw9rshNIL9RHu1eQk18JtI9Phk3CHTZuKVFqWzsmEqharlRk= 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 1597080635681188.36963560946845; Mon, 10 Aug 2020 10:30:35 -0700 (PDT) Received: from localhost ([::1]:49936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bd4-0006n4-AT for importer@patchew.org; Mon, 10 Aug 2020 13:30:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJf-0007sE-LZ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:31 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20364 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 1k5BJc-0002sM-JN for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:31 -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-207-W8hyK0FtNSur3s5S4pjSGA-1; Mon, 10 Aug 2020 13:10:25 -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 CCC0F8005B0 for ; Mon, 10 Aug 2020 17:10:24 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA26B5F1EA; Mon, 10 Aug 2020 17:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079427; 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=Fbtc3wi63iSDR/DRBtbuLdvl9oB7/ret4wblyCKVl0A=; b=YRCeHyGz/D+HlyHzZa+wLWu8rGPMvvFNYMIZilwdtK7kUQtmFn0pOtI+EJiu7vz59jig8A IuzJkSiB/yzZQD6M//+tjtowzbf5K1zLXBavoQQ9k8ES66xjFB0BPIB9rbPKQDWA/af8/A E2v3guyfmNcjsefJnJ2Y4XAhCUdXE80= X-MC-Unique: W8hyK0FtNSur3s5S4pjSGA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 045/147] meson: generate qemu-version.h Date: Mon, 10 Aug 2020 19:07:23 +0200 Message-Id: <1597079345-42801-46-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 | 27 +-------------------------- meson.build | 14 ++++++++++++-- scripts/qemu-version.sh | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 28 deletions(-) create mode 100755 scripts/qemu-version.sh diff --git a/Makefile b/Makefile index d5e43a0..f995b23 100644 --- a/Makefile +++ b/Makefile @@ -105,21 +105,7 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 -# Create QEMU_PKGVERSION and FULL_VERSION strings -# If PKGVERSION is set, use that; otherwise get version and -dirty status = from git -QEMU_PKGVERSION :=3D $(if $(PKGVERSION),$(PKGVERSION),$(shell \ - cd $(SRC_PATH); \ - if test -e .git; then \ - git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ - if ! git diff-index --quiet HEAD &>/dev/null; then \ - echo "-dirty"; \ - fi; \ - fi)) - -# Either "version (pkgversion)", or just "version" if pkgversion not set -FULL_VERSION :=3D $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),= $(VERSION)) - -generated-files-y =3D qemu-version.h config-host.h qemu-options.def +generated-files-y =3D config-host.h qemu-options.def =20 generated-files-y +=3D module_block.h =20 @@ -259,17 +245,6 @@ include $(SRC_PATH)/tests/Makefile.include =20 all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules =20 -qemu-version.h: FORCE - $(call quiet-command, \ - (printf '#define QEMU_PKGVERSION "$(QEMU_PKGVERSION)"\n'; \ - printf '#define QEMU_FULL_VERSION "$(FULL_VERSION)"\n'; \ - ) > $@.tmp) - $(call quiet-command, if ! cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - else \ - rm $@.tmp; \ - fi) - config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool diff --git a/meson.build b/meson.build index 4ea7fbb..549d81c 100644 --- a/meson.build +++ b/meson.build @@ -137,6 +137,7 @@ have_block =3D have_system or have_tools =20 # Generators =20 +genh =3D [] qapi_gen =3D find_program('scripts/qapi-gen.py') qapi_gen_depends =3D [ meson.source_root() / 'scripts/qapi/__init__.py', meson.source_root() / 'scripts/qapi/commands.py', @@ -162,6 +163,17 @@ tracetool =3D [ '--backend=3D' + config_host['TRACE_BACKENDS'] ] =20 +qemu_version_cmd =3D [find_program('scripts/qemu-version.sh'), + meson.current_source_dir(), + config_host['PKGVERSION'], config_host['VERSION']] +qemu_version =3D custom_target('qemu-version.h', + output: 'qemu-version.h', + command: qemu_version_cmd, + capture: true, + build_by_default: true, + build_always_stale: true) +genh +=3D qemu_version + # Collect sourcesets. =20 util_ss =3D ss.source_set() @@ -262,8 +274,6 @@ trace_events_subdirs +=3D [ 'util', ] =20 -genh =3D [] - subdir('qapi') subdir('qobject') subdir('stubs') diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh new file mode 100755 index 0000000..4847385 --- /dev/null +++ b/scripts/qemu-version.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +set -eu + +dir=3D"$1" +pkgversion=3D"$2" +version=3D"$3" + +if [ -z "$pkgversion"]; then + cd "$dir" + if [ -e .git ]; then + pkgversion=3D$(git describe --match 'v*' --dirty | echo "") + fi +fi + +if [ -n "$pkgversion" ]; then + fullversion=3D"$version ($pkgversion)" +else + fullversion=3D"$version" +fi + +cat < (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 1597080778138412.50780690466377; Mon, 10 Aug 2020 10:32:58 -0700 (PDT) Received: from localhost ([::1]:60148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BfM-0002Xt-Rq for importer@patchew.org; Mon, 10 Aug 2020 13:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJj-0007xx-7y for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:35 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21071 helo=us-smtp-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 1k5BJg-0002vD-4T for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:34 -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-157-lrY8cX5XOdSL8IxzJDnS_g-1; Mon, 10 Aug 2020 13:10:27 -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 37C9357 for ; Mon, 10 Aug 2020 17:10:26 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44C355F1E9; Mon, 10 Aug 2020 17:10:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079431; 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=j3N/I3VV6j6pV3Gpe88E/l6R8yVt2mDTrP6LJcQEY8U=; b=Kyl40iZnPAziCLLhJUmmGgd+QyDdDuROEmPufYMSoYMfsHVDJJoVaCGlPrlOHHNUqiwPOg MlwPrPp+CH6vR4K89G31h3gsntWMPun5Oth8lycemN4C++f0dorAqmCYzC61JE43e17ypI DCbVOt8zzItrDtFYtiDSV4RQ8ZvHWkM= X-MC-Unique: lrY8cX5XOdSL8IxzJDnS_g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 046/147] meson: generate shader headers Date: Mon, 10 Aug 2020 19:07:24 +0200 Message-Id: <1597079345-42801-47-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 19 ------------------- meson.build | 1 + ui/meson.build | 2 ++ ui/shader/meson.build | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 ui/shader/meson.build diff --git a/Makefile b/Makefile index f995b23..f7af925 100644 --- a/Makefile +++ b/Makefile @@ -376,7 +376,6 @@ clean: recurse-clean rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h - rm -f ui/shader/*-vert.h ui/shader/*-frag.h rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) rm -f config-all-devices.mak rm -f $(SUBDIR_DEVICES_MAK) @@ -598,24 +597,6 @@ endif $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ done =20 -# opengl shader programs -ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shade= rinclude.pl - @mkdir -p $(dir $@) - $(call quiet-command,\ - perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ - "VERT","$@") - -ui/shader/%-frag.h: $(SRC_PATH)/ui/shader/%.frag $(SRC_PATH)/scripts/shade= rinclude.pl - @mkdir -p $(dir $@) - $(call quiet-command,\ - perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ - "FRAG","$@") - -ui/shader.o: $(SRC_PATH)/ui/shader.c \ - ui/shader/texture-blit-vert.h \ - ui/shader/texture-blit-flip-vert.h \ - ui/shader/texture-blit-frag.h - # documentation MAKEINFO=3Dmakeinfo MAKEINFOINCLUDES=3D -I docs -I $( (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 1597080759991967.732226480341; Mon, 10 Aug 2020 10:32:39 -0700 (PDT) Received: from localhost ([::1]:58564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bf4-0001uP-PF for importer@patchew.org; Mon, 10 Aug 2020 13:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJi-0007vq-CB for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJf-0002tj-9K for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:33 -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-338-RpUULCj-OJO15gbecTZ-0g-1; Mon, 10 Aug 2020 13:10:28 -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 971A419067E1 for ; Mon, 10 Aug 2020 17:10:27 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A456D5F1E9; Mon, 10 Aug 2020 17:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079430; 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=TQrkgKjG8LCrNKK/Hk46+rS84jqD20L7o4hLhkWF7oM=; b=OzwUezHDLctunnriXGR1b2Qj9POwuRAyEM+UBZafOeS343Kl2Bmit5QnpyI9gmm0v2xT+V vvxYeu9BAGnW8bm6ln+4HflRiBw09o4b5EtvM3YRqwxNwCPjhSD8+ek1DCuvGfo/4T+VSH gs1k8KnpstTHc8ptWbuOUtpvNFB5gEU= X-MC-Unique: RpUULCj-OJO15gbecTZ-0g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 047/147] meson: generate hxtool files Date: Mon, 10 Aug 2020 19:07:25 +0200 Message-Id: <1597079345-42801-48-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=63.128.21.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/10 13:09:25 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 | 8 +------- Makefile.target | 6 ------ meson.build | 22 ++++++++++++++++++++++ scripts/hxtool | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) mode change 100644 =3D> 100755 scripts/hxtool diff --git a/Makefile b/Makefile index f7af925..b9260a1 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 -generated-files-y =3D config-host.h qemu-options.def +generated-files-y =3D config-host.h =20 generated-files-y +=3D module_block.h =20 @@ -247,8 +247,6 @@ all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(= HELPERS-y) recurse-all mo =20 config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak -qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@= ") =20 TARGET_DIRS_RULES :=3D $(foreach t, all fuzz clean install, $(addsuffix /$= (t), $(TARGET_DIRS))) =20 @@ -355,9 +353,6 @@ ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS +=3D -ludev -lmultipath -lmpathpersist endif =20 -qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@= ") - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ @@ -375,7 +370,6 @@ clean: recurse-clean rm -f $(edk2-decompressed) rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ rm -f fsdev/*.pod scsi/*.pod - rm -f qemu-img-cmds.h rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) rm -f config-all-devices.mak rm -f $(SUBDIR_DEVICES_MAK) diff --git a/Makefile.target b/Makefile.target index 0b32364..257afc2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -225,12 +225,6 @@ endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_= c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@") =20 -hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(= TARGET_DIR)$@") - -hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/= hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(= TARGET_DIR)$@") - clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') diff --git a/meson.build b/meson.build index e007c98..0c4988a 100644 --- a/meson.build +++ b/meson.build @@ -138,6 +138,7 @@ have_block =3D have_system or have_tools # Generators =20 genh =3D [] +hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') qapi_gen =3D find_program('scripts/qapi-gen.py') qapi_gen_depends =3D [ meson.source_root() / 'scripts/qapi/__init__.py', @@ -175,6 +176,27 @@ qemu_version =3D custom_target('qemu-version.h', build_always_stale: true) genh +=3D qemu_version =20 +hxdep =3D [] +hx_headers =3D [ + ['qemu-options.hx', 'qemu-options.def'], + ['qemu-img-cmds.hx', 'qemu-img-cmds.h'], +] +if have_system + hx_headers +=3D [ + ['hmp-commands.hx', 'hmp-commands.h'], + ['hmp-commands-info.hx', 'hmp-commands-info.h'], + ] +endif +foreach d : hx_headers + custom_target(d[1], + input: files(d[0]), + output: d[1], + capture: true, + build_by_default: true, # to be removed when added to a ta= rget + command: [hxtool, '-h', '@INPUT0@']) +endforeach +genh +=3D hxdep + # Collect sourcesets. =20 util_ss =3D ss.source_set() diff --git a/scripts/hxtool b/scripts/hxtool old mode 100644 new mode 100755 index 7b1452f..80516b9 --- a/scripts/hxtool +++ b/scripts/hxtool @@ -19,6 +19,6 @@ hxtoh() case "$1" in "-h") hxtoh ;; *) exit 1 ;; -esac +esac < "$2" =20 exit 0 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080551; cv=none; d=zohomail.com; s=zohoarc; b=aY9lQCAWH1/sqR6VxYbFPmQyEPPNkRh33XiUP8eVqtJJ7WSfHw0lNSHBreDsR8zBrs1rdE09ApoqCzW6Rambo9wahBjYuu7ZxkeLrdvA9A9VKZ+SrFSWXrUDCO0BIv4i0BU4no8PInU6v2ff5ogQB8Ol7iERFHMgEh1NPgP46NU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080551; 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=W8adBKv5XMbGfEcY2W4sjWHF7+yMbUZcLd5zR4CKoX8=; b=Rv39C8Vxoiqtr3FJyOCSIRSU0TScrCCfBy+GR5NUdFB00UnhMOb3LIr3IBZPBChzXOEBfDu7KTT/MI8KO99T7aa9awxskiN96bhWYrZI0/5EMftjdGCW/x+47opstG0a1XgT06ZYL9I9gOEwIfrPwLZ3zKkD2XIsgkxj5x884IU= 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 1597080551397950.6086304660399; Mon, 10 Aug 2020 10:29:11 -0700 (PDT) Received: from localhost ([::1]:41816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bbi-0003XF-4W for importer@patchew.org; Mon, 10 Aug 2020 13:29:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJj-0007yd-Hj for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:35 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46300 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 1k5BJg-0002vO-AJ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:35 -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-431-ndzHYFSgMAiPCcycnojXtQ-1; Mon, 10 Aug 2020 13:10:29 -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 0309680047B for ; Mon, 10 Aug 2020 17:10:29 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F84A5F1E9; Mon, 10 Aug 2020 17:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079431; 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=W8adBKv5XMbGfEcY2W4sjWHF7+yMbUZcLd5zR4CKoX8=; b=OCT9vfwbBw5mT19+9w8MBqM7Vaq2ojuCtDP2annEZdFEhNMBIN+AF6jQkbC93PWD5xAjcG KC2DZxaEOIPUkdSb+BRvQixJ0AQUom9l7+4Spphiu2ilQGKRFj6hulc2Y3n71YhYFWjL2z Y4JwR24bGU966dLYvsn2pXhjMeSXiH8= X-MC-Unique: ndzHYFSgMAiPCcycnojXtQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 048/147] meson: handle edk2 bios and descriptors Date: Mon, 10 Aug 2020 19:07:26 +0200 Message-Id: <1597079345-42801-49-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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 29 ----------------------------- meson.build | 1 + pc-bios/descriptors/meson.build | 14 ++++++++++++++ pc-bios/meson.build | 27 +++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 29 deletions(-) create mode 100644 pc-bios/descriptors/meson.build create mode 100644 pc-bios/meson.build diff --git a/Makefile b/Makefile index b9260a1..62e0ef0 100644 --- a/Makefile +++ b/Makefile @@ -111,10 +111,6 @@ generated-files-y +=3D module_block.h =20 generated-files-y +=3D .git-submodule-status =20 -edk2-decompressed =3D $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) -pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2 - $(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<) - # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; @@ -258,9 +254,6 @@ $(SOFTMMU_ALL_RULES): $(chardev-obj-y) $(SOFTMMU_ALL_RULES): $(crypto-obj-y) $(SOFTMMU_ALL_RULES): $(io-obj-y) $(SOFTMMU_ALL_RULES): config-all-devices.mak -ifdef DECOMPRESS_EDK2_BLOBS -$(SOFTMMU_ALL_RULES): $(edk2-decompressed) -endif =20 SOFTMMU_FUZZ_RULES=3D$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES)) $(SOFTMMU_FUZZ_RULES): $(authz-obj-y) @@ -367,7 +360,6 @@ clean: recurse-clean ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + - rm -f $(edk2-decompressed) rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ rm -f fsdev/*.pod scsi/*.pod rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) @@ -441,13 +433,8 @@ edk2-licenses.txt \ hppa-firmware.img \ opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \ opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin - - -DESCS=3D50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \ -60-edk2-aarch64.json 60-edk2-arm.json 60-edk2-i386.json 60-edk2-x86_64.json else BLOBS=3D -DESCS=3D endif =20 # Note that we manually filter-out the non-Sphinx documentation which @@ -524,7 +511,6 @@ install-includedir: export DESTDIR install: all $(if $(BUILD_DOCS),install-doc) \ install-datadir install-localstatedir install-includedir \ - $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) @@ -548,21 +534,6 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifdef INSTALL_BLOBS - set -e; for x in $(edk2-decompressed); do \ - $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)"; \ - done -endif -ifneq ($(DESCS),) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" - set -e; tmpf=3D$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ - for x in $(DESCS); do \ - sed -e 's,@DATADIR@,$(qemu_datadir),' \ - "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \ - $(INSTALL_DATA) "$$tmpf" \ - "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \ - done -endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ diff --git a/meson.build b/meson.build index 0c4988a..a3c2ea7 100644 --- a/meson.build +++ b/meson.build @@ -362,6 +362,7 @@ if have_tools endif =20 subdir('tools') +subdir('pc-bios') =20 summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild new file mode 100644 index 0000000..7c715ba --- /dev/null +++ b/pc-bios/descriptors/meson.build @@ -0,0 +1,14 @@ +foreach f: [ + '50-edk2-i386-secure.json', + '50-edk2-x86_64-secure.json', + '60-edk2-aarch64.json', + '60-edk2-arm.json', + '60-edk2-i386.json', + '60-edk2-x86_64.json' +] + configure_file(input: files(f), + output: f, + configuration: {'DATADIR': config_host['qemu_datadir']}, + install: install_blobs, + install_dir: config_host['qemu_datadir'] / 'firmware') +endforeach diff --git a/pc-bios/meson.build b/pc-bios/meson.build new file mode 100644 index 0000000..6e3bfe3 --- /dev/null +++ b/pc-bios/meson.build @@ -0,0 +1,27 @@ +bzip2 =3D find_program('bzip2') + +install_blobs =3D 'INSTALL_BLOBS' in config_host +if 'DECOMPRESS_EDK2_BLOBS' in config_host + fds =3D [ + 'edk2-aarch64-code.fd', + 'edk2-arm-code.fd', + 'edk2-arm-vars.fd', + 'edk2-i386-code.fd', + 'edk2-i386-secure-code.fd', + 'edk2-i386-vars.fd', + 'edk2-x86_64-code.fd', + 'edk2-x86_64-secure-code.fd', + ] + + foreach f : fds + custom_target(f, + output: f, + input: '@0@.bz2'.format(f), + capture: true, + install: install_blobs, + install_dir: config_host['qemu_datadir'], + command: [ bzip2, '-dc', '@INPUT0@' ]) + endforeach +endif + +subdir('descriptors') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080846; cv=none; d=zohomail.com; s=zohoarc; b=Wf5SJkofvrfwFQWNuQwmqwIebNUFXh7ABsfNJ8a8MHIBlEC6xyqgUS646C9BwH8X6HdyEQ2RpyEU4+EkOWP2ho3C2gbWJrGPBrkpvbdIR6wNAvhBn42S8Y5MEDt7F/zLJ0w5Ob/Am/0MyHyPVAqseqF9jo6SxYh2bEYaObVQ42E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080846; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=sUO9Y2S65BnQB9VsGOH2uoMXaaBFvPeSWzaYGkq3nXk=; b=L6WY7ABJjL031EYmfSFlL/X20oOJyOxXgGUQSxI0h2G0nSMc8ZLwuBfqVcxQ0QyJzbuX1skexuc4u2yJwHUcAAzn1NEQrc6UfyApSElfGoX0JA9LrPkfcUEUjjlfhatD4Fg2CPaAFF8Eus7sKjkLnpkWkimUNv++8Ut2yMZFJw8= 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 1597080846961921.4347230482244; Mon, 10 Aug 2020 10:34:06 -0700 (PDT) Received: from localhost ([::1]:38878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BgT-0005JN-Ly for importer@patchew.org; Mon, 10 Aug 2020 13:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJl-00081Z-3a for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22409 helo=us-smtp-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 1k5BJj-0002yb-8v for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:36 -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-288-ZIRJbaiwPpeDX-UtYxpHuw-1; Mon, 10 Aug 2020 13:10:31 -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 2ADED57 for ; Mon, 10 Aug 2020 17:10:30 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EA5F5F1E9 for ; Mon, 10 Aug 2020 17:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=sUO9Y2S65BnQB9VsGOH2uoMXaaBFvPeSWzaYGkq3nXk=; b=ERhOoX1pKtV8qqWVO/Hxh2NhEdh0yoyyDYbDKjDU9/tXaSAOrfZyVLUNCBwMpqCVEEOd+Z kMkQ81nJBFMxoqL+EznMX0ujYk2bZlvN6KGk7KS2Jq48TN9fzszz3yNqm8eJL7ceO13wUo V+5ckMEEXkRfBeqI3OJJ/aWALPKozg0= X-MC-Unique: ZIRJbaiwPpeDX-UtYxpHuw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 049/147] meson: convert check-decodetree Date: Mon, 10 Aug 2020 19:07:27 +0200 Message-Id: <1597079345-42801-50-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ tests/Makefile.include | 8 +------- tests/meson.build | 4 ++++ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 tests/meson.build diff --git a/meson.build b/meson.build index a3c2ea7..6f1e199 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ not_found =3D dependency('', required: false) keyval =3D import('unstable-keyval') ss =3D import('sourceset') =20 +sh =3D find_program('sh') cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') =20 @@ -363,6 +364,7 @@ endif =20 subdir('tools') subdir('pc-bios') +subdir('tests') =20 summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} diff --git a/tests/Makefile.include b/tests/Makefile.include index f277d23..8e953a2 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -894,13 +894,6 @@ check-tests/qapi-schema/frontend: $(addprefix $(SRC_PA= TH)/, $(check-qapi-schema- check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi @diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $< =20 -.PHONY: check-decodetree -check-decodetree: - $(call quiet-command, \ - cd $(SRC_PATH)/tests/decode && \ - ./check.sh "$(PYTHON)" "$(SRC_PATH)/scripts/decodetree.py", \ - TEST, decodetree.py) - # Python venv for running tests =20 .PHONY: check-venv check-acceptance @@ -962,6 +955,7 @@ check-block: $(patsubst %,check-%, $(check-block-y)) endif check-build: build-unit build-softfloat build-qtest =20 +check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) diff --git a/tests/meson.build b/tests/meson.build new file mode 100644 index 0000000..5c52021 --- /dev/null +++ b/tests/meson.build @@ -0,0 +1,4 @@ +test('decodetree', sh, + args: [ files('decode/check.sh'), config_host['PYTHON'], files('../sc= ripts/decodetree.py') ], + workdir: meson.current_source_dir() / 'decode', + suite: 'decodetree') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080940; cv=none; d=zohomail.com; s=zohoarc; b=SXdoDmK0nttJFJioYLGRK26j7F4g/f1CYU/lzy73++GXvv0oyloi6nQ+dWtOC0ebSTD26V0H9TzD1VgomYvrJTiBKlY8i6sWYFdmzfC1le0RmYNKoKjLLntPN+6iF5q/dgCDUzm78t9IWA3na0imgmBg2WhnTM4dkgAq6X1Q5GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080940; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+Cg2arue/xKodvQHrCVrBW0u9dadkNN8uEb5ppXBGNQ=; b=JOb/MET6iPmuR+b+m/LUC1GPT2JEkH98mrlmeSQgRqCUD2gCYCzhdRwicMzJ/oyM+6MUOdd8R3kgJNOX9CCbDl4KeuVFNOMEZg6c6OOw235UsNQXrC96qTqoq6mfr5bn9IzANsSjR6H+1y3YehBjKmMm8CBItMlqtvv939uvVeM= 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 15970809408419.64668424951958; Mon, 10 Aug 2020 10:35:40 -0700 (PDT) Received: from localhost ([::1]:47424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bhz-0000Ig-B8 for importer@patchew.org; Mon, 10 Aug 2020 13:35:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJn-00087f-Mc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:39 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:53230 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 1k5BJj-0002yZ-4n for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:39 -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-414-gyWStP0TNT-wqGQq6YIo4g-1; Mon, 10 Aug 2020 13:10:32 -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 7C85F19067E1 for ; Mon, 10 Aug 2020 17:10:31 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 961E05F1E9 for ; Mon, 10 Aug 2020 17:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+Cg2arue/xKodvQHrCVrBW0u9dadkNN8uEb5ppXBGNQ=; b=bDXY5FGfnWiGL6Z1nPjHVI46DezO/8b50F1bhXTm/kPefa7ewroOgOgx+c3dQMJ09TcFhJ jX1Y2TnnYpFR0Zp7TlHos3nmVsfoR93cwamCOppUig9G1v7oHsp2noXuexASEtxYAPOTLV hILl+LHdtRsxIRIAPOjSntz1hhE/eps= X-MC-Unique: gyWStP0TNT-wqGQq6YIo4g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 050/147] meson: convert tests/fp and check-softfloat Date: Mon, 10 Aug 2020 19:07:28 +0200 Message-Id: <1597079345-42801-51-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 2 +- tests/Makefile.include | 160 +------------ tests/fp/Makefile | 600 ---------------------------------------------- tests/fp/meson.build | 636 +++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/meson.build | 4 + 5 files changed, 644 insertions(+), 758 deletions(-) delete mode 100644 tests/fp/Makefile create mode 100644 tests/fp/meson.build diff --git a/configure b/configure index 76a4658..4e9dc80 100755 --- a/configure +++ b/configure @@ -8324,7 +8324,7 @@ DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/lm32/Makefile po/Makefile" -LINKS=3D"$LINKS tests/tcg/Makefile.target tests/fp/Makefile" +LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS tests/plugin/Makefile" LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" diff --git a/tests/Makefile.include b/tests/Makefile.include index 8e953a2..b3f8fdd 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -437,9 +437,6 @@ tests/test-bufferiszero$(EXESUF): tests/test-bufferisze= ro.o $(test-util-obj-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) =20 -tests/fp/%: - $(MAKE) -C $(dir $@) $(notdir $@) - tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\ hw/core/bus.o \ @@ -675,157 +672,6 @@ check-report-unit.tap: $(check-unit-y) =20 check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS))= check-report-unit.tap =20 -# FPU Emulation tests (aka softfloat) -# -# As we still have some places that need fixing the rules are a little -# more complex than they need to be and have to override some of the -# generic Makefile expansions. Once we are cleanly passing all -# the tests we can simplify the make syntax. - -FP_TEST_BIN=3D$(BUILD_DIR)/tests/fp/fp-test - -# the build dir is created by configure -$(FP_TEST_BIN): config-host.h $(test-util-obj-y) - $(call quiet-command, \ - $(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" $(notdir $@), \ - "BUILD", "$(notdir $@)") - -# The full test suite can take a bit of time, default to a quick run -# "-l 2 -r all" can take more than a day for some operations and is best -# run manually -FP_TL=3D-l 1 -r all - -# $1 =3D tests, $2 =3D description, $3 =3D test flags -test-softfloat =3D $(call quiet-command, \ - cd $(BUILD_DIR)/tests/fp && \ - ./fp-test -s $(if $3,$3,$(FP_TL)) $1 > $2.out 2>&1 || \ - (cat $2.out && exit 1;), \ - "FLOAT TEST", $2) - -# Conversion Routines: Float to Float -# FIXME: f32_to_f128 (broken), f64_to_f128 (broken) -# FIXME: f128_to_f32(broken), f128_to_f64 (broken) -# FIXME: f128_to_extF80 (broken) -check-softfloat-conv-f2f: $(FP_TEST_BIN) - $(call test-softfloat, \ - f16_to_f32 f16_to_f64 \ - f16_to_extF80 f16_to_f128 \ - f32_to_f16 f32_to_f64 \ - f32_to_extF80 \ - f64_to_f16 f64_to_f32 \ - extF80_to_f16 extF80_to_f32 \ - extF80_to_f64 extF80_to_f128 \ - f128_to_f16, \ - float-to-float) - -# Conversion Routines: Int and Uint to Float -# FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken) -# ui32_to_f128 (not implemented) -check-softfloat-conv-to-float: $(FP_TEST_BIN) - $(call test-softfloat, \ - i32_to_f16 i64_to_f16 \ - i32_to_f32 i64_to_f32 \ - i32_to_f64 i64_to_f64 \ - i32_to_f128 i64_to_f128, int-to-float) - $(call test-softfloat, \ - ui32_to_f16 ui64_to_f16 \ - ui32_to_f32 ui64_to_f32 \ - ui32_to_f64 ui64_to_f64 \ - ui32_to_extF80 ui64_to_extF80 \ - ui64_to_f128, uint-to-float) - -# Conversion Routines: Float to integers -# FIXME: extF80_roundToInt (broken) -check-softfloat-conv-to-int: $(FP_TEST_BIN) - $(call test-softfloat, \ - f16_to_i32 f16_to_i32_r_minMag \ - f32_to_i32 f32_to_i32_r_minMag \ - f64_to_i32 f64_to_i32_r_minMag \ - extF80_to_i32 extF80_to_i32_r_minMag \ - f128_to_i32 f128_to_i32_r_minMag \ - f16_to_i64 f16_to_i64_r_minMag \ - f32_to_i64 f32_to_i64_r_minMag \ - f64_to_i64 f64_to_i64_r_minMag \ - extF80_to_i64 extF80_to_i64_r_minMag \ - f128_to_i64 f128_to_i64_r_minMag, \ - float-to-int) - $(call test-softfloat, \ - f16_to_ui32 f16_to_ui32_r_minMag \ - f32_to_ui32 f32_to_ui32_r_minMag \ - f64_to_ui32 f64_to_ui32_r_minMag \ - extF80_to_ui32 extF80_to_ui32_r_minMag \ - f128_to_ui32 f128_to_ui32_r_minMag \ - f16_to_ui64 f16_to_ui64_r_minMag \ - f32_to_ui64 f32_to_ui64_r_minMag \ - f64_to_ui64 f64_to_ui64_r_minMag \ - extF80_to_ui64 extF80_to_ui64_r_minMag \ - f128_to_ui64 f128_to_ui64_r_minMag, \ - float-to-uint) - $(call test-softfloat, \ - f16_roundToInt f32_roundToInt \ - f64_roundToInt f128_roundToInt, \ - round-to-integer) - -.PHONY: check-softfloat-conv -check-softfloat-conv: check-softfloat-conv-f2f -check-softfloat-conv: check-softfloat-conv-to-float -check-softfloat-conv: check-softfloat-conv-to-int - -# Generic rule for all float operations -# -# Some patterns are overridden due to broken or missing tests. -# Hopefully these can be removed over time. - -check-softfloat-%: $(FP_TEST_BIN) - $(call test-softfloat, f16_$* f32_$* f64_$* extF80_$* f128_$*, $*) - -# Float Compare routines -SF_COMPARE_OPS=3Deq eq_signaling le le_quiet lt_quiet -SF_COMPARE_RULES=3D$(patsubst %,check-softfloat-%, $(SF_COMPARE_OPS)) - -# FIXME: extF80_lt_quiet (broken) -check-softfloat-lt_quiet: $(FP_TEST_BIN) - $(call test-softfloat, \ - f16_lt_quiet f32_lt_quiet f64_lt_quiet \ - f128_lt_quiet, \ - lt_quiet) - -.PHONY: check-softfloat-compare -check-softfloat-compare: $(SF_COMPARE_RULES) - -# Math Operations - -# FIXME: extF80_mulAdd (missing) -check-softfloat-mulAdd: $(FP_TEST_BIN) - $(call test-softfloat, \ - f16_mulAdd f32_mulAdd f64_mulAdd f128_mulAdd, \ - mulAdd,-l 1) - -# FIXME: extF80_rem (broken) -check-softfloat-rem: $(FP_TEST_BIN) - $(call test-softfloat, \ - f16_rem f32_rem f64_rem f128_rem, \ - rem) - -SF_MATH_OPS=3Dadd sub mul mulAdd div rem sqrt -SF_MATH_RULES=3D$(patsubst %,check-softfloat-%, $(SF_MATH_OPS)) - -.PHONY: check-softfloat-ops -check-softfloat-ops: $(SF_MATH_RULES) - -# Finally a generic rule to test all of softfoat. If TCG isnt't -# enabled we define a null operation which skips the tests. - -.PHONY: check-softfloat -ifeq ($(CONFIG_TCG),y) -build-softfloat: $(FP_TEST_BIN) -check-softfloat: build-softfloat check-softfloat-conv check-softfloat-comp= are check-softfloat-ops -else -build-softfloat check-softfloat: - $(call quiet-command, /bin/true, "FLOAT TEST", \ - "SKIPPED for non-TCG builds") -endif - # Plugins ifeq ($(CONFIG_PLUGIN),y) .PHONY: plugins @@ -953,9 +799,9 @@ check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGET= S)) ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif -check-build: build-unit build-softfloat build-qtest +check-build: build-unit build-qtest =20 -check: check-block check-qapi-schema check-unit check-softfloat check-qtest +check: check-block check-qapi-schema check-unit check-qtest check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) @@ -963,7 +809,7 @@ check-clean: rm -f tests/qtest/dbus-vmstate1-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 -check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree +check: check-block check-qapi-schema check-unit check-qtest check-decodetr= ee =20 clean: check-clean =20 diff --git a/tests/fp/Makefile b/tests/fp/Makefile deleted file mode 100644 index 56768ec..0000000 --- a/tests/fp/Makefile +++ /dev/null @@ -1,600 +0,0 @@ -BUILD_DIR :=3D $(CURDIR)/../.. - -include $(BUILD_DIR)/config-host.mak -include $(SRC_PATH)/rules.mak - -SOFTFLOAT_DIR :=3D $(SRC_PATH)/tests/fp/berkeley-softfloat-3 -TESTFLOAT_DIR :=3D $(SRC_PATH)/tests/fp/berkeley-testfloat-3 - -SF_SOURCE_DIR :=3D $(SOFTFLOAT_DIR)/source -SF_INCLUDE_DIR :=3D $(SOFTFLOAT_DIR)/source/include -# we could use any specialize here, it doesn't matter -SF_SPECIALIZE :=3D 8086-SSE -SF_SPECIALIZE_DIR :=3D $(SF_SOURCE_DIR)/$(SF_SPECIALIZE) - -TF_SOURCE_DIR :=3D $(TESTFLOAT_DIR)/source - -$(call set-vpath, $(SRC_PATH)/fpu $(SRC_PATH)/tests/fp) - -LIBQEMUUTIL :=3D $(BUILD_DIR)/libqemuutil.a - -# Use this variable to be clear when we pull in our own implementation -# We build the object with a default rule thanks to the vpath above -QEMU_SOFTFLOAT_OBJ :=3D softfloat.o - -QEMU_INCLUDES +=3D -I$(SRC_PATH)/tests/fp -QEMU_INCLUDES +=3D -I$(SF_INCLUDE_DIR) -QEMU_INCLUDES +=3D -I$(SF_SPECIALIZE_DIR) -QEMU_INCLUDES +=3D -I$(TF_SOURCE_DIR) - -# work around TARGET_* poisoning -QEMU_CFLAGS +=3D -DHW_POISON_H -# define a target to match testfloat's implementation-defined choices, suc= h as -# whether to raise the invalid flag when dealing with NaNs in muladd. -QEMU_CFLAGS +=3D -DTARGET_ARM - -# capstone has a platform.h file that clashes with softfloat's -QEMU_CFLAGS :=3D $(filter-out %capstone, $(QEMU_CFLAGS)) - -# softfloat defines -SF_OPTS :=3D -SF_OPTS +=3D -DSOFTFLOAT_ROUND_ODD -SF_OPTS +=3D -DINLINE_LEVEL=3D5 -SF_OPTS +=3D -DSOFTFLOAT_FAST_DIV32TO16 -SF_OPTS +=3D -DSOFTFLOAT_FAST_DIV64TO32 -SF_OPTS +=3D -DSOFTFLOAT_FAST_INT64 -QEMU_CFLAGS +=3D $(SF_OPTS) - -# silence the build of softfloat objects -SF_CFLAGS +=3D -Wno-missing-prototypes -SF_CFLAGS +=3D -Wno-redundant-decls -SF_CFLAGS +=3D -Wno-return-type -SF_CFLAGS +=3D -Wno-error - -# testfloat defines -TF_OPTS :=3D -TF_OPTS +=3D -DFLOAT16 -TF_OPTS +=3D -DFLOAT64 -TF_OPTS +=3D -DEXTFLOAT80 -TF_OPTS +=3D -DFLOAT128 -TF_OPTS +=3D -DFLOAT_ROUND_ODD -TF_OPTS +=3D -DLONG_DOUBLE_IS_EXTFLOAT80 -QEMU_CFLAGS +=3D $(TF_OPTS) - -# silence the build of testfloat objects -TF_CFLAGS :=3D -TF_CFLAGS +=3D -Wno-strict-prototypes -TF_CFLAGS +=3D -Wno-unknown-pragmas -TF_CFLAGS +=3D -Wno-uninitialized -TF_CFLAGS +=3D -Wno-missing-prototypes -TF_CFLAGS +=3D -Wno-return-type -TF_CFLAGS +=3D -Wno-unused-function -TF_CFLAGS +=3D -Wno-error - -# softfloat objects -SF_OBJS_PRIMITIVES :=3D -SF_OBJS_PRIMITIVES +=3D s_eq128.o -SF_OBJS_PRIMITIVES +=3D s_le128.o -SF_OBJS_PRIMITIVES +=3D s_lt128.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftLeft128.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftRight128.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftRightJam64.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftRightJam64Extra.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftRightJam128.o -SF_OBJS_PRIMITIVES +=3D s_shortShiftRightJam128Extra.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam32.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam64.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam64Extra.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam128.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam128Extra.o -SF_OBJS_PRIMITIVES +=3D s_shiftRightJam256M.o -SF_OBJS_PRIMITIVES +=3D s_countLeadingZeros8.o -SF_OBJS_PRIMITIVES +=3D s_countLeadingZeros16.o -SF_OBJS_PRIMITIVES +=3D s_countLeadingZeros32.o -SF_OBJS_PRIMITIVES +=3D s_countLeadingZeros64.o -SF_OBJS_PRIMITIVES +=3D s_add128.o -SF_OBJS_PRIMITIVES +=3D s_add256M.o -SF_OBJS_PRIMITIVES +=3D s_sub128.o -SF_OBJS_PRIMITIVES +=3D s_sub256M.o -SF_OBJS_PRIMITIVES +=3D s_mul64ByShifted32To128.o -SF_OBJS_PRIMITIVES +=3D s_mul64To128.o -SF_OBJS_PRIMITIVES +=3D s_mul128By32.o -SF_OBJS_PRIMITIVES +=3D s_mul128To256M.o -SF_OBJS_PRIMITIVES +=3D s_approxRecip_1Ks.o -SF_OBJS_PRIMITIVES +=3D s_approxRecip32_1.o -SF_OBJS_PRIMITIVES +=3D s_approxRecipSqrt_1Ks.o -SF_OBJS_PRIMITIVES +=3D s_approxRecipSqrt32_1.o - -SF_OBJS_SPECIALIZE :=3D -SF_OBJS_SPECIALIZE +=3D softfloat_raiseFlags.o -SF_OBJS_SPECIALIZE +=3D s_f16UIToCommonNaN.o -SF_OBJS_SPECIALIZE +=3D s_commonNaNToF16UI.o -SF_OBJS_SPECIALIZE +=3D s_propagateNaNF16UI.o -SF_OBJS_SPECIALIZE +=3D s_f32UIToCommonNaN.o -SF_OBJS_SPECIALIZE +=3D s_commonNaNToF32UI.o -SF_OBJS_SPECIALIZE +=3D s_propagateNaNF32UI.o -SF_OBJS_SPECIALIZE +=3D s_f64UIToCommonNaN.o -SF_OBJS_SPECIALIZE +=3D s_commonNaNToF64UI.o -SF_OBJS_SPECIALIZE +=3D s_propagateNaNF64UI.o -SF_OBJS_SPECIALIZE +=3D extF80M_isSignalingNaN.o -SF_OBJS_SPECIALIZE +=3D s_extF80UIToCommonNaN.o -SF_OBJS_SPECIALIZE +=3D s_commonNaNToExtF80UI.o -SF_OBJS_SPECIALIZE +=3D s_propagateNaNExtF80UI.o -SF_OBJS_SPECIALIZE +=3D f128M_isSignalingNaN.o -SF_OBJS_SPECIALIZE +=3D s_f128UIToCommonNaN.o -SF_OBJS_SPECIALIZE +=3D s_commonNaNToF128UI.o -SF_OBJS_SPECIALIZE +=3D s_propagateNaNF128UI.o - -SF_OBJS_OTHERS :=3D -SF_OBJS_OTHERS +=3D s_roundToUI32.o -SF_OBJS_OTHERS +=3D s_roundToUI64.o -SF_OBJS_OTHERS +=3D s_roundToI32.o -SF_OBJS_OTHERS +=3D s_roundToI64.o -SF_OBJS_OTHERS +=3D s_normSubnormalF16Sig.o -SF_OBJS_OTHERS +=3D s_roundPackToF16.o -SF_OBJS_OTHERS +=3D s_normRoundPackToF16.o -SF_OBJS_OTHERS +=3D s_addMagsF16.o -SF_OBJS_OTHERS +=3D s_subMagsF16.o -SF_OBJS_OTHERS +=3D s_mulAddF16.o -SF_OBJS_OTHERS +=3D s_normSubnormalF32Sig.o -SF_OBJS_OTHERS +=3D s_roundPackToF32.o -SF_OBJS_OTHERS +=3D s_normRoundPackToF32.o -SF_OBJS_OTHERS +=3D s_addMagsF32.o -SF_OBJS_OTHERS +=3D s_subMagsF32.o -SF_OBJS_OTHERS +=3D s_mulAddF32.o -SF_OBJS_OTHERS +=3D s_normSubnormalF64Sig.o -SF_OBJS_OTHERS +=3D s_roundPackToF64.o -SF_OBJS_OTHERS +=3D s_normRoundPackToF64.o -SF_OBJS_OTHERS +=3D s_addMagsF64.o -SF_OBJS_OTHERS +=3D s_subMagsF64.o -SF_OBJS_OTHERS +=3D s_mulAddF64.o -SF_OBJS_OTHERS +=3D s_normSubnormalExtF80Sig.o -SF_OBJS_OTHERS +=3D s_roundPackToExtF80.o -SF_OBJS_OTHERS +=3D s_normRoundPackToExtF80.o -SF_OBJS_OTHERS +=3D s_addMagsExtF80.o -SF_OBJS_OTHERS +=3D s_subMagsExtF80.o -SF_OBJS_OTHERS +=3D s_normSubnormalF128Sig.o -SF_OBJS_OTHERS +=3D s_roundPackToF128.o -SF_OBJS_OTHERS +=3D s_normRoundPackToF128.o -SF_OBJS_OTHERS +=3D s_addMagsF128.o -SF_OBJS_OTHERS +=3D s_subMagsF128.o -SF_OBJS_OTHERS +=3D s_mulAddF128.o -SF_OBJS_OTHERS +=3D softfloat_state.o -SF_OBJS_OTHERS +=3D ui32_to_f16.o -SF_OBJS_OTHERS +=3D ui32_to_f32.o -SF_OBJS_OTHERS +=3D ui32_to_f64.o -SF_OBJS_OTHERS +=3D ui32_to_extF80.o -SF_OBJS_OTHERS +=3D ui32_to_extF80M.o -SF_OBJS_OTHERS +=3D ui32_to_f128.o -SF_OBJS_OTHERS +=3D ui32_to_f128M.o -SF_OBJS_OTHERS +=3D ui64_to_f16.o -SF_OBJS_OTHERS +=3D ui64_to_f32.o -SF_OBJS_OTHERS +=3D ui64_to_f64.o -SF_OBJS_OTHERS +=3D ui64_to_extF80.o -SF_OBJS_OTHERS +=3D ui64_to_extF80M.o -SF_OBJS_OTHERS +=3D ui64_to_f128.o -SF_OBJS_OTHERS +=3D ui64_to_f128M.o -SF_OBJS_OTHERS +=3D i32_to_f16.o -SF_OBJS_OTHERS +=3D i32_to_f32.o -SF_OBJS_OTHERS +=3D i32_to_f64.o -SF_OBJS_OTHERS +=3D i32_to_extF80.o -SF_OBJS_OTHERS +=3D i32_to_extF80M.o -SF_OBJS_OTHERS +=3D i32_to_f128.o -SF_OBJS_OTHERS +=3D i32_to_f128M.o -SF_OBJS_OTHERS +=3D i64_to_f16.o -SF_OBJS_OTHERS +=3D i64_to_f32.o -SF_OBJS_OTHERS +=3D i64_to_f64.o -SF_OBJS_OTHERS +=3D i64_to_extF80.o -SF_OBJS_OTHERS +=3D i64_to_extF80M.o -SF_OBJS_OTHERS +=3D i64_to_f128.o -SF_OBJS_OTHERS +=3D i64_to_f128M.o -SF_OBJS_OTHERS +=3D f16_to_ui32.o -SF_OBJS_OTHERS +=3D f16_to_ui64.o -SF_OBJS_OTHERS +=3D f16_to_i32.o -SF_OBJS_OTHERS +=3D f16_to_i64.o -SF_OBJS_OTHERS +=3D f16_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D f16_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D f16_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D f16_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D f16_to_f32.o -SF_OBJS_OTHERS +=3D f16_to_f64.o -SF_OBJS_OTHERS +=3D f16_to_extF80.o -SF_OBJS_OTHERS +=3D f16_to_extF80M.o -SF_OBJS_OTHERS +=3D f16_to_f128.o -SF_OBJS_OTHERS +=3D f16_to_f128M.o -SF_OBJS_OTHERS +=3D f16_roundToInt.o -SF_OBJS_OTHERS +=3D f16_add.o -SF_OBJS_OTHERS +=3D f16_sub.o -SF_OBJS_OTHERS +=3D f16_mul.o -SF_OBJS_OTHERS +=3D f16_mulAdd.o -SF_OBJS_OTHERS +=3D f16_div.o -SF_OBJS_OTHERS +=3D f16_rem.o -SF_OBJS_OTHERS +=3D f16_sqrt.o -SF_OBJS_OTHERS +=3D f16_eq.o -SF_OBJS_OTHERS +=3D f16_le.o -SF_OBJS_OTHERS +=3D f16_lt.o -SF_OBJS_OTHERS +=3D f16_eq_signaling.o -SF_OBJS_OTHERS +=3D f16_le_quiet.o -SF_OBJS_OTHERS +=3D f16_lt_quiet.o -SF_OBJS_OTHERS +=3D f16_isSignalingNaN.o -SF_OBJS_OTHERS +=3D f32_to_ui32.o -SF_OBJS_OTHERS +=3D f32_to_ui64.o -SF_OBJS_OTHERS +=3D f32_to_i32.o -SF_OBJS_OTHERS +=3D f32_to_i64.o -SF_OBJS_OTHERS +=3D f32_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D f32_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D f32_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D f32_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D f32_to_f16.o -SF_OBJS_OTHERS +=3D f32_to_f64.o -SF_OBJS_OTHERS +=3D f32_to_extF80.o -SF_OBJS_OTHERS +=3D f32_to_extF80M.o -SF_OBJS_OTHERS +=3D f32_to_f128.o -SF_OBJS_OTHERS +=3D f32_to_f128M.o -SF_OBJS_OTHERS +=3D f32_roundToInt.o -SF_OBJS_OTHERS +=3D f32_add.o -SF_OBJS_OTHERS +=3D f32_sub.o -SF_OBJS_OTHERS +=3D f32_mul.o -SF_OBJS_OTHERS +=3D f32_mulAdd.o -SF_OBJS_OTHERS +=3D f32_div.o -SF_OBJS_OTHERS +=3D f32_rem.o -SF_OBJS_OTHERS +=3D f32_sqrt.o -SF_OBJS_OTHERS +=3D f32_eq.o -SF_OBJS_OTHERS +=3D f32_le.o -SF_OBJS_OTHERS +=3D f32_lt.o -SF_OBJS_OTHERS +=3D f32_eq_signaling.o -SF_OBJS_OTHERS +=3D f32_le_quiet.o -SF_OBJS_OTHERS +=3D f32_lt_quiet.o -SF_OBJS_OTHERS +=3D f32_isSignalingNaN.o -SF_OBJS_OTHERS +=3D f64_to_ui32.o -SF_OBJS_OTHERS +=3D f64_to_ui64.o -SF_OBJS_OTHERS +=3D f64_to_i32.o -SF_OBJS_OTHERS +=3D f64_to_i64.o -SF_OBJS_OTHERS +=3D f64_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D f64_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D f64_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D f64_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D f64_to_f16.o -SF_OBJS_OTHERS +=3D f64_to_f32.o -SF_OBJS_OTHERS +=3D f64_to_extF80.o -SF_OBJS_OTHERS +=3D f64_to_extF80M.o -SF_OBJS_OTHERS +=3D f64_to_f128.o -SF_OBJS_OTHERS +=3D f64_to_f128M.o -SF_OBJS_OTHERS +=3D f64_roundToInt.o -SF_OBJS_OTHERS +=3D f64_add.o -SF_OBJS_OTHERS +=3D f64_sub.o -SF_OBJS_OTHERS +=3D f64_mul.o -SF_OBJS_OTHERS +=3D f64_mulAdd.o -SF_OBJS_OTHERS +=3D f64_div.o -SF_OBJS_OTHERS +=3D f64_rem.o -SF_OBJS_OTHERS +=3D f64_sqrt.o -SF_OBJS_OTHERS +=3D f64_eq.o -SF_OBJS_OTHERS +=3D f64_le.o -SF_OBJS_OTHERS +=3D f64_lt.o -SF_OBJS_OTHERS +=3D f64_eq_signaling.o -SF_OBJS_OTHERS +=3D f64_le_quiet.o -SF_OBJS_OTHERS +=3D f64_lt_quiet.o -SF_OBJS_OTHERS +=3D f64_isSignalingNaN.o -SF_OBJS_OTHERS +=3D extF80_to_ui32.o -SF_OBJS_OTHERS +=3D extF80_to_ui64.o -SF_OBJS_OTHERS +=3D extF80_to_i32.o -SF_OBJS_OTHERS +=3D extF80_to_i64.o -SF_OBJS_OTHERS +=3D extF80_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D extF80_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D extF80_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D extF80_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D extF80_to_f16.o -SF_OBJS_OTHERS +=3D extF80_to_f32.o -SF_OBJS_OTHERS +=3D extF80_to_f64.o -SF_OBJS_OTHERS +=3D extF80_to_f128.o -SF_OBJS_OTHERS +=3D extF80_roundToInt.o -SF_OBJS_OTHERS +=3D extF80_add.o -SF_OBJS_OTHERS +=3D extF80_sub.o -SF_OBJS_OTHERS +=3D extF80_mul.o -SF_OBJS_OTHERS +=3D extF80_div.o -SF_OBJS_OTHERS +=3D extF80_rem.o -SF_OBJS_OTHERS +=3D extF80_sqrt.o -SF_OBJS_OTHERS +=3D extF80_eq.o -SF_OBJS_OTHERS +=3D extF80_le.o -SF_OBJS_OTHERS +=3D extF80_lt.o -SF_OBJS_OTHERS +=3D extF80_eq_signaling.o -SF_OBJS_OTHERS +=3D extF80_le_quiet.o -SF_OBJS_OTHERS +=3D extF80_lt_quiet.o -SF_OBJS_OTHERS +=3D extF80_isSignalingNaN.o -SF_OBJS_OTHERS +=3D extF80M_to_ui32.o -SF_OBJS_OTHERS +=3D extF80M_to_ui64.o -SF_OBJS_OTHERS +=3D extF80M_to_i32.o -SF_OBJS_OTHERS +=3D extF80M_to_i64.o -SF_OBJS_OTHERS +=3D extF80M_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D extF80M_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D extF80M_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D extF80M_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D extF80M_to_f16.o -SF_OBJS_OTHERS +=3D extF80M_to_f32.o -SF_OBJS_OTHERS +=3D extF80M_to_f64.o -SF_OBJS_OTHERS +=3D extF80M_to_f128M.o -SF_OBJS_OTHERS +=3D extF80M_roundToInt.o -SF_OBJS_OTHERS +=3D extF80M_add.o -SF_OBJS_OTHERS +=3D extF80M_sub.o -SF_OBJS_OTHERS +=3D extF80M_mul.o -SF_OBJS_OTHERS +=3D extF80M_div.o -SF_OBJS_OTHERS +=3D extF80M_rem.o -SF_OBJS_OTHERS +=3D extF80M_sqrt.o -SF_OBJS_OTHERS +=3D extF80M_eq.o -SF_OBJS_OTHERS +=3D extF80M_le.o -SF_OBJS_OTHERS +=3D extF80M_lt.o -SF_OBJS_OTHERS +=3D extF80M_eq_signaling.o -SF_OBJS_OTHERS +=3D extF80M_le_quiet.o -SF_OBJS_OTHERS +=3D extF80M_lt_quiet.o -SF_OBJS_OTHERS +=3D f128_to_ui32.o -SF_OBJS_OTHERS +=3D f128_to_ui64.o -SF_OBJS_OTHERS +=3D f128_to_i32.o -SF_OBJS_OTHERS +=3D f128_to_i64.o -SF_OBJS_OTHERS +=3D f128_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D f128_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D f128_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D f128_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D f128_to_f16.o -SF_OBJS_OTHERS +=3D f128_to_f32.o -SF_OBJS_OTHERS +=3D f128_to_extF80.o -SF_OBJS_OTHERS +=3D f128_to_f64.o -SF_OBJS_OTHERS +=3D f128_roundToInt.o -SF_OBJS_OTHERS +=3D f128_add.o -SF_OBJS_OTHERS +=3D f128_sub.o -SF_OBJS_OTHERS +=3D f128_mul.o -SF_OBJS_OTHERS +=3D f128_mulAdd.o -SF_OBJS_OTHERS +=3D f128_div.o -SF_OBJS_OTHERS +=3D f128_rem.o -SF_OBJS_OTHERS +=3D f128_sqrt.o -SF_OBJS_OTHERS +=3D f128_eq.o -SF_OBJS_OTHERS +=3D f128_le.o -SF_OBJS_OTHERS +=3D f128_lt.o -SF_OBJS_OTHERS +=3D f128_eq_signaling.o -SF_OBJS_OTHERS +=3D f128_le_quiet.o -SF_OBJS_OTHERS +=3D f128_lt_quiet.o -SF_OBJS_OTHERS +=3D f128_isSignalingNaN.o -SF_OBJS_OTHERS +=3D f128M_to_ui32.o -SF_OBJS_OTHERS +=3D f128M_to_ui64.o -SF_OBJS_OTHERS +=3D f128M_to_i32.o -SF_OBJS_OTHERS +=3D f128M_to_i64.o -SF_OBJS_OTHERS +=3D f128M_to_ui32_r_minMag.o -SF_OBJS_OTHERS +=3D f128M_to_ui64_r_minMag.o -SF_OBJS_OTHERS +=3D f128M_to_i32_r_minMag.o -SF_OBJS_OTHERS +=3D f128M_to_i64_r_minMag.o -SF_OBJS_OTHERS +=3D f128M_to_f16.o -SF_OBJS_OTHERS +=3D f128M_to_f32.o -SF_OBJS_OTHERS +=3D f128M_to_extF80M.o -SF_OBJS_OTHERS +=3D f128M_to_f64.o -SF_OBJS_OTHERS +=3D f128M_roundToInt.o -SF_OBJS_OTHERS +=3D f128M_add.o -SF_OBJS_OTHERS +=3D f128M_sub.o -SF_OBJS_OTHERS +=3D f128M_mul.o -SF_OBJS_OTHERS +=3D f128M_mulAdd.o -SF_OBJS_OTHERS +=3D f128M_div.o -SF_OBJS_OTHERS +=3D f128M_rem.o -SF_OBJS_OTHERS +=3D f128M_sqrt.o -SF_OBJS_OTHERS +=3D f128M_eq.o -SF_OBJS_OTHERS +=3D f128M_le.o -SF_OBJS_OTHERS +=3D f128M_lt.o -SF_OBJS_OTHERS +=3D f128M_eq_signaling.o -SF_OBJS_OTHERS +=3D f128M_le_quiet.o -SF_OBJS_OTHERS +=3D f128M_lt_quiet.o - -SF_OBJS_ALL_NOSPEC :=3D -SF_OBJS_ALL_NOSPEC +=3D $(SF_OBJS_PRIMITIVES) -SF_OBJS_ALL_NOSPEC +=3D $(SF_OBJS_OTHERS) - -SF_OBJS_ALL :=3D -SF_OBJS_ALL +=3D $(SF_OBJS_ALL_NOSPEC) -SF_OBJS_ALL +=3D $(SF_OBJS_SPECIALIZE) - -# testfloat objects -TF_OBJS_GENCASES :=3D -TF_OBJS_GENCASES +=3D genCases_ui32.o -TF_OBJS_GENCASES +=3D genCases_ui64.o -TF_OBJS_GENCASES +=3D genCases_i32.o -TF_OBJS_GENCASES +=3D genCases_i64.o -TF_OBJS_GENCASES +=3D genCases_f16.o -TF_OBJS_GENCASES +=3D genCases_f32.o -TF_OBJS_GENCASES +=3D genCases_f64.o -TF_OBJS_GENCASES +=3D genCases_extF80.o -TF_OBJS_GENCASES +=3D genCases_f128.o - -TF_OBJS_WRITECASE :=3D -TF_OBJS_WRITECASE +=3D writeCase_a_ui32.o -TF_OBJS_WRITECASE +=3D writeCase_a_ui64.o -TF_OBJS_WRITECASE +=3D writeCase_a_f16.o -TF_OBJS_WRITECASE +=3D writeCase_ab_f16.o -TF_OBJS_WRITECASE +=3D writeCase_abc_f16.o -TF_OBJS_WRITECASE +=3D writeCase_a_f32.o -TF_OBJS_WRITECASE +=3D writeCase_ab_f32.o -TF_OBJS_WRITECASE +=3D writeCase_abc_f32.o -TF_OBJS_WRITECASE +=3D writeCase_a_f64.o -TF_OBJS_WRITECASE +=3D writeCase_ab_f64.o -TF_OBJS_WRITECASE +=3D writeCase_abc_f64.o -TF_OBJS_WRITECASE +=3D writeCase_a_extF80M.o -TF_OBJS_WRITECASE +=3D writeCase_ab_extF80M.o -TF_OBJS_WRITECASE +=3D writeCase_a_f128M.o -TF_OBJS_WRITECASE +=3D writeCase_ab_f128M.o -TF_OBJS_WRITECASE +=3D writeCase_abc_f128M.o -TF_OBJS_WRITECASE +=3D writeCase_z_bool.o -TF_OBJS_WRITECASE +=3D writeCase_z_ui32.o -TF_OBJS_WRITECASE +=3D writeCase_z_ui64.o -TF_OBJS_WRITECASE +=3D writeCase_z_f16.o -TF_OBJS_WRITECASE +=3D writeCase_z_f32.o -TF_OBJS_WRITECASE +=3D writeCase_z_f64.o -TF_OBJS_WRITECASE +=3D writeCase_z_extF80M.o -TF_OBJS_WRITECASE +=3D writeCase_z_f128M.o - -TF_OBJS_TEST :=3D -TF_OBJS_TEST +=3D test_a_ui32_z_f16.o -TF_OBJS_TEST +=3D test_a_ui32_z_f32.o -TF_OBJS_TEST +=3D test_a_ui32_z_f64.o -TF_OBJS_TEST +=3D test_a_ui32_z_extF80.o -TF_OBJS_TEST +=3D test_a_ui32_z_f128.o -TF_OBJS_TEST +=3D test_a_ui64_z_f16.o -TF_OBJS_TEST +=3D test_a_ui64_z_f32.o -TF_OBJS_TEST +=3D test_a_ui64_z_f64.o -TF_OBJS_TEST +=3D test_a_ui64_z_extF80.o -TF_OBJS_TEST +=3D test_a_ui64_z_f128.o -TF_OBJS_TEST +=3D test_a_i32_z_f16.o -TF_OBJS_TEST +=3D test_a_i32_z_f32.o -TF_OBJS_TEST +=3D test_a_i32_z_f64.o -TF_OBJS_TEST +=3D test_a_i32_z_extF80.o -TF_OBJS_TEST +=3D test_a_i32_z_f128.o -TF_OBJS_TEST +=3D test_a_i64_z_f16.o -TF_OBJS_TEST +=3D test_a_i64_z_f32.o -TF_OBJS_TEST +=3D test_a_i64_z_f64.o -TF_OBJS_TEST +=3D test_a_i64_z_extF80.o -TF_OBJS_TEST +=3D test_a_i64_z_f128.o -TF_OBJS_TEST +=3D test_a_f16_z_ui32_rx.o -TF_OBJS_TEST +=3D test_a_f16_z_ui64_rx.o -TF_OBJS_TEST +=3D test_a_f16_z_i32_rx.o -TF_OBJS_TEST +=3D test_a_f16_z_i64_rx.o -TF_OBJS_TEST +=3D test_a_f16_z_ui32_x.o -TF_OBJS_TEST +=3D test_a_f16_z_ui64_x.o -TF_OBJS_TEST +=3D test_a_f16_z_i32_x.o -TF_OBJS_TEST +=3D test_a_f16_z_i64_x.o -TF_OBJS_TEST +=3D test_a_f16_z_f32.o -TF_OBJS_TEST +=3D test_a_f16_z_f64.o -TF_OBJS_TEST +=3D test_a_f16_z_extF80.o -TF_OBJS_TEST +=3D test_a_f16_z_f128.o -TF_OBJS_TEST +=3D test_az_f16.o -TF_OBJS_TEST +=3D test_az_f16_rx.o -TF_OBJS_TEST +=3D test_abz_f16.o -TF_OBJS_TEST +=3D test_abcz_f16.o -TF_OBJS_TEST +=3D test_ab_f16_z_bool.o -TF_OBJS_TEST +=3D test_a_f32_z_ui32_rx.o -TF_OBJS_TEST +=3D test_a_f32_z_ui64_rx.o -TF_OBJS_TEST +=3D test_a_f32_z_i32_rx.o -TF_OBJS_TEST +=3D test_a_f32_z_i64_rx.o -TF_OBJS_TEST +=3D test_a_f32_z_ui32_x.o -TF_OBJS_TEST +=3D test_a_f32_z_ui64_x.o -TF_OBJS_TEST +=3D test_a_f32_z_i32_x.o -TF_OBJS_TEST +=3D test_a_f32_z_i64_x.o -TF_OBJS_TEST +=3D test_a_f32_z_f16.o -TF_OBJS_TEST +=3D test_a_f32_z_f64.o -TF_OBJS_TEST +=3D test_a_f32_z_extF80.o -TF_OBJS_TEST +=3D test_a_f32_z_f128.o -TF_OBJS_TEST +=3D test_az_f32.o -TF_OBJS_TEST +=3D test_az_f32_rx.o -TF_OBJS_TEST +=3D test_abz_f32.o -TF_OBJS_TEST +=3D test_abcz_f32.o -TF_OBJS_TEST +=3D test_ab_f32_z_bool.o -TF_OBJS_TEST +=3D test_a_f64_z_ui32_rx.o -TF_OBJS_TEST +=3D test_a_f64_z_ui64_rx.o -TF_OBJS_TEST +=3D test_a_f64_z_i32_rx.o -TF_OBJS_TEST +=3D test_a_f64_z_i64_rx.o -TF_OBJS_TEST +=3D test_a_f64_z_ui32_x.o -TF_OBJS_TEST +=3D test_a_f64_z_ui64_x.o -TF_OBJS_TEST +=3D test_a_f64_z_i32_x.o -TF_OBJS_TEST +=3D test_a_f64_z_i64_x.o -TF_OBJS_TEST +=3D test_a_f64_z_f16.o -TF_OBJS_TEST +=3D test_a_f64_z_f32.o -TF_OBJS_TEST +=3D test_a_f64_z_extF80.o -TF_OBJS_TEST +=3D test_a_f64_z_f128.o -TF_OBJS_TEST +=3D test_az_f64.o -TF_OBJS_TEST +=3D test_az_f64_rx.o -TF_OBJS_TEST +=3D test_abz_f64.o -TF_OBJS_TEST +=3D test_abcz_f64.o -TF_OBJS_TEST +=3D test_ab_f64_z_bool.o -TF_OBJS_TEST +=3D test_a_extF80_z_ui32_rx.o -TF_OBJS_TEST +=3D test_a_extF80_z_ui64_rx.o -TF_OBJS_TEST +=3D test_a_extF80_z_i32_rx.o -TF_OBJS_TEST +=3D test_a_extF80_z_i64_rx.o -TF_OBJS_TEST +=3D test_a_extF80_z_ui32_x.o -TF_OBJS_TEST +=3D test_a_extF80_z_ui64_x.o -TF_OBJS_TEST +=3D test_a_extF80_z_i32_x.o -TF_OBJS_TEST +=3D test_a_extF80_z_i64_x.o -TF_OBJS_TEST +=3D test_a_extF80_z_f16.o -TF_OBJS_TEST +=3D test_a_extF80_z_f32.o -TF_OBJS_TEST +=3D test_a_extF80_z_f64.o -TF_OBJS_TEST +=3D test_a_extF80_z_f128.o -TF_OBJS_TEST +=3D test_az_extF80.o -TF_OBJS_TEST +=3D test_az_extF80_rx.o -TF_OBJS_TEST +=3D test_abz_extF80.o -TF_OBJS_TEST +=3D test_ab_extF80_z_bool.o -TF_OBJS_TEST +=3D test_a_f128_z_ui32_rx.o -TF_OBJS_TEST +=3D test_a_f128_z_ui64_rx.o -TF_OBJS_TEST +=3D test_a_f128_z_i32_rx.o -TF_OBJS_TEST +=3D test_a_f128_z_i64_rx.o -TF_OBJS_TEST +=3D test_a_f128_z_ui32_x.o -TF_OBJS_TEST +=3D test_a_f128_z_ui64_x.o -TF_OBJS_TEST +=3D test_a_f128_z_i32_x.o -TF_OBJS_TEST +=3D test_a_f128_z_i64_x.o -TF_OBJS_TEST +=3D test_a_f128_z_f16.o -TF_OBJS_TEST +=3D test_a_f128_z_f32.o -TF_OBJS_TEST +=3D test_a_f128_z_f64.o -TF_OBJS_TEST +=3D test_a_f128_z_extF80.o -TF_OBJS_TEST +=3D test_az_f128.o -TF_OBJS_TEST +=3D test_az_f128_rx.o -TF_OBJS_TEST +=3D test_abz_f128.o -TF_OBJS_TEST +=3D test_abcz_f128.o -TF_OBJS_TEST +=3D test_ab_f128_z_bool.o - -TF_OBJS_LIB :=3D -TF_OBJS_LIB +=3D uint128_inline.o -TF_OBJS_LIB +=3D uint128.o -TF_OBJS_LIB +=3D fail.o -TF_OBJS_LIB +=3D functions_common.o -TF_OBJS_LIB +=3D functionInfos.o -TF_OBJS_LIB +=3D standardFunctionInfos.o -TF_OBJS_LIB +=3D random.o -TF_OBJS_LIB +=3D genCases_common.o -TF_OBJS_LIB +=3D $(TF_OBJS_GENCASES) -TF_OBJS_LIB +=3D genCases_writeTestsTotal.o -TF_OBJS_LIB +=3D verCases_inline.o -TF_OBJS_LIB +=3D verCases_common.o -TF_OBJS_LIB +=3D verCases_writeFunctionName.o -TF_OBJS_LIB +=3D readHex.o -TF_OBJS_LIB +=3D writeHex.o -TF_OBJS_LIB +=3D $(TF_OBJS_WRITECASE) -TF_OBJS_LIB +=3D testLoops_common.o -TF_OBJS_LIB +=3D $(TF_OBJS_TEST) - -BINARIES :=3D fp-test$(EXESUF) fp-bench$(EXESUF) - -# We require artefacts from the main build including config-host.h -# because platform.h includes it. Rather than re-invoking the main -# build we just error out if things aren't there. -$(LIBQEMUUTIL) $(BUILD_DIR)/config-host.h: - $(error $@ missing, re-run parent build) - -all: $(BUILD_DIR)/config-host.h $(BINARIES) - -# libtestfloat.a depends on libsoftfloat.a, so specify it first -FP_TEST_LIBS :=3D libtestfloat.a libsoftfloat.a $(LIBQEMUUTIL) - -fp-test$(EXESUF): fp-test.o slowfloat.o $(QEMU_SOFTFLOAT_OBJ) $(FP_TEST_LI= BS) - -# Custom rule to build with SF_CFLAGS -SF_BUILD =3D $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCL= UDES) \ - $(QEMU_CFLAGS) $(SF_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ - $($@-cflags) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -$(SF_OBJS_ALL_NOSPEC): %.o: $(SF_SOURCE_DIR)/%.c - $(SF_BUILD) -$(SF_OBJS_SPECIALIZE): %.o: $(SF_SPECIALIZE_DIR)/%.c - $(SF_BUILD) - -libsoftfloat.a: $(SF_OBJS_ALL) - -# Custom rule to build with TF_CFLAGS -$(TF_OBJS_LIB) slowfloat.o: %.o: $(TF_SOURCE_DIR)/%.c - $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CFLAGS) $(TF_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ - $($@-cflags) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -libtestfloat.a: $(TF_OBJS_LIB) - -fp-bench$(EXESUF): fp-bench.o $(QEMU_SOFTFLOAT_OBJ) $(LIBQEMUUTIL) - -clean: - rm -f *.o *.d $(BINARIES) - rm -f *.gcno *.gcda *.gcov - rm -f fp-test$(EXESUF) - rm -f fp-bench$(EXESUF) - rm -f libsoftfloat.a - rm -f libtestfloat.a - --include $(wildcard *.d) diff --git a/tests/fp/meson.build b/tests/fp/meson.build new file mode 100644 index 0000000..8779a17 --- /dev/null +++ b/tests/fp/meson.build @@ -0,0 +1,636 @@ +# There are namespace pollution issues on Windows, due to osdep.h +# bringing in Windows headers that define a FLOAT128 type. +if targetos =3D=3D 'windows' + subdir_done() +endif + +fpcflags =3D [ + # softfloat defines + '-DSOFTFLOAT_ROUND_ODD', + '-DINLINE_LEVEL=3D5', + '-DSOFTFLOAT_FAST_DIV32TO16', + '-DSOFTFLOAT_FAST_DIV64TO32', + '-DSOFTFLOAT_FAST_INT64', + # testfloat defines + '-DFLOAT16', + '-DFLOAT64', + '-DEXTFLOAT80', + '-DFLOAT128', + '-DFLOAT_ROUND_ODD', + '-DLONG_DOUBLE_IS_EXTFLOAT80', +] + +sfdir =3D 'berkeley-softfloat-3/source' +sfspedir =3D sfdir / '8086-SSE' +tfdir =3D 'berkeley-testfloat-3/source' + +sfinc =3D include_directories(sfdir / 'include', sfspedir) + +tfcflags =3D [ + '-Wno-strict-prototypes', + '-Wno-unknown-pragmas', + '-Wno-uninitialized', + '-Wno-missing-prototypes', + '-Wno-return-type', + '-Wno-unused-function', + '-Wno-error', +] + +tfgencases =3D [ + tfdir / 'genCases_ui32.c', + tfdir / 'genCases_ui64.c', + tfdir / 'genCases_i32.c', + tfdir / 'genCases_i64.c', + tfdir / 'genCases_f16.c', + tfdir / 'genCases_f32.c', + tfdir / 'genCases_f64.c', + tfdir / 'genCases_extF80.c', + tfdir / 'genCases_f128.c', +] + +tfwritecase =3D [ + tfdir / 'writeCase_a_ui32.c', + tfdir / 'writeCase_a_ui64.c', + tfdir / 'writeCase_a_f16.c', + tfdir / 'writeCase_ab_f16.c', + tfdir / 'writeCase_abc_f16.c', + tfdir / 'writeCase_a_f32.c', + tfdir / 'writeCase_ab_f32.c', + tfdir / 'writeCase_abc_f32.c', + tfdir / 'writeCase_a_f64.c', + tfdir / 'writeCase_ab_f64.c', + tfdir / 'writeCase_abc_f64.c', + tfdir / 'writeCase_a_extF80M.c', + tfdir / 'writeCase_ab_extF80M.c', + tfdir / 'writeCase_a_f128M.c', + tfdir / 'writeCase_ab_f128M.c', + tfdir / 'writeCase_abc_f128M.c', + tfdir / 'writeCase_z_bool.c', + tfdir / 'writeCase_z_ui32.c', + tfdir / 'writeCase_z_ui64.c', + tfdir / 'writeCase_z_f16.c', + tfdir / 'writeCase_z_f32.c', + tfdir / 'writeCase_z_f64.c', + tfdir / 'writeCase_z_extF80M.c', + tfdir / 'writeCase_z_f128M.c', +] + +tftest =3D [ + tfdir / 'test_a_ui32_z_f16.c', + tfdir / 'test_a_ui32_z_f32.c', + tfdir / 'test_a_ui32_z_f64.c', + tfdir / 'test_a_ui32_z_extF80.c', + tfdir / 'test_a_ui32_z_f128.c', + tfdir / 'test_a_ui64_z_f16.c', + tfdir / 'test_a_ui64_z_f32.c', + tfdir / 'test_a_ui64_z_f64.c', + tfdir / 'test_a_ui64_z_extF80.c', + tfdir / 'test_a_ui64_z_f128.c', + tfdir / 'test_a_i32_z_f16.c', + tfdir / 'test_a_i32_z_f32.c', + tfdir / 'test_a_i32_z_f64.c', + tfdir / 'test_a_i32_z_extF80.c', + tfdir / 'test_a_i32_z_f128.c', + tfdir / 'test_a_i64_z_f16.c', + tfdir / 'test_a_i64_z_f32.c', + tfdir / 'test_a_i64_z_f64.c', + tfdir / 'test_a_i64_z_extF80.c', + tfdir / 'test_a_i64_z_f128.c', + tfdir / 'test_a_f16_z_ui32_rx.c', + tfdir / 'test_a_f16_z_ui64_rx.c', + tfdir / 'test_a_f16_z_i32_rx.c', + tfdir / 'test_a_f16_z_i64_rx.c', + tfdir / 'test_a_f16_z_ui32_x.c', + tfdir / 'test_a_f16_z_ui64_x.c', + tfdir / 'test_a_f16_z_i32_x.c', + tfdir / 'test_a_f16_z_i64_x.c', + tfdir / 'test_a_f16_z_f32.c', + tfdir / 'test_a_f16_z_f64.c', + tfdir / 'test_a_f16_z_extF80.c', + tfdir / 'test_a_f16_z_f128.c', + tfdir / 'test_az_f16.c', + tfdir / 'test_az_f16_rx.c', + tfdir / 'test_abz_f16.c', + tfdir / 'test_abcz_f16.c', + tfdir / 'test_ab_f16_z_bool.c', + tfdir / 'test_a_f32_z_ui32_rx.c', + tfdir / 'test_a_f32_z_ui64_rx.c', + tfdir / 'test_a_f32_z_i32_rx.c', + tfdir / 'test_a_f32_z_i64_rx.c', + tfdir / 'test_a_f32_z_ui32_x.c', + tfdir / 'test_a_f32_z_ui64_x.c', + tfdir / 'test_a_f32_z_i32_x.c', + tfdir / 'test_a_f32_z_i64_x.c', + tfdir / 'test_a_f32_z_f16.c', + tfdir / 'test_a_f32_z_f64.c', + tfdir / 'test_a_f32_z_extF80.c', + tfdir / 'test_a_f32_z_f128.c', + tfdir / 'test_az_f32.c', + tfdir / 'test_az_f32_rx.c', + tfdir / 'test_abz_f32.c', + tfdir / 'test_abcz_f32.c', + tfdir / 'test_ab_f32_z_bool.c', + tfdir / 'test_a_f64_z_ui32_rx.c', + tfdir / 'test_a_f64_z_ui64_rx.c', + tfdir / 'test_a_f64_z_i32_rx.c', + tfdir / 'test_a_f64_z_i64_rx.c', + tfdir / 'test_a_f64_z_ui32_x.c', + tfdir / 'test_a_f64_z_ui64_x.c', + tfdir / 'test_a_f64_z_i32_x.c', + tfdir / 'test_a_f64_z_i64_x.c', + tfdir / 'test_a_f64_z_f16.c', + tfdir / 'test_a_f64_z_f32.c', + tfdir / 'test_a_f64_z_extF80.c', + tfdir / 'test_a_f64_z_f128.c', + tfdir / 'test_az_f64.c', + tfdir / 'test_az_f64_rx.c', + tfdir / 'test_abz_f64.c', + tfdir / 'test_abcz_f64.c', + tfdir / 'test_ab_f64_z_bool.c', + tfdir / 'test_a_extF80_z_ui32_rx.c', + tfdir / 'test_a_extF80_z_ui64_rx.c', + tfdir / 'test_a_extF80_z_i32_rx.c', + tfdir / 'test_a_extF80_z_i64_rx.c', + tfdir / 'test_a_extF80_z_ui32_x.c', + tfdir / 'test_a_extF80_z_ui64_x.c', + tfdir / 'test_a_extF80_z_i32_x.c', + tfdir / 'test_a_extF80_z_i64_x.c', + tfdir / 'test_a_extF80_z_f16.c', + tfdir / 'test_a_extF80_z_f32.c', + tfdir / 'test_a_extF80_z_f64.c', + tfdir / 'test_a_extF80_z_f128.c', + tfdir / 'test_az_extF80.c', + tfdir / 'test_az_extF80_rx.c', + tfdir / 'test_abz_extF80.c', + tfdir / 'test_ab_extF80_z_bool.c', + tfdir / 'test_a_f128_z_ui32_rx.c', + tfdir / 'test_a_f128_z_ui64_rx.c', + tfdir / 'test_a_f128_z_i32_rx.c', + tfdir / 'test_a_f128_z_i64_rx.c', + tfdir / 'test_a_f128_z_ui32_x.c', + tfdir / 'test_a_f128_z_ui64_x.c', + tfdir / 'test_a_f128_z_i32_x.c', + tfdir / 'test_a_f128_z_i64_x.c', + tfdir / 'test_a_f128_z_f16.c', + tfdir / 'test_a_f128_z_f32.c', + tfdir / 'test_a_f128_z_f64.c', + tfdir / 'test_a_f128_z_extF80.c', + tfdir / 'test_az_f128.c', + tfdir / 'test_az_f128_rx.c', + tfdir / 'test_abz_f128.c', + tfdir / 'test_abcz_f128.c', + tfdir / 'test_ab_f128_z_bool.c', +] + +libtestfloat =3D static_library( + 'testfloat', + files( + tfdir / 'uint128_inline.c', + tfdir / 'uint128.c', + tfdir / 'fail.c', + tfdir / 'functions_common.c', + tfdir / 'functionInfos.c', + tfdir / 'standardFunctionInfos.c', + tfdir / 'random.c', + tfdir / 'genCases_common.c', + tfgencases, + tfdir / 'genCases_writeTestsTotal.c', + tfdir / 'verCases_inline.c', + tfdir / 'verCases_common.c', + tfdir / 'verCases_writeFunctionName.c', + tfdir / 'readHex.c', + tfdir / 'writeHex.c', + tfwritecase, + tfdir / 'testLoops_common.c', + tftest, + ), + include_directories: sfinc, + c_args: tfcflags + fpcflags, +) + +sfcflags =3D [ + '-Wno-missing-prototypes', + '-Wno-redundant-decls', + '-Wno-return-type', + '-Wno-error', +] + +libsoftfloat =3D static_library( + 'softfloat', + files( + # primitives + sfdir / 's_eq128.c', + sfdir / 's_le128.c', + sfdir / 's_lt128.c', + sfdir / 's_shortShiftLeft128.c', + sfdir / 's_shortShiftRight128.c', + sfdir / 's_shortShiftRightJam64.c', + sfdir / 's_shortShiftRightJam64Extra.c', + sfdir / 's_shortShiftRightJam128.c', + sfdir / 's_shortShiftRightJam128Extra.c', + sfdir / 's_shiftRightJam32.c', + sfdir / 's_shiftRightJam64.c', + sfdir / 's_shiftRightJam64Extra.c', + sfdir / 's_shiftRightJam128.c', + sfdir / 's_shiftRightJam128Extra.c', + sfdir / 's_shiftRightJam256M.c', + sfdir / 's_countLeadingZeros8.c', + sfdir / 's_countLeadingZeros16.c', + sfdir / 's_countLeadingZeros32.c', + sfdir / 's_countLeadingZeros64.c', + sfdir / 's_add128.c', + sfdir / 's_add256M.c', + sfdir / 's_sub128.c', + sfdir / 's_sub256M.c', + sfdir / 's_mul64ByShifted32To128.c', + sfdir / 's_mul64To128.c', + sfdir / 's_mul128By32.c', + sfdir / 's_mul128To256M.c', + sfdir / 's_approxRecip_1Ks.c', + sfdir / 's_approxRecip32_1.c', + sfdir / 's_approxRecipSqrt_1Ks.c', + sfdir / 's_approxRecipSqrt32_1.c', + # others + sfdir / 's_roundToUI32.c', + sfdir / 's_roundToUI64.c', + sfdir / 's_roundToI32.c', + sfdir / 's_roundToI64.c', + sfdir / 's_normSubnormalF16Sig.c', + sfdir / 's_roundPackToF16.c', + sfdir / 's_normRoundPackToF16.c', + sfdir / 's_addMagsF16.c', + sfdir / 's_subMagsF16.c', + sfdir / 's_mulAddF16.c', + sfdir / 's_normSubnormalF32Sig.c', + sfdir / 's_roundPackToF32.c', + sfdir / 's_normRoundPackToF32.c', + sfdir / 's_addMagsF32.c', + sfdir / 's_subMagsF32.c', + sfdir / 's_mulAddF32.c', + sfdir / 's_normSubnormalF64Sig.c', + sfdir / 's_roundPackToF64.c', + sfdir / 's_normRoundPackToF64.c', + sfdir / 's_addMagsF64.c', + sfdir / 's_subMagsF64.c', + sfdir / 's_mulAddF64.c', + sfdir / 's_normSubnormalExtF80Sig.c', + sfdir / 's_roundPackToExtF80.c', + sfdir / 's_normRoundPackToExtF80.c', + sfdir / 's_addMagsExtF80.c', + sfdir / 's_subMagsExtF80.c', + sfdir / 's_normSubnormalF128Sig.c', + sfdir / 's_roundPackToF128.c', + sfdir / 's_normRoundPackToF128.c', + sfdir / 's_addMagsF128.c', + sfdir / 's_subMagsF128.c', + sfdir / 's_mulAddF128.c', + sfdir / 'softfloat_state.c', + sfdir / 'ui32_to_f16.c', + sfdir / 'ui32_to_f32.c', + sfdir / 'ui32_to_f64.c', + sfdir / 'ui32_to_extF80.c', + sfdir / 'ui32_to_extF80M.c', + sfdir / 'ui32_to_f128.c', + sfdir / 'ui32_to_f128M.c', + sfdir / 'ui64_to_f16.c', + sfdir / 'ui64_to_f32.c', + sfdir / 'ui64_to_f64.c', + sfdir / 'ui64_to_extF80.c', + sfdir / 'ui64_to_extF80M.c', + sfdir / 'ui64_to_f128.c', + sfdir / 'ui64_to_f128M.c', + sfdir / 'i32_to_f16.c', + sfdir / 'i32_to_f32.c', + sfdir / 'i32_to_f64.c', + sfdir / 'i32_to_extF80.c', + sfdir / 'i32_to_extF80M.c', + sfdir / 'i32_to_f128.c', + sfdir / 'i32_to_f128M.c', + sfdir / 'i64_to_f16.c', + sfdir / 'i64_to_f32.c', + sfdir / 'i64_to_f64.c', + sfdir / 'i64_to_extF80.c', + sfdir / 'i64_to_extF80M.c', + sfdir / 'i64_to_f128.c', + sfdir / 'i64_to_f128M.c', + sfdir / 'f16_to_ui32.c', + sfdir / 'f16_to_ui64.c', + sfdir / 'f16_to_i32.c', + sfdir / 'f16_to_i64.c', + sfdir / 'f16_to_ui32_r_minMag.c', + sfdir / 'f16_to_ui64_r_minMag.c', + sfdir / 'f16_to_i32_r_minMag.c', + sfdir / 'f16_to_i64_r_minMag.c', + sfdir / 'f16_to_f32.c', + sfdir / 'f16_to_f64.c', + sfdir / 'f16_to_extF80.c', + sfdir / 'f16_to_extF80M.c', + sfdir / 'f16_to_f128.c', + sfdir / 'f16_to_f128M.c', + sfdir / 'f16_roundToInt.c', + sfdir / 'f16_add.c', + sfdir / 'f16_sub.c', + sfdir / 'f16_mul.c', + sfdir / 'f16_mulAdd.c', + sfdir / 'f16_div.c', + sfdir / 'f16_rem.c', + sfdir / 'f16_sqrt.c', + sfdir / 'f16_eq.c', + sfdir / 'f16_le.c', + sfdir / 'f16_lt.c', + sfdir / 'f16_eq_signaling.c', + sfdir / 'f16_le_quiet.c', + sfdir / 'f16_lt_quiet.c', + sfdir / 'f16_isSignalingNaN.c', + sfdir / 'f32_to_ui32.c', + sfdir / 'f32_to_ui64.c', + sfdir / 'f32_to_i32.c', + sfdir / 'f32_to_i64.c', + sfdir / 'f32_to_ui32_r_minMag.c', + sfdir / 'f32_to_ui64_r_minMag.c', + sfdir / 'f32_to_i32_r_minMag.c', + sfdir / 'f32_to_i64_r_minMag.c', + sfdir / 'f32_to_f16.c', + sfdir / 'f32_to_f64.c', + sfdir / 'f32_to_extF80.c', + sfdir / 'f32_to_extF80M.c', + sfdir / 'f32_to_f128.c', + sfdir / 'f32_to_f128M.c', + sfdir / 'f32_roundToInt.c', + sfdir / 'f32_add.c', + sfdir / 'f32_sub.c', + sfdir / 'f32_mul.c', + sfdir / 'f32_mulAdd.c', + sfdir / 'f32_div.c', + sfdir / 'f32_rem.c', + sfdir / 'f32_sqrt.c', + sfdir / 'f32_eq.c', + sfdir / 'f32_le.c', + sfdir / 'f32_lt.c', + sfdir / 'f32_eq_signaling.c', + sfdir / 'f32_le_quiet.c', + sfdir / 'f32_lt_quiet.c', + sfdir / 'f32_isSignalingNaN.c', + sfdir / 'f64_to_ui32.c', + sfdir / 'f64_to_ui64.c', + sfdir / 'f64_to_i32.c', + sfdir / 'f64_to_i64.c', + sfdir / 'f64_to_ui32_r_minMag.c', + sfdir / 'f64_to_ui64_r_minMag.c', + sfdir / 'f64_to_i32_r_minMag.c', + sfdir / 'f64_to_i64_r_minMag.c', + sfdir / 'f64_to_f16.c', + sfdir / 'f64_to_f32.c', + sfdir / 'f64_to_extF80.c', + sfdir / 'f64_to_extF80M.c', + sfdir / 'f64_to_f128.c', + sfdir / 'f64_to_f128M.c', + sfdir / 'f64_roundToInt.c', + sfdir / 'f64_add.c', + sfdir / 'f64_sub.c', + sfdir / 'f64_mul.c', + sfdir / 'f64_mulAdd.c', + sfdir / 'f64_div.c', + sfdir / 'f64_rem.c', + sfdir / 'f64_sqrt.c', + sfdir / 'f64_eq.c', + sfdir / 'f64_le.c', + sfdir / 'f64_lt.c', + sfdir / 'f64_eq_signaling.c', + sfdir / 'f64_le_quiet.c', + sfdir / 'f64_lt_quiet.c', + sfdir / 'f64_isSignalingNaN.c', + sfdir / 'extF80_to_ui32.c', + sfdir / 'extF80_to_ui64.c', + sfdir / 'extF80_to_i32.c', + sfdir / 'extF80_to_i64.c', + sfdir / 'extF80_to_ui32_r_minMag.c', + sfdir / 'extF80_to_ui64_r_minMag.c', + sfdir / 'extF80_to_i32_r_minMag.c', + sfdir / 'extF80_to_i64_r_minMag.c', + sfdir / 'extF80_to_f16.c', + sfdir / 'extF80_to_f32.c', + sfdir / 'extF80_to_f64.c', + sfdir / 'extF80_to_f128.c', + sfdir / 'extF80_roundToInt.c', + sfdir / 'extF80_add.c', + sfdir / 'extF80_sub.c', + sfdir / 'extF80_mul.c', + sfdir / 'extF80_div.c', + sfdir / 'extF80_rem.c', + sfdir / 'extF80_sqrt.c', + sfdir / 'extF80_eq.c', + sfdir / 'extF80_le.c', + sfdir / 'extF80_lt.c', + sfdir / 'extF80_eq_signaling.c', + sfdir / 'extF80_le_quiet.c', + sfdir / 'extF80_lt_quiet.c', + sfdir / 'extF80_isSignalingNaN.c', + sfdir / 'extF80M_to_ui32.c', + sfdir / 'extF80M_to_ui64.c', + sfdir / 'extF80M_to_i32.c', + sfdir / 'extF80M_to_i64.c', + sfdir / 'extF80M_to_ui32_r_minMag.c', + sfdir / 'extF80M_to_ui64_r_minMag.c', + sfdir / 'extF80M_to_i32_r_minMag.c', + sfdir / 'extF80M_to_i64_r_minMag.c', + sfdir / 'extF80M_to_f16.c', + sfdir / 'extF80M_to_f32.c', + sfdir / 'extF80M_to_f64.c', + sfdir / 'extF80M_to_f128M.c', + sfdir / 'extF80M_roundToInt.c', + sfdir / 'extF80M_add.c', + sfdir / 'extF80M_sub.c', + sfdir / 'extF80M_mul.c', + sfdir / 'extF80M_div.c', + sfdir / 'extF80M_rem.c', + sfdir / 'extF80M_sqrt.c', + sfdir / 'extF80M_eq.c', + sfdir / 'extF80M_le.c', + sfdir / 'extF80M_lt.c', + sfdir / 'extF80M_eq_signaling.c', + sfdir / 'extF80M_le_quiet.c', + sfdir / 'extF80M_lt_quiet.c', + sfdir / 'f128_to_ui32.c', + sfdir / 'f128_to_ui64.c', + sfdir / 'f128_to_i32.c', + sfdir / 'f128_to_i64.c', + sfdir / 'f128_to_ui32_r_minMag.c', + sfdir / 'f128_to_ui64_r_minMag.c', + sfdir / 'f128_to_i32_r_minMag.c', + sfdir / 'f128_to_i64_r_minMag.c', + sfdir / 'f128_to_f16.c', + sfdir / 'f128_to_f32.c', + sfdir / 'f128_to_extF80.c', + sfdir / 'f128_to_f64.c', + sfdir / 'f128_roundToInt.c', + sfdir / 'f128_add.c', + sfdir / 'f128_sub.c', + sfdir / 'f128_mul.c', + sfdir / 'f128_mulAdd.c', + sfdir / 'f128_div.c', + sfdir / 'f128_rem.c', + sfdir / 'f128_sqrt.c', + sfdir / 'f128_eq.c', + sfdir / 'f128_le.c', + sfdir / 'f128_lt.c', + sfdir / 'f128_eq_signaling.c', + sfdir / 'f128_le_quiet.c', + sfdir / 'f128_lt_quiet.c', + sfdir / 'f128_isSignalingNaN.c', + sfdir / 'f128M_to_ui32.c', + sfdir / 'f128M_to_ui64.c', + sfdir / 'f128M_to_i32.c', + sfdir / 'f128M_to_i64.c', + sfdir / 'f128M_to_ui32_r_minMag.c', + sfdir / 'f128M_to_ui64_r_minMag.c', + sfdir / 'f128M_to_i32_r_minMag.c', + sfdir / 'f128M_to_i64_r_minMag.c', + sfdir / 'f128M_to_f16.c', + sfdir / 'f128M_to_f32.c', + sfdir / 'f128M_to_extF80M.c', + sfdir / 'f128M_to_f64.c', + sfdir / 'f128M_roundToInt.c', + sfdir / 'f128M_add.c', + sfdir / 'f128M_sub.c', + sfdir / 'f128M_mul.c', + sfdir / 'f128M_mulAdd.c', + sfdir / 'f128M_div.c', + sfdir / 'f128M_rem.c', + sfdir / 'f128M_sqrt.c', + sfdir / 'f128M_eq.c', + sfdir / 'f128M_le.c', + sfdir / 'f128M_lt.c', + sfdir / 'f128M_eq_signaling.c', + sfdir / 'f128M_le_quiet.c', + sfdir / 'f128M_lt_quiet.c', + # spe + sfspedir / 'softfloat_raiseFlags.c', + sfspedir / 's_f16UIToCommonNaN.c', + sfspedir / 's_commonNaNToF16UI.c', + sfspedir / 's_propagateNaNF16UI.c', + sfspedir / 's_f32UIToCommonNaN.c', + sfspedir / 's_commonNaNToF32UI.c', + sfspedir / 's_propagateNaNF32UI.c', + sfspedir / 's_f64UIToCommonNaN.c', + sfspedir / 's_commonNaNToF64UI.c', + sfspedir / 's_propagateNaNF64UI.c', + sfspedir / 'extF80M_isSignalingNaN.c', + sfspedir / 's_extF80UIToCommonNaN.c', + sfspedir / 's_commonNaNToExtF80UI.c', + sfspedir / 's_propagateNaNExtF80UI.c', + sfspedir / 'f128M_isSignalingNaN.c', + sfspedir / 's_f128UIToCommonNaN.c', + sfspedir / 's_commonNaNToF128UI.c', + sfspedir / 's_propagateNaNF128UI.c', + ), + include_directories: sfinc, + c_args: sfcflags + fpcflags, +) + +fpcflags +=3D [ + # work around TARGET_* poisoning + '-DHW_POISON_H', + # define a target to match testfloat's implementation-defined choices, s= uch as + # whether to raise the invalid flag when dealing with NaNs in muladd. + '-DTARGET_ARM', + # FIXME: uiZ may be used uninitialized in this function + '-Wno-uninitialized', +] + +fptest =3D executable( + 'fp-test', + ['fp-test.c', tfdir / 'slowfloat.c', '../../fpu/softfloat.c'], + build_by_default: false, + link_with: [libtestfloat, libsoftfloat], + dependencies: [qemuutil], + include_directories: [sfinc, include_directories(tfdir)], + c_args: fpcflags, +) +softfloat_conv_tests =3D { + 'float-to-float': 'f16_to_f32 f16_to_f64 f16_to_extF80 f16_to_f128 ' + + 'f32_to_f16 f32_to_f64 f32_to_extF80 ' + + 'f64_to_f16 f64_to_f32 ' + + 'extF80_to_f16 extF80_to_f32 ' + + 'extF80_to_f64 extF80_to_f128 ' + + 'f128_to_f16', + 'int-to-float': 'i32_to_f16 i64_to_f16 i32_to_f32 i64_to_f32 ' + + 'i32_to_f64 i64_to_f64 i32_to_f128 i64_to_f128', + 'uint-to-float': 'ui32_to_f16 ui64_to_f16 ui32_to_f32 ui64_to_f32 ' + + 'ui32_to_f64 ui64_to_f64 ui64_to_f128 ' + + 'ui32_to_extF80 ui64_to_extF80', + 'float-to-int': 'f16_to_i32 f16_to_i32_r_minMag ' + + 'f32_to_i32 f32_to_i32_r_minMag ' + + 'f64_to_i32 f64_to_i32_r_minMag ' + + 'extF80_to_i32 extF80_to_i32_r_minMag ' + + 'f128_to_i32 f128_to_i32_r_minMag ' + + 'f16_to_i64 f16_to_i64_r_minMag ' + + 'f32_to_i64 f32_to_i64_r_minMag ' + + 'f64_to_i64 f64_to_i64_r_minMag ' + + 'extF80_to_i64 extF80_to_i64_r_minMag ' + + 'f128_to_i64 f128_to_i64_r_minMag', + 'float-to-uint': 'f16_to_ui32 f16_to_ui32_r_minMag ' + + 'f32_to_ui32 f32_to_ui32_r_minMag ' + + 'f64_to_ui32 f64_to_ui32_r_minMag ' + + 'extF80_to_ui32 extF80_to_ui32_r_minMag ' + + 'f128_to_ui32 f128_to_ui32_r_minMag ' + + 'f16_to_ui64 f16_to_ui64_r_minMag ' + + 'f32_to_ui64 f32_to_ui64_r_minMag ' + + 'f64_to_ui64 f64_to_ui64_r_minMag ' + + 'extF80_to_ui64 extF80_to_ui64_r_minMag ' + + 'f128_to_ui64 f128_to_ui64_r_minMag', + 'round-to-integer': 'f16_roundToInt f32_roundToInt ' + + 'f64_roundToInt f128_roundToInt' +} +softfloat_tests =3D { + 'eq_signaling' : 'compare', + 'le' : 'compare', + 'le_quiet' : 'compare', + 'lt_quiet' : 'compare', + 'add': 'ops', + 'sub': 'ops', + 'mul': 'ops', + 'div': 'ops', + 'rem': 'ops', + 'sqrt': 'ops' +} +# The full test suite can take a bit of time, default to a quick run +# "-l 2 -r all" can take more than a day for some operations and is best +# run manually +fptest_args =3D ['-s', '-l', '1'] +fptest_rounding_args =3D ['-r', 'all'] + +# Conversion Routines: +# FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken) +# extF80_roundToInt (broken) +foreach k, v : softfloat_conv_tests + test('fp-test:' + k, fptest, + args: fptest_args + fptest_rounding_args + v.split(), + suite: ['softfloat', 'softfloat-conv']) +endforeach + +# FIXME: extF80_{lt_quiet, rem} (broken), +# extF80_{mulAdd} (missing) +foreach k, v : softfloat_tests + extF80_broken =3D ['lt_quiet', 'rem'].contains(k) + test('fp-test:' + k, fptest, + args: fptest_args + fptest_rounding_args + + ['f16_' + k, 'f32_' + k, 'f64_' + k, 'f128_' + k] + + (extF80_broken ? [] : ['extF80_' + k]), + suite: ['softfloat', 'softfloat-' + v]) +endforeach +test('fp-test:mulAdd', fptest, + # no fptest_rounding_args + args: fptest_args + + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], + suite: ['softfloat-slow', 'softfloat-ops-slow'], timeout: 60) + +fpbench =3D executable( + 'fp-bench', + ['fp-bench.c', '../../fpu/softfloat.c'], + build_by_default: false, + link_with: [libtestfloat, libsoftfloat], + dependencies: [qemuutil], + include_directories: [sfinc, include_directories(tfdir)], + c_args: fpcflags, +) diff --git a/tests/meson.build b/tests/meson.build index 5c52021..ec26f92 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -2,3 +2,7 @@ test('decodetree', sh, args: [ files('decode/check.sh'), config_host['PYTHON'], files('../sc= ripts/decodetree.py') ], workdir: meson.current_source_dir() / 'decode', suite: 'decodetree') + +if 'CONFIG_TCG' in config_host + subdir('fp') +endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080644; cv=none; d=zohomail.com; s=zohoarc; b=cK7EJB0Y+uE++Ri7LxysiJCqnzMLTLejp9TzG2tLbxsaroa1QX+/JleixNiGyApgdv/S2e1+WhCdGC1cpXH+iIZVPCb0QScBqcHAz/QWouUeyS9V0mzdJo9ApZ3SUGuBPqma8zMCBlgQB5E8Xx8pFIGAHljPYCL8jaW+eVwnr8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080644; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=S2HU21n7c9VQf5Q+uHozZWvjxefhUZqRf30/JH02dIk=; b=DLerVBvivr8D8J0AO72gl9LfrCEWj3PHbSSBtFif+uGVesmNyvsbzSJSOI0iEm+3kmQdX1kOoVg/rx/YSuM6I/oHrm3JHJTcQP9zpnmxwRcSnoLfAMtL7zdPX9ag+D+R8cRqfssOf/cGNyZlx3SM4LDx6Zalg+oOrwZk92so0Sg= 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 1597080644946566.1400416704171; Mon, 10 Aug 2020 10:30:44 -0700 (PDT) Received: from localhost ([::1]:50596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BdD-00073F-Eo for importer@patchew.org; Mon, 10 Aug 2020 13:30:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJo-00089N-FF for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:40 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:35585 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 1k5BJl-0002zg-DO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:40 -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-176-4zrxP57hPVC67PjmJ5BIIQ-1; Mon, 10 Aug 2020 13:10:33 -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 97783107ACCA for ; Mon, 10 Aug 2020 17:10:32 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBBB85F1E9 for ; Mon, 10 Aug 2020 17:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=S2HU21n7c9VQf5Q+uHozZWvjxefhUZqRf30/JH02dIk=; b=IPjD6kLtC9PO2I8gV/u9gHrfA478rHit20V6cQp+3upbczR8IqARBRJW53oqW3910fmi+P ZzZcHQj5xVCwddTW6ro+HXOW3HV3Vwka8mvmDhBcbV1HxTcX4G9g86TJAfAILZQ6bd46Az oxGyRApkeqqPOMEJ12Zd0SkYw+zvoNo= X-MC-Unique: 4zrxP57hPVC67PjmJ5BIIQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 051/147] meson: convert check-qapi-schema Date: Mon, 10 Aug 2020 19:07:29 +0200 Message-Id: <1597079345-42801-52-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 218 +-------------------------------------= ---- tests/meson.build | 2 + tests/qapi-schema/meson.build | 216 ++++++++++++++++++++++++++++++++++++++= +++ 3 files changed, 220 insertions(+), 216 deletions(-) create mode 100644 tests/qapi-schema/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index b3f8fdd..676d099 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -161,201 +161,6 @@ check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh =20 -qapi-schema +=3D alternate-any.json -qapi-schema +=3D alternate-array.json -qapi-schema +=3D alternate-base.json -qapi-schema +=3D alternate-branch-if-invalid.json -qapi-schema +=3D alternate-clash.json -qapi-schema +=3D alternate-conflict-dict.json -qapi-schema +=3D alternate-conflict-enum-bool.json -qapi-schema +=3D alternate-conflict-enum-int.json -qapi-schema +=3D alternate-conflict-string.json -qapi-schema +=3D alternate-conflict-bool-string.json -qapi-schema +=3D alternate-conflict-num-string.json -qapi-schema +=3D alternate-empty.json -qapi-schema +=3D alternate-invalid-dict.json -qapi-schema +=3D alternate-nested.json -qapi-schema +=3D alternate-unknown.json -qapi-schema +=3D args-alternate.json -qapi-schema +=3D args-any.json -qapi-schema +=3D args-array-empty.json -qapi-schema +=3D args-array-unknown.json -qapi-schema +=3D args-bad-boxed.json -qapi-schema +=3D args-boxed-anon.json -qapi-schema +=3D args-boxed-string.json -qapi-schema +=3D args-int.json -qapi-schema +=3D args-invalid.json -qapi-schema +=3D args-member-array-bad.json -qapi-schema +=3D args-member-case.json -qapi-schema +=3D args-member-unknown.json -qapi-schema +=3D args-name-clash.json -qapi-schema +=3D args-union.json -qapi-schema +=3D args-unknown.json -qapi-schema +=3D bad-base.json -qapi-schema +=3D bad-data.json -qapi-schema +=3D bad-ident.json -qapi-schema +=3D bad-if.json -qapi-schema +=3D bad-if-empty.json -qapi-schema +=3D bad-if-empty-list.json -qapi-schema +=3D bad-if-list.json -qapi-schema +=3D bad-type-bool.json -qapi-schema +=3D bad-type-dict.json -qapi-schema +=3D bad-type-int.json -qapi-schema +=3D base-cycle-direct.json -qapi-schema +=3D base-cycle-indirect.json -qapi-schema +=3D command-int.json -qapi-schema +=3D comments.json -qapi-schema +=3D doc-bad-alternate-member.json -qapi-schema +=3D doc-bad-boxed-command-arg.json -qapi-schema +=3D doc-bad-command-arg.json -qapi-schema +=3D doc-bad-enum-member.json -qapi-schema +=3D doc-bad-event-arg.json -qapi-schema +=3D doc-bad-feature.json -qapi-schema +=3D doc-bad-section.json -qapi-schema +=3D doc-bad-symbol.json -qapi-schema +=3D doc-bad-union-member.json -qapi-schema +=3D doc-before-include.json -qapi-schema +=3D doc-before-pragma.json -qapi-schema +=3D doc-duplicated-arg.json -qapi-schema +=3D doc-duplicated-return.json -qapi-schema +=3D doc-duplicated-since.json -qapi-schema +=3D doc-empty-arg.json -qapi-schema +=3D doc-empty-section.json -qapi-schema +=3D doc-empty-symbol.json -qapi-schema +=3D doc-good.json -qapi-schema +=3D doc-interleaved-section.json -qapi-schema +=3D doc-invalid-end.json -qapi-schema +=3D doc-invalid-end2.json -qapi-schema +=3D doc-invalid-return.json -qapi-schema +=3D doc-invalid-section.json -qapi-schema +=3D doc-invalid-start.json -qapi-schema +=3D doc-missing-colon.json -qapi-schema +=3D doc-missing-expr.json -qapi-schema +=3D doc-missing-space.json -qapi-schema +=3D doc-missing.json -qapi-schema +=3D doc-no-symbol.json -qapi-schema +=3D doc-undoc-feature.json -qapi-schema +=3D double-type.json -qapi-schema +=3D duplicate-key.json -qapi-schema +=3D empty.json -qapi-schema +=3D enum-bad-member.json -qapi-schema +=3D enum-bad-name.json -qapi-schema +=3D enum-bad-prefix.json -qapi-schema +=3D enum-clash-member.json -qapi-schema +=3D enum-dict-member-unknown.json -qapi-schema +=3D enum-if-invalid.json -qapi-schema +=3D enum-int-member.json -qapi-schema +=3D enum-member-case.json -qapi-schema +=3D enum-missing-data.json -qapi-schema +=3D enum-wrong-data.json -qapi-schema +=3D event-boxed-empty.json -qapi-schema +=3D event-case.json -qapi-schema +=3D event-member-invalid-dict.json -qapi-schema +=3D event-nest-struct.json -qapi-schema +=3D features-bad-type.json -qapi-schema +=3D features-deprecated-type.json -qapi-schema +=3D features-duplicate-name.json -qapi-schema +=3D features-if-invalid.json -qapi-schema +=3D features-missing-name.json -qapi-schema +=3D features-name-bad-type.json -qapi-schema +=3D features-no-list.json -qapi-schema +=3D features-unknown-key.json -qapi-schema +=3D flat-union-array-branch.json -qapi-schema +=3D flat-union-bad-base.json -qapi-schema +=3D flat-union-bad-discriminator.json -qapi-schema +=3D flat-union-base-any.json -qapi-schema +=3D flat-union-base-union.json -qapi-schema +=3D flat-union-clash-member.json -qapi-schema +=3D flat-union-discriminator-bad-name.json -qapi-schema +=3D flat-union-empty.json -qapi-schema +=3D flat-union-inline.json -qapi-schema +=3D flat-union-inline-invalid-dict.json -qapi-schema +=3D flat-union-int-branch.json -qapi-schema +=3D flat-union-invalid-branch-key.json -qapi-schema +=3D flat-union-invalid-discriminator.json -qapi-schema +=3D flat-union-invalid-if-discriminator.json -qapi-schema +=3D flat-union-no-base.json -qapi-schema +=3D flat-union-optional-discriminator.json -qapi-schema +=3D flat-union-string-discriminator.json -qapi-schema +=3D funny-char.json -qapi-schema +=3D funny-word.json -qapi-schema +=3D ident-with-escape.json -qapi-schema +=3D include-before-err.json -qapi-schema +=3D include-cycle.json -qapi-schema +=3D include-extra-junk.json -qapi-schema +=3D include-nested-err.json -qapi-schema +=3D include-no-file.json -qapi-schema +=3D include-non-file.json -qapi-schema +=3D include-repetition.json -qapi-schema +=3D include-self-cycle.json -qapi-schema +=3D include-simple.json -qapi-schema +=3D indented-expr.json -qapi-schema +=3D leading-comma-list.json -qapi-schema +=3D leading-comma-object.json -qapi-schema +=3D missing-colon.json -qapi-schema +=3D missing-comma-list.json -qapi-schema +=3D missing-comma-object.json -qapi-schema +=3D missing-type.json -qapi-schema +=3D nested-struct-data.json -qapi-schema +=3D nested-struct-data-invalid-dict.json -qapi-schema +=3D non-objects.json -qapi-schema +=3D oob-test.json -qapi-schema +=3D allow-preconfig-test.json -qapi-schema +=3D pragma-doc-required-crap.json -qapi-schema +=3D pragma-extra-junk.json -qapi-schema +=3D pragma-name-case-whitelist-crap.json -qapi-schema +=3D pragma-non-dict.json -qapi-schema +=3D pragma-unknown.json -qapi-schema +=3D pragma-returns-whitelist-crap.json -qapi-schema +=3D qapi-schema-test.json -qapi-schema +=3D quoted-structural-chars.json -qapi-schema +=3D redefined-builtin.json -qapi-schema +=3D redefined-command.json -qapi-schema +=3D redefined-event.json -qapi-schema +=3D redefined-type.json -qapi-schema +=3D reserved-command-q.json -qapi-schema +=3D reserved-enum-q.json -qapi-schema +=3D reserved-member-has.json -qapi-schema +=3D reserved-member-q.json -qapi-schema +=3D reserved-member-u.json -qapi-schema +=3D reserved-member-underscore.json -qapi-schema +=3D reserved-type-kind.json -qapi-schema +=3D reserved-type-list.json -qapi-schema +=3D returns-alternate.json -qapi-schema +=3D returns-array-bad.json -qapi-schema +=3D returns-dict.json -qapi-schema +=3D returns-unknown.json -qapi-schema +=3D returns-whitelist.json -qapi-schema +=3D string-code-point-31.json -qapi-schema +=3D string-code-point-127.json -qapi-schema +=3D struct-base-clash-deep.json -qapi-schema +=3D struct-base-clash.json -qapi-schema +=3D struct-data-invalid.json -qapi-schema +=3D struct-member-if-invalid.json -qapi-schema +=3D struct-member-invalid-dict.json -qapi-schema +=3D struct-member-invalid.json -qapi-schema +=3D trailing-comma-list.json -qapi-schema +=3D trailing-comma-object.json -qapi-schema +=3D type-bypass-bad-gen.json -qapi-schema +=3D unclosed-list.json -qapi-schema +=3D unclosed-object.json -qapi-schema +=3D unclosed-string.json -qapi-schema +=3D union-base-empty.json -qapi-schema +=3D union-base-no-discriminator.json -qapi-schema +=3D union-branch-case.json -qapi-schema +=3D union-branch-if-invalid.json -qapi-schema +=3D union-branch-invalid-dict.json -qapi-schema +=3D union-clash-branches.json -qapi-schema +=3D union-empty.json -qapi-schema +=3D union-invalid-base.json -qapi-schema +=3D union-optional-branch.json -qapi-schema +=3D union-unknown.json -qapi-schema +=3D unknown-escape.json -qapi-schema +=3D unknown-expr-key.json - - -check-qapi-schema-y :=3D $(addprefix tests/qapi-schema/, $(qapi-schema)) - generated-files-y +=3D tests/test-qapi-types.h generated-files-y +=3D tests/include/test-qapi-types-sub-module.h generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h @@ -501,13 +306,6 @@ tests/test-qapi-gen-timestamp: \ @rm -f tests/test-qapi-doc.texi @>$@ =20 -tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/tests/qapi-schema/doc-go= od.json $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o tests/qapi-schema -p "doc-good-" $<, \ - "GEN","$@") - @mv tests/qapi-schema/doc-good-qapi-doc.texi $@ - @rm -f tests/qapi-schema/doc-good-qapi-*.[ch] tests/qapi-schema/doc-good-= qmp-*.[ch] - tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-= vmstate1-gen-timestamp ; tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmst= ate1.xml $(call quiet-command,$(GDBUS_CODEGEN) $< \ @@ -720,7 +518,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 -# Other tests =20 QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D te= sts/qemu-iotests/socket_scm_helper$(EXESUF) =20 @@ -730,16 +527,6 @@ check-tests/check-block.sh: tests/check-block.sh qemu-= img$(EXESUF) \ $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) @$< =20 -.PHONY: check-tests/qapi-schema/frontend -check-tests/qapi-schema/frontend: $(addprefix $(SRC_PATH)/, $(check-qapi-s= chema-y)) - $(call quiet-command, PYTHONPATH=3D$(SRC_PATH)/scripts \ - PYTHONIOENCODING=3Dutf-8 $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-q= api.py $^, \ - TEST, check-qapi-schema) - -.PHONY: check-tests/qapi-schema/doc-good.texi -check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi - @diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $< - # Python venv for running tests =20 .PHONY: check-venv check-acceptance @@ -793,15 +580,14 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get= -vm-images =20 # Consolidated targets =20 -.PHONY: check-block check-qapi-schema check-qtest check-unit check check-c= lean get-vm-images -check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schem= a/doc-good.texi +.PHONY: check-block check-qtest check-unit check check-clean get-vm-images check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif check-build: build-unit build-qtest =20 -check: check-block check-qapi-schema check-unit check-qtest +check: check-block check-unit check-qtest check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) diff --git a/tests/meson.build b/tests/meson.build index ec26f92..8be9c22 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -6,3 +6,5 @@ test('decodetree', sh, if 'CONFIG_TCG' in config_host subdir('fp') endif + +subdir('qapi-schema') diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build new file mode 100644 index 0000000..9dc453c --- /dev/null +++ b/tests/qapi-schema/meson.build @@ -0,0 +1,216 @@ +test_env =3D environment() +test_env.set('PYTHONPATH', meson.source_root() / 'scripts') +test_env.set('PYTHONIOENCODING', 'utf-8') + +schemas =3D [ + 'alternate-any.json', + 'alternate-array.json', + 'alternate-base.json', + 'alternate-branch-if-invalid.json', + 'alternate-clash.json', + 'alternate-conflict-dict.json', + 'alternate-conflict-enum-bool.json', + 'alternate-conflict-enum-int.json', + 'alternate-conflict-string.json', + 'alternate-conflict-bool-string.json', + 'alternate-conflict-num-string.json', + 'alternate-empty.json', + 'alternate-invalid-dict.json', + 'alternate-nested.json', + 'alternate-unknown.json', + 'args-alternate.json', + 'args-any.json', + 'args-array-empty.json', + 'args-array-unknown.json', + 'args-bad-boxed.json', + 'args-boxed-anon.json', + 'args-boxed-string.json', + 'args-int.json', + 'args-invalid.json', + 'args-member-array-bad.json', + 'args-member-case.json', + 'args-member-unknown.json', + 'args-name-clash.json', + 'args-union.json', + 'args-unknown.json', + 'bad-base.json', + 'bad-data.json', + 'bad-ident.json', + 'bad-if.json', + 'bad-if-empty.json', + 'bad-if-empty-list.json', + 'bad-if-list.json', + 'bad-type-bool.json', + 'bad-type-dict.json', + 'bad-type-int.json', + 'base-cycle-direct.json', + 'base-cycle-indirect.json', + 'command-int.json', + 'comments.json', + 'doc-bad-alternate-member.json', + 'doc-bad-boxed-command-arg.json', + 'doc-bad-command-arg.json', + 'doc-bad-enum-member.json', + 'doc-bad-event-arg.json', + 'doc-bad-feature.json', + 'doc-bad-section.json', + 'doc-bad-symbol.json', + 'doc-bad-union-member.json', + 'doc-before-include.json', + 'doc-before-pragma.json', + 'doc-duplicated-arg.json', + 'doc-duplicated-return.json', + 'doc-duplicated-since.json', + 'doc-empty-arg.json', + 'doc-empty-section.json', + 'doc-empty-symbol.json', + 'doc-good.json', + 'doc-interleaved-section.json', + 'doc-invalid-end.json', + 'doc-invalid-end2.json', + 'doc-invalid-return.json', + 'doc-invalid-section.json', + 'doc-invalid-start.json', + 'doc-missing-colon.json', + 'doc-missing-expr.json', + 'doc-missing-space.json', + 'doc-missing.json', + 'doc-no-symbol.json', + 'doc-undoc-feature.json', + 'double-type.json', + 'duplicate-key.json', + 'empty.json', + 'enum-bad-member.json', + 'enum-bad-name.json', + 'enum-bad-prefix.json', + 'enum-clash-member.json', + 'enum-dict-member-unknown.json', + 'enum-if-invalid.json', + 'enum-int-member.json', + 'enum-member-case.json', + 'enum-missing-data.json', + 'enum-wrong-data.json', + 'event-boxed-empty.json', + 'event-case.json', + 'event-member-invalid-dict.json', + 'event-nest-struct.json', + 'features-bad-type.json', + 'features-deprecated-type.json', + 'features-duplicate-name.json', + 'features-if-invalid.json', + 'features-missing-name.json', + 'features-name-bad-type.json', + 'features-no-list.json', + 'features-unknown-key.json', + 'flat-union-array-branch.json', + 'flat-union-bad-base.json', + 'flat-union-bad-discriminator.json', + 'flat-union-base-any.json', + 'flat-union-base-union.json', + 'flat-union-clash-member.json', + 'flat-union-discriminator-bad-name.json', + 'flat-union-empty.json', + 'flat-union-inline.json', + 'flat-union-inline-invalid-dict.json', + 'flat-union-int-branch.json', + 'flat-union-invalid-branch-key.json', + 'flat-union-invalid-discriminator.json', + 'flat-union-invalid-if-discriminator.json', + 'flat-union-no-base.json', + 'flat-union-optional-discriminator.json', + 'flat-union-string-discriminator.json', + 'funny-char.json', + 'funny-word.json', + 'ident-with-escape.json', + 'include-before-err.json', + 'include-cycle.json', + 'include-extra-junk.json', + 'include-nested-err.json', + 'include-no-file.json', + 'include-non-file.json', + 'include-repetition.json', + 'include-self-cycle.json', + 'include-simple.json', + 'indented-expr.json', + 'leading-comma-list.json', + 'leading-comma-object.json', + 'missing-colon.json', + 'missing-comma-list.json', + 'missing-comma-object.json', + 'missing-type.json', + 'nested-struct-data.json', + 'nested-struct-data-invalid-dict.json', + 'non-objects.json', + 'oob-test.json', + 'allow-preconfig-test.json', + 'pragma-doc-required-crap.json', + 'pragma-extra-junk.json', + 'pragma-name-case-whitelist-crap.json', + 'pragma-non-dict.json', + 'pragma-unknown.json', + 'pragma-returns-whitelist-crap.json', + 'qapi-schema-test.json', + 'quoted-structural-chars.json', + 'redefined-builtin.json', + 'redefined-command.json', + 'redefined-event.json', + 'redefined-type.json', + 'reserved-command-q.json', + 'reserved-enum-q.json', + 'reserved-member-has.json', + 'reserved-member-q.json', + 'reserved-member-u.json', + 'reserved-member-underscore.json', + 'reserved-type-kind.json', + 'reserved-type-list.json', + 'returns-alternate.json', + 'returns-array-bad.json', + 'returns-dict.json', + 'returns-unknown.json', + 'returns-whitelist.json', + 'string-code-point-31.json', + 'string-code-point-127.json', + 'struct-base-clash-deep.json', + 'struct-base-clash.json', + 'struct-data-invalid.json', + 'struct-member-if-invalid.json', + 'struct-member-invalid-dict.json', + 'struct-member-invalid.json', + 'trailing-comma-list.json', + 'trailing-comma-object.json', + 'type-bypass-bad-gen.json', + 'unclosed-list.json', + 'unclosed-object.json', + 'unclosed-string.json', + 'union-base-empty.json', + 'union-base-no-discriminator.json', + 'union-branch-case.json', + 'union-branch-if-invalid.json', + 'union-branch-invalid-dict.json', + 'union-clash-branches.json', + 'union-empty.json', + 'union-invalid-base.json', + 'union-optional-branch.json', + 'union-unknown.json', + 'unknown-escape.json', + 'unknown-expr-key.json', +] + +# Because people may want to use test-qapi.py from the command line, we +# are not using the "#! /usr/bin/env python3" trick here. See +# docs/devel/build-system.txt +test('QAPI schema regression tests', python, args: files('test-qapi.py', s= chemas), + env: test_env, suite: ['qapi-schema', 'qapi-frontend']) + +diff =3D find_program('diff') + +qapi_doc =3D custom_target('QAPI doc', + output: 'doc-good-qapi-doc.texi', + input: files('doc-good.json'), + command: [ qapi_gen, '-o', meson.current_build_di= r(), + '-p', 'doc-good-', '@INPUT0@' ], + depend_files: qapi_gen_depends) + +test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), qapi_doc], + depends: qapi_doc, + suite: ['qapi-schema', 'qapi-doc']) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080766; cv=none; d=zohomail.com; s=zohoarc; b=lEsfL4S4Teig0EuvYkZMPzfwaVc20GCx1QRfdo6cOC4FzfTQyogfWkVn3ZBoiBqXTx+pITOsdFp8FpGBJdXEtTrzNKeeqlep0a3N7xdudZ94YHaCtTMxoCmfFs5H4UGbJkjUcj2iltv4WnEPJnpZF7G+cW9Hbmqzsv7dXhQ86bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080766; 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=8BExYD+jYRnltvzX/J1apmJ6spW8unIA0zrj1JMhdZQ=; b=XwHjMhALseAI5zNFYvxxEzSLD1+jDne/Jixc4eWCW9YOELDFI2nsz3G8JrYSEU1WpPlB7XVDbVROa+k3NmdUt/uipLDuBqMa+2jbTBFddvxof0zhisS9Squ5Jccs1EPxKQ3DO1qk6tUMFLSSaw6QaJEC4CsXxK/DrAF9eoc78sU= 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 1597080766828942.9038825043829; Mon, 10 Aug 2020 10:32:46 -0700 (PDT) Received: from localhost ([::1]:59226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BfB-0002Ap-H7 for importer@patchew.org; Mon, 10 Aug 2020 13:32:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJp-0008BK-Cl for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:41 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:53844 helo=us-smtp-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 1k5BJl-0002zl-O7 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:41 -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-20-wWYdnWRNPMmThpsSkMeHGA-1; Mon, 10 Aug 2020 13:10:34 -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 036E619067E1 for ; Mon, 10 Aug 2020 17:10:34 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EB515F1E9; Mon, 10 Aug 2020 17:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079437; 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=8BExYD+jYRnltvzX/J1apmJ6spW8unIA0zrj1JMhdZQ=; b=WAQFUn80vwsM3mSSIEbC2VYQK6dyP3KBe5LzQSLIDnTj1vi2n+4sh12LDet7kNbvRHiTzl 3Aa2MtVTlLlm0y5jUKJaAL9G2ZRouQMEWJilR9dPxKyarecryRH+8wIf+zZpISxWTmVk6q xXbRcn0krwstMwQWqGINuiH5ohlreh4= X-MC-Unique: wWYdnWRNPMmThpsSkMeHGA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 052/147] meson: convert qom directory to Meson (tools part) Date: Mon, 10 Aug 2020 19:07:30 +0200 Message-Id: <1597079345-42801-53-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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 2 +- Makefile.objs | 2 +- Makefile.target | 3 ++- meson.build | 1 + qom/Makefile.objs | 3 --- qom/meson.build | 15 +++++++++++++++ 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 qom/meson.build diff --git a/Makefile b/Makefile index 62e0ef0..1be6019 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,6 @@ dummy :=3D $(call unnest-vars,, \ storage-daemon-obj-y \ storage-daemon-obj-m \ crypto-obj-y \ - qom-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) @@ -253,6 +252,7 @@ $(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y) $(SOFTMMU_ALL_RULES): $(chardev-obj-y) $(SOFTMMU_ALL_RULES): $(crypto-obj-y) $(SOFTMMU_ALL_RULES): $(io-obj-y) +$(SOFTMMU_ALL_RULES): $(qom-obj-y) $(SOFTMMU_ALL_RULES): config-all-devices.mak =20 SOFTMMU_FUZZ_RULES=3D$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES)) diff --git a/Makefile.objs b/Makefile.objs index baf1565..84bfa2a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,6 +1,6 @@ ####################################################################### # Common libraries for tools and emulators -qom-obj-y =3D qom/ +qom-obj-y =3D qom/libqom.fa =20 ####################################################################### # code used by both qemu system emulation and qemu-img diff --git a/Makefile.target b/Makefile.target index 257afc2..1e04551 100644 --- a/Makefile.target +++ b/Makefile.target @@ -191,13 +191,14 @@ all-obj-y :=3D $(obj-y) common-obj-m :=3D =20 include $(SRC_PATH)/Makefile.objs +dummy :=3D $(call fix-paths,../,, \ + qom-obj-y) dummy :=3D $(call unnest-vars,.., \ authz-obj-y \ block-obj-y \ block-obj-m \ chardev-obj-y \ crypto-obj-y \ - qom-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) diff --git a/meson.build b/meson.build index 6f1e199..6517d7e 100644 --- a/meson.build +++ b/meson.build @@ -319,6 +319,7 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +subdir('qom') subdir('fsdev') =20 # Other build targets diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 1b45d10..b962904 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,5 +1,2 @@ -qom-obj-y =3D object.o container.o qom-qobject.o -qom-obj-y +=3D object_interfaces.o - common-obj-$(CONFIG_SOFTMMU) +=3D qom-hmp-cmds.o qom-qmp-cmds.o storage-daemon-obj-y +=3D qom-qmp-cmds.o diff --git a/qom/meson.build b/qom/meson.build new file mode 100644 index 0000000..3c41ed3 --- /dev/null +++ b/qom/meson.build @@ -0,0 +1,15 @@ +qom_ss =3D ss.source_set() +qom_ss.add(files( + 'container.c', + 'object.c', + 'object_interfaces.c', + 'qom-qobject.c', +)) + +qom_ss =3D qom_ss.apply(config_host, strict: false) +libqom =3D static_library('qom', qom_ss.sources(), + dependencies: [qom_ss.dependencies()], + link_with: [libqemuutil], + name_suffix: 'fa') + +qom =3D declare_dependency(link_whole: libqom) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081029; cv=none; d=zohomail.com; s=zohoarc; b=fpfe1+jhQp772tHFuW3MgqpNDwFWJ1WWGTKgUQ3Ps1yvCR7Neg/psr5hapev7YPpT3LefugKp0ppShv3CRYLxCFSUGqAQRaUKjAn4x6VAAM/hrcRnyYNj3K5QFQzyHEa9DAb9onYffSn/79W1Rd4KmBJrNeaPbpQPGRRNEaB2LI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081029; 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=gr8MjIzbAVwQXxACXb77HW3lFv7imGoDWT4qAN144w4=; b=JxHBrhXFT7tTUsb6HC+2UxpjtMK+tAUHjwkDxP4r4KC+K/dc68Z/CDBnBDe6JYiVGi67qD1v2IFftjvlwxyGg/zK4WU9D27JtkIMCSU0pp9OImdWtPI1/QssnJAcwjiEXk/TgzdrniZwjm0fd2AgfO9P9yAmiC4EMWMJdOEAuZU= 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 1597081029375748.1074352559798; Mon, 10 Aug 2020 10:37:09 -0700 (PDT) Received: from localhost ([::1]:55974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BjQ-0003nv-5Q for importer@patchew.org; Mon, 10 Aug 2020 13:37:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJt-0008KT-3u for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26578 helo=us-smtp-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 1k5BJm-0002zq-NS for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:44 -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-458-mAraBCqcP5Gfjluvyb9Wig-1; Mon, 10 Aug 2020 13:10:36 -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 61DD08064B7 for ; Mon, 10 Aug 2020 17:10:35 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FDB95F1EA; Mon, 10 Aug 2020 17:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079438; 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=gr8MjIzbAVwQXxACXb77HW3lFv7imGoDWT4qAN144w4=; b=YaSc9BiqAtu3Z4KqxV258D/ANC5S2jddYAKHMW/0+sZ2hqeMqkBeaAb8XQbXwE/s+uZDOg s999dEa4NNHLq8O3jwbI9EUtmVRBOPk4LGt7jfjONWQbc7a4nUq/9YDy4KQm4HNjZukqrN hIhq23c3mpvo6482GijRKWI/2DiIJ7w= X-MC-Unique: mAraBCqcP5Gfjluvyb9Wig-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 053/147] meson: convert authz directory to Meson Date: Mon, 10 Aug 2020 19:07:31 +0200 Message-Id: <1597079345-42801-54-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 | 1 - Makefile.objs | 3 ++- Makefile.target | 2 +- authz/Makefile.objs | 7 ------- authz/meson.build | 19 +++++++++++++++++++ meson.build | 5 +++++ 6 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 authz/Makefile.objs create mode 100644 authz/meson.build diff --git a/Makefile b/Makefile index 1be6019..872f450 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - authz-obj-y \ chardev-obj-y \ block-obj-y \ block-obj-m \ diff --git a/Makefile.objs b/Makefile.objs index 84bfa2a..0bc361d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -9,7 +9,8 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) =20 chardev-obj-y =3D chardev/ =20 -authz-obj-y =3D authz/ +authz-obj-y =3D authz/libauthz.fa +authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) =20 block-obj-y =3D block/ nbd/ scsi/ block-obj-y +=3D block.o blockjob.o job.o diff --git a/Makefile.target b/Makefile.target index 1e04551..79b6e02 100644 --- a/Makefile.target +++ b/Makefile.target @@ -192,9 +192,9 @@ common-obj-m :=3D =20 include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ + authz-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ - authz-obj-y \ block-obj-y \ block-obj-m \ chardev-obj-y \ diff --git a/authz/Makefile.objs b/authz/Makefile.objs deleted file mode 100644 index ed7b273..0000000 --- a/authz/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -authz-obj-y +=3D base.o -authz-obj-y +=3D simple.o -authz-obj-y +=3D list.o -authz-obj-y +=3D listfile.o -authz-obj-$(CONFIG_AUTH_PAM) +=3D pamacct.o - -pamacct.o-libs =3D -lpam diff --git a/authz/meson.build b/authz/meson.build new file mode 100644 index 0000000..c1f6362 --- /dev/null +++ b/authz/meson.build @@ -0,0 +1,19 @@ +authz_ss =3D ss.source_set() +authz_ss.add(genh) +authz_ss.add(files( + 'base.c', + 'list.c', + 'listfile.c', + 'simple.c', +)) + +authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) + +authz_ss =3D authz_ss.apply(config_host, strict: false) +libauthz =3D static_library('authz', authz_ss.sources(), + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz =3D declare_dependency(link_whole: libauthz, + dependencies: qom) diff --git a/meson.build b/meson.build index 6517d7e..f8fd56a 100644 --- a/meson.build +++ b/meson.build @@ -82,6 +82,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), link_args: config_host['PIXMAN_LIBS'].split()) +pam =3D not_found +if 'CONFIG_AUTH_PAM' in config_host + pam =3D cc.find_library('pam') +endif libattr =3D not_found if 'CONFIG_ATTR' in config_host libattr =3D declare_dependency(link_args: config_host['LIBATTR_LIBS'].sp= lit()) @@ -320,6 +324,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('qom') +subdir('authz') subdir('fsdev') =20 # Other build targets --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080854; cv=none; d=zohomail.com; s=zohoarc; b=JR+F+Mif0uGdE0M8wcEJVlDySYSzCKqEoWVUTRNlEy5MwSqigsxI/vgOhrs/6EyEtXaC+lEoBuOBghWErBQ6cixIFPryHmzkURjLdh+vq8cdJA6WV5FbAuoyIEm7VoRm12JDAa6JFkMrGoPYf0fdotLMt8nXjuoL1a8dMVpWFNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080854; 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=KOsEBTNkKuEQxmw2J8FfhfR58sAy37Ne2eNjB4HMElE=; b=eQyAiraWBzkK79gohq28iT7f2tuF/uvxl7qzx1t9stvZSX1O62/1RF3rLPZWNrnol1SamUJjoLr8Fc/n6fLXkuDs5MfGT/QgotTgEcwXpjTLT3DDwbokFhi2N8gQLgeGx0ivP3IBpbArIrB+omRMX/uyU4/D1DS61XdRXQ7Ad00= 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 159708085459041.41631805586326; Mon, 10 Aug 2020 10:34:14 -0700 (PDT) Received: from localhost ([::1]:39540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bgb-0005an-5W for importer@patchew.org; Mon, 10 Aug 2020 13:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJq-0008EN-MR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35782 helo=us-smtp-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 1k5BJo-000301-FI for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:42 -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-109-g3gjQ9M2NVSHP6qUZ3UzXw-1; Mon, 10 Aug 2020 13:10:37 -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 C10338005B0 for ; Mon, 10 Aug 2020 17:10:36 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDF605F1E9; Mon, 10 Aug 2020 17:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079439; 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=KOsEBTNkKuEQxmw2J8FfhfR58sAy37Ne2eNjB4HMElE=; b=WLuc6djMVgJ9CrWoQEqQeblGI/C8c7Vabvu8DGmhvfjbXb+zW6kibesx4c8Y3VTmxUmRrn Gb9yKiz9ibIqzqcmq235Ztv0pl31ewnaqhovJYgDjPPC/CKy54GysHFKLBC2qVEy8aoq4e 4ZggEmZokACbOz4mKuur4KbVdXmakEE= X-MC-Unique: g3gjQ9M2NVSHP6qUZ3UzXw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 054/147] meson: convert crypto directory to Meson Date: Mon, 10 Aug 2020 19:07:32 +0200 Message-Id: <1597079345-42801-55-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 1 - Makefile.objs | 2 +- Makefile.target | 2 +- crypto/Makefile.objs | 37 ------------------------------------- crypto/meson.build | 52 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ meson.build | 4 ++-- qom/meson.build | 2 +- 7 files changed, 57 insertions(+), 43 deletions(-) delete mode 100644 crypto/Makefile.objs diff --git a/Makefile b/Makefile index 872f450..d26ad4c 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,6 @@ dummy :=3D $(call unnest-vars,, \ block-obj-m \ storage-daemon-obj-y \ storage-daemon-obj-m \ - crypto-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) diff --git a/Makefile.objs b/Makefile.objs index 0bc361d..018338d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -19,7 +19,7 @@ block-obj-$(CONFIG_REPLICATION) +=3D replication.o =20 block-obj-m =3D block/ =20 -crypto-obj-y =3D crypto/ +crypto-obj-y =3D crypto/libcrypto.fa =20 io-obj-y =3D io/ =20 diff --git a/Makefile.target b/Makefile.target index 79b6e02..b213955 100644 --- a/Makefile.target +++ b/Makefile.target @@ -193,12 +193,12 @@ common-obj-m :=3D include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ + crypto-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ chardev-obj-y \ - crypto-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs deleted file mode 100644 index a988591..0000000 --- a/crypto/Makefile.objs +++ /dev/null @@ -1,37 +0,0 @@ -crypto-obj-y =3D init.o -crypto-obj-y +=3D hash.o -crypto-obj-$(CONFIG_NETTLE) +=3D hash-nettle.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) +=3D hash-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) +=3D hash-g= lib.o -crypto-obj-y +=3D hmac.o -crypto-obj-$(CONFIG_NETTLE) +=3D hmac-nettle.o -crypto-obj-$(CONFIG_GCRYPT_HMAC) +=3D hmac-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT_HMAC),n,y)) +=3D h= mac-glib.o -crypto-obj-y +=3D aes.o -crypto-obj-y +=3D desrfb.o -crypto-obj-y +=3D cipher.o -crypto-obj-$(CONFIG_AF_ALG) +=3D afalg.o -crypto-obj-$(CONFIG_AF_ALG) +=3D cipher-afalg.o -crypto-obj-$(CONFIG_AF_ALG) +=3D hash-afalg.o -crypto-obj-$(CONFIG_GNUTLS) +=3D tls-cipher-suites.o -crypto-obj-y +=3D tlscreds.o -crypto-obj-y +=3D tlscredsanon.o -crypto-obj-y +=3D tlscredspsk.o -crypto-obj-y +=3D tlscredsx509.o -crypto-obj-y +=3D tlssession.o -crypto-obj-y +=3D secret_common.o -crypto-obj-y +=3D secret.o -crypto-obj-$(CONFIG_SECRET_KEYRING) +=3D secret_keyring.o -crypto-obj-y +=3D pbkdf.o -crypto-obj-$(CONFIG_NETTLE) +=3D pbkdf-nettle.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) +=3D pbkdf-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) +=3D pbkdf-= stub.o -crypto-obj-y +=3D ivgen.o -crypto-obj-y +=3D ivgen-essiv.o -crypto-obj-y +=3D ivgen-plain.o -crypto-obj-y +=3D ivgen-plain64.o -crypto-obj-y +=3D afsplit.o -crypto-obj-$(CONFIG_QEMU_PRIVATE_XTS) +=3D xts.o -crypto-obj-y +=3D block.o -crypto-obj-y +=3D block-qcow.o -crypto-obj-y +=3D block-luks.o diff --git a/crypto/meson.build b/crypto/meson.build index 1b24431..7aab8db 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,3 +1,55 @@ +crypto_ss =3D ss.source_set() +crypto_ss.add(genh) +crypto_ss.add(files( + 'afsplit.c', + 'block-luks.c', + 'block-qcow.c', + 'block.c', + 'cipher.c', + 'desrfb.c', + 'hash.c', + 'hmac.c', + 'ivgen-essiv.c', + 'ivgen-plain.c', + 'ivgen-plain64.c', + 'ivgen.c', + 'pbkdf.c', + 'secret_common.c', + 'secret.c', + 'tlscreds.c', + 'tlscredsanon.c', + 'tlscredspsk.c', + 'tlscredsx509.c', + 'tlssession.c', +)) + +if 'CONFIG_GCRYPT' in config_host + wo_nettle =3D files('hash-gcrypt.c', 'pbkdf-gcrypt.c') +else + wo_nettle =3D files('hash-glib.c', 'pbkdf-stub.c') +endif +if 'CONFIG_GCRYPT_HMAC' not in config_host + wo_nettle +=3D files('hmac-glib.c') +endif +crypto_ss.add(when: [nettle, 'CONFIG_NETTLE'], + if_true: files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettl= e.c'), + if_false: wo_nettle) + +crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyrin= g.c')) +crypto_ss.add(when: 'CONFIG_QEMU_PRIVATE_XTS', if_true: files('xts.c')) +crypto_ss.add(when: 'CONFIG_GCRYPT_HMAC', if_true: files('hmac-gcrypt.c')) +crypto_ss.add(when: 'CONFIG_AF_ALG', if_true: files('afalg.c', 'cipher-afa= lg.c', 'hash-afalg.c')) +crypto_ss.add(when: 'CONFIG_GNUTLS', if_true: files('tls-cipher-suites.c')) + +crypto_ss =3D crypto_ss.apply(config_host, strict: false) +libcrypto =3D static_library('crypto', crypto_ss.sources(), + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto =3D declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + util_ss.add(files('aes.c')) util_ss.add(files('init.c')) if 'CONFIG_GCRYPT' in config_host diff --git a/meson.build b/meson.build index f8fd56a..8d46944 100644 --- a/meson.build +++ b/meson.build @@ -307,6 +307,8 @@ subdir('qobject') subdir('stubs') subdir('trace') subdir('util') +subdir('qom') +subdir('authz') subdir('crypto') subdir('storage-daemon') subdir('ui') @@ -323,8 +325,6 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 -subdir('qom') -subdir('authz') subdir('fsdev') =20 # Other build targets diff --git a/qom/meson.build b/qom/meson.build index 3c41ed3..4af044d 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -1,4 +1,5 @@ qom_ss =3D ss.source_set() +qom_ss.add(genh) qom_ss.add(files( 'container.c', 'object.c', @@ -9,7 +10,6 @@ qom_ss.add(files( qom_ss =3D qom_ss.apply(config_host, strict: false) libqom =3D static_library('qom', qom_ss.sources(), dependencies: [qom_ss.dependencies()], - link_with: [libqemuutil], name_suffix: 'fa') =20 qom =3D declare_dependency(link_whole: libqom) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080863; cv=none; d=zohomail.com; s=zohoarc; b=VvJ1il7QrEYOCpi6+rwU3Pv1GMgpz3H62JthGyiqy/5WTXUhFcSENoSE6dwnrGUig1tlOV+Thxv/HzQ+Gc7ej4qVjkEW+nKZnw8G5ZymHBX4C+WBfax1rCs9DQXo+BcAguEy5ON9L1+kdTq5pEqGMO8R5mOzjxFNSe0oOl85zQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080863; 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=2P8D7Lc7ZtZoGC3w4qeh3vy0JHVE2eHklOeBmAj68Zc=; b=THnNbB2ZP7Sf96fsrS/srhi7ueKXTS1LeDZsWQFPdLt30DYtufDFKUBKLbquNduZdCupDnkA9v5Z2gnSQ3SSGkFf63lvX7F7w8raM8JA5D4CjAoUJsMnlvsY1YGUhLlQXNnK4bUehLttOhBBQkKqC6FTNFuEVzdgSxcWqlUy+Gs= 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 1597080863164727.4685699497223; Mon, 10 Aug 2020 10:34:23 -0700 (PDT) Received: from localhost ([::1]:40522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bgj-0005yf-B1 for importer@patchew.org; Mon, 10 Aug 2020 13:34:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJr-0008HT-U7 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:43 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44615 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 1k5BJp-00030D-UI for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:43 -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-321-2dCq8jJ5PumnjLxyiXwhvQ-1; Mon, 10 Aug 2020 13:10:39 -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 2A4B291299 for ; Mon, 10 Aug 2020 17:10:38 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3762D8BD67; Mon, 10 Aug 2020 17:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079441; 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=2P8D7Lc7ZtZoGC3w4qeh3vy0JHVE2eHklOeBmAj68Zc=; b=PirhrkPw6HHIPTYYZ7GPCRTgu51sb76wfdOnNOnQcpvgkq0kolJqZoLFPWuZsueiYF3F1S ix3iaSEgWwGKlQwnjrocCAoMmu6UUHcCHMvxQifYu/aTQ6bVfg2u3KBF9pUe08AgyokbiX 5/GeMdV3BDzgb+YNHdMwYHJpqzQmHvQ= X-MC-Unique: 2dCq8jJ5PumnjLxyiXwhvQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 055/147] meson: convert io directory to Meson Date: Mon, 10 Aug 2020 19:07:33 +0200 Message-Id: <1597079345-42801-56-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 | 1 - Makefile.objs | 2 +- Makefile.target | 2 +- io/Makefile.objs | 12 ------------ io/meson.build | 25 +++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 io/Makefile.objs create mode 100644 io/meson.build diff --git a/Makefile b/Makefile index d26ad4c..8fe446b 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,6 @@ dummy :=3D $(call unnest-vars,, \ block-obj-m \ storage-daemon-obj-y \ storage-daemon-obj-m \ - io-obj-y \ common-obj-y \ common-obj-m) =20 diff --git a/Makefile.objs b/Makefile.objs index 018338d..0920cdb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -21,7 +21,7 @@ block-obj-m =3D block/ =20 crypto-obj-y =3D crypto/libcrypto.fa =20 -io-obj-y =3D io/ +io-obj-y =3D io/libio.fa =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS =20 diff --git a/Makefile.target b/Makefile.target index b213955..f6b7a86 100644 --- a/Makefile.target +++ b/Makefile.target @@ -194,12 +194,12 @@ include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ crypto-obj-y \ + io-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ chardev-obj-y \ - io-obj-y \ common-obj-y \ common-obj-m) all-obj-y +=3D $(common-obj-y) diff --git a/io/Makefile.objs b/io/Makefile.objs deleted file mode 100644 index 9a20fce..0000000 --- a/io/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -io-obj-y =3D channel.o -io-obj-y +=3D channel-buffer.o -io-obj-y +=3D channel-command.o -io-obj-y +=3D channel-file.o -io-obj-y +=3D channel-socket.o -io-obj-y +=3D channel-tls.o -io-obj-y +=3D channel-watch.o -io-obj-y +=3D channel-websock.o -io-obj-y +=3D channel-util.o -io-obj-y +=3D dns-resolver.o -io-obj-y +=3D net-listener.o -io-obj-y +=3D task.o diff --git a/io/meson.build b/io/meson.build new file mode 100644 index 0000000..062e011 --- /dev/null +++ b/io/meson.build @@ -0,0 +1,25 @@ +io_ss =3D ss.source_set() +io_ss.add(genh) +io_ss.add(files( + 'channel-buffer.c', + 'channel-command.c', + 'channel-file.c', + 'channel-socket.c', + 'channel-tls.c', + 'channel-util.c', + 'channel-watch.c', + 'channel-websock.c', + 'channel.c', + 'dns-resolver.c', + 'net-listener.c', + 'task.c', +)) + +io_ss =3D io_ss.apply(config_host, strict: false) +libio =3D static_library('io', io_ss.sources(), + dependencies: [io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io =3D declare_dependency(link_whole: libio, dependencies: [crypto, qom]) diff --git a/meson.build b/meson.build index 8d46944..5c4bf16 100644 --- a/meson.build +++ b/meson.build @@ -325,6 +325,7 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +subdir('io') subdir('fsdev') =20 # Other build targets --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081136; cv=none; d=zohomail.com; s=zohoarc; b=PxJE/w8oPm+O8jptZHfHpjnsUFV8N5OBHK9IK7XBuJbPzW34sMDE3y19QzJDsbywDotlJQUpp1jjGd5QbYrQRNykZ/sejWioHdWPDJqozxzcaqThqPmwYIoKVVy/2ADsjxSMxbuRMY08uGxoX+zumOB7pZigz9kYtqg6tMeiBMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081136; 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=vEd0dH5tGDjH7ILlW7VnRohxh8DxnRSlWfblayOI2zw=; b=lTDcfEa7oUW9Ryqiec9H6m0PP4ZSAqy9J7hgMuEzyq5RSWr728TnFsCsF/habpHrm/S4rxGuIuHNdUY/KPEzTNjalE3nP8SvChs7ICAV0qL+Q61yfu5TgH/1AlruevPx+MA8w0/idgugD263rFJ7Jf+K45dSSIpX87hL2BsMKmQ= 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 1597081136832464.2555044390674; Mon, 10 Aug 2020 10:38:56 -0700 (PDT) Received: from localhost ([::1]:35868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bl9-000747-D3 for importer@patchew.org; Mon, 10 Aug 2020 13:38:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJx-0008TV-53 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33462 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 1k5BJu-00030T-Oa for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:48 -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-503-Er9eVJNCOKGldtHBHvtd_Q-1; Mon, 10 Aug 2020 13:10:43 -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 64B8719067E5 for ; Mon, 10 Aug 2020 17:10:42 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96AEC5F1E9; Mon, 10 Aug 2020 17:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079446; 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=vEd0dH5tGDjH7ILlW7VnRohxh8DxnRSlWfblayOI2zw=; b=VBzD3ZkexNPM9wzqYnpfRs2bIBpLvz1AwHt3k4IqXSO8Y1o8qch8q5KV3lU6yfPG0xrAn0 W5gCpkQxgjEJg6tm4bCaD58yPPDZV8ERr8SDnhsO3K3WQOr/y1f8XQft4LHLT0zy9ih8Q6 F5oMc/nlD3Rt8kUnLJCKYaYN9sNRCK8= X-MC-Unique: Er9eVJNCOKGldtHBHvtd_Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 056/147] meson: convert target/s390x/gen-features.h Date: Mon, 10 Aug 2020 19:07:34 +0200 Message-Id: <1597079345-42801-57-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 Needed by linux-user/s390x/cpu_loop.c. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 2 ++ meson.build | 1 + target/meson.build | 1 + target/s390x/Makefile.objs | 20 -------------------- target/s390x/cpu_features.h | 2 +- target/s390x/cpu_models.h | 2 +- target/s390x/meson.build | 9 +++++++++ 7 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 target/meson.build create mode 100644 target/s390x/meson.build diff --git a/Makefile b/Makefile index 8fe446b..bd5b4db 100644 --- a/Makefile +++ b/Makefile @@ -108,6 +108,8 @@ CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG= _TOOLS)) generated-files-y =3D config-host.h =20 generated-files-y +=3D module_block.h +generated-files-y +=3D target/s390x/gen-features.h +target/s390x/gen-features.h: Makefile.ninja =20 generated-files-y +=3D .git-submodule-status =20 diff --git a/meson.build b/meson.build index 5c4bf16..c072d68 100644 --- a/meson.build +++ b/meson.build @@ -327,6 +327,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, =20 subdir('io') subdir('fsdev') +subdir('target') =20 # Other build targets if 'CONFIG_GUEST_AGENT' in config_host diff --git a/target/meson.build b/target/meson.build new file mode 100644 index 0000000..e29dd3e --- /dev/null +++ b/target/meson.build @@ -0,0 +1 @@ +subdir('s390x') diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index 3e27455..9b9accc 100644 --- a/target/s390x/Makefile.objs +++ b/target/s390x/Makefile.objs @@ -8,23 +8,3 @@ obj-$(CONFIG_SOFTMMU) +=3D sigp.o obj-$(CONFIG_KVM) +=3D kvm.o obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o - -# build and run feature list generator -feat-src =3D $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/ -feat-dst =3D $(BUILD_DIR)/$(TARGET_DIR) -ifneq ($(MAKECMDGOALS),clean) -generated-files-y +=3D $(feat-dst)gen-features.h -endif - -$(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(feat-dst)gen-features.h-timestamp: $(feat-dst)gen-features - $(call quiet-command,$< >$@,"GEN","$(TARGET_DIR)gen-features.h") - -$(feat-dst)gen-features: $(feat-src)gen-features.c - $(call quiet-command,$(HOST_CC) $(QEMU_INCLUDES) -o $@ $<,"CC","$(TARGET_= DIR)gen-features") - -clean-target: - rm -f gen-features.h-timestamp - rm -f gen-features.h - rm -f gen-features diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h index da695a8..2a29475 100644 --- a/target/s390x/cpu_features.h +++ b/target/s390x/cpu_features.h @@ -16,7 +16,7 @@ =20 #include "qemu/bitmap.h" #include "cpu_features_def.h" -#include "gen-features.h" +#include "target/s390x/gen-features.h" =20 /* CPU features are announced via different ways */ typedef enum { diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index 88bd01a6..74d1f87 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -14,7 +14,7 @@ #define TARGET_S390X_CPU_MODELS_H =20 #include "cpu_features.h" -#include "gen-features.h" +#include "target/s390x/gen-features.h" #include "hw/core/cpu.h" =20 /* static CPU definition */ diff --git a/target/s390x/meson.build b/target/s390x/meson.build new file mode 100644 index 0000000..ddf8d20 --- /dev/null +++ b/target/s390x/meson.build @@ -0,0 +1,9 @@ +gen_features =3D executable('gen-features', 'gen-features.c', native: true, + build_by_default: false) + +gen_features_h =3D custom_target('gen-features.h', + output: 'gen-features.h', + capture: true, + command: gen_features) + +specific_ss.add(gen_features_h) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081480; cv=none; d=zohomail.com; s=zohoarc; b=cFRHL4ejgiSuKqJE6TFw7OUUogc/FOLkLKeFLhgdEcZyKb3xCRnQfQJGa19dop3RLBY/e7VB4FIGOZFH0PvqgqZazGU8qEj4Y9QTjEZ4rHKTieuSpr7jfsoURdZP9YRXZJlFkTG2mtosYGmz40s6s1jttK0oP2jYpR7T7sAUZ4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081480; 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=Ux8yR2DXoHnSRNgLOpX0KoAe1/wzqR+FCnbJz9kF3Cs=; b=TzVjUIUrfCqkwjX0mcBDrubPCm9JE+xs/CuVXfz4jJJZ3GUWCXGCSONITchW4MqEKJiZ8pWpM7J4WcXDmnKoDr3SMzuIC2SupYpr3vZyY5Wa3m9VFYNZ2JwMQs0ProOJQASNEKoogQh1AQEn+jLyWU9uXPv2vWRnjZghMUKBn7Q= 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 1597081480173390.055078377065; Mon, 10 Aug 2020 10:44:40 -0700 (PDT) Received: from localhost ([::1]:36552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bqg-0001rp-T2 for importer@patchew.org; Mon, 10 Aug 2020 13:44:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKO-0000mZ-Jp for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BKJ-00037Z-Em for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:16 -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-548-kvlbcMcePYOZFlY_yKZuOA-1; Mon, 10 Aug 2020 13:10:44 -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 C128B19067E1 for ; Mon, 10 Aug 2020 17:10:43 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D00155F1E9; Mon, 10 Aug 2020 17:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079470; 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=Ux8yR2DXoHnSRNgLOpX0KoAe1/wzqR+FCnbJz9kF3Cs=; b=eOK3f7BQ7rQboXUx7ISd+5FyqPAc42MVAZb1mk8aGE8OO2Q7BILYAxvVX62ciipp+czxPc glTkW4KLRHsCpyA1MxcHP9i9LqLaSiP8vPgCY+EJuRlV9NPoPFamkHK2HRq1ik2LfZVuT6 LDougzX/Dz64boZ0xH0JAMIDbwRSybY= X-MC-Unique: kvlbcMcePYOZFlY_yKZuOA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 057/147] meson: infrastructure for building emulators Date: Mon, 10 Aug 2020 19:07:35 +0200 Message-Id: <1597079345-42801-58-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=63.128.21.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/10 13:09:25 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 74 +++------------------- Makefile.target | 19 +++--- configure | 6 -- hw/i386/fw_cfg.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/x86.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/virtio/virtio-mem.c | 2 +- include/qemu/osdep.h | 2 +- meson.build | 166 +++++++++++++++++++++++++++++++++++++++++++++= +++- rules.mak | 8 --- scripts/create_config | 2 + scripts/grepy.sh | 3 + scripts/minikconf.py | 0 softmmu/qtest.c | 2 +- util/meson.build | 5 +- 17 files changed, 193 insertions(+), 106 deletions(-) create mode 100755 scripts/grepy.sh mode change 100755 =3D> 100644 scripts/minikconf.py diff --git a/Makefile b/Makefile index bd5b4db..f0fed55 100644 --- a/Makefile +++ b/Makefile @@ -105,8 +105,6 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 -generated-files-y =3D config-host.h - generated-files-y +=3D module_block.h generated-files-y +=3D target/s390x/gen-features.h target/s390x/gen-features.h: Makefile.ninja @@ -162,65 +160,6 @@ DOCS=3D endif =20 SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) -SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(filter %-softmm= u, $(TARGET_DIRS))) -SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK)) - -ifeq ($(SUBDIR_DEVICES_MAK),) -config-all-devices.mak: config-host.mak - $(call quiet-command,echo '# no devices' > $@,"GEN","$@") -else -config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak - $(call quiet-command, sed -n \ - 's|^\([^=3D]*\)=3D\(.*\)$$|\1:=3D$$(findstring y,$$(\1)\2)|p'= \ - $(SUBDIR_DEVICES_MAK) | sort -u > $@, \ - "GEN","$@") -endif - --include $(SUBDIR_DEVICES_MAK_DEP) - -# This has to be kept in sync with Kconfig.host. -MINIKCONF_ARGS =3D \ - $(CONFIG_MINIKCONF_MODE) \ - $@ $*/config-devices.mak.d $< $(SRC_PATH)/Kconfig \ - CONFIG_TCG=3D$(CONFIG_TCG) \ - CONFIG_KVM=3D$(CONFIG_KVM) \ - CONFIG_SPICE=3D$(CONFIG_SPICE) \ - CONFIG_IVSHMEM=3D$(CONFIG_IVSHMEM) \ - CONFIG_TPM=3D$(CONFIG_TPM) \ - CONFIG_XEN=3D$(CONFIG_XEN) \ - CONFIG_OPENGL=3D$(CONFIG_OPENGL) \ - CONFIG_X11=3D$(CONFIG_X11) \ - CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ - CONFIG_VHOST_KERNEL=3D$(CONFIG_VHOST_KERNEL) \ - CONFIG_VIRTFS=3D$(CONFIG_VIRTFS) \ - CONFIG_LINUX=3D$(CONFIG_LINUX) \ - CONFIG_PVRDMA=3D$(CONFIG_PVRDMA) - -MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py - -$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(SRC_P= ATH)/Kconfig $(BUILD_DIR)/config-host.mak - $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \ - > $@.tmp, "GEN", "$@.tmp") - $(call quiet-command, if test -f $@; then \ - if cmp -s $@.old $@; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ - else \ - if test -f $@.old; then \ - echo "WARNING: $@ (user modified) out of date.";\ - else \ - echo "WARNING: $@ out of date.";\ - fi; \ - echo "Run \"$(MAKE) defconfig\" to regenerate."; \ - rm $@.tmp; \ - fi; \ - else \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ - fi,"GEN","$@"); - -defconfig: - rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) =20 ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs @@ -263,10 +202,15 @@ $(SOFTMMU_FUZZ_RULES): $(io-obj-y) $(SOFTMMU_FUZZ_RULES): config-all-devices.mak $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) =20 +# meson: this is sub-optimal but going away after conversion +TARGET_DEPS =3D $(patsubst %,%-config-target.h, $(TARGET_DIRS)) +TARGET_DEPS +=3D $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TAR= GET_DIRS))) +TARGET_DEPS +=3D $(patsubst %,libqemu-%.fa, $(TARGET_DIRS)) + .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that # $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal -$(TARGET_DIRS_RULES): +$(TARGET_DIRS_RULES): $(TARGET_DEPS) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" $(notdir $@),) =20 # LIBFDT_lib=3D"": avoid breaking existing trees with objects requiring -f= PIC @@ -353,7 +297,6 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_bloc= k.py config-host.mak clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h - rm -f qemu-options.def find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]= ' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ @@ -362,8 +305,6 @@ clean: recurse-clean rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ rm -f fsdev/*.pod scsi/*.pod rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) - rm -f config-all-devices.mak - rm -f $(SUBDIR_DEVICES_MAK) =20 VERSION ?=3D $(shell cat VERSION) =20 @@ -380,8 +321,7 @@ endef distclean: clean rm -f config-host.mak config-host.h* $(DOCS) rm -f tests/tcg/config-*.mak - rm -f config-all-devices.mak config-all-disas.mak config.status - rm -f $(SUBDIR_DEVICES_MAK) + rm -f config-all-disas.mak config.status rm -f po/*.mo tests/qemu-iotests/common.env rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols diff --git a/Makefile.target b/Makefile.target index f6b7a86..43d2f97 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,8 +6,10 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak =20 +FULL_TARGET_NAME=3D$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-use= r) + ifdef CONFIG_SOFTMMU -include config-devices.mak +include ../$(FULL_TARGET_NAME)-config-devices.mak endif =20 $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) @@ -18,6 +20,9 @@ QEMU_CFLAGS +=3D -iquote .. -iquote $(SRC_PATH)/target/$(= TARGET_BASE_ARCH) -DNEED_ =20 QEMU_CFLAGS+=3D-iquote $(SRC_PATH)/include =20 +QEMU_CFLAGS +=3D -DCONFIG_TARGET=3D\"../$(FULL_TARGET_NAME)-config-target.= h\" +QEMU_CFLAGS +=3D -DCONFIG_DEVICES=3D\"../$(FULL_TARGET_NAME)-config-device= s.h\" + ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=3Dqemu-$(TARGET_NAME) @@ -36,15 +41,10 @@ QEMU_PROG_BUILD =3D $(QEMU_PROG) endif endif =20 +LIBQEMU =3D ../libqemu-$(FULL_TARGET_NAME).fa PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) STPFILES=3D =20 -config-target.h: config-target.h-timestamp -config-target.h-timestamp: config-target.mak - -config-devices.h: config-devices.h-timestamp -config-devices.h-timestamp: config-devices.mak - ifdef CONFIG_TRACE_SYSTEMTAP stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace= .stp $(QEMU_PROG)-log.stp =20 @@ -103,6 +103,7 @@ all: $(PROGS) stap # Dummy command so that make thinks it has done something @true =20 +obj-y +=3D $(LIBQEMU) obj-y +=3D trace/ =20 ######################################################### @@ -169,7 +170,6 @@ obj-y +=3D hw/$(TARGET_BASE_ARCH)/ endif =20 generated-files-y +=3D hmp-commands.h hmp-commands-info.h -generated-files-y +=3D config-devices.h =20 endif # CONFIG_SOFTMMU =20 @@ -210,7 +210,7 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) =20 ifdef CONFIG_SOFTMMU -$(QEMU_PROG_BUILD): config-devices.mak +$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak endif =20 COMMON_LDADDS =3D ../libqemuutil.a @@ -262,5 +262,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../system= tap/tapset/$(QEMU_PROG)-log.stp" endif =20 -generated-files-y +=3D config-target.h Makefile: $(generated-files-y) diff --git a/configure b/configure index 4e9dc80..f1a9824 100755 --- a/configure +++ b/configure @@ -8098,18 +8098,12 @@ fi =20 if supported_xen_target $target; then echo "CONFIG_XEN=3Dy" >> $config_target_mak - echo "$target/config-devices.mak: CONFIG_XEN=3Dy" >> $config_host_mak if test "$xen_pci_passthrough" =3D yes; then echo "CONFIG_XEN_PCI_PASSTHROUGH=3Dy" >> "$config_target_mak" fi -else - echo "$target/config-devices.mak: CONFIG_XEN=3Dn" >> $config_host_mak fi if supported_kvm_target $target; then echo "CONFIG_KVM=3Dy" >> $config_target_mak - echo "$target/config-devices.mak: CONFIG_KVM=3Dy" >> $config_host_mak -else - echo "$target/config-devices.mak: CONFIG_KVM=3Dn" >> $config_host_mak fi if supported_hax_target $target; then echo "CONFIG_HAX=3Dy" >> $config_target_mak diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index c55abfb..33441ad 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -22,7 +22,7 @@ #include "hw/nvram/fw_cfg.h" #include "e820_memory_layout.h" #include "kvm_i386.h" -#include "config-devices.h" +#include CONFIG_DEVICES =20 struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX}; =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 47c5ca3..cc616e4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -92,10 +92,10 @@ #include "hw/mem/memory-device.h" #include "sysemu/replay.h" #include "qapi/qmp/qerror.h" -#include "config-devices.h" #include "e820_memory_layout.h" #include "fw_cfg.h" #include "trace.h" +#include CONFIG_DEVICES =20 GlobalProperty pc_compat_5_0[] =3D { }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b789e83..456e336 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "config-devices.h" +#include CONFIG_DEVICES =20 #include "qemu/units.h" #include "hw/loader.h" diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 67bee1b..cf384b9 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -49,7 +49,7 @@ #include "multiboot.h" #include "elf.h" #include "standard-headers/asm-x86/bootparam.h" -#include "config-devices.h" +#include CONFIG_DEVICES #include "kvm_i386.h" =20 #define BIOS_FILENAME "bios.bin" diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 3a14b7c..5715091 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "config-devices.h" +#include CONFIG_DEVICES #include "exec/memop.h" #include "qemu/units.h" #include "qemu/error-report.h" diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7740fc6..8fbec77 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -29,7 +29,7 @@ #include "migration/misc.h" #include "hw/boards.h" #include "hw/qdev-properties.h" -#include "config-devices.h" +#include CONFIG_DEVICES #include "trace.h" =20 /* diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 20872e7..412962d 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -29,7 +29,7 @@ =20 #include "config-host.h" #ifdef NEED_CPU_H -#include "config-target.h" +#include CONFIG_TARGET #else #include "exec/poison.h" #endif diff --git a/meson.build b/meson.build index c072d68..3388d68 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,7 @@ ss =3D import('sourceset') sh =3D find_program('sh') cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') +config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: ['c', 'objc']) @@ -130,16 +131,96 @@ if 'CONFIG_LIBUDEV' in config_host libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) endif =20 +create_config =3D find_program('scripts/create_config') +minikconf =3D find_program('scripts/minikconf.py') target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false have_system =3D false +config_devices_mak_list =3D [] +config_devices_h =3D {} +config_target_mak =3D {} +kconfig_external_symbols =3D [ + 'CONFIG_KVM', + 'CONFIG_XEN', + 'CONFIG_TPM', + 'CONFIG_SPICE', + 'CONFIG_IVSHMEM', + 'CONFIG_OPENGL', + 'CONFIG_X11', + 'CONFIG_VHOST_USER', + 'CONFIG_VHOST_KERNEL', + 'CONFIG_VIRTFS', + 'CONFIG_LINUX', + 'CONFIG_PVRDMA', +] foreach target : target_dirs have_user =3D have_user or target.endswith('-user') - have_system =3D have_system or target.endswith('-softmmu') + config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') + config_host + + if target.endswith('-softmmu') + have_system =3D true + + base_kconfig =3D [] + foreach sym : kconfig_external_symbols + if sym in config_target + base_kconfig +=3D '@0@=3Dy'.format(sym) + endif + endforeach + + config_devices_mak =3D target + '-config-devices.mak' + config_devices_mak =3D configure_file( + input: ['default-configs' / target + '.mak', 'Kconfig'], + output: config_devices_mak, + depfile: config_devices_mak + '.d', + capture: true, + command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], + config_devices_mak, '@DEPFILE@', '@INPUT@', + base_kconfig]) + config_devices_h +=3D {target: custom_target( + target + '-config-devices.h', + input: config_devices_mak, + output: target + '-config-devices.h', + capture: true, + command: [create_config, '@INPUT@'])} + config_devices_mak_list +=3D config_devices_mak + config_target +=3D keyval.load(config_devices_mak) + endif + config_target_mak +=3D {target: config_target} endforeach have_tools =3D 'CONFIG_TOOLS' in config_host have_block =3D have_system or have_tools =20 +grepy =3D find_program('scripts/grepy.sh') +# This configuration is used to build files that are shared by +# multiple binaries, and then extracted out of the "common" +# static_library target. +# +# We do not use all_sources()/all_dependencies(), because it would +# build literally all source files, including devices only used by +# targets that are not built for this compilation. The CONFIG_ALL +# pseudo symbol replaces it. + +if have_system + config_all_devices_mak =3D configure_file( + output: 'config-all-devices.mak', + input: config_devices_mak_list, + capture: true, + command: [grepy, '@INPUT@'], + ) + config_all_devices =3D keyval.load(config_all_devices_mak) +else + config_all_devices =3D {} +endif +config_all =3D config_all_devices +config_all +=3D config_host +config_all +=3D config_all_disas +config_all +=3D { + 'CONFIG_XEN': config_host.has_key('CONFIG_XEN_BACKEND'), + 'CONFIG_SOFTMMU': have_system, + 'CONFIG_USER_ONLY': have_user, + 'CONFIG_ALL': true, +} + # Generators =20 genh =3D [] @@ -181,6 +262,13 @@ qemu_version =3D custom_target('qemu-version.h', build_always_stale: true) genh +=3D qemu_version =20 +config_host_h =3D custom_target('config-host.h', + input: meson.current_build_dir() / 'config-h= ost.mak', + output: 'config-host.h', + capture: true, + command: [create_config, '@INPUT@']) +genh +=3D config_host_h + hxdep =3D [] hx_headers =3D [ ['qemu-options.hx', 'qemu-options.def'], @@ -207,6 +295,16 @@ genh +=3D hxdep util_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() +common_ss =3D ss.source_set() +softmmu_ss =3D ss.source_set() +user_ss =3D ss.source_set() +bsd_user_ss =3D ss.source_set() +linux_user_ss =3D ss.source_set() +specific_ss =3D ss.source_set() + +hw_arch =3D {} +target_arch =3D {} +target_softmmu_arch =3D {} =20 ############### # Trace files # @@ -315,10 +413,10 @@ subdir('ui') =20 # Build targets from sourcesets =20 -stub_ss =3D stub_ss.apply(config_host, strict: false) +stub_ss =3D stub_ss.apply(config_all, strict: false) =20 util_ss.add_all(trace_ss) -util_ss =3D util_ss.apply(config_host, strict: false) +util_ss =3D util_ss.apply(config_all, strict: false) libqemuutil =3D static_library('qemuutil', sources: util_ss.sources() + stub_ss.sources(= ) + genh, dependencies: [util_ss.dependencies(), m, gli= b, socket]) @@ -329,6 +427,68 @@ subdir('io') subdir('fsdev') subdir('target') =20 +common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) +common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) + +common_all =3D common_ss.apply(config_all, strict: false) +common_all =3D static_library('common', + build_by_default: false, + sources: common_all.sources() + genh, + dependencies: common_all.dependencies(), + name_suffix: 'fa') + +foreach target : target_dirs + config_target =3D config_target_mak[target] + target_name =3D config_target['TARGET_NAME'] + arch =3D config_target['TARGET_BASE_ARCH'] + arch_srcs =3D [] + + target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] + if host_machine.system() =3D=3D 'linux' + target_inc +=3D include_directories('linux-headers', is_system: true) + endif + if target.endswith('-softmmu') + qemu_target_name =3D 'qemu-system-' + target_name + target_type=3D'system' + arch_srcs +=3D config_devices_h[target] + else + target_type=3D'user' + qemu_target_name =3D 'qemu-' + target_name + if 'CONFIG_LINUX_USER' in config_target + base_dir =3D 'linux-user' + target_inc +=3D include_directories('linux-user/host/' / config_host= ['ARCH']) + else + base_dir =3D 'bsd-user' + endif + target_inc +=3D include_directories( + base_dir, + base_dir / config_target['TARGET_ABI_DIR'], + ) + endif + + target_common =3D common_ss.apply(config_target, strict: false) + objects =3D common_all.extract_objects(target_common.sources()) + + # TODO: Change to generator once obj-y goes away + config_target_h =3D custom_target(target + '-config-target.h', + input: meson.current_build_dir() / target / = 'config-target.mak', + output: target + '-config-target.h', + capture: true, + command: [create_config, '@INPUT@']) + + target_specific =3D specific_ss.apply(config_target, strict: false) + arch_srcs +=3D target_specific.sources() + + static_library('qemu-' + target, + sources: arch_srcs + [config_target_h] + genh, + objects: objects, + include_directories: target_inc, + c_args: ['-DNEED_CPU_H', + '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format= (target), + '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.form= at(target)], + name_suffix: 'fa') +endforeach + # Other build targets if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') diff --git a/rules.mak b/rules.mak index 1aa6394..d8d35f7 100644 --- a/rules.mak +++ b/rules.mak @@ -203,14 +203,6 @@ notempty =3D $(if $1,y,n) # Generate files with tracetool TRACETOOL=3D$(PYTHON) $(SRC_PATH)/scripts/tracetool.py =20 -# Generate timestamp files for .h include files - -config-%.h: config-%.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ - -config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config - $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@,"GEN= ","$(TARGET_DIR)config-$*.h") - .PHONY: clean-timestamp clean-timestamp: rm -f *.timestamp diff --git a/scripts/create_config b/scripts/create_config index 6d8f08b..bc82661 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -1,5 +1,7 @@ #!/bin/sh =20 +test $# -gt 0 && exec < $1 + echo "/* Automatically generated by create_config - do not modify */" =20 while read line; do diff --git a/scripts/grepy.sh b/scripts/grepy.sh new file mode 100755 index 0000000..33c74c6 --- /dev/null +++ b/scripts/grepy.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +grep --no-filename '=3Dy$' "$@" | sort -u diff --git a/scripts/minikconf.py b/scripts/minikconf.py old mode 100755 new mode 100644 diff --git a/softmmu/qtest.c b/softmmu/qtest.c index 5672b75..4e439ca 100644 --- a/softmmu/qtest.c +++ b/softmmu/qtest.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/cutils.h" -#include "config-devices.h" +#include CONFIG_DEVICES #ifdef CONFIG_PSERIES #include "hw/ppc/spapr_rtas.h" #endif diff --git a/util/meson.build b/util/meson.build index 62113ba..9ee7425 100644 --- a/util/meson.build +++ b/util/meson.build @@ -62,7 +62,4 @@ util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-he= lpers.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c')) util_ss.add(files('guest-random.c')) util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio]) - -if have_user then - util_ss.add(files('selfmap.c')) -endif +util_ss.add(when: 'CONFIG_USER_ONLY', if_true: [files('selfmap.c')]) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080541; cv=none; d=zohomail.com; s=zohoarc; b=D8za+lFdp4RTyDCwjrltNZGakb/6vkSrUjUFCuHITVzCLsP/ezI4p0q2lHpCfilHrsqCysybqa09SlBmxjLTgtOMuN3Y0BT2Mi5zI+KoN50d7Cj5NGfINoJyh4sEERKaUXuS0GFV//4eRi0Nr6In+2i25al1B5tJRt5G2leYLvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080541; 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=3xUMW7cQsvPY4cg/gULdWz2gclWFWQG4Ct45IxYfcXc=; b=kkQ+wuf3McOViWp2jyxLBtyRwCT4Z8PAK6bqGtQi7ff+7+IOs3XywPBGlNkN4i/m+/1emuK30adpXTUuge+HFQNvDEDsOPSbVozhLRc+CmO07EGmftnVqjOF9PeHUfcvr10dZ1Ck2ivrRTPtGQoUwFwlRDb9RBiB0tFc6028gs4= 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 15970805409271000.186279109204; Mon, 10 Aug 2020 10:29:00 -0700 (PDT) Received: from localhost ([::1]:40750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BbX-000366-Jq for importer@patchew.org; Mon, 10 Aug 2020 13:28:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJy-0008WV-Ke for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37384 helo=us-smtp-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 1k5BJw-00030m-EH for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:50 -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-24-gX4kiV5FMn282G0oIoAO0g-1; Mon, 10 Aug 2020 13:10:45 -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 1F73391277 for ; Mon, 10 Aug 2020 17:10:45 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C23A5F1EA; Mon, 10 Aug 2020 17:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079447; 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=3xUMW7cQsvPY4cg/gULdWz2gclWFWQG4Ct45IxYfcXc=; b=G6dyYemlQrGPTdaFX9GsG261BUVsIzqDoVtPSp/9RodJwG//NbEm9dtu7lsW5aZO4evq7u 9unxCbiJaeluTZpY9/tbfD1njAdGFt6cjrbOfWZep4TS9QgiXWZ+xm0UgcJHiE89rKUheP uobnVD4Ce8USG1y8MFQKW5MuB0i+AnQ= X-MC-Unique: gX4kiV5FMn282G0oIoAO0g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 058/147] meson: add macos dependencies Date: Mon, 10 Aug 2020 19:07:36 +0200 Message-Id: <1597079345-42801-59-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 There is no probing in configure, so no need to pass them as variables to meson. Do a regular meson dependency() instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meson.build b/meson.build index 3388d68..74be140 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,10 @@ m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) socket =3D [] version_res =3D [] +coref =3D [] +iokit =3D [] +cocoa =3D [] +hvf =3D [] if host_machine.system() =3D=3D 'windows' socket =3D cc.find_library('ws2_32') =20 @@ -55,6 +59,11 @@ if host_machine.system() =3D=3D 'windows' version_res =3D win.compile_resources('version.rc', depend_files: files('pc-bios/qemu-ns= is.ico'), include_directories: include_directo= ries('.')) +elif host_machine.system() =3D=3D 'darwin' + coref =3D dependency('appleframeworks', modules: 'CoreFoundation') + iokit =3D dependency('appleframeworks', modules: 'IOKit') + cocoa =3D dependency('appleframeworks', modules: 'Cocoa') + hvf =3D dependency('appleframeworks', modules: 'Hypervisor') endif glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), link_args: config_host['GLIB_LIBS'].split()) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080981; cv=none; d=zohomail.com; s=zohoarc; b=B2yyUOzXqkpRQ6AkuhqY2xFmIvNRFbJO+jDtQE3/CBNNL3kJ/+zroUdy0hEDAS7zqc3CINxvZtXFTCYTuWd5Gv0wnyaZoETwh9ltA7JejHgyOows3e/QqNgpHU27yXh5FsVWIYfVFeY2l9F2bYuCTTo4LdERLB2tfkC1U89FhOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080981; 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=ePJ3VEWz0NOI2SzM4kvU5UV6QHTzOKUZ0A5s9X+LNsU=; b=ffW9dXsvgN9Q6Hu6vEFI4cMVx7iidzL436NflNlp5sdIWfRy9+tnb39zaMyl36UK63xi96pDo1njZf0zp8hEGPiJshWOQQOXvJB8PGvAQ7uwsZ1XACWdVQlCjpE2pmWs9cNsBb49NmMSbpqfx3isYPgmweIigNBxv5VhcrEP+O8= 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 1597080981199219.53999456108818; Mon, 10 Aug 2020 10:36:21 -0700 (PDT) Received: from localhost ([::1]:51074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bid-0001rv-3L for importer@patchew.org; Mon, 10 Aug 2020 13:36:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BK0-00009h-Iu for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:52 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:47975 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 1k5BJy-00031i-9v for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:52 -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-215-hqne5gBAMr606Zm8p8i07g-1; Mon, 10 Aug 2020 13:10:47 -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 7F42057 for ; Mon, 10 Aug 2020 17:10:46 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6DA5F1E9; Mon, 10 Aug 2020 17:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079449; 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=ePJ3VEWz0NOI2SzM4kvU5UV6QHTzOKUZ0A5s9X+LNsU=; b=NrYOthCh03pHTKcLygGBhZd1fb/zkfW7sp0UUBeCpdehfUpnzQCsIjShSBMRl9g2PGYYyZ /Vh3h6VSdcGCNPtL/hBLAKAnJmUbZwCFCTEExSFRNDCzyPsOFqsYHsJaMy2azoyu2B/6c2 c9s8EQVI72m69YerGCtInc3p5LS0wtY= X-MC-Unique: hqne5gBAMr606Zm8p8i07g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 059/147] meson: add modules infrastructure Date: Mon, 10 Aug 2020 19:07:37 +0200 Message-Id: <1597079345-42801-60-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 | 10 +--------- Makefile.target | 6 ++++++ meson.build | 52 +++++++++++++++++++++++++++++++++++++++++++++++++= +++ rules.mak | 10 +++++----- scripts/undefsym.sh | 20 ++++++++++++++++++++ 5 files changed, 84 insertions(+), 14 deletions(-) create mode 100755 scripts/undefsym.sh diff --git a/Makefile b/Makefile index f0fed55..6d58b43 100644 --- a/Makefile +++ b/Makefile @@ -250,7 +250,7 @@ slirp/all: .git-submodule-status CFLAGS=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)") =20 $(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) + $(qom-obj-y) block.syms qemu.syms =20 $(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY)) @@ -454,14 +454,6 @@ install: all $(if $(BUILD_DOCS),install-doc) \ ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif -ifneq ($(CONFIG_MODULES),) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" - for s in $(modules-m:.mo=3D$(DSOSUF)); do \ - t=3D"$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ - $(INSTALL_LIB) $$s "$$t"; \ - test -z "$(STRIP)" || $(STRIP) "$$t"; \ - done -endif ifneq ($(HELPERS-y),) $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir)) endif diff --git a/Makefile.target b/Makefile.target index 43d2f97..d1d8906 100644 --- a/Makefile.target +++ b/Makefile.target @@ -162,6 +162,12 @@ obj-y +=3D qapi/ obj-y +=3D migration/ram.o LIBS :=3D $(libs_softmmu) $(LIBS) =20 +# Temporary until emulators are linked by Meson +LIBS :=3D $(LIBS) @../block.syms @../qemu.syms +ifneq ($(CONFIG_MODULES),y) +LIBS :=3D $(LIBS) +endif + # Hardware support ifeq ($(TARGET_NAME), sparc64) obj-y +=3D hw/sparc64/ diff --git a/meson.build b/meson.build index 74be140..ccf5a63 100644 --- a/meson.build +++ b/meson.build @@ -10,6 +10,7 @@ sh =3D find_program('sh') cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') +enable_modules =3D 'CONFIG_MODULES' in config_host =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: ['c', 'objc']) @@ -304,6 +305,7 @@ genh +=3D hxdep util_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() +block_ss =3D ss.source_set() common_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() user_ss =3D ss.source_set() @@ -311,6 +313,7 @@ bsd_user_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() specific_ss =3D ss.source_set() =20 +modules =3D {} hw_arch =3D {} target_arch =3D {} target_softmmu_arch =3D {} @@ -420,6 +423,12 @@ subdir('crypto') subdir('storage-daemon') subdir('ui') =20 + +if enable_modules + libmodulecommon =3D static_library('module-common', files('module-common= .c') + genh, pic: true, c_args: '-DBUILD_DSO') + modulecommon =3D declare_dependency(link_whole: libmodulecommon, compile= _args: '-DBUILD_DSO') +endif + # Build targets from sourcesets =20 stub_ss =3D stub_ss.apply(config_all, strict: false) @@ -436,6 +445,49 @@ subdir('io') subdir('fsdev') subdir('target') =20 +mods =3D [] +block_mods =3D [] +softmmu_mods =3D [] +foreach d, list : modules + foreach m : list + if enable_modules and host_machine.system() !=3D 'windows' + sl =3D static_library(d + '-' + m[0], m[1], dependencies: m[2], pic:= true) + if d =3D=3D 'block' + block_mods +=3D sl + else + softmmu_mods +=3D sl + endif + mods +=3D {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]} + else + if d =3D=3D 'block' + block_ss.add(when: [m.get(3, []), m[2]], if_true: m[1]) + else + softmmu_ss.add(when: [m.get(3, []), m[2]], if_true: m[1]) + endif + endif + endforeach +endforeach + +nm =3D find_program('nm') +undefsym =3D find_program('scripts/undefsym.sh') +block_syms =3D custom_target('block.syms', output: 'block.syms', + input: [libqemuutil, block_mods], + capture: true, + command: [undefsym, nm, '@INPUT@']) +qemu_syms =3D custom_target('qemu.syms', output: 'qemu.syms', + input: [libqemuutil, softmmu_mods], + capture: true, + command: [undefsym, nm, '@INPUT@']) + + +foreach m : mods + shared_module(m['dir'] + '-' + m['name'], + name_prefix: '', + link_whole: m['lib'], + install: true, + install_dir: config_host['qemu_moddir']) +endforeach + common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) =20 diff --git a/rules.mak b/rules.mak index d8d35f7..9da9dcd 100644 --- a/rules.mak +++ b/rules.mak @@ -61,17 +61,17 @@ endif # This is necessary because the exectuable itself may not use the function= , in # which case the function would not be linked in. Then the DSO loading will # fail because of the missing symbol. -process-archive-undefs =3D $(filter-out %.a %.fa %.mo,$1) \ +process-archive-undefs =3D $(filter-out %.a %.fa %.mo %$(DSOSUF),$1) \ $(addprefix $(WL_U), \ $(filter $(call defined-symbols,$(filter %.a %.fa, $1= )), \ - $(call undefined-symbols,$(filter %.mo,$1)))= ) \ + $(call undefined-symbols,$(filter %.mo %$(DSOSUF),$1)))) \ $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ $(filter %.a,$1) =20 -extract-libs =3D $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs))) +extract-libs =3D $(strip $(foreach o,$(filter-out %.mo %$(DSOSUF),$1),$($o= -libs))) expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ - $(foreach o,$(filter %.mo,$1),$($o-objs)) \ - $(filter-out %.o %.mo,$1)) + $(foreach o,$(filter %.mo %$(DSOSUF),$1),$($o-objs)) \ + $(filter-out %.o %.mo %$(DSOSUF),$1)) =20 %.o: %.c @mkdir -p $(dir $@) diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh new file mode 100755 index 0000000..b9ec332 --- /dev/null +++ b/scripts/undefsym.sh @@ -0,0 +1,20 @@ +#! /usr/bin/env bash + +# Before a shared module's DSO is produced, a static library is built for = it +# and passed to this script. The script generates -Wl,-u options to force +# the inclusion of symbol from libqemuutil.a if the shared modules need th= em, +# This is necessary because the modules may use functions not needed by the +# executable itself, which would cause the function to not be linked in. +# Then the DSO loading would fail because of the missing symbol. + +if test $# -le 2; then + exit 0 +fi + +NM=3D$1 +staticlib=3D$2 +shift 2 +# Find symbols defined in static libraries and undefined in shared modules +comm -12 \ + <( $NM -P -g $staticlib | awk '$2!=3D"U"{print "-Wl,-u," $1}' | sort -u)= \ + <( $NM -P -g "$@" | awk '$2=3D=3D"U"{print "-Wl,-u," $1}' | sort -u) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081067; cv=none; d=zohomail.com; s=zohoarc; b=JXCJd5Cubh7XRoenj5S5DBzS1r89gp2m9ZvC8JAj5gi6zyvai3yTRsu9iQZBXx5kogNdkAaWu0gGIEuS9TkcCpNeLx/rkXu7PRQJhtKtdTuUL3IyFcAre6RYItPrSOI8gq8lXFhhTNum84iMcKXfpnDm6jf2ZFeKeADDzHUKwnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081067; 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=aBsIv/N8xjVu6qt5Ue0OAE7NqVFKHkJbIndev6SmYrk=; b=P2LfVVRP6OzZzYEzL0FFN1Tz6VdUU8p/38tW5TiL8zk5vMAeuYdVo9w2/+vO5/vlJQNd4Gwu+I3uSOOMOmpYXwdihiFCQtlfhH46JV6A9gTwXYudnXMLW2geo1D0UvPoxC3jmPqHQPUhSXVOFly7v8+dbCm01IjEI94YZOLBCKc= 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 1597081067769877.4705634984988; Mon, 10 Aug 2020 10:37:47 -0700 (PDT) Received: from localhost ([::1]:59246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bk2-00057D-Ar for importer@patchew.org; Mon, 10 Aug 2020 13:37:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BK1-0000CB-C2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:53 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32284 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 1k5BJz-000328-9l for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:53 -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-476-HfftLunhNRmWC25K5MHl2Q-1; Mon, 10 Aug 2020 13:10:48 -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 DDC04100CCC6 for ; Mon, 10 Aug 2020 17:10:47 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAFE65F1E9; Mon, 10 Aug 2020 17:10:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079450; 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=aBsIv/N8xjVu6qt5Ue0OAE7NqVFKHkJbIndev6SmYrk=; b=EY9TrVPP4CExvkfq9sgW5ASkU6M+XFtig3sldmN/jU7+p+tY83qCL20YRGOjb95Oxrut3M FxkM8UtLTIQSxIz1W9v+LgX5tPQ5PZRj1vOOYgWfqnS28+HusB0jPXXVU8STpMC8Bcrrgt oNl50+sjPalVXE3aLiAUoIIfUlITHOw= X-MC-Unique: HfftLunhNRmWC25K5MHl2Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 060/147] meson: convert chardev directory to Meson (tools part) Date: Mon, 10 Aug 2020 19:07:38 +0200 Message-Id: <1597079345-42801-61-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 4 ++-- Makefile.target | 2 +- chardev/Makefile.objs | 19 ------------------- chardev/meson.build | 32 ++++++++++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 chardev/meson.build diff --git a/Makefile b/Makefile index 6d58b43..bd54901 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - chardev-obj-y \ block-obj-y \ block-obj-m \ storage-daemon-obj-y \ diff --git a/Makefile.objs b/Makefile.objs index 0920cdb..297bd5b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -7,8 +7,6 @@ qom-obj-y =3D qom/libqom.fa =20 ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) =20 -chardev-obj-y =3D chardev/ - authz-obj-y =3D authz/libauthz.fa authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) =20 @@ -19,6 +17,8 @@ block-obj-$(CONFIG_REPLICATION) +=3D replication.o =20 block-obj-m =3D block/ =20 +chardev-obj-y =3D chardev/libchardev.fa + crypto-obj-y =3D crypto/libcrypto.fa =20 io-obj-y =3D io/libio.fa diff --git a/Makefile.target b/Makefile.target index d1d8906..6b9de09 100644 --- a/Makefile.target +++ b/Makefile.target @@ -199,13 +199,13 @@ common-obj-m :=3D include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ + chardev-obj-y \ crypto-obj-y \ io-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ - chardev-obj-y \ common-obj-y \ common-obj-m) all-obj-y +=3D $(common-obj-y) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 3783dad..6662d0d 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1,23 +1,4 @@ -chardev-obj-y +=3D char.o chardev-obj-$(CONFIG_SOFTMMU) +=3D chardev-sysemu.o -chardev-obj-$(CONFIG_WIN32) +=3D char-console.o -chardev-obj-$(CONFIG_POSIX) +=3D char-fd.o -chardev-obj-y +=3D char-fe.o -chardev-obj-y +=3D char-file.o -chardev-obj-y +=3D char-io.o -chardev-obj-y +=3D char-mux.o -chardev-obj-y +=3D char-null.o -chardev-obj-$(CONFIG_POSIX) +=3D char-parallel.o -chardev-obj-y +=3D char-pipe.o -chardev-obj-$(CONFIG_POSIX) +=3D char-pty.o -chardev-obj-y +=3D char-ringbuf.o -chardev-obj-y +=3D char-serial.o -chardev-obj-y +=3D char-socket.o -chardev-obj-y +=3D char-stdio.o -chardev-obj-y +=3D char-udp.o -chardev-obj-$(CONFIG_WIN32) +=3D char-win.o -chardev-obj-$(CONFIG_WIN32) +=3D char-win-stdio.o - common-obj-$(CONFIG_SOFTMMU) +=3D msmouse.o wctablet.o testdev.o =20 ifeq ($(CONFIG_BRLAPI),y) diff --git a/chardev/meson.build b/chardev/meson.build new file mode 100644 index 0000000..a2e671d --- /dev/null +++ b/chardev/meson.build @@ -0,0 +1,32 @@ +chardev_ss =3D ss.source_set() +chardev_ss.add(files( + 'char-fe.c', + 'char-file.c', + 'char-io.c', + 'char-mux.c', + 'char-null.c', + 'char-pipe.c', + 'char-ringbuf.c', + 'char-serial.c', + 'char-socket.c', + 'char-stdio.c', + 'char-udp.c', + 'char.c', +)) +chardev_ss.add(when: 'CONFIG_POSIX', if_true: files( + 'char-fd.c', + 'char-parallel.c', + 'char-pty.c', +)) +chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( + 'char-console.c', + 'char-win-stdio.c', + 'char-win.c', +)) + +chardev_ss =3D chardev_ss.apply(config_host, strict: false) +libchardev =3D static_library('chardev', chardev_ss.sources(), + name_suffix: 'fa', + build_by_default: false) + +chardev =3D declare_dependency(link_whole: libchardev) diff --git a/meson.build b/meson.build index ccf5a63..aa813a2 100644 --- a/meson.build +++ b/meson.build @@ -442,6 +442,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('io') +subdir('chardev') subdir('fsdev') subdir('target') =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081174; cv=none; d=zohomail.com; s=zohoarc; b=DrDcKQyWENO4iCKP1b+C2ZamFARLggYvo6jayKsGDq0DYIQz8FHqqmSitgw6Vuvz8UkzbrOQeMksabyEi1ZToZ2KzhZDdpbpVAMlF5m98RkjnA/x+h2b8lskE2qA+1wh9IiCLIAQwMSxZhh6fqPTE0pA4D9Po3DRp4Ghow9T9Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081174; 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=zPnGwiSP/tv4kTK5Ft6rCKZAHIJsi9Mr9fNhw1HXMOE=; b=MFZ0tEsN0GU6hfCGUbYO7uOlJeFf0/5+raCX7FWONuqS8cAyunFNAhWuBkhQCUw7mWkWjqcnn+Hl6Tj84CLHvD5LZCGIP6SDL2A/d4Yc/P3NKDguPMd2gk71zPICFrD42t6ip+lKOBNX1+iHyjlRnHdIROP8Pzwp6r77oUXtEfo= 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 1597081174853689.4026779517574; Mon, 10 Aug 2020 10:39:34 -0700 (PDT) Received: from localhost ([::1]:39414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bll-0008Uq-IF for importer@patchew.org; Mon, 10 Aug 2020 13:39:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BK5-0000L8-5B for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BK2-00034g-3n for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:56 -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-337-xgzOahT1Mcyv-_3z0zOpeg-1; Mon, 10 Aug 2020 13:10:50 -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 4945B100CCC4 for ; Mon, 10 Aug 2020 17:10:49 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55D565F1E9; Mon, 10 Aug 2020 17:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079453; 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=zPnGwiSP/tv4kTK5Ft6rCKZAHIJsi9Mr9fNhw1HXMOE=; b=H2NFsj6oeWxUWZXP6PP7H7suAtG/p4JK/LasA397p39LBcBGF3xX3vqXcyaDf8UBMa6yLR cJlosPy9f4xRIN570sgHoBBz2GQAHSKdl2zRexO9r5udEKIaOiLDe4Tiua1PCUenxU4WRQ GABptINnUAtGB44KdMCAkx1Wi6/UO/o= X-MC-Unique: xgzOahT1Mcyv-_3z0zOpeg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 061/147] meson: convert block Date: Mon, 10 Aug 2020 19:07:39 +0200 Message-Id: <1597079345-42801-62-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=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/10 11:11:16 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 | 8 ---- Makefile.objs | 32 ++++++++++--- Makefile.target | 3 +- block.c | 2 +- block/Makefile.objs | 75 ------------------------------ block/meson.build | 111 ++++++++++++++++++++++++++++++++++++++++= ++++ block/monitor/Makefile.objs | 2 - block/monitor/meson.build | 2 + configure | 14 ++++-- meson.build | 68 +++++++++++++++++++++++++++ nbd/Makefile.objs | 1 - nbd/meson.build | 5 ++ rules.mak | 3 +- scsi/Makefile.objs | 4 -- scsi/meson.build | 4 ++ 15 files changed, 227 insertions(+), 107 deletions(-) delete mode 100644 block/Makefile.objs create mode 100644 block/meson.build delete mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/meson.build delete mode 100644 nbd/Makefile.objs create mode 100644 nbd/meson.build delete mode 100644 scsi/Makefile.objs create mode 100644 scsi/meson.build diff --git a/Makefile b/Makefile index bd54901..f251703 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,6 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 -generated-files-y +=3D module_block.h generated-files-y +=3D target/s390x/gen-features.h target/s390x/gen-features.h: Makefile.ninja =20 @@ -166,8 +165,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - block-obj-y \ - block-obj-m \ storage-daemon-obj-y \ storage-daemon-obj-m \ common-obj-y \ @@ -288,11 +285,6 @@ ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS +=3D -ludev -lmultipath -lmpathpersist endif =20 -module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak - $(call quiet-command,$(PYTHON) $< $@ \ - $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ - "GEN","$@") - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h diff --git a/Makefile.objs b/Makefile.objs index 297bd5b..eeaa0cf 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -10,12 +10,20 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) authz-obj-y =3D authz/libauthz.fa authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) =20 -block-obj-y =3D block/ nbd/ scsi/ -block-obj-y +=3D block.o blockjob.o job.o -block-obj-y +=3D qemu-io-cmds.o -block-obj-$(CONFIG_REPLICATION) +=3D replication.o - -block-obj-m =3D block/ +block-obj-y +=3D libblock.fa + +libblock.fa-libs =3D $(ZSTD_LIBS) +libblock.fa-libs +=3D $(LIBNFS_LIBS) +libblock.fa-libs +=3D $(LIBISCSI_LIBS) +libblock.fa-libs +=3D $(CURL_LIBS) +libblock.fa-libs +=3D $(RBD_LIBS) +libblock.fa-libs +=3D $(GLUSTERFS_LIBS) +libblock.fa-libs +=3D $(VXHS_LIBS) +libblock.fa-libs +=3D $(LIBSSH_LIBS) +libblock.fa-libs +=3D $(BZIP2_LIBS) +libblock.fa-libs +=3D $(LZFSE_LIBS) +libblock.fa-libs +=3D $(if $(CONFIG_LINUX_AIO),-laio) +libblock.fa-libs +=3D $(LIBXML2_LIBS) =20 chardev-obj-y =3D chardev/libchardev.fa =20 @@ -40,7 +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 blockdev.o blockdev-nbd.o block/ +common-obj-y =3D blockdev.o blockdev-nbd.o common-obj-y +=3D bootdevice.o iothread.o common-obj-y +=3D dump/ common-obj-y +=3D job-qmp.o @@ -55,6 +63,16 @@ common-obj-$(CONFIG_LINUX) +=3D fsdev/ common-obj-y +=3D accel/ common-obj-y +=3D migration/ =20 +common-obj-$(if $(CONFIG_CURL),m) +=3D block-curl$(DSOSUF) +common-obj-$(if $(CONFIG_GLUSTERFS),m) +=3D block-gluster$(DSOSUF) +common-obj-$(if $(CONFIG_LIBISCSI),m) +=3D block-iscsi$(DSOSUF) +common-obj-$(if $(CONFIG_LIBNFS),m) +=3D block-nfs$(DSOSUF) +common-obj-$(if $(CONFIG_LIBSSH),m) +=3D block-ssh$(DSOSUF) +common-obj-$(if $(CONFIG_RBD),m) +=3D block-rbd$(DSOSUF) + +common-obj-$(if $(CONFIG_LZFSE),m) +=3D block-dmg-lzfse$(DSOSUF) +common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=3D block-dmg-bz2= $(DSOSUF) + common-obj-y +=3D audio/ common-obj-m +=3D audio/ common-obj-y +=3D hw/ diff --git a/Makefile.target b/Makefile.target index 6b9de09..c0575da 100644 --- a/Makefile.target +++ b/Makefile.target @@ -199,13 +199,12 @@ common-obj-m :=3D include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ + block-obj-y \ chardev-obj-y \ crypto-obj-y \ io-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ - block-obj-y \ - block-obj-m \ common-obj-y \ common-obj-m) all-obj-y +=3D $(common-obj-y) diff --git a/block.c b/block.c index d9ac0e0..67c5028 100644 --- a/block.c +++ b/block.c @@ -29,7 +29,7 @@ #include "block/nbd.h" #include "block/qdict.h" #include "qemu/error-report.h" -#include "module_block.h" +#include "block/module_block.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/block/Makefile.objs b/block/Makefile.objs deleted file mode 100644 index 19c6f37..0000000 --- a/block/Makefile.objs +++ /dev/null @@ -1,75 +0,0 @@ -block-obj-y +=3D raw-format.o vmdk.o vpc.o -block-obj-$(CONFIG_QCOW1) +=3D qcow.o -block-obj-$(CONFIG_VDI) +=3D vdi.o -block-obj-$(CONFIG_CLOOP) +=3D cloop.o -block-obj-$(CONFIG_BOCHS) +=3D bochs.o -block-obj-$(CONFIG_VVFAT) +=3D vvfat.o -block-obj-$(CONFIG_DMG) +=3D dmg.o - -block-obj-y +=3D qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o= qcow2-cache.o qcow2-bitmap.o qcow2-threads.o -block-obj-$(CONFIG_QED) +=3D qed.o qed-l2-cache.o qed-table.o qed-cluster.o -block-obj-$(CONFIG_QED) +=3D qed-check.o -block-obj-y +=3D vhdx.o vhdx-endian.o vhdx-log.o -block-obj-y +=3D quorum.o -block-obj-y +=3D blkdebug.o blkverify.o blkreplay.o -block-obj-$(CONFIG_PARALLELS) +=3D parallels.o -block-obj-y +=3D blklogwrites.o -block-obj-y +=3D block-backend.o snapshot.o qapi.o -block-obj-$(CONFIG_WIN32) +=3D file-win32.o win32-aio.o -block-obj-$(CONFIG_POSIX) +=3D file-posix.o -block-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o -block-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o -block-obj-y +=3D null.o mirror.o commit.o io.o create.o amend.o -block-obj-y +=3D throttle-groups.o -block-obj-$(CONFIG_LINUX) +=3D nvme.o - -block-obj-y +=3D nbd.o -block-obj-$(CONFIG_SHEEPDOG) +=3D sheepdog.o -block-obj-$(CONFIG_LIBISCSI) +=3D iscsi.o -block-obj-$(if $(CONFIG_LIBISCSI),y,n) +=3D iscsi-opts.o -block-obj-$(CONFIG_LIBNFS) +=3D nfs.o -block-obj-$(CONFIG_CURL) +=3D curl.o -block-obj-$(CONFIG_RBD) +=3D rbd.o -block-obj-$(CONFIG_GLUSTERFS) +=3D gluster.o -block-obj-$(CONFIG_LIBSSH) +=3D ssh.o -block-obj-y +=3D accounting.o dirty-bitmap.o -block-obj-y +=3D write-threshold.o -block-obj-y +=3D backup.o -block-obj-$(CONFIG_REPLICATION) +=3D replication.o -block-obj-y +=3D throttle.o copy-on-read.o -block-obj-y +=3D block-copy.o - -block-obj-y +=3D crypto.o - -block-obj-y +=3D aio_task.o -block-obj-y +=3D backup-top.o -block-obj-y +=3D filter-compress.o -common-obj-y +=3D monitor/ -block-obj-y +=3D monitor/ - -block-obj-y +=3D stream.o - -common-obj-y +=3D qapi-sysemu.o - -nfs.o-libs :=3D $(LIBNFS_LIBS) -iscsi.o-cflags :=3D $(LIBISCSI_CFLAGS) -iscsi.o-libs :=3D $(LIBISCSI_LIBS) -curl.o-cflags :=3D $(CURL_CFLAGS) -curl.o-libs :=3D $(CURL_LIBS) -rbd.o-cflags :=3D $(RBD_CFLAGS) -rbd.o-libs :=3D $(RBD_LIBS) -gluster.o-cflags :=3D $(GLUSTERFS_CFLAGS) -gluster.o-libs :=3D $(GLUSTERFS_LIBS) -ssh.o-cflags :=3D $(LIBSSH_CFLAGS) -ssh.o-libs :=3D $(LIBSSH_LIBS) -block-obj-dmg-bz2-$(CONFIG_BZIP2) +=3D dmg-bz2.o -block-obj-$(if $(CONFIG_DMG),m,n) +=3D $(block-obj-dmg-bz2-y) -dmg-bz2.o-libs :=3D $(BZIP2_LIBS) -block-obj-$(if $(CONFIG_LZFSE),m,n) +=3D dmg-lzfse.o -dmg-lzfse.o-libs :=3D $(LZFSE_LIBS) -qcow.o-libs :=3D -lz -linux-aio.o-libs :=3D -laio -io_uring.o-cflags :=3D $(LINUX_IO_URING_CFLAGS) -io_uring.o-libs :=3D $(LINUX_IO_URING_LIBS) -parallels.o-cflags :=3D $(LIBXML2_CFLAGS) -parallels.o-libs :=3D $(LIBXML2_LIBS) diff --git a/block/meson.build b/block/meson.build new file mode 100644 index 0000000..a177f20 --- /dev/null +++ b/block/meson.build @@ -0,0 +1,111 @@ +block_ss.add(genh) +block_ss.add(files( + 'accounting.c', + 'aio_task.c', + 'amend.c', + 'backup.c', + 'backup-top.c', + 'blkdebug.c', + 'blklogwrites.c', + 'blkreplay.c', + 'blkverify.c', + 'block-backend.c', + 'block-copy.c', + 'commit.c', + 'copy-on-read.c', + 'create.c', + 'crypto.c', + 'dirty-bitmap.c', + 'filter-compress.c', + 'io.c', + 'mirror.c', + 'nbd.c', + 'null.c', + 'qapi.c', + 'qcow2-bitmap.c', + 'qcow2-cache.c', + 'qcow2-cluster.c', + 'qcow2-refcount.c', + 'qcow2-snapshot.c', + 'qcow2-threads.c', + 'qcow2.c', + 'quorum.c', + 'raw-format.c', + 'snapshot.c', + 'throttle-groups.c', + 'throttle.c', + 'vhdx-endian.c', + 'vhdx-log.c', + 'vhdx.c', + 'vmdk.c', + 'vpc.c', + 'write-threshold.c', +), zstd) + +block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c')) +block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c')) +block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c')) +block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c')) +block_ss.add(when: 'CONFIG_VVFAT', if_true: files('vvfat.c')) +block_ss.add(when: 'CONFIG_DMG', if_true: files('dmg.c')) +block_ss.add(when: 'CONFIG_QED', if_true: files( + 'qed-check.c', + 'qed-cluster.c', + 'qed-l2-cache.c', + 'qed-table.c', + 'qed.c', +)) +block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], if_true: files('parallel= s.c')) +block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-a= io.c')) +block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref,= iokit]) +block_ss.add(when: 'CONFIG_LIBISCSI', if_true: files('iscsi-opts.c')) +block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c')) +block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c')) +block_ss.add(when: 'CONFIG_SHEEPDOG', if_true: files('sheepdog.c')) +block_ss.add(when: ['CONFIG_LINUX_AIO', libaio], if_true: files('linux-aio= .c')) +block_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: fil= es('io_uring.c')) + +block_modules =3D [] + +modsrc =3D [] +foreach m : [ + ['CONFIG_CURL', 'curl', [curl, glib], 'curl.c'], + ['CONFIG_GLUSTERFS', 'gluster', glusterfs, 'gluster.c'], + ['CONFIG_LIBISCSI', 'iscsi', libiscsi, 'iscsi.c'], + ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'], + ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'], + ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'], +] + if config_host.has_key(m[0]) + if enable_modules + modsrc +=3D files(m[3]) + endif + block_modules +=3D [[m[1], files(m[3]), m[2]]] + endif +endforeach + +# those are not exactly regular block modules, so treat them apart +if 'CONFIG_DMG' in config_host + foreach m : [ + ['CONFIG_LZFSE', 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], + ['CONFIG_BZIP2', 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] + ] + if config_host.has_key(m[0]) + block_modules +=3D [[m[1], files(m[3]), m[2]]] + endif + endforeach +endif + +module_block_py =3D find_program('../scripts/modules/module_block.py') +module_block_h =3D custom_target('module_block.h', + output: 'module_block.h', + input: modsrc, + command: [module_block_py, '@OUTPUT0@', mod= src]) +block_ss.add(module_block_h) + +block_ss.add(files('stream.c')) + +softmmu_ss.add(files('qapi-sysemu.c')) +subdir('monitor') + +modules +=3D {'block': block_modules} diff --git a/block/monitor/Makefile.objs b/block/monitor/Makefile.objs deleted file mode 100644 index 39acf85..0000000 --- a/block/monitor/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-y +=3D block-hmp-cmds.o -block-obj-y +=3D bitmap-qmp-cmds.o diff --git a/block/monitor/meson.build b/block/monitor/meson.build new file mode 100644 index 0000000..374aac1 --- /dev/null +++ b/block/monitor/meson.build @@ -0,0 +1,2 @@ +softmmu_ss.add(files('block-hmp-cmds.c')) +block_ss.add(files('bitmap-qmp-cmds.c')) diff --git a/configure b/configure index f1a9824..200c5f7 100755 --- a/configure +++ b/configure @@ -2628,8 +2628,6 @@ if test "$zstd" !=3D "no" ; then if $pkg_config --atleast-version=3D$libzstd_minver libzstd ; then zstd_cflags=3D"$($pkg_config --cflags libzstd)" zstd_libs=3D"$($pkg_config --libs libzstd)" - LIBS=3D"$zstd_libs $LIBS" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $zstd_cflags" zstd=3D"yes" else if test "$zstd" =3D "yes" ; then @@ -4047,7 +4045,8 @@ if test "$zlib" !=3D "no" ; then int main(void) { zlibVersion(); return 0; } EOF if compile_prog "" "-lz" ; then - LIBS=3D"$LIBS -lz" + zlib_libs=3D-lz + LIBS=3D"$LIBS $zlib_libs" else error_exit "zlib check failed" \ "Make sure to have the zlib libs and headers installed." @@ -7324,7 +7323,11 @@ fi if test "$posix_memalign" =3D "yes" ; then echo "CONFIG_POSIX_MEMALIGN=3Dy" >> $config_host_mak fi - +if test "$zlib" !=3D "no" ; then + echo "CONFIG_ZLIB=3Dy" >> $config_host_mak + echo "ZLIB_CFLAGS=3D$zlib_cflags" >> $config_host_mak + echo "ZLIB_LIBS=3D$zlib_libs" >> $config_host_mak +fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak fi @@ -7394,6 +7397,8 @@ fi =20 if test "$zstd" =3D "yes" ; then echo "CONFIG_ZSTD=3Dy" >> $config_host_mak + echo "ZSTD_CFLAGS=3D$zstd_cflags" >> $config_host_mak + echo "ZSTD_LIBS=3D$zstd_libs" >> $config_host_mak fi =20 if test "$libiscsi" =3D "yes" ; then @@ -7426,7 +7431,6 @@ if test "$qom_cast_debug" =3D "yes" ; then fi if test "$rbd" =3D "yes" ; then echo "CONFIG_RBD=3Dm" >> $config_host_mak - echo "RBD_CFLAGS=3D$rbd_cflags" >> $config_host_mak echo "RBD_LIBS=3D$rbd_libs" >> $config_host_mak fi =20 diff --git a/meson.build b/meson.build index aa813a2..62ceb46 100644 --- a/meson.build +++ b/meson.build @@ -97,6 +97,26 @@ pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') endif +libaio =3D cc.find_library('aio', required: false) +zlib =3D not_found +if 'CONFIG_ZLIB' in config_host + zlib =3D declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].spl= it(), + link_args: config_host['ZLIB_LIBS'].split()) +endif +linux_io_uring =3D not_found +if 'CONFIG_LINUX_IO_URING' in config_host + linux_io_uring =3D declare_dependency(compile_args: config_host['LINUX_I= O_URING_CFLAGS'].split(), + link_args: config_host['LINUX_IO_URI= NG_LIBS'].split()) +endif +libxml2 =3D not_found +if 'CONFIG_LIBXML2' in config_host + libxml2 =3D declare_dependency(compile_args: config_host['LIBXML2_CFLAGS= '].split(), + link_args: config_host['LIBXML2_LIBS'].spli= t()) +endif +libnfs =3D not_found +if 'CONFIG_LIBNFS' in config_host + libnfs =3D declare_dependency(link_args: config_host['LIBNFS_LIBS'].spli= t()) +endif libattr =3D not_found if 'CONFIG_ATTR' in config_host libattr =3D declare_dependency(link_args: config_host['LIBATTR_LIBS'].sp= lit()) @@ -121,6 +141,11 @@ if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), link_args: config_host['LIBISCSI_LIBS'].sp= lit()) endif +zstd =3D not_found +if 'CONFIG_ZSTD' in config_host + zstd =3D declare_dependency(compile_args: config_host['ZSTD_CFLAGS'].spl= it(), + link_args: config_host['ZSTD_LIBS'].split()) +endif gbm =3D not_found if 'CONFIG_GBM' in config_host gbm =3D declare_dependency(compile_args: config_host['GBM_CFLAGS'].split= (), @@ -140,6 +165,28 @@ libudev =3D not_found if 'CONFIG_LIBUDEV' in config_host libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) endif +rbd =3D not_found +if 'CONFIG_RBD' in config_host + rbd =3D declare_dependency(link_args: config_host['RBD_LIBS'].split()) +endif +glusterfs =3D not_found +if 'CONFIG_GLUSTERFS' in config_host + glusterfs =3D declare_dependency(compile_args: config_host['GLUSTERFS_CF= LAGS'].split(), + link_args: config_host['GLUSTERFS_LIBS'].= split()) +endif +libssh =3D not_found +if 'CONFIG_LIBSSH' in config_host + libssh =3D declare_dependency(compile_args: config_host['LIBSSH_CFLAGS']= .split(), + link_args: config_host['LIBSSH_LIBS'].split(= )) +endif +libbzip2 =3D not_found +if 'CONFIG_BZIP2' in config_host + libbzip2 =3D declare_dependency(link_args: config_host['BZIP2_LIBS'].spl= it()) +endif +liblzfse =3D not_found +if 'CONFIG_LZFSE' in config_host + liblzfse =3D declare_dependency(link_args: config_host['LZFSE_LIBS'].spl= it()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -446,6 +493,18 @@ subdir('chardev') subdir('fsdev') subdir('target') =20 +block_ss.add(files( + 'block.c', + 'blockjob.c', + 'job.c', + 'qemu-io-cmds.c', +)) +block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c')) + +subdir('nbd') +subdir('scsi') +subdir('block') + mods =3D [] block_mods =3D [] softmmu_mods =3D [] @@ -480,6 +539,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qemu= .syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 +block_ss =3D block_ss.apply(config_host, strict: false) +libblock =3D static_library('block', block_ss.sources(), + dependencies: block_ss.dependencies(), + link_depends: block_syms, + name_suffix: 'fa', + build_by_default: false) + +block =3D declare_dependency(link_whole: [libblock], + link_args: '@block.syms') =20 foreach m : mods shared_module(m['dir'] + '-' + m['name'], diff --git a/nbd/Makefile.objs b/nbd/Makefile.objs deleted file mode 100644 index eb3dd44..0000000 --- a/nbd/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -block-obj-y +=3D server.o client.o common.o diff --git a/nbd/meson.build b/nbd/meson.build new file mode 100644 index 0000000..0c00a77 --- /dev/null +++ b/nbd/meson.build @@ -0,0 +1,5 @@ +block_ss.add(files( + 'client.c', + 'common.c', + 'server.c', +)) diff --git a/rules.mak b/rules.mak index 9da9dcd..8285fe5 100644 --- a/rules.mak +++ b/rules.mak @@ -374,8 +374,7 @@ define unnest-vars # Find all the .mo objects in variables and add dependency rul= es # according to .mo-objs. Report error if not set $(if $($o-objs), - $(eval $(o:%.mo=3D%$(DSOSUF)): module-common.o $($o-objs)), - $(error $o added in $v but $o-objs is not set))) + $(eval $(o:%.mo=3D%$(DSOSUF)): module-common.o $($o-objs))= )) $(shell mkdir -p ./ $(sort $(dir $($v)))) # Include all the .d files $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.= o,$($v))))) diff --git a/scsi/Makefile.objs b/scsi/Makefile.objs deleted file mode 100644 index bb8789c..0000000 --- a/scsi/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -block-obj-y +=3D utils.o - -block-obj-$(CONFIG_LINUX) +=3D pr-manager.o pr-manager-helper.o -block-obj-$(call lnot,$(CONFIG_LINUX)) +=3D pr-manager-stub.o diff --git a/scsi/meson.build b/scsi/meson.build new file mode 100644 index 0000000..53f3a1f --- /dev/null +++ b/scsi/meson.build @@ -0,0 +1,4 @@ +block_ss.add(files('utils.c')) +block_ss.add(when: 'CONFIG_LINUX', + if_true: files('pr-manager.c', 'pr-manager-helper.c'), + if_false: files('pr-manager-stub.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081165; cv=none; d=zohomail.com; s=zohoarc; b=msd5RxLEPkIaIuc2yv+HfL49ZUu7wPGIsSKJ+PinRRogesWWe+8BF8osmqAoxEjtMKy3OV+FEIcB9rHb7JPXKUneFJnpWqa7ViYl6LuTM40VC+jZ9gkx9rYTQK9ln/ZnoVtIfto0Uq8Bmp5w9uqdDSh2qZeV3+z8x0qK4A5wT3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081165; 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=HmSH9Si3BMMH2jyU54LL7p+W+sorbpHjWFLkPgkV43I=; b=AwmG9fjsUT3C2GEAMHehSvn/bIMp7Hi/CGIPaF2H5iepM8G3l07As53YYCYM4VzRgWHDzVOPvbPN3lJO+LitqKOb5MOr+v6flTi9yLN5hGjZw2+AB1Wy4xkKD7/EXoqCtC/pdKm9PblFqRr2KRQDYjZ7SUqZ+eGmVey4X9wjGI4= 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 159708116557074.77993025445289; Mon, 10 Aug 2020 10:39:25 -0700 (PDT) Received: from localhost ([::1]:38700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Blc-0008DL-7O for importer@patchew.org; Mon, 10 Aug 2020 13:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKL-0000ei-F2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33727 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 1k5BKJ-00037N-ED for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:13 -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-129-rYimQlVLMrW7mTHaUpcnFw-1; Mon, 10 Aug 2020 13:10:52 -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 BB9B919067E5 for ; Mon, 10 Aug 2020 17:10:51 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53865F1E9; Mon, 10 Aug 2020 17:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079468; 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=HmSH9Si3BMMH2jyU54LL7p+W+sorbpHjWFLkPgkV43I=; b=QS+DAwayNszfCaTL65NM4U88SzKZsu4D2C1cZgq84ygds7bsgsWcX+X/skyql4JKCEuKKD ck1O6ni7iuiB2H9Wda+4yxVNmSS9jzFQ/ZCoRhgkzcu6iCT9FzfTl+Ykizclb5Vink+gb+ LLO7PaSUCV1S9g8mePduveb9O8n5OIc= X-MC-Unique: rYimQlVLMrW7mTHaUpcnFw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 062/147] meson: qemu-{img,io,nbd} Date: Mon, 10 Aug 2020 19:07:40 +0200 Message-Id: <1597079345-42801-63-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 | 5 ----- configure | 3 +-- meson.build | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f251703..c269823 100644 --- a/Makefile +++ b/Makefile @@ -273,11 +273,6 @@ Makefile: $(version-obj-y) =20 COMMON_LDADDS =3D libqemuutil.a =20 -qemu-img.o: qemu-img-cmds.h - -qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y= ) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y= ) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) = $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-o= bj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) diff --git a/configure b/configure index 200c5f7..a8ad31c 100755 --- a/configure +++ b/configure @@ -6647,9 +6647,8 @@ fi tools=3D"" helpers=3D"" if test "$want_tools" =3D "yes" ; then - tools=3D"qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then - tools=3D"qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools" + tools=3D"qemu-storage-daemon\$(EXESUF) $tools" fi fi if test "$softmmu" =3D yes ; then diff --git a/meson.build b/meson.build index 62ceb46..ad38f29 100644 --- a/meson.build +++ b/meson.build @@ -338,7 +338,7 @@ if have_system ] endif foreach d : hx_headers - custom_target(d[1], + hxdep +=3D custom_target(d[1], input: files(d[0]), output: d[1], capture: true, @@ -547,7 +547,8 @@ libblock =3D static_library('block', block_ss.sources(), build_by_default: false) =20 block =3D declare_dependency(link_whole: [libblock], - link_args: '@block.syms') + link_args: '@block.syms', + dependencies: [crypto, io]) =20 foreach m : mods shared_module(m['dir'] + '-' + m['name'], @@ -625,6 +626,15 @@ if 'CONFIG_GUEST_AGENT' in config_host endif =20 if have_tools + qemu_img =3D executable('qemu-img', [files('qemu-img.c'), hxdep], + dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) + qemu_io =3D executable('qemu-io', files('qemu-io.c'), + dependencies: [block, qemuutil], install: true) + if host_machine.system() =3D=3D 'linux' or host_machine.system() =3D=3D = 'sunos' or host_machine.system().endswith('bsd') + qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), + dependencies: [block, qemuutil], install: true) + endif + subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080629; cv=none; d=zohomail.com; s=zohoarc; b=bMPpLb0hOIbi5JpL70h3fOmOqkiLwMMwX+OJSTWwlblITgtB1zgZPIKFYDMpYbFHaKXc0x0Pby9DT8l1wnOe8cepQz1oioWmcgRqw4ezs+KDHgD1O963Nfk6BSC29GcOjE937zhITh1G9z6qh31uJ3cArL1+fzj8FQcrqh11mB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080629; 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=EMUTNvWn8e8ORTRWT60Uub01xjy6NRJPkcAGvJMMBFs=; b=QIU6vNKNCvDqmfrhb2r0hek+bJV6Pv1QX1s5PwZawOPMM4hXlUVTRL7AM/z9yt0b/XkZeCo0NXM/79bmTO8E6kkt6CihovaggU1C2IdVNt54hW1zqmwD3e8zVm0ixcK29oSKARAMMFV3FsqxLh3F6wqVgQ10/TdhLQvwlMJQl+U= 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 1597080629535242.70422405441855; Mon, 10 Aug 2020 10:30:29 -0700 (PDT) Received: from localhost ([::1]:49298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bcx-0006XG-Fd for importer@patchew.org; Mon, 10 Aug 2020 13:30:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BK7-0000PH-Rw for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28592 helo=us-smtp-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 1k5BK4-00036B-Oc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:59 -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-404-JmPuapHxPyCSpf3CiQGx_g-1; Mon, 10 Aug 2020 13:10:53 -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 28190107ACCA for ; Mon, 10 Aug 2020 17:10:53 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32F1C5F1E9; Mon, 10 Aug 2020 17:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079455; 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=EMUTNvWn8e8ORTRWT60Uub01xjy6NRJPkcAGvJMMBFs=; b=d1lERXVD3lVhr87XjzuDmQN4cZHxcwoWamY2QupQxV0ajChoMDX2PV/e4Y+BKqIwrmo34n h+0jwmk7Yu+mNe+V2/umwX6sM1/B1n+FvEuF2W3Rco7tBywDFTUvsa3hD4wszl5PcSGefz KgYr5VR51iKh6rTTBEqmVwcVNo+f3XE= X-MC-Unique: JmPuapHxPyCSpf3CiQGx_g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 063/147] meson: qemu-pr-helper Date: Mon, 10 Aug 2020 19:07:41 +0200 Message-Id: <1597079345-42801-64-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 | 7 +------ configure | 3 --- meson.build | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c269823..9ca02de 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -HELPERS-y =3D $(HELPERS) +HELPERS-y =3D =20 # Sphinx does not allow building manuals into the same directory as # the source files, so if we're doing an in-tree QEMU build we must @@ -275,11 +275,6 @@ COMMON_LDADDS =3D libqemuutil.a =20 qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) =20 -scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-o= bj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -ifdef CONFIG_MPATH -scsi/qemu-pr-helper$(EXESUF): LIBS +=3D -ludev -lmultipath -lmpathpersist -endif - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h diff --git a/configure b/configure index a8ad31c..da082f4 100755 --- a/configure +++ b/configure @@ -6645,7 +6645,6 @@ if [ "$eventfd" =3D "yes" ]; then fi =20 tools=3D"" -helpers=3D"" if test "$want_tools" =3D "yes" ; then if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-storage-daemon\$(EXESUF) $tools" @@ -6669,7 +6668,6 @@ if test "$softmmu" =3D yes ; then fi mpath=3Dno fi - helpers=3D"$helpers scsi/qemu-pr-helper\$(EXESUF)" else if test "$virtfs" =3D yes; then error_exit "VirtFS is supported only on Linux" @@ -7747,7 +7745,6 @@ else QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES" fi =20 -echo "HELPERS=3D$helpers" >> $config_host_mak echo "TOOLS=3D$tools" >> $config_host_mak echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak diff --git a/meson.build b/meson.build index ad38f29..ae2716b 100644 --- a/meson.build +++ b/meson.build @@ -136,6 +136,10 @@ if 'CONFIG_XKBCOMMON' in config_host link_args: config_host['XKBCOMMON_LIBS'].= split()) endif rt =3D cc.find_library('rt', required: false) +libmpathpersist =3D not_found +if config_host.has_key('CONFIG_MPATH') + libmpathpersist =3D cc.find_library('mpathpersist') +endif libiscsi =3D not_found if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), @@ -621,6 +625,7 @@ foreach target : target_dirs endforeach =20 # Other build targets + if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif @@ -662,6 +667,11 @@ if have_tools dependencies: [qemuutil, libcap_ng], install: true, install_dir: get_option('libexecdir')) + + executable('qemu-pr-helper', files('scsi/qemu-pr-helper.c', 'scsi/util= s.c'), + dependencies: [authz, crypto, io, qom, qemuutil, + libcap_ng, libudev, libmpathpersist], + install: true) endif =20 if 'CONFIG_IVSHMEM' in config_host --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080955; cv=none; d=zohomail.com; s=zohoarc; b=duChlRYJ8hEIr8KwYzCLQ76b4YNS9ZBV3geF9rlGOhJ8EmSkxKQE86IS2xBpYI4VbNy4stgl7BPIMcm210bmRy8qHMt23Kdp1dye3nsFlMIfPutWyRuWEasGxiCDdErwwPvDj0MtMTL+HPuSfDpwip8FjKtkBlmcf9vDKYB7v34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080955; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=reC3lBwKIQFjDVdgDFZAHnhVcRPmFJMcMwaWSdW+vBs=; b=NvnJkj/vhxe7UHpFvgg0y4df/laHwHArRXvGsQa+gfdhFzgbqf2KCsHH9NUlh1V5Ud2OWnm24YN519ENwItP57qGgQyJzIwFE6KPwrABMbPRzAGULvTmHZpJ5i2cUjPptjJIMRhzM6IvC5fRmUe7j3/qh4N8HHZoIuMEm4ULDC4= 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 1597080955244782.2258304148913; Mon, 10 Aug 2020 10:35:55 -0700 (PDT) Received: from localhost ([::1]:48884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BiE-0000yd-1D for importer@patchew.org; Mon, 10 Aug 2020 13:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BK9-0000Qj-4p for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:01 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:25998 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 1k5BK5-00036W-GX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:00 -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-55-K1385yUsOMSbTP0v3b3cAQ-1; Mon, 10 Aug 2020 13:10:55 -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 4FA0C91270 for ; Mon, 10 Aug 2020 17:10:54 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 957085F1E9 for ; Mon, 10 Aug 2020 17:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=reC3lBwKIQFjDVdgDFZAHnhVcRPmFJMcMwaWSdW+vBs=; b=ggapjWtnZzIQyAte8Z07NG1Wt9khNALzbuSv2WRbCuZVpUGtF5JJz7yWuNwjL5Uzm4t+OT 2IuZWeTyzmBxdgMbiek3mwGdI8TlTrcZsJNETTNLsIBVHGSJ46Fjg8wy3jBilolMWJ9DdK Mjl4WR8aN9U0vNQE5GbYThq3QKE99OQ= X-MC-Unique: K1385yUsOMSbTP0v3b3cAQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 064/147] configure, Makefile; remove TOOLS and HELPERS-y variable Date: Mon, 10 Aug 2020 19:07:42 +0200 Message-Id: <1597079345-42801-65-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> 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 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Everything involving tools is now done by meson. Signed-off-by: Paolo Bonzini --- Makefile | 22 ++-------------------- configure | 7 ------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 9ca02de..ac1e31f 100644 --- a/Makefile +++ b/Makefile @@ -122,8 +122,6 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -HELPERS-y =3D - # Sphinx does not allow building manuals into the same directory as # the source files, so if we're doing an in-tree QEMU build we must # build the manuals into a subdirectory (and then install them from @@ -172,7 +170,7 @@ dummy :=3D $(call unnest-vars,, \ =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules =20 config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak @@ -283,7 +281,7 @@ clean: recurse-clean ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + - rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ + rm -f TAGS cscope.* *.pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) =20 @@ -432,12 +430,6 @@ export DESTDIR install: all $(if $(BUILD_DOCS),install-doc) \ install-datadir install-localstatedir install-includedir \ recurse-install -ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) -endif -ifneq ($(HELPERS-y),) - $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir)) -endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) endif @@ -697,16 +689,6 @@ endif $(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \ ))) \ echo '') - @$(if $(HELPERS-y), \ - echo 'Helper targets:'; \ - $(foreach t, $(HELPERS-y), \ - $(call print-help-run,$(t),Build $(shell basename $(t)));) \ - echo '') - @$(if $(TOOLS), \ - echo 'Tools targets:'; \ - $(foreach t, $(TOOLS), \ - $(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \ - echo '') @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) $(call print-help,distclean,Remove all generated files) diff --git a/configure b/configure index da082f4..088072c 100755 --- a/configure +++ b/configure @@ -6644,12 +6644,6 @@ if [ "$eventfd" =3D "yes" ]; then ivshmem=3Dyes fi =20 -tools=3D"" -if test "$want_tools" =3D "yes" ; then - if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then - tools=3D"qemu-storage-daemon\$(EXESUF) $tools" - fi -fi if test "$softmmu" =3D yes ; then if test "$linux" =3D yes; then if test "$virtfs" !=3D no && test "$cap_ng" =3D yes && test "$attr" = =3D yes ; then @@ -7745,7 +7739,6 @@ else QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES" fi =20 -echo "TOOLS=3D$tools" >> $config_host_mak echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak echo "INSTALL=3D$install" >> $config_host_mak --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081279; cv=none; d=zohomail.com; s=zohoarc; b=C7WLYUSLdHnhFo3l+fKfAklNB67t/aTOO7UYn2Yqchtt+X3Cp/5yDqOdHOl1kMKUvevpFITEIcNFB6bpMH8qUjb2Lt0W+sWrvtlHtgJmU662peyZ5mdt7eFIjSRPEDahs4I+aGgPChynZjlCP3tWDCYfJH0f4C2GU/NhZZzxCxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081279; 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=XG+3xyVqNZquj8YuYINwUMMECtoqDwaQ/KCFFZwt1jU=; b=FegZAfQymoTgnjw5Pz3X+AYT5zwGFfTc/xLcbE0u6WFvQeTjKzhfJuitiEwWrDUHTPnKX/RBVfVqe2lbTYZ0sxpTX1hRS2PHkcPExv9Bmfh1tbNBN3y7K/+Qn04dG/C2jnIe3qb+7FnKttkF1gCzYJSFY7mCoUoutmDEWRzynIg= 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 1597081279928584.6271419977121; Mon, 10 Aug 2020 10:41:19 -0700 (PDT) Received: from localhost ([::1]:47820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BnS-0003Vt-8Q for importer@patchew.org; Mon, 10 Aug 2020 13:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKA-0000Sp-T7 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49605 helo=us-smtp-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 1k5BK8-00036i-PA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:02 -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-357-IOAm9n5ZPMiGDTI28Y2-yA-1; Mon, 10 Aug 2020 13:10:58 -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 50A591005504 for ; Mon, 10 Aug 2020 17:10:57 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC2CB5F1E9; Mon, 10 Aug 2020 17:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079460; 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=XG+3xyVqNZquj8YuYINwUMMECtoqDwaQ/KCFFZwt1jU=; b=H8hl2MfNrQMyQdNK85d6EVY0zYnc8aX5d7gUBtKiAczy7NfvEhLvReMzeodOkBnPpqfqqk tVpLA9o5o94H1gYo1U+bMh8U0ORi7WimHFDgowzAugsOQPbFwv4zArZzXxetjqTz3P7cFp Ehb2nylyB4yyKVOaDqza9fIWXwW76IE= X-MC-Unique: IOAm9n5ZPMiGDTI28Y2-yA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 065/147] meson: convert chardev directory to Meson (emulator part) Date: Mon, 10 Aug 2020 19:07:43 +0200 Message-Id: <1597079345-42801-66-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 2 -- Makefile.target | 2 ++ chardev/Makefile.objs | 10 ---------- chardev/meson.build | 11 +++++++++++ configure | 2 ++ meson.build | 14 ++++++++++++++ 6 files changed, 29 insertions(+), 12 deletions(-) delete mode 100644 chardev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index eeaa0cf..e43526f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -87,8 +87,6 @@ common-obj-y +=3D dma-helpers.o common-obj-$(CONFIG_TPM) +=3D tpm.o =20 common-obj-y +=3D backends/ -common-obj-y +=3D chardev/ -common-obj-m +=3D chardev/ =20 common-obj-$(CONFIG_SECCOMP) +=3D qemu-seccomp.o qemu-seccomp.o-cflags :=3D $(SECCOMP_CFLAGS) diff --git a/Makefile.target b/Makefile.target index c0575da..c8c4b70 100644 --- a/Makefile.target +++ b/Makefile.target @@ -104,6 +104,7 @@ all: $(PROGS) stap @true =20 obj-y +=3D $(LIBQEMU) + obj-y +=3D trace/ =20 ######################################################### @@ -167,6 +168,7 @@ LIBS :=3D $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS :=3D $(LIBS) endif +LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs deleted file mode 100644 index 6662d0d..0000000 --- a/chardev/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -chardev-obj-$(CONFIG_SOFTMMU) +=3D chardev-sysemu.o -common-obj-$(CONFIG_SOFTMMU) +=3D msmouse.o wctablet.o testdev.o - -ifeq ($(CONFIG_BRLAPI),y) -common-obj-m +=3D baum.o -baum.o-cflags :=3D $(SDL_CFLAGS) -baum.o-libs :=3D $(BRLAPI_LIBS) -endif - -common-obj-$(CONFIG_SPICE) +=3D spice.o diff --git a/chardev/meson.build b/chardev/meson.build index a2e671d..2122505 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -30,3 +30,14 @@ libchardev =3D static_library('chardev', chardev_ss.sour= ces(), build_by_default: false) =20 chardev =3D declare_dependency(link_whole: libchardev) + +softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testd= ev.c')) +softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) + +chardev_modules =3D [] + +if config_host.has_key('CONFIG_BRLAPI') and config_host.has_key('CONFIG_SD= L') + chardev_modules +=3D [['baum', files('baum.c'), [sdl, brlapi]]] +endif + +modules +=3D { 'chardev': chardev_modules } diff --git a/configure b/configure index 088072c..875f088 100755 --- a/configure +++ b/configure @@ -7321,6 +7321,8 @@ if test "$zlib" !=3D "no" ; then fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak + echo "SPICE_CFLAGS=3D$spice_cflags" >> $config_host_mak + echo "SPICE_LIBS=3D$spice_libs" >> $config_host_mak fi =20 if test "$smartcard" =3D "yes" ; then diff --git a/meson.build b/meson.build index ae2716b..534ed4c 100644 --- a/meson.build +++ b/meson.build @@ -135,6 +135,11 @@ if 'CONFIG_XKBCOMMON' in config_host xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), link_args: config_host['XKBCOMMON_LIBS'].= split()) endif +spice =3D not_found +if 'CONFIG_SPICE' in config_host + spice =3D declare_dependency(compile_args: config_host['SPICE_CFLAGS'].s= plit(), + link_args: config_host['SPICE_LIBS'].split()) +endif rt =3D cc.find_library('rt', required: false) libmpathpersist =3D not_found if config_host.has_key('CONFIG_MPATH') @@ -169,6 +174,15 @@ libudev =3D not_found if 'CONFIG_LIBUDEV' in config_host libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) endif +brlapi =3D not_found +if 'CONFIG_BRLAPI' in config_host + brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) +endif +sdl =3D not_found +if 'CONFIG_SDL' in config_host + sdl =3D declare_dependency(compile_args: config_host['SDL_CFLAGS'].split= (), + link_args: config_host['SDL_LIBS'].split()) +endif rbd =3D not_found if 'CONFIG_RBD' in config_host rbd =3D declare_dependency(link_args: config_host['RBD_LIBS'].split()) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081053; cv=none; d=zohomail.com; s=zohoarc; b=ENEjMiqaiOAQyiKWhm7iJaNSo2WDc1xTYElfVgowvVIqkZC+uPu1jPSuMSy+7d577eHKkXJo7svUraMs5IEv3BebrGoh2RMKtJPBrC1QooSyFMCbnl1WNT2KZn4W5X9W+dPgj65Nv3f/t6jKCSqb7xVz7eXAGEdP5DBZCduIVUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081053; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=w2spgkFB82WszMrpSBEUVgDMi800gtbbFmvrmgwdb5o=; b=enObKKJnweEPbHNU+wHvf89j6df/w5nXD6T2qZyDo8cXGnBXpkQE/Q1JuwsRhMha2VpaTkr3fA0xVDML3y6wmnsM1ZNgHff067Cqw6L7gNHx5JSmj5+CNPi1wwd3truh2wpQ5fdQnnIIQg67k3m4MqJfFPJ8pN9EgX3hrLXz1vw= 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 1597081053413945.8972605672075; Mon, 10 Aug 2020 10:37:33 -0700 (PDT) Received: from localhost ([::1]:57820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bjn-0004YE-UL for importer@patchew.org; Mon, 10 Aug 2020 13:37:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKJ-0000bA-Qn for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28576 helo=us-smtp-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 1k5BKB-00036v-4f for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:11 -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-426-wQQ2LhjpPZq1QwsUZdEQ7A-1; Mon, 10 Aug 2020 13:10:59 -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 D599D8064A9 for ; Mon, 10 Aug 2020 17:10:58 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCBD05F1E9 for ; Mon, 10 Aug 2020 17:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=w2spgkFB82WszMrpSBEUVgDMi800gtbbFmvrmgwdb5o=; b=OtxQourvYlLalAN9UwvCePpxzpnfTKJa0XytbMWR34qPLkFnKnBnbyZO7/4bskyd2UDFWT n/XpjKgqhcC8pqRKZdJs+xPPsoowSzT3xSqwDhHHw39nxZ7QdeirjVvb4+5busrkuv3DFe HB7CKTBxzvXwHKhKnqwSDgd0+lDqv90= X-MC-Unique: wQQ2LhjpPZq1QwsUZdEQ7A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 066/147] meson: convert tests/qtest to meson Date: Mon, 10 Aug 2020 19:07:44 +0200 Message-Id: <1597079345-42801-67-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 3 + tests/Makefile.include | 47 +--- tests/meson.build | 1 + tests/qtest/Makefile.include | 332 -------------------= ---- tests/qtest/ac97-test.c | 2 +- tests/qtest/acpi-utils.h | 2 +- tests/qtest/ahci-test.c | 2 +- tests/qtest/arm-cpu-features.c | 2 +- tests/qtest/boot-order-test.c | 2 +- tests/qtest/boot-sector.c | 2 +- tests/qtest/boot-sector.h | 2 +- tests/qtest/boot-serial-test.c | 2 +- tests/qtest/cdrom-test.c | 2 +- tests/qtest/dbus-vmstate-test.c | 2 +- tests/qtest/device-introspect-test.c | 2 +- tests/qtest/device-plug-test.c | 2 +- tests/qtest/drive_del-test.c | 2 +- tests/qtest/ds1338-test.c | 2 +- tests/qtest/e1000-test.c | 2 +- tests/qtest/eepro100-test.c | 2 +- tests/qtest/endianness-test.c | 2 +- tests/qtest/es1370-test.c | 2 +- tests/qtest/fuzz/fuzz.c | 2 +- tests/qtest/fuzz/fuzz.h | 2 +- tests/qtest/fuzz/i440fx_fuzz.c | 2 +- tests/qtest/fuzz/qos_fuzz.c | 2 +- tests/qtest/fuzz/virtio_net_fuzz.c | 2 +- tests/qtest/fw_cfg-test.c | 2 +- tests/qtest/hd-geo-test.c | 2 +- tests/qtest/hexloader-test.c | 2 +- tests/qtest/ide-test.c | 2 +- tests/qtest/ipoctal232-test.c | 2 +- tests/qtest/ivshmem-test.c | 2 +- tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c | 4 +- tests/qtest/libqos/ahci.c | 6 +- tests/qtest/libqos/ahci.h | 6 +- tests/qtest/libqos/arm-imx25-pdk-machine.c | 6 +- tests/qtest/libqos/arm-n800-machine.c | 6 +- tests/qtest/libqos/arm-raspi2-machine.c | 4 +- tests/qtest/libqos/arm-sabrelite-machine.c | 4 +- tests/qtest/libqos/arm-smdkc210-machine.c | 4 +- tests/qtest/libqos/arm-virt-machine.c | 6 +- tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c | 4 +- tests/qtest/libqos/e1000e.c | 6 +- tests/qtest/libqos/e1000e.h | 2 +- tests/qtest/libqos/fw_cfg.c | 2 +- tests/qtest/libqos/i2c-imx.c | 2 +- tests/qtest/libqos/i2c-omap.c | 2 +- tests/qtest/libqos/i2c.c | 2 +- tests/qtest/libqos/i2c.h | 2 +- tests/qtest/libqos/libqos-pc.c | 6 +- tests/qtest/libqos/libqos-pc.h | 2 +- tests/qtest/libqos/libqos-spapr.c | 6 +- tests/qtest/libqos/libqos-spapr.h | 2 +- tests/qtest/libqos/libqos.c | 4 +- tests/qtest/libqos/libqos.h | 4 +- tests/qtest/{ =3D> libqos}/libqtest.h | 0 tests/qtest/libqos/malloc-pc.c | 4 +- tests/qtest/libqos/malloc-pc.h | 2 +- tests/qtest/libqos/malloc-spapr.c | 2 +- tests/qtest/libqos/malloc-spapr.h | 2 +- tests/qtest/libqos/malloc.c | 2 +- tests/qtest/libqos/meson.build | 57 ++++ tests/qtest/libqos/pci-pc.c | 2 +- tests/qtest/libqos/pci-pc.h | 6 +- tests/qtest/libqos/pci-spapr.c | 6 +- tests/qtest/libqos/pci-spapr.h | 6 +- tests/qtest/libqos/pci.c | 4 +- tests/qtest/libqos/pci.h | 2 +- tests/qtest/libqos/ppc64_pseries-machine.c | 4 +- tests/qtest/libqos/qgraph.c | 4 +- tests/qtest/libqos/qgraph.h | 6 +- tests/qtest/libqos/qgraph_internal.h | 4 +- tests/qtest/libqos/qos_external.c | 8 +- tests/qtest/libqos/qos_external.h | 4 +- tests/qtest/libqos/rtas.c | 2 +- tests/qtest/libqos/rtas.h | 2 +- tests/qtest/libqos/sdhci.c | 2 +- tests/qtest/libqos/sdhci.h | 2 +- tests/qtest/libqos/tpci200.c | 4 +- tests/qtest/libqos/usb.c | 2 +- tests/qtest/libqos/usb.h | 2 +- tests/qtest/libqos/virtio-9p.c | 4 +- tests/qtest/libqos/virtio-9p.h | 6 +- tests/qtest/libqos/virtio-balloon.c | 4 +- tests/qtest/libqos/virtio-balloon.h | 6 +- tests/qtest/libqos/virtio-blk.c | 4 +- tests/qtest/libqos/virtio-blk.h | 6 +- tests/qtest/libqos/virtio-mmio.c | 8 +- tests/qtest/libqos/virtio-mmio.h | 4 +- tests/qtest/libqos/virtio-net.c | 4 +- tests/qtest/libqos/virtio-net.h | 6 +- tests/qtest/libqos/virtio-pci.c | 14 +- tests/qtest/libqos/virtio-pci.h | 6 +- tests/qtest/libqos/virtio-rng.c | 4 +- tests/qtest/libqos/virtio-rng.h | 6 +- tests/qtest/libqos/virtio-scsi.c | 4 +- tests/qtest/libqos/virtio-scsi.h | 6 +- tests/qtest/libqos/virtio-serial.c | 4 +- tests/qtest/libqos/virtio-serial.h | 6 +- tests/qtest/libqos/virtio.c | 2 +- tests/qtest/libqos/virtio.h | 2 +- tests/qtest/libqos/x86_64_pc-machine.c | 2 +- tests/qtest/libqtest-single.h | 2 +- tests/qtest/libqtest.c | 2 +- tests/qtest/m48t59-test.c | 2 +- tests/qtest/machine-none-test.c | 2 +- tests/qtest/megasas-test.c | 2 +- tests/qtest/meson.build | 257 ++++++++++++++++++ tests/qtest/microbit-test.c | 2 +- tests/qtest/migration-helpers.h | 2 +- tests/qtest/migration-test.c | 4 +- tests/qtest/modules-test.c | 2 +- tests/qtest/ne2000-test.c | 2 +- tests/qtest/numa-test.c | 2 +- tests/qtest/nvme-test.c | 2 +- tests/qtest/pca9552-test.c | 2 +- tests/qtest/pci-test.c | 2 +- tests/qtest/pcnet-test.c | 2 +- tests/qtest/pflash-cfi02-test.c | 2 +- tests/qtest/pnv-xscom-test.c | 2 +- tests/qtest/prom-env-test.c | 2 +- tests/qtest/pvpanic-test.c | 2 +- tests/qtest/pxe-test.c | 2 +- tests/qtest/q35-test.c | 2 +- tests/qtest/qmp-cmd-test.c | 2 +- tests/qtest/qmp-test.c | 2 +- tests/qtest/qom-test.c | 2 +- tests/qtest/rtas-test.c | 2 +- tests/qtest/sdhci-test.c | 2 +- tests/qtest/spapr-phb-test.c | 2 +- tests/qtest/tco-test.c | 2 +- tests/qtest/test-filter-mirror.c | 2 +- tests/qtest/test-filter-redirector.c | 2 +- tests/qtest/test-hmp.c | 2 +- tests/qtest/tpm-crb-swtpm-test.c | 2 +- tests/qtest/tpm-tis-device-swtpm-test.c | 2 +- tests/qtest/tpm-tis-swtpm-test.c | 2 +- tests/qtest/tpm-util.c | 2 +- tests/qtest/tulip-test.c | 2 +- tests/qtest/virtio-rng-test.c | 2 +- tests/qtest/virtio-test.c | 2 +- tests/qtest/vmgenid-test.c | 2 +- tests/qtest/vmxnet3-test.c | 2 +- tests/qtest/wdt_ib700-test.c | 2 +- tests/test-qga.c | 2 +- tests/test-qgraph.c | 5 +- 147 files changed, 541 insertions(+), 589 deletions(-) delete mode 100644 tests/qtest/Makefile.include rename tests/qtest/{ =3D> libqos}/libqtest.h (100%) create mode 100644 tests/qtest/libqos/meson.build create mode 100644 tests/qtest/meson.build diff --git a/meson.build b/meson.build index 534ed4c..2ff1be0 100644 --- a/meson.build +++ b/meson.build @@ -523,6 +523,9 @@ subdir('nbd') subdir('scsi') subdir('block') =20 +# needed for fuzzing binaries +subdir('tests/qtest/libqos') + mods =3D [] block_mods =3D [] softmmu_mods =3D [] diff --git a/tests/Makefile.include b/tests/Makefile.include index 676d099..66acf9c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -109,6 +109,7 @@ check-unit-y +=3D tests/test-qht$(EXESUF) check-unit-y +=3D tests/test-qht-par$(EXESUF) check-unit-y +=3D tests/test-bitops$(EXESUF) check-unit-y +=3D tests/test-bitcnt$(EXESUF) +check-unit-y +=3D tests/test-qgraph$(EXESUF) check-unit-y +=3D tests/check-qom-interface$(EXESUF) check-unit-y +=3D tests/check-qom-proplist$(EXESUF) check-unit-y +=3D tests/test-qemu-opts$(EXESUF) @@ -306,19 +307,6 @@ tests/test-qapi-gen-timestamp: \ @rm -f tests/test-qapi-doc.texi @>$@ =20 -tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-= vmstate1-gen-timestamp ; -tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmst= ate1.xml - $(call quiet-command,$(GDBUS_CODEGEN) $< \ - --interface-prefix org.qemu --generate-c-code tests/qtest/dbus-vmstate1,= \ - "GEN","$(@:%-timestamp=3D%)") - @>$@ - -tests/qtest/dbus-vmstate-test.o-cflags :=3D -DSRCDIR=3D"$(SRC_PATH)" -tests/qtest/dbus-vmstate1.o-cflags :=3D $(GIO_CFLAGS) -tests/qtest/dbus-vmstate1.o-libs :=3D $(GIO_LIBS) - -tests/qtest/dbus-vmstate-test.o: tests/qtest/dbus-vmstate1.h - tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o @@ -333,6 +321,7 @@ tests/test-shift128$(EXESUF): tests/test-shift128.o $(t= est-util-obj-y) tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y) tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y) tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) +tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.= o $(test-util-obj-y) tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-ob= j-y) @@ -396,10 +385,8 @@ tests/migration/initrd-stress.img: tests/migration/str= ess$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -include $(SRC_PATH)/tests/qtest/Makefile.include - tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF) -tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) +tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-ut= il-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 @@ -440,14 +427,6 @@ define do_test_tap "TAP","$@") endef =20 -.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/a= ll $(check-qtest-y) - $(call do_test_human,$(check-qtest-$*-y:%=3Dtests/qtest/%$(EXESUF)) $(che= ck-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)), \ - QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ - QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) - -build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS)) $(check-qtest-= y) - build-unit: $(check-unit-y) =20 check-unit: $(check-unit-y) @@ -458,18 +437,9 @@ check-speed: $(check-speed-y) =20 # gtester tests with TAP output =20 -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qt= est-%.tap: %-softmmu/all $(check-qtest-y) - $(call do_test_tap, $(check-qtest-$*-y:%=3Dtests/qtest/%$(EXESUF)) $(chec= k-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)), \ - QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ - QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) - check-report-unit.tap: $(check-unit-y) $(call do_test_tap,$^) =20 -# Reports and overall runs - -check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS))= check-report-unit.tap - # Plugins ifeq ($(CONFIG_PLUGIN),y) .PHONY: plugins @@ -580,19 +550,16 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get= -vm-images =20 # Consolidated targets =20 -.PHONY: check-block check-qtest check-unit check check-clean get-vm-images -check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) +.PHONY: check-block check-unit check check-clean get-vm-images ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif -check-build: build-unit build-qtest +check-build: build-unit =20 -check: check-block check-unit check-qtest +check: check-block check-unit check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) rm -f tests/test-qapi-gen-timestamp - rm -f tests/qtest/dbus-vmstate1-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 check: check-block check-qapi-schema check-unit check-qtest check-decodetr= ee @@ -604,7 +571,5 @@ clean: check-clean all: $(QEMU_IOTESTS_HELPERS-y) =20 -include $(wildcard tests/*.d) --include $(wildcard tests/qtest/*.d) --include $(wildcard tests/qtest/libqos/*.d) =20 endif diff --git a/tests/meson.build b/tests/meson.build index 8be9c22..d724402 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -8,3 +8,4 @@ if 'CONFIG_TCG' in config_host endif =20 subdir('qapi-schema') +subdir('qtest') diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include deleted file mode 100644 index b0204e4..0000000 --- a/tests/qtest/Makefile.include +++ /dev/null @@ -1,332 +0,0 @@ -# All QTests for now are POSIX-only, but the dependencies are -# really in libqtest, not in the testcases themselves. - -check-qtest-generic-y +=3D cdrom-test -check-qtest-generic-y +=3D device-introspect-test -check-qtest-generic-y +=3D machine-none-test -check-qtest-generic-y +=3D qmp-test -check-qtest-generic-y +=3D qmp-cmd-test -check-qtest-generic-y +=3D qom-test -check-qtest-generic-$(CONFIG_MODULES) +=3D modules-test -check-qtest-generic-y +=3D test-hmp - -check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D rtl8139-test -check-qtest-pci-$(CONFIG_VGA) +=3D display-vga-test -check-qtest-pci-$(CONFIG_HDA) +=3D intel-hda-test -check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test - -DBUS_DAEMON :=3D $(shell which dbus-daemon 2>/dev/null) -ifneq ($(GDBUS_CODEGEN),) -ifneq ($(DBUS_DAEMON),) -# Temporarily disabled due to Patchew failures: -#check-qtest-pci-$(CONFIG_GIO) +=3D dbus-vmstate-test -endif -endif - -check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-i386-y +=3D fdc-test -check-qtest-i386-y +=3D ide-test -check-qtest-i386-$(CONFIG_TOOLS) +=3D ahci-test -check-qtest-i386-y +=3D hd-geo-test -check-qtest-i386-y +=3D boot-order-test -check-qtest-i386-y +=3D bios-tables-test -check-qtest-i386-$(CONFIG_SGA) +=3D boot-serial-test -check-qtest-i386-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-i386-y +=3D rtc-test -check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D ipmi-kcs-test -ifdef CONFIG_LINUX -check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test -endif -check-qtest-i386-y +=3D i440fx-test -check-qtest-i386-y +=3D fw_cfg-test -check-qtest-i386-y +=3D device-plug-test -check-qtest-i386-y +=3D drive_del-test -check-qtest-i386-$(CONFIG_WDT_IB700) +=3D wdt_ib700-test -check-qtest-i386-y +=3D tco-test -check-qtest-i386-y +=3D $(check-qtest-pci-y) -check-qtest-i386-$(CONFIG_PVPANIC) +=3D pvpanic-test -check-qtest-i386-$(CONFIG_I82801B11) +=3D i82801b11-test -check-qtest-i386-$(CONFIG_IOH3420) +=3D ioh3420-test -check-qtest-i386-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test -check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=3D u= sb-hcd-ehci-test -check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test -check-qtest-i386-y +=3D cpu-plug-test -check-qtest-i386-y +=3D q35-test -check-qtest-i386-y +=3D vmgenid-test -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-swtpm-test -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-test -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) +=3D tpm-tis-swtpm-test -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) +=3D tpm-tis-test -check-qtest-i386-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-i386-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector -check-qtest-i386-y +=3D migration-test -check-qtest-i386-y +=3D test-x86-cpuid-compat -check-qtest-i386-y +=3D numa-test - -check-qtest-x86_64-y +=3D $(check-qtest-i386-y) - -check-qtest-avr-y +=3D boot-serial-test - -check-qtest-alpha-y +=3D boot-serial-test -check-qtest-alpha-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-hppa-y +=3D boot-serial-test -check-qtest-hppa-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-m68k-y =3D boot-serial-test - -check-qtest-microblaze-y +=3D boot-serial-test - -check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips64-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips64el-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-moxie-y +=3D boot-serial-test - -check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-ppc-y +=3D boot-order-test -check-qtest-ppc-y +=3D prom-env-test -check-qtest-ppc-y +=3D drive_del-test -check-qtest-ppc-y +=3D boot-serial-test -check-qtest-ppc-$(CONFIG_M48T59) +=3D m48t59-test - -check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D device-plug-test -check-qtest-ppc64-$(CONFIG_POWERNV) +=3D pnv-xscom-test -check-qtest-ppc64-y +=3D migration-test -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D rtas-test -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test -check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-ppc64-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-ppc64-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector -check-qtest-ppc64-$(CONFIG_VGA) +=3D display-vga-test -check-qtest-ppc64-y +=3D numa-test -check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test -check-qtest-ppc64-y +=3D cpu-plug-test - -check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D endianness-test - -check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D endianness-test - -check-qtest-sparc-y +=3D prom-env-test -check-qtest-sparc-y +=3D m48t59-test -check-qtest-sparc-y +=3D boot-serial-test - -check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-sparc64-y +=3D prom-env-test -check-qtest-sparc64-y +=3D boot-serial-test - -check-qtest-arm-y +=3D arm-cpu-features -check-qtest-arm-y +=3D microbit-test -check-qtest-arm-y +=3D m25p80-test -check-qtest-arm-y +=3D test-arm-mptimer -check-qtest-arm-y +=3D boot-serial-test -check-qtest-arm-y +=3D hexloader-test -check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D pflash-cfi02-test - -check-qtest-aarch64-y +=3D arm-cpu-features -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) +=3D tpm-tis-device-test -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) +=3D tpm-tis-device-swtpm-test -check-qtest-aarch64-y +=3D numa-test -check-qtest-aarch64-y +=3D boot-serial-test -check-qtest-aarch64-y +=3D migration-test - -# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditio= nal -ifneq ($(ARCH),arm) -check-qtest-aarch64-y +=3D bios-tables-test -endif - -check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) - -check-qtest-xtensaeb-y +=3D $(check-qtest-xtensa-y) - -check-qtest-s390x-y =3D boot-serial-test -check-qtest-s390x-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-s390x-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-redirector -check-qtest-s390x-y +=3D drive_del-test -check-qtest-s390x-y +=3D device-plug-test -check-qtest-s390x-y +=3D virtio-ccw-test -check-qtest-s390x-y +=3D cpu-plug-test -check-qtest-s390x-y +=3D migration-test - -# libqos / qgraph : -libqgraph-obj-y =3D tests/qtest/libqos/qgraph.o - -libqos-core-obj-y =3D $(libqgraph-obj-y) tests/qtest/libqos/pci.o tests/qt= est/libqos/fw_cfg.o -libqos-core-obj-y +=3D tests/qtest/libqos/malloc.o -libqos-core-obj-y +=3D tests/qtest/libqos/libqos.o -libqos-spapr-obj-y =3D $(libqos-core-obj-y) tests/qtest/libqos/malloc-spap= r.o -libqos-spapr-obj-y +=3D tests/qtest/libqos/libqos-spapr.o -libqos-spapr-obj-y +=3D tests/qtest/libqos/rtas.o -libqos-spapr-obj-y +=3D tests/qtest/libqos/pci-spapr.o -libqos-pc-obj-y =3D $(libqos-core-obj-y) tests/qtest/libqos/pci-pc.o -libqos-pc-obj-y +=3D tests/qtest/libqos/malloc-pc.o tests/qtest/libqos/lib= qos-pc.o -libqos-pc-obj-y +=3D tests/qtest/libqos/ahci.o -libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/qtest/= libqos/usb.o - -# qos devices: -libqos-obj-y =3D $(libqgraph-obj-y) -libqos-obj-y +=3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -libqos-obj-y +=3D tests/qtest/libqos/qos_external.o -libqos-obj-y +=3D tests/qtest/libqos/e1000e.o -libqos-obj-y +=3D tests/qtest/libqos/i2c.o -libqos-obj-y +=3D tests/qtest/libqos/i2c-imx.o -libqos-obj-y +=3D tests/qtest/libqos/i2c-omap.o -libqos-obj-y +=3D tests/qtest/libqos/sdhci.o -libqos-obj-y +=3D tests/qtest/libqos/tpci200.o -libqos-obj-y +=3D tests/qtest/libqos/virtio.o -libqos-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/libqos/virtio-9p.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-balloon.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-blk.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-mmio.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-net.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-pci.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-pci-modern.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-rng.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-scsi.o -libqos-obj-y +=3D tests/qtest/libqos/virtio-serial.o - -# qos machines: -libqos-obj-y +=3D tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-imx25-pdk-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-n800-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-raspi2-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-sabrelite-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-smdkc210-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-virt-machine.o -libqos-obj-y +=3D tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o -libqos-obj-y +=3D tests/qtest/libqos/ppc64_pseries-machine.o -libqos-obj-y +=3D tests/qtest/libqos/x86_64_pc-machine.o - -# qos tests: -qos-test-obj-y +=3D tests/qtest/qos-test.o -qos-test-obj-y +=3D tests/qtest/ac97-test.o -qos-test-obj-y +=3D tests/qtest/ds1338-test.o -qos-test-obj-y +=3D tests/qtest/e1000-test.o -qos-test-obj-y +=3D tests/qtest/e1000e-test.o -qos-test-obj-y +=3D tests/qtest/eepro100-test.o -qos-test-obj-y +=3D tests/qtest/es1370-test.o -qos-test-obj-y +=3D tests/qtest/ipoctal232-test.o -qos-test-obj-y +=3D tests/qtest/megasas-test.o -qos-test-obj-y +=3D tests/qtest/ne2000-test.o -qos-test-obj-y +=3D tests/qtest/tulip-test.o -qos-test-obj-y +=3D tests/qtest/nvme-test.o -qos-test-obj-y +=3D tests/qtest/pca9552-test.o -qos-test-obj-y +=3D tests/qtest/pci-test.o -qos-test-obj-y +=3D tests/qtest/pcnet-test.o -qos-test-obj-y +=3D tests/qtest/sdhci-test.o -qos-test-obj-y +=3D tests/qtest/spapr-phb-test.o -qos-test-obj-y +=3D tests/qtest/tmp105-test.o -qos-test-obj-y +=3D tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y) -qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/qtest/vhost-user-test.o $= (chardev-obj-y) $(test-io-obj-y) -qos-test-obj-y +=3D tests/qtest/virtio-test.o -qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/virtio-9p-test.o -qos-test-obj-y +=3D tests/qtest/virtio-blk-test.o -qos-test-obj-y +=3D tests/qtest/virtio-net-test.o -qos-test-obj-y +=3D tests/qtest/virtio-rng-test.o -qos-test-obj-y +=3D tests/qtest/virtio-scsi-test.o -qos-test-obj-y +=3D tests/qtest/virtio-serial-test.o -qos-test-obj-y +=3D tests/qtest/vmxnet3-test.o - -check-unit-y +=3D tests/test-qgraph$(EXESUF) -tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) - -check-qtest-generic-y +=3D qos-test -tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y) - -# QTest dependencies: -tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o -tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o -tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect= -test.o -tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o -tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o -tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o -tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o -tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o -tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-o= bj-y) -tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj= -y) -tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o -tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y) -tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y)= qemu-img$(EXESUF) -tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o -tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o -tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o $(libqos-obj-y) -tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libq= os-obj-y) -tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(li= bqos-obj-y) -tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \ - tests/qtest/tpm-emu.o $(test-io-obj-y) \ - tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y) -tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sec= tor.o $(libqos-obj-y) -tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o -tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o -tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-ob= j-y) -tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y) -tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-ob= j-y) -tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-= obj-y) -tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o -tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o -tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) -tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o -tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o -tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o -tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o -tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o -tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o -tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o -tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o -tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o -tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o -tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o -tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o -tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(= libqos-usb-obj-y) -tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(= libqos-usb-obj-y) -tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(= libqos-usb-obj-y) -tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o -tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o tests/qt= est/migration-helpers.o -tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-= obj-y) -tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o = $(qtest-obj-y) -tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redir= ector.o $(qtest-obj-y) -tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-com= pat.o $(qtest-obj-y) -tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivsh= mem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o te= sts/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y= ) $(libqos-spapr-obj-y) -tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o -tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o -tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/= boot-sector.o tests/qtest/acpi-utils.o -tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot= -sector.o $(libqos-obj-y) -tests/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o -tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o = tests/qtest/tpm-emu.o \ - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) -tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/= tpm-emu.o $(test-io-obj-y) -tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/qtest/tpm-emu.o \ - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) -tests/qtest/tpm-tis-device-swtpm-test$(EXESUF): tests/qtest/tpm-tis-device= -swtpm-test.o tests/qtest/tpm-emu.o \ - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) -tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/= tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y) -tests/qtest/tpm-tis-device-test$(EXESUF): tests/qtest/tpm-tis-device-test.= o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y) - -# QTest rules - -TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) -QTEST_TARGETS =3D -# The qtests are not runnable (yet) under TSan due to a known issue. -# https://github.com/google/sanitizers/issues/1116 -ifndef CONFIG_TSAN -ifeq ($(CONFIG_POSIX),y) -QTEST_TARGETS =3D $(TARGETS) -check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/qtest/%$(EXESUF))) -check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)) -endif -endif - -qtest-obj-y =3D tests/qtest/libqtest.o $(test-util-obj-y) -$(check-qtest-y): $(qtest-obj-y) diff --git a/tests/qtest/ac97-test.c b/tests/qtest/ac97-test.c index b084e31..e09f249 100644 --- a/tests/qtest/ac97-test.c +++ b/tests/qtest/ac97-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/acpi-utils.h b/tests/qtest/acpi-utils.h index 0c86780..261784d 100644 --- a/tests/qtest/acpi-utils.h +++ b/tests/qtest/acpi-utils.h @@ -13,7 +13,7 @@ #ifndef TEST_ACPI_UTILS_H #define TEST_ACPI_UTILS_H =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 /* DSDT and SSDTs format */ typedef struct { diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c index c8d42ce..ca4294f 100644 --- a/tests/qtest/ahci-test.c +++ b/tests/qtest/ahci-test.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/libqos-pc.h" #include "libqos/ahci.h" #include "libqos/pci-pc.h" diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index f7e062c..77b5e30 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" #include "qemu/bitops.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" =20 diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c index 2f1c072..fac580d 100644 --- a/tests/qtest/boot-order-test.c +++ b/tests/qtest/boot-order-test.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "libqos/fw_cfg.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "standard-headers/linux/qemu_fw_cfg.h" =20 diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c index 9e66c6d..24df5c4 100644 --- a/tests/qtest/boot-sector.c +++ b/tests/qtest/boot-sector.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "boot-sector.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 #define LOW(x) ((x) & 0xff) #define HIGH(x) ((x) >> 8) diff --git a/tests/qtest/boot-sector.h b/tests/qtest/boot-sector.h index 6ee6bb4..b339fde 100644 --- a/tests/qtest/boot-sector.h +++ b/tests/qtest/boot-sector.h @@ -14,7 +14,7 @@ #ifndef TEST_BOOT_SECTOR_H #define TEST_BOOT_SECTOR_H =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 /* Create boot disk file. fname must be a suitable string for mkstemp() */ int boot_sector_init(char *fname); diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index bfe7624..b6b1c23 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -14,7 +14,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/libqos-spapr.h" =20 static const uint8_t bios_avr[] =3D { diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 833a050..e9afab6 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "boot-sector.h" #include "qapi/qmp/qdict.h" =20 diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-tes= t.c index 2e5e47d..aca9b98 100644 --- a/tests/qtest/dbus-vmstate-test.c +++ b/tests/qtest/dbus-vmstate-test.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" #include #include -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu-common.h" #include "dbus-vmstate1.h" #include "migration-helpers.h" diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-intr= ospect-test.c index d68b785..9f22340 100644 --- a/tests/qtest/device-introspect-test.c +++ b/tests/qtest/device-introspect-test.c @@ -22,7 +22,7 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 const char common_args[] =3D "-nodefaults -machine none"; =20 diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c index 318e422..9214892 100644 --- a/tests/qtest/device-plug-test.c +++ b/tests/qtest/device-plug-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" =20 diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c index 5f8839b..2ab11ad 100644 --- a/tests/qtest/drive_del-test.c +++ b/tests/qtest/drive_del-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/virtio.h" #include "qapi/qmp/qdict.h" =20 diff --git a/tests/qtest/ds1338-test.c b/tests/qtest/ds1338-test.c index f6ade9a..c5d46bc 100644 --- a/tests/qtest/ds1338-test.c +++ b/tests/qtest/ds1338-test.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/i2c.h" =20 #define DS1338_ADDR 0x68 diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c index c387984..ea286d1 100644 --- a/tests/qtest/e1000-test.c +++ b/tests/qtest/e1000-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/eepro100-test.c b/tests/qtest/eepro100-test.c index 8dbffff..d72ad09 100644 --- a/tests/qtest/eepro100-test.c +++ b/tests/qtest/eepro100-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c index cc088ac..4e79e22 100644 --- a/tests/qtest/endianness-test.c +++ b/tests/qtest/endianness-test.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/bswap.h" =20 typedef struct TestCase TestCase; diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c index adccdac..2fd7fd2 100644 --- a/tests/qtest/es1370-test.c +++ b/tests/qtest/es1370-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 031594a..1ceea84 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -20,7 +20,7 @@ #include "sysemu/sysemu.h" #include "qemu/main-loop.h" #include "qemu/rcu.h" -#include "tests/qtest/libqtest.h" +#include "tests/qtest/libqos/libqtest.h" #include "tests/qtest/libqos/qgraph.h" #include "fuzz.h" =20 diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 9ca3d10..8eb765e 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -18,7 +18,7 @@ #include "qemu/units.h" #include "qapi/error.h" =20 -#include "tests/qtest/libqtest.h" +#include "tests/qtest/libqos/libqtest.h" =20 /** * A libfuzzer fuzzing target diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c index bf966d4..f45373f 100644 --- a/tests/qtest/fuzz/i440fx_fuzz.c +++ b/tests/qtest/fuzz/i440fx_fuzz.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" =20 #include "qemu/main-loop.h" -#include "tests/qtest/libqtest.h" +#include "tests/qtest/libqos/libqtest.h" #include "tests/qtest/libqos/pci.h" #include "tests/qtest/libqos/pci-pc.h" #include "fuzz.h" diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c index d52f3eb..b943577 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -25,7 +25,7 @@ #include "sysemu/sysemu.h" #include "qemu/main-loop.h" =20 -#include "tests/qtest/libqtest.h" +#include "tests/qtest/libqos/libqtest.h" #include "tests/qtest/libqos/malloc.h" #include "tests/qtest/libqos/qgraph.h" #include "tests/qtest/libqos/qgraph_internal.h" diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_n= et_fuzz.c index a33bd73..277a9e2 100644 --- a/tests/qtest/fuzz/virtio_net_fuzz.c +++ b/tests/qtest/fuzz/virtio_net_fuzz.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" =20 #include "standard-headers/linux/virtio_config.h" -#include "tests/qtest/libqtest.h" +#include "tests/qtest/libqos/libqtest.h" #include "tests/qtest/libqos/virtio-net.h" #include "fuzz.h" #include "fork_fuzz.h" diff --git a/tests/qtest/fw_cfg-test.c b/tests/qtest/fw_cfg-test.c index 5dc807b..95b3907 100644 --- a/tests/qtest/fw_cfg-test.c +++ b/tests/qtest/fw_cfg-test.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "standard-headers/linux/qemu_fw_cfg.h" #include "libqos/fw_cfg.h" #include "qemu/bswap.h" diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c index 48e8e02..f7b7cfb 100644 --- a/tests/qtest/hd-geo-test.c +++ b/tests/qtest/hd-geo-test.c @@ -19,7 +19,7 @@ #include "qemu-common.h" #include "qemu/bswap.h" #include "qapi/qmp/qlist.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/fw_cfg.h" #include "libqos/libqos.h" #include "standard-headers/linux/qemu_fw_cfg.h" diff --git a/tests/qtest/hexloader-test.c b/tests/qtest/hexloader-test.c index 8b7aa2d..5615020 100644 --- a/tests/qtest/hexloader-test.c +++ b/tests/qtest/hexloader-test.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 /* Load 'test.hex' and verify that the in-memory contents are as expected. * 'test.hex' is a memory test pattern stored in Hexadecimal Object diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c index 5cfd97f..3f8081e 100644 --- a/tests/qtest/ide-test.c +++ b/tests/qtest/ide-test.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" =20 =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/libqos.h" #include "libqos/pci-pc.h" #include "libqos/malloc-pc.h" diff --git a/tests/qtest/ipoctal232-test.c b/tests/qtest/ipoctal232-test.c index 53a8c9b..65ce10b 100644 --- a/tests/qtest/ipoctal232-test.c +++ b/tests/qtest/ipoctal232-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" =20 diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c index ecda256..d5c8b9f 100644 --- a/tests/qtest/ivshmem-test.c +++ b/tests/qtest/ivshmem-test.c @@ -13,7 +13,7 @@ #include "contrib/ivshmem-server/ivshmem-server.h" #include "libqos/libqos-pc.h" #include "libqos/libqos-spapr.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu-common.h" =20 #define TMPSHMSIZE (1 << 20) diff --git a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c b/tests/qtest= /libqos/aarch64-xlnx-zcu102-machine.c index 8f827ae..79631cc 100644 --- a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c +++ b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "sdhci.h" =20 typedef struct QXlnxZCU102Machine QXlnxZCU102Machine; diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c index cc1b08e..2946abc 100644 --- a/tests/qtest/libqos/ahci.c +++ b/tests/qtest/libqos/ahci.c @@ -25,8 +25,8 @@ #include "qemu/osdep.h" =20 #include "libqtest.h" -#include "libqos/ahci.h" -#include "libqos/pci-pc.h" +#include "ahci.h" +#include "pci-pc.h" =20 #include "qemu-common.h" #include "qemu/host-utils.h" @@ -579,7 +579,7 @@ void ahci_write_fis(AHCIQState *ahci, AHCICommand *cmd) /* NCQ commands use exclusively 8 bit fields and needs no adjustment. * Only the count field needs to be adjusted for non-NCQ commands. * The auxiliary FIS fields are defined per-command and are not curren= tly - * implemented in libqos/ahci.o, but may or may not need to be flipped= . */ + * implemented in ahci.o, but may or may not need to be flipped. */ if (!cmd->props->ncq) { tmp.count =3D cpu_to_le16(tmp.count); } diff --git a/tests/qtest/libqos/ahci.h b/tests/qtest/libqos/ahci.h index 44ab110..88835b6 100644 --- a/tests/qtest/libqos/ahci.h +++ b/tests/qtest/libqos/ahci.h @@ -25,9 +25,9 @@ * THE SOFTWARE. */ =20 -#include "libqos/libqos.h" -#include "libqos/pci.h" -#include "libqos/malloc-pc.h" +#include "libqos.h" +#include "pci.h" +#include "malloc-pc.h" =20 /*** Supplementary PCI Config Space IDs & Masks ***/ #define PCI_DEVICE_ID_INTEL_Q35_AHCI (0x2922) diff --git a/tests/qtest/libqos/arm-imx25-pdk-machine.c b/tests/qtest/libqo= s/arm-imx25-pdk-machine.c index 0da3f19..6692adf 100644 --- a/tests/qtest/libqos/arm-imx25-pdk-machine.c +++ b/tests/qtest/libqos/arm-imx25-pdk-machine.c @@ -20,9 +20,9 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" -#include "libqos/i2c.h" +#include "malloc.h" +#include "qgraph.h" +#include "i2c.h" =20 #define ARM_PAGE_SIZE 4096 #define IMX25_PDK_RAM_START 0x80000000 diff --git a/tests/qtest/libqos/arm-n800-machine.c b/tests/qtest/libqos/arm= -n800-machine.c index 35f8207..ff2049c 100644 --- a/tests/qtest/libqos/arm-n800-machine.c +++ b/tests/qtest/libqos/arm-n800-machine.c @@ -20,9 +20,9 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" -#include "libqos/i2c.h" +#include "malloc.h" +#include "qgraph.h" +#include "i2c.h" =20 #define ARM_PAGE_SIZE 4096 #define N800_RAM_START 0x80000000 diff --git a/tests/qtest/libqos/arm-raspi2-machine.c b/tests/qtest/libqos/a= rm-raspi2-machine.c index 8480d80..35bb470 100644 --- a/tests/qtest/libqos/arm-raspi2-machine.c +++ b/tests/qtest/libqos/arm-raspi2-machine.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "sdhci.h" =20 #define ARM_PAGE_SIZE 4096 diff --git a/tests/qtest/libqos/arm-sabrelite-machine.c b/tests/qtest/libqo= s/arm-sabrelite-machine.c index f6e403b..72425f0 100644 --- a/tests/qtest/libqos/arm-sabrelite-machine.c +++ b/tests/qtest/libqos/arm-sabrelite-machine.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "sdhci.h" =20 #define ARM_PAGE_SIZE 4096 diff --git a/tests/qtest/libqos/arm-smdkc210-machine.c b/tests/qtest/libqos= /arm-smdkc210-machine.c index eebac7f..321b882 100644 --- a/tests/qtest/libqos/arm-smdkc210-machine.c +++ b/tests/qtest/libqos/arm-smdkc210-machine.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "sdhci.h" =20 #define ARM_PAGE_SIZE 4096 diff --git a/tests/qtest/libqos/arm-virt-machine.c b/tests/qtest/libqos/arm= -virt-machine.c index 9316598..e0f5932 100644 --- a/tests/qtest/libqos/arm-virt-machine.c +++ b/tests/qtest/libqos/arm-virt-machine.c @@ -19,9 +19,9 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-mmio.h" +#include "malloc.h" +#include "qgraph.h" +#include "virtio-mmio.h" =20 #define ARM_PAGE_SIZE 4096 #define VIRTIO_MMIO_BASE_ADDR 0x0A003E00 diff --git a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c b/tests/qtest/= libqos/arm-xilinx-zynq-a9-machine.c index 473acce..56e53c7 100644 --- a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c +++ b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "sdhci.h" =20 typedef struct QXilinxZynqA9Machine QXilinxZynqA9Machine; diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c index e2927ed..a451f61 100644 --- a/tests/qtest/libqos/e1000e.c +++ b/tests/qtest/libqos/e1000e.c @@ -18,13 +18,13 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/pci-pc.h" +#include "pci-pc.h" #include "qemu/sockets.h" #include "qemu/iov.h" #include "qemu/module.h" #include "qemu/bitops.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "qgraph.h" #include "e1000e.h" =20 #define E1000E_IMS (0x00d0) diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h index 35183b2..a22f5fd 100644 --- a/tests/qtest/libqos/e1000e.h +++ b/tests/qtest/libqos/e1000e.h @@ -19,7 +19,7 @@ #ifndef QGRAPH_E1000E_H #define QGRAPH_E1000E_H =20 -#include "libqos/qgraph.h" +#include "qgraph.h" #include "pci.h" =20 #define E1000E_RX0_MSG_ID (0) diff --git a/tests/qtest/libqos/fw_cfg.c b/tests/qtest/libqos/fw_cfg.c index 1f46258..6b8e1ba 100644 --- a/tests/qtest/libqos/fw_cfg.c +++ b/tests/qtest/libqos/fw_cfg.c @@ -13,7 +13,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/fw_cfg.h" +#include "fw_cfg.h" #include "libqtest.h" #include "qemu/bswap.h" #include "hw/nvram/fw_cfg.h" diff --git a/tests/qtest/libqos/i2c-imx.c b/tests/qtest/libqos/i2c-imx.c index f33ece5..8f9a7e3 100644 --- a/tests/qtest/libqos/i2c-imx.c +++ b/tests/qtest/libqos/i2c-imx.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/i2c.h" +#include "i2c.h" =20 =20 #include "libqtest.h" diff --git a/tests/qtest/libqos/i2c-omap.c b/tests/qtest/libqos/i2c-omap.c index 9ae8214..eb4e453 100644 --- a/tests/qtest/libqos/i2c-omap.c +++ b/tests/qtest/libqos/i2c-omap.c @@ -7,7 +7,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "libqos/i2c.h" +#include "i2c.h" =20 =20 #include "qemu/bswap.h" diff --git a/tests/qtest/libqos/i2c.c b/tests/qtest/libqos/i2c.c index 38f800d..ade1bdb 100644 --- a/tests/qtest/libqos/i2c.c +++ b/tests/qtest/libqos/i2c.c @@ -7,7 +7,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "libqos/i2c.h" +#include "i2c.h" #include "libqtest.h" =20 void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len) diff --git a/tests/qtest/libqos/i2c.h b/tests/qtest/libqos/i2c.h index c65f087..1341bac 100644 --- a/tests/qtest/libqos/i2c.h +++ b/tests/qtest/libqos/i2c.h @@ -10,7 +10,7 @@ #define LIBQOS_I2C_H =20 #include "libqtest.h" -#include "libqos/qgraph.h" +#include "qgraph.h" =20 typedef struct I2CAdapter I2CAdapter; struct I2CAdapter { diff --git a/tests/qtest/libqos/libqos-pc.c b/tests/qtest/libqos/libqos-pc.c index d04abc5..db420a5 100644 --- a/tests/qtest/libqos/libqos-pc.c +++ b/tests/qtest/libqos/libqos-pc.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" -#include "libqos/libqos-pc.h" -#include "libqos/malloc-pc.h" -#include "libqos/pci-pc.h" +#include "libqos-pc.h" +#include "malloc-pc.h" +#include "pci-pc.h" =20 static QOSOps qos_ops =3D { .alloc_init =3D pc_alloc_init, diff --git a/tests/qtest/libqos/libqos-pc.h b/tests/qtest/libqos/libqos-pc.h index a0e4c45..1a9923e 100644 --- a/tests/qtest/libqos/libqos-pc.h +++ b/tests/qtest/libqos/libqos-pc.h @@ -1,7 +1,7 @@ #ifndef LIBQOS_PC_H #define LIBQOS_PC_H =20 -#include "libqos/libqos.h" +#include "libqos.h" =20 QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap); QOSState *qtest_pc_boot(const char *cmdline_fmt, ...); diff --git a/tests/qtest/libqos/libqos-spapr.c b/tests/qtest/libqos/libqos-= spapr.c index 8766d54..db0e87b 100644 --- a/tests/qtest/libqos/libqos-spapr.c +++ b/tests/qtest/libqos/libqos-spapr.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" -#include "libqos/libqos-spapr.h" -#include "libqos/malloc-spapr.h" -#include "libqos/pci-spapr.h" +#include "libqos-spapr.h" +#include "malloc-spapr.h" +#include "pci-spapr.h" =20 static QOSOps qos_ops =3D { .alloc_init =3D spapr_alloc_init, diff --git a/tests/qtest/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-= spapr.h index 49bd72d..c613389 100644 --- a/tests/qtest/libqos/libqos-spapr.h +++ b/tests/qtest/libqos/libqos-spapr.h @@ -1,7 +1,7 @@ #ifndef LIBQOS_SPAPR_H #define LIBQOS_SPAPR_H =20 -#include "libqos/libqos.h" +#include "libqos.h" =20 QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap); QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...); diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c index f229eb2..2251e86 100644 --- a/tests/qtest/libqos/libqos.c +++ b/tests/qtest/libqos/libqos.c @@ -2,8 +2,8 @@ #include =20 #include "libqtest.h" -#include "libqos/libqos.h" -#include "libqos/pci.h" +#include "libqos.h" +#include "pci.h" #include "qapi/qmp/qdict.h" =20 /*** Test Setup & Teardown ***/ diff --git a/tests/qtest/libqos/libqos.h b/tests/qtest/libqos/libqos.h index 8e971c2..e0b2bfe 100644 --- a/tests/qtest/libqos/libqos.h +++ b/tests/qtest/libqos/libqos.h @@ -2,8 +2,8 @@ #define LIBQOS_H =20 #include "libqtest.h" -#include "libqos/pci.h" -#include "libqos/malloc.h" +#include "pci.h" +#include "malloc.h" =20 typedef struct QOSState QOSState; =20 diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqos/libqtest.h similarity index 100% rename from tests/qtest/libqtest.h rename to tests/qtest/libqos/libqtest.h diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c index 6f92ce4..16ff960 100644 --- a/tests/qtest/libqos/malloc-pc.c +++ b/tests/qtest/libqos/malloc-pc.c @@ -11,8 +11,8 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/malloc-pc.h" -#include "libqos/fw_cfg.h" +#include "malloc-pc.h" +#include "fw_cfg.h" =20 #include "standard-headers/linux/qemu_fw_cfg.h" =20 diff --git a/tests/qtest/libqos/malloc-pc.h b/tests/qtest/libqos/malloc-pc.h index 21e75ae..d8d7985 100644 --- a/tests/qtest/libqos/malloc-pc.h +++ b/tests/qtest/libqos/malloc-pc.h @@ -13,7 +13,7 @@ #ifndef LIBQOS_MALLOC_PC_H #define LIBQOS_MALLOC_PC_H =20 -#include "libqos/malloc.h" +#include "malloc.h" =20 void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags); =20 diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-= spapr.c index 2a6b7e3..84862e4 100644 --- a/tests/qtest/libqos/malloc-spapr.c +++ b/tests/qtest/libqos/malloc-spapr.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/malloc-spapr.h" +#include "malloc-spapr.h" =20 #include "qemu-common.h" =20 diff --git a/tests/qtest/libqos/malloc-spapr.h b/tests/qtest/libqos/malloc-= spapr.h index e5fe9bf..f99572f 100644 --- a/tests/qtest/libqos/malloc-spapr.h +++ b/tests/qtest/libqos/malloc-spapr.h @@ -8,7 +8,7 @@ #ifndef LIBQOS_MALLOC_SPAPR_H #define LIBQOS_MALLOC_SPAPR_H =20 -#include "libqos/malloc.h" +#include "malloc.h" =20 void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flag= s); =20 diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c index 615422a..f708b01 100644 --- a/tests/qtest/libqos/malloc.c +++ b/tests/qtest/libqos/malloc.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/malloc.h" +#include "malloc.h" #include "qemu-common.h" #include "qemu/host-utils.h" =20 diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build new file mode 100644 index 0000000..19931b9 --- /dev/null +++ b/tests/qtest/libqos/meson.build @@ -0,0 +1,57 @@ +libqos =3D static_library('qos', + files('../libqtest.c', + 'qgraph.c', + 'qos_external.c', + 'pci.c', + 'fw_cfg.c', + 'malloc.c', + 'libqos.c', + + # spapr + 'malloc-spapr.c', + 'libqos-spapr.c', + 'rtas.c', + 'pci-spapr.c', + + # pc + 'pci-pc.c', + 'malloc-pc.c', + 'libqos-pc.c', + 'ahci.c', + + # usb + 'usb.c', + + # qgraph devices: + 'e1000e.c', + 'i2c.c', + 'i2c-imx.c', + 'i2c-omap.c', + 'sdhci.c', + 'tpci200.c', + 'virtio.c', + 'virtio-9p.c', + 'virtio-balloon.c', + 'virtio-blk.c', + 'virtio-mmio.c', + 'virtio-net.c', + 'virtio-pci.c', + 'virtio-pci-modern.c', + 'virtio-rng.c', + 'virtio-scsi.c', + 'virtio-serial.c', + + # qgraph machines: + 'aarch64-xlnx-zcu102-machine.c', + 'arm-imx25-pdk-machine.c', + 'arm-n800-machine.c', + 'arm-raspi2-machine.c', + 'arm-sabrelite-machine.c', + 'arm-smdkc210-machine.c', + 'arm-virt-machine.c', + 'arm-xilinx-zynq-a9-machine.c', + 'ppc64_pseries-machine.c', + 'x86_64_pc-machine.c', +), build_by_default: false) + +qos =3D declare_dependency(link_whole: libqos) diff --git a/tests/qtest/libqos/pci-pc.c b/tests/qtest/libqos/pci-pc.c index 3bb2eb3..f978442 100644 --- a/tests/qtest/libqos/pci-pc.c +++ b/tests/qtest/libqos/pci-pc.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/pci-pc.h" +#include "pci-pc.h" #include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" =20 diff --git a/tests/qtest/libqos/pci-pc.h b/tests/qtest/libqos/pci-pc.h index 4690005..49ec950 100644 --- a/tests/qtest/libqos/pci-pc.h +++ b/tests/qtest/libqos/pci-pc.h @@ -13,9 +13,9 @@ #ifndef LIBQOS_PCI_PC_H #define LIBQOS_PCI_PC_H =20 -#include "libqos/pci.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "pci.h" +#include "malloc.h" +#include "qgraph.h" =20 typedef struct QPCIBusPC { QOSGraphObject obj; diff --git a/tests/qtest/libqos/pci-spapr.c b/tests/qtest/libqos/pci-spapr.c index d6f8c01..2622269 100644 --- a/tests/qtest/libqos/pci-spapr.c +++ b/tests/qtest/libqos/pci-spapr.c @@ -7,9 +7,9 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/pci-spapr.h" -#include "libqos/rtas.h" -#include "libqos/qgraph.h" +#include "pci-spapr.h" +#include "rtas.h" +#include "qgraph.h" =20 #include "hw/pci/pci_regs.h" =20 diff --git a/tests/qtest/libqos/pci-spapr.h b/tests/qtest/libqos/pci-spapr.h index d9e2563..20a4371 100644 --- a/tests/qtest/libqos/pci-spapr.h +++ b/tests/qtest/libqos/pci-spapr.h @@ -8,9 +8,9 @@ #ifndef LIBQOS_PCI_SPAPR_H #define LIBQOS_PCI_SPAPR_H =20 -#include "libqos/malloc.h" -#include "libqos/pci.h" -#include "libqos/qgraph.h" +#include "malloc.h" +#include "pci.h" +#include "qgraph.h" =20 /* From include/hw/pci-host/spapr.h */ =20 diff --git a/tests/qtest/libqos/pci.c b/tests/qtest/libqos/pci.c index 2309a72..e1e9618 100644 --- a/tests/qtest/libqos/pci.c +++ b/tests/qtest/libqos/pci.c @@ -11,11 +11,11 @@ */ =20 #include "qemu/osdep.h" -#include "libqos/pci.h" +#include "pci.h" =20 #include "hw/pci/pci_regs.h" #include "qemu/host-utils.h" -#include "libqos/qgraph.h" +#include "qgraph.h" =20 void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id, void (*func)(QPCIDevice *dev, int devfn, void *da= ta), diff --git a/tests/qtest/libqos/pci.h b/tests/qtest/libqos/pci.h index 590c175..ee64fde 100644 --- a/tests/qtest/libqos/pci.h +++ b/tests/qtest/libqos/pci.h @@ -14,7 +14,7 @@ #define LIBQOS_PCI_H =20 #include "libqtest.h" -#include "libqos/qgraph.h" +#include "qgraph.h" =20 #define QPCI_PIO_LIMIT 0x10000 =20 diff --git a/tests/qtest/libqos/ppc64_pseries-machine.c b/tests/qtest/libqo= s/ppc64_pseries-machine.c index 5d7bd88..24ca179 100644 --- a/tests/qtest/libqos/ppc64_pseries-machine.c +++ b/tests/qtest/libqos/ppc64_pseries-machine.c @@ -18,10 +18,10 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/qgraph.h" +#include "qgraph.h" #include "pci-spapr.h" #include "qemu/module.h" -#include "libqos/malloc-spapr.h" +#include "malloc-spapr.h" =20 typedef struct QSPAPR_pci_host QSPAPR_pci_host; typedef struct Qppc64_pseriesMachine Qppc64_pseriesMachine; diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c index eb0af8a..fc49cfa 100644 --- a/tests/qtest/libqos/qgraph.c +++ b/tests/qtest/libqos/qgraph.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/queue.h" -#include "libqos/qgraph_internal.h" -#include "libqos/qgraph.h" +#include "qgraph_internal.h" +#include "qgraph.h" =20 #define QGRAPH_PRINT_DEBUG 0 #define QOS_ROOT "" diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h index db1244e..1054326 100644 --- a/tests/qtest/libqos/qgraph.h +++ b/tests/qtest/libqos/qgraph.h @@ -106,7 +106,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void= *arg); * * Creating new driver an its interface * - #include "libqos/qgraph.h" + #include "qgraph.h" =20 struct My_driver { QOSGraphObject obj; @@ -190,7 +190,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void= *arg); * * Creating new test * - * #include "libqos/qgraph.h" + * #include "qgraph.h" * * static void my_test_function(void *obj, void *data) * { @@ -230,7 +230,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void= *arg); * a valid test path will be: * "/x86_64/pc/other_node/my_driver/my_interface/my_test". * - * Additional examples are also in libqos/test-qgraph.c + * Additional examples are also in test-qgraph.c * * Command line: * Command line is built by using node names and optional arguments diff --git a/tests/qtest/libqos/qgraph_internal.h b/tests/qtest/libqos/qgra= ph_internal.h index aa3123f..968fa69 100644 --- a/tests/qtest/libqos/qgraph_internal.h +++ b/tests/qtest/libqos/qgraph_internal.h @@ -20,11 +20,11 @@ #define QGRAPH_INTERNAL_H =20 /* This header is declaring additional helper functions defined in - * libqos/qgraph.c + * qgraph.c * It should not be included in tests */ =20 -#include "libqos/qgraph.h" +#include "qgraph.h" =20 typedef struct QOSGraphMachine QOSGraphMachine; typedef enum QOSEdgeType QOSEdgeType; diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_ext= ernal.c index 0dfc05c..10ee0f7 100644 --- a/tests/qtest/libqos/qos_external.c +++ b/tests/qtest/libqos/qos_external.c @@ -24,10 +24,10 @@ #include "qapi/qmp/qstring.h" #include "qemu/module.h" #include "qapi/qmp/qlist.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" -#include "libqos/qgraph_internal.h" -#include "libqos/qos_external.h" +#include "malloc.h" +#include "qgraph.h" +#include "qgraph_internal.h" +#include "qos_external.h" =20 static void machine_apply_to_node(const char *name) { diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_ext= ernal.h index 56a2f37..8446e3d 100644 --- a/tests/qtest/libqos/qos_external.h +++ b/tests/qtest/libqos/qos_external.h @@ -19,7 +19,9 @@ #ifndef QOS_EXTERNAL_H #define QOS_EXTERNAL_H =20 -#include "libqos/malloc.h" +#include "qgraph.h" + +#include "malloc.h" #include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-qom.h" =20 diff --git a/tests/qtest/libqos/rtas.c b/tests/qtest/libqos/rtas.c index d81ff42..db29d55 100644 --- a/tests/qtest/libqos/rtas.c +++ b/tests/qtest/libqos/rtas.c @@ -5,7 +5,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/rtas.h" +#include "rtas.h" =20 static void qrtas_copy_args(QTestState *qts, uint64_t target_args, uint32_t nargs, uint32_t *args) diff --git a/tests/qtest/libqos/rtas.h b/tests/qtest/libqos/rtas.h index 459e23a..f38f99d 100644 --- a/tests/qtest/libqos/rtas.h +++ b/tests/qtest/libqos/rtas.h @@ -5,7 +5,7 @@ =20 #ifndef LIBQOS_RTAS_H #define LIBQOS_RTAS_H -#include "libqos/malloc.h" +#include "malloc.h" =20 int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc, struct tm *tm, uint32_t *ns); diff --git a/tests/qtest/libqos/sdhci.c b/tests/qtest/libqos/sdhci.c index fbf2e36..65f0d07 100644 --- a/tests/qtest/libqos/sdhci.c +++ b/tests/qtest/libqos/sdhci.c @@ -18,7 +18,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/qgraph.h" +#include "qgraph.h" #include "pci.h" #include "qemu/module.h" #include "sdhci.h" diff --git a/tests/qtest/libqos/sdhci.h b/tests/qtest/libqos/sdhci.h index 1acd309..22d647b 100644 --- a/tests/qtest/libqos/sdhci.h +++ b/tests/qtest/libqos/sdhci.h @@ -19,7 +19,7 @@ #ifndef QGRAPH_QSDHCI_H #define QGRAPH_QSDHCI_H =20 -#include "libqos/qgraph.h" +#include "qgraph.h" #include "pci.h" =20 typedef struct QSDHCI QSDHCI; diff --git a/tests/qtest/libqos/tpci200.c b/tests/qtest/libqos/tpci200.c index ae590a4..1787b1f 100644 --- a/tests/qtest/libqos/tpci200.c +++ b/tests/qtest/libqos/tpci200.c @@ -10,8 +10,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/qgraph.h" -#include "libqos/pci.h" +#include "qgraph.h" +#include "pci.h" =20 typedef struct QTpci200 QTpci200; typedef struct QIpack QIpack; diff --git a/tests/qtest/libqos/usb.c b/tests/qtest/libqos/usb.c index d7a9cb3..8b45b02 100644 --- a/tests/qtest/libqos/usb.c +++ b/tests/qtest/libqos/usb.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "hw/usb/uhci-regs.h" -#include "libqos/usb.h" +#include "usb.h" =20 void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, in= t bar) { diff --git a/tests/qtest/libqos/usb.h b/tests/qtest/libqos/usb.h index eeced39..50030d7 100644 --- a/tests/qtest/libqos/usb.h +++ b/tests/qtest/libqos/usb.h @@ -1,7 +1,7 @@ #ifndef LIBQOS_USB_H #define LIBQOS_USB_H =20 -#include "libqos/pci-pc.h" +#include "pci-pc.h" =20 struct qhc { QPCIDevice *dev; diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c index c87b561..2e30006 100644 --- a/tests/qtest/libqos/virtio-9p.c +++ b/tests/qtest/libqos/virtio-9p.c @@ -20,8 +20,8 @@ #include "libqtest.h" #include "qemu/module.h" #include "standard-headers/linux/virtio_ids.h" -#include "libqos/virtio-9p.h" -#include "libqos/qgraph.h" +#include "virtio-9p.h" +#include "qgraph.h" =20 static QGuestAllocator *alloc; =20 diff --git a/tests/qtest/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h index be9621a..b1e6bad 100644 --- a/tests/qtest/libqos/virtio-9p.h +++ b/tests/qtest/libqos/virtio-9p.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_9P_H #define TESTS_LIBQOS_VIRTIO_9P_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtio9P QVirtio9P; typedef struct QVirtio9PPCI QVirtio9PPCI; diff --git a/tests/qtest/libqos/virtio-balloon.c b/tests/qtest/libqos/virti= o-balloon.c index 9745f4a..a3da5c2 100644 --- a/tests/qtest/libqos/virtio-balloon.c +++ b/tests/qtest/libqos/virtio-balloon.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-balloon.h" +#include "qgraph.h" +#include "virtio-balloon.h" =20 /* virtio-balloon-device */ static void *qvirtio_balloon_get_driver(QVirtioBalloon *v_balloon, diff --git a/tests/qtest/libqos/virtio-balloon.h b/tests/qtest/libqos/virti= o-balloon.h index 5b91930..309894c 100644 --- a/tests/qtest/libqos/virtio-balloon.h +++ b/tests/qtest/libqos/virtio-balloon.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_BALLOON_H #define TESTS_LIBQOS_VIRTIO_BALLOON_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioBalloon QVirtioBalloon; typedef struct QVirtioBalloonPCI QVirtioBalloonPCI; diff --git a/tests/qtest/libqos/virtio-blk.c b/tests/qtest/libqos/virtio-bl= k.c index 5fc6940..5da0259 100644 --- a/tests/qtest/libqos/virtio-blk.c +++ b/tests/qtest/libqos/virtio-blk.c @@ -20,8 +20,8 @@ #include "libqtest.h" #include "qemu/module.h" #include "standard-headers/linux/virtio_blk.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-blk.h" +#include "qgraph.h" +#include "virtio-blk.h" =20 #define PCI_SLOT 0x04 #define PCI_FN 0x00 diff --git a/tests/qtest/libqos/virtio-blk.h b/tests/qtest/libqos/virtio-bl= k.h index 5170f13..dcef388 100644 --- a/tests/qtest/libqos/virtio-blk.h +++ b/tests/qtest/libqos/virtio-blk.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_BLK_H #define TESTS_LIBQOS_VIRTIO_BLK_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioBlk QVirtioBlk; typedef struct QVirtioBlkPCI QVirtioBlkPCI; diff --git a/tests/qtest/libqos/virtio-mmio.c b/tests/qtest/libqos/virtio-m= mio.c index e0a2bd7..75efda3 100644 --- a/tests/qtest/libqos/virtio-mmio.c +++ b/tests/qtest/libqos/virtio-mmio.c @@ -10,10 +10,10 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/virtio.h" -#include "libqos/virtio-mmio.h" -#include "libqos/malloc.h" -#include "libqos/qgraph.h" +#include "virtio.h" +#include "virtio-mmio.h" +#include "malloc.h" +#include "qgraph.h" #include "standard-headers/linux/virtio_ring.h" =20 static uint8_t qvirtio_mmio_config_readb(QVirtioDevice *d, uint64_t off) diff --git a/tests/qtest/libqos/virtio-mmio.h b/tests/qtest/libqos/virtio-m= mio.h index 0e45778..30803bc 100644 --- a/tests/qtest/libqos/virtio-mmio.h +++ b/tests/qtest/libqos/virtio-mmio.h @@ -10,8 +10,8 @@ #ifndef LIBQOS_VIRTIO_MMIO_H #define LIBQOS_VIRTIO_MMIO_H =20 -#include "libqos/virtio.h" -#include "libqos/qgraph.h" +#include "virtio.h" +#include "qgraph.h" =20 #define QVIRTIO_MMIO_MAGIC_VALUE 0x000 #define QVIRTIO_MMIO_VERSION 0x004 diff --git a/tests/qtest/libqos/virtio-net.c b/tests/qtest/libqos/virtio-ne= t.c index a9e253a..1cae07f 100644 --- a/tests/qtest/libqos/virtio-net.c +++ b/tests/qtest/libqos/virtio-net.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-net.h" +#include "qgraph.h" +#include "virtio-net.h" #include "hw/virtio/virtio-net.h" =20 =20 diff --git a/tests/qtest/libqos/virtio-net.h b/tests/qtest/libqos/virtio-ne= t.h index b8cbec0..5ba2161 100644 --- a/tests/qtest/libqos/virtio-net.h +++ b/tests/qtest/libqos/virtio-net.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_NET_H #define TESTS_LIBQOS_VIRTIO_NET_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioNet QVirtioNet; typedef struct QVirtioNetPCI QVirtioNetPCI; diff --git a/tests/qtest/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pc= i.c index 62851c2..cd3c0f5 100644 --- a/tests/qtest/libqos/virtio-pci.c +++ b/tests/qtest/libqos/virtio-pci.c @@ -9,13 +9,13 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" -#include "libqos/pci.h" -#include "libqos/pci-pc.h" -#include "libqos/malloc.h" -#include "libqos/malloc-pc.h" -#include "libqos/qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" +#include "pci.h" +#include "pci-pc.h" +#include "malloc.h" +#include "malloc-pc.h" +#include "qgraph.h" #include "standard-headers/linux/virtio_ring.h" #include "standard-headers/linux/virtio_pci.h" =20 diff --git a/tests/qtest/libqos/virtio-pci.h b/tests/qtest/libqos/virtio-pc= i.h index 294d556..f5115ca 100644 --- a/tests/qtest/libqos/virtio-pci.h +++ b/tests/qtest/libqos/virtio-pci.h @@ -10,9 +10,9 @@ #ifndef LIBQOS_VIRTIO_PCI_H #define LIBQOS_VIRTIO_PCI_H =20 -#include "libqos/virtio.h" -#include "libqos/pci.h" -#include "libqos/qgraph.h" +#include "virtio.h" +#include "pci.h" +#include "qgraph.h" =20 typedef struct QVirtioPCIMSIXOps QVirtioPCIMSIXOps; =20 diff --git a/tests/qtest/libqos/virtio-rng.c b/tests/qtest/libqos/virtio-rn= g.c index 46f8d95..2e09dd7 100644 --- a/tests/qtest/libqos/virtio-rng.c +++ b/tests/qtest/libqos/virtio-rng.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-rng.h" +#include "qgraph.h" +#include "virtio-rng.h" =20 /* virtio-rng-device */ static void *qvirtio_rng_get_driver(QVirtioRng *v_rng, diff --git a/tests/qtest/libqos/virtio-rng.h b/tests/qtest/libqos/virtio-rn= g.h index 9342372..9ca102b 100644 --- a/tests/qtest/libqos/virtio-rng.h +++ b/tests/qtest/libqos/virtio-rng.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_RNG_H #define TESTS_LIBQOS_VIRTIO_RNG_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioRng QVirtioRng; typedef struct QVirtioRngPCI QVirtioRngPCI; diff --git a/tests/qtest/libqos/virtio-scsi.c b/tests/qtest/libqos/virtio-s= csi.c index c8c3598..5644e32 100644 --- a/tests/qtest/libqos/virtio-scsi.c +++ b/tests/qtest/libqos/virtio-scsi.c @@ -20,8 +20,8 @@ #include "libqtest.h" #include "qemu/module.h" #include "standard-headers/linux/virtio_ids.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-scsi.h" +#include "qgraph.h" +#include "virtio-scsi.h" =20 /* virtio-scsi-device */ static void *qvirtio_scsi_get_driver(QVirtioSCSI *v_scsi, diff --git a/tests/qtest/libqos/virtio-scsi.h b/tests/qtest/libqos/virtio-s= csi.h index 9e3774d..531315e 100644 --- a/tests/qtest/libqos/virtio-scsi.h +++ b/tests/qtest/libqos/virtio-scsi.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_SCSI_H #define TESTS_LIBQOS_VIRTIO_SCSI_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioSCSI QVirtioSCSI; typedef struct QVirtioSCSIPCI QVirtioSCSIPCI; diff --git a/tests/qtest/libqos/virtio-serial.c b/tests/qtest/libqos/virtio= -serial.c index b956540..ee34afd 100644 --- a/tests/qtest/libqos/virtio-serial.c +++ b/tests/qtest/libqos/virtio-serial.c @@ -19,8 +19,8 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/module.h" -#include "libqos/qgraph.h" -#include "libqos/virtio-serial.h" +#include "qgraph.h" +#include "virtio-serial.h" =20 static void *qvirtio_serial_get_driver(QVirtioSerial *v_serial, const char *interface) diff --git a/tests/qtest/libqos/virtio-serial.h b/tests/qtest/libqos/virtio= -serial.h index 3328c6c..3db43b2 100644 --- a/tests/qtest/libqos/virtio-serial.h +++ b/tests/qtest/libqos/virtio-serial.h @@ -19,9 +19,9 @@ #ifndef TESTS_LIBQOS_VIRTIO_SERIAL_H #define TESTS_LIBQOS_VIRTIO_SERIAL_H =20 -#include "libqos/qgraph.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "qgraph.h" +#include "virtio.h" +#include "virtio-pci.h" =20 typedef struct QVirtioSerial QVirtioSerial; typedef struct QVirtioSerialPCI QVirtioSerialPCI; diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c index 9aa3606..6fe7bf9 100644 --- a/tests/qtest/libqos/virtio.c +++ b/tests/qtest/libqos/virtio.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/bswap.h" #include "libqtest.h" -#include "libqos/virtio.h" +#include "virtio.h" #include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" =20 diff --git a/tests/qtest/libqos/virtio.h b/tests/qtest/libqos/virtio.h index 529ef75..b8bd06e 100644 --- a/tests/qtest/libqos/virtio.h +++ b/tests/qtest/libqos/virtio.h @@ -10,7 +10,7 @@ #ifndef LIBQOS_VIRTIO_H #define LIBQOS_VIRTIO_H =20 -#include "libqos/malloc.h" +#include "malloc.h" #include "standard-headers/linux/virtio_ring.h" =20 #define QVIRTIO_F_BAD_FEATURE 0x40000000ull diff --git a/tests/qtest/libqos/x86_64_pc-machine.c b/tests/qtest/libqos/x8= 6_64_pc-machine.c index 0edb1c9..ad96742 100644 --- a/tests/qtest/libqos/x86_64_pc-machine.c +++ b/tests/qtest/libqos/x86_64_pc-machine.c @@ -18,7 +18,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/qgraph.h" +#include "qgraph.h" #include "pci-pc.h" #include "qemu/module.h" #include "malloc-pc.h" diff --git a/tests/qtest/libqtest-single.h b/tests/qtest/libqtest-single.h index 6f1bb13..176979a 100644 --- a/tests/qtest/libqtest-single.h +++ b/tests/qtest/libqtest-single.h @@ -11,7 +11,7 @@ #ifndef LIBQTEST_SINGLE_H #define LIBQTEST_SINGLE_H =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 QTestState *global_qtest __attribute__((common, weak)); =20 diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index fd46805..26f1223 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -20,7 +20,7 @@ #include #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu-common.h" #include "qemu/ctype.h" #include "qemu/cutils.h" diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c index b94a123..6db3234 100644 --- a/tests/qtest/m48t59-test.c +++ b/tests/qtest/m48t59-test.c @@ -14,7 +14,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 #define RTC_SECONDS 0x9 #define RTC_MINUTES 0xa diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-tes= t.c index 57107f1..aab06b9 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -14,7 +14,7 @@ =20 #include "qemu-common.h" #include "qemu/cutils.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" =20 =20 diff --git a/tests/qtest/megasas-test.c b/tests/qtest/megasas-test.c index d6796b9..eae70ff 100644 --- a/tests/qtest/megasas-test.c +++ b/tests/qtest/megasas-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/bswap.h" #include "qemu/module.h" #include "libqos/qgraph.h" diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build new file mode 100644 index 0000000..30cb88d --- /dev/null +++ b/tests/qtest/meson.build @@ -0,0 +1,257 @@ +# All QTests for now are POSIX-only, but the dependencies are +# really in libqtest, not in the testcases themselves. +if not config_host.has_key('CONFIG_POSIX') + subdir_done() +endif + +qtests_generic =3D [ + 'cdrom-test', + 'device-introspect-test', + 'machine-none-test', + 'qmp-test', + 'qmp-cmd-test', + 'qom-test', + 'test-hmp', + 'qos-test', +] +if config_host.has_key('CONFIG_MODULES') + qtests_generic +=3D [ 'modules-test' ] +endif + +qtests_pci =3D \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) += \ + (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] = : []) + +qtests_i386 =3D \ + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : = []) + \ + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + = \ + (have_tools ? ['ahci-test'] : []) + = \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) += \ + (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['test-filter-redire= ctor'] : []) + \ + (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] := []) + \ + (config_host.has_key('CONFIG_LINUX') and = \ + config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : [= ]) + \ + (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : [= ]) + \ + (config_all_devices.has_key('CONFIG_PVPANIC') ? ['pvpanic-test'] : []) += \ + (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + = \ + (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : [= ]) + \ + (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) += \ + (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] := []) + \ + (config_all_devices.has_key('CONFIG_USB_UHCI') and = \ + config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] := []) + \ + (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test= '] : []) + \ + (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] : []) += \ + (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-swtpm-test'] := []) + \ + (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : [= ]) + \ + (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test= '] : []) + \ + (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : [= ]) + \ + qtests_pci + = \ + ['fdc-test', + 'ide-test', + 'ahci-test', + 'hd-geo-test', + 'boot-order-test', + 'bios-tables-test', + 'rtc-test', + 'i440fx-test', + 'fw_cfg-test', + 'device-plug-test', + 'drive_del-test', + 'tco-test', + 'cpu-plug-test', + 'q35-test', + 'vmgenid-test', + 'migration-test', + 'test-x86-cpuid-compat', + 'numa-test'] + +dbus_daemon =3D find_program('dbus-daemon', required: false) +if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN') + # Temporarily disabled due to Patchew failures: + #qtests_i386 +=3D ['dbus-vmstate-test'] + dbus_vmstate1 =3D custom_target('dbus-vmstate description', + output: ['dbus-vmstate1.h', 'dbus-vmstate1= .c'], + input: files('dbus-vmstate1.xml'), + command: [config_host['GDBUS_CODEGEN'], + '@INPUT@', + '--interface-prefix', 'org.qemu', + '--generate-c-code', '@BASENAME@= ']).to_list() +else + dbus_vmstate1 =3D [] +endif + +qtests_x86_64 =3D qtests_i386 + +qtests_alpha =3D [ 'boot-serial-test' ] + = \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + +qtests_avr =3D [ 'boot-serial-test' ] + +qtests_hppa =3D [ 'boot-serial-test' ] + = \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + +qtests_m68k =3D [ 'boot-serial-test' ] +qtests_microblaze =3D [ 'boot-serial-test' ] +qtests_microblazeel =3D qtests_microblaze + +qtests_mips =3D \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + +qtests_mips64 =3D \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + +qtests_mips64el =3D \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + +qtests_moxie =3D [ 'boot-serial-test' ] + +qtests_ppc =3D \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + = \ + ['boot-order-test', 'prom-env-test', 'drive_del-test', 'boot-serial-test= '] \ + +qtests_ppc64 =3D \ + (config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : [= ]) + \ + (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : [])= + \ + (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + = \ + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : = []) + \ + (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] := []) + \ + (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test= '] : []) + \ + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + = \ + qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test'] + +qtests_sh4 =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endia= nness-test'] : []) +qtests_sh4eb =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['end= ianness-test'] : []) + +qtests_sparc =3D ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + +qtests_sparc64 =3D \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + ['prom-env-test', 'boot-serial-test'] + +qtests_arm =3D \ + (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test= '] : []) + \ + ['arm-cpu-features', + 'microbit-test', + 'm25p80-test', + 'test-arm-mptimer', + 'boot-serial-test', + 'hexloader-test'] + +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-tes= t unconditional +qtests_aarch64 =3D \ + (cpu !=3D 'arm' ? ['bios-tables-test'] : []) + = \ + (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= test'] : []) + \ + (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= swtpm-test'] : []) + \ + ['numa-test', + 'boot-serial-test', + 'migration-test'] + +qtests_s390x =3D \ + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : = []) + \ + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + = \ + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) = + \ + ['boot-serial-test', + 'drive_del-test', + 'device-plug-test', + 'virtio-ccw-test', + 'cpu-plug-test', + 'migration-test'] + +qos_test_ss =3D ss.source_set() +qos_test_ss.add( + 'ac97-test.c', + 'ds1338-test.c', + 'e1000-test.c', + 'e1000e-test.c', + 'eepro100-test.c', + 'es1370-test.c', + 'ipoctal232-test.c', + 'megasas-test.c', + 'ne2000-test.c', + 'tulip-test.c', + 'nvme-test.c', + 'pca9552-test.c', + 'pci-test.c', + 'pcnet-test.c', + 'sdhci-test.c', + 'spapr-phb-test.c', + 'tmp105-test.c', + 'usb-hcd-ohci-test.c', + 'virtio-test.c', + 'virtio-blk-test.c', + 'virtio-net-test.c', + 'virtio-rng-test.c', + 'virtio-scsi-test.c', + 'virtio-serial-test.c', + 'vmxnet3-test.c', +) +qos_test_ss.add(when: 'CONFIG_VIRTFS', if_true: files('virtio-9p-test.c')) +qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-test= .c')) + +extra_qtest_deps =3D { + 'bios-tables-test': [io], + 'ivshmem-test': [rt], + 'qos-test': [chardev, io], + 'tpm-crb-swtpm-test': [io], + 'tpm-crb-test': [io], + 'tpm-tis-swtpm-test': [io], + 'tpm-tis-test': [io], + 'tpm-tis-device-swtpm-test': [io], + 'tpm-tis-device-test': [io], +} +extra_qtest_srcs =3D { + 'bios-tables-test': files('boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'), + 'pxe-test': files('boot-sector.c'), + 'cdrom-test': files('boot-sector.c'), + 'migration-test': files('migration-helpers.c'), + 'ivshmem-test': files('../../contrib/ivshmem-server/ivshmem-server.c'), + 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1, + 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'), + 'tpm-crb-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'), + 'tpm-crb-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'), + 'tpm-tis-device-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-u= til.c', 'tpm-tests.c'), + 'tpm-tis-device-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c'= , 'tpm-tests.c'), + 'tpm-tis-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c',= 'tpm-tests.c'), + 'tpm-tis-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-= tests.c'), + 'qos-test': qos_test_ss.apply(config_host, strict: false).sources() +} + + +qtest_executables =3D {} +foreach dir : target_dirs + if not dir.endswith('-softmmu') + continue + endif + + target_base =3D dir.split('-')[0] + qtests =3D get_variable('qtests_' + target_base, []) + qtests_generic + + qtest_env =3D environment() + qtest_env.set('QTEST_QEMU_IMG', './qemu-img') + qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vm= state-daemon.sh') + qtest_env.set('QTEST_QEMU_BINARY', '@0@-softmmu/qemu-system-@0@'.format(= target_base)) + =20 + foreach test : qtests + # Executables are shared across targets, declare them only the first t= ime we + # encounter them + if not qtest_executables.has_key(test) + qtest_executables +=3D { + test: executable(test, + files(test + '.c') + extra_qtest_srcs.get(test, [= ]), + dependencies: [qemuutil, qos] + extra_qtest_deps.= get(test, [])) + } + endif + # FIXME: missing dependency on the emulator binary and qemu-img + test('qtest-@0@: @1@'.format(target_base, test), + qtest_executables[test], + env: qtest_env, + args: ['--tap', '-k'], + protocol: 'tap', + suite: ['qtest', 'qtest-' + target_base]) + endforeach +endforeach diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c index 04e199e..2b25557 100644 --- a/tests/qtest/microbit-test.c +++ b/tests/qtest/microbit-test.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "exec/hwaddr.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 #include "hw/arm/nrf51.h" #include "hw/char/nrf51_uart.h" diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helper= s.h index a11808b..d63bba9 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -12,7 +12,7 @@ #ifndef MIGRATION_HELPERS_H_ #define MIGRATION_HELPERS_H_ =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 extern bool got_stop; =20 diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 21ea5ba..00a233c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qemu/module.h" @@ -25,7 +25,7 @@ #include "qapi/qobject-output-visitor.h" =20 #include "migration-helpers.h" -#include "migration/migration-test.h" +#include "tests/migration/migration-test.h" =20 /* TODO actually test the results and get rid of this */ #define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS_= _)) diff --git a/tests/qtest/modules-test.c b/tests/qtest/modules-test.c index 8821768..c238b3f 100644 --- a/tests/qtest/modules-test.c +++ b/tests/qtest/modules-test.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 const char common_args[] =3D "-nodefaults -machine none"; =20 diff --git a/tests/qtest/ne2000-test.c b/tests/qtest/ne2000-test.c index 3fc0e55..43cfc45 100644 --- a/tests/qtest/ne2000-test.c +++ b/tests/qtest/ne2000-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index e1ed6d4..b25ebf9 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 diff --git a/tests/qtest/nvme-test.c b/tests/qtest/nvme-test.c index ff04421..d32c953 100644 --- a/tests/qtest/nvme-test.c +++ b/tests/qtest/nvme-test.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/qgraph.h" #include "libqos/pci.h" =20 diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c index d80ed93..42a1312 100644 --- a/tests/qtest/pca9552-test.c +++ b/tests/qtest/pca9552-test.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" #include "hw/misc/pca9552_regs.h" diff --git a/tests/qtest/pci-test.c b/tests/qtest/pci-test.c index 4b2092b..e15d4d9 100644 --- a/tests/qtest/pci-test.c +++ b/tests/qtest/pci-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/pcnet-test.c b/tests/qtest/pcnet-test.c index 900944f..7583aeb 100644 --- a/tests/qtest/pcnet-test.c +++ b/tests/qtest/pcnet-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-tes= t.c index 17aa669..afb702b 100644 --- a/tests/qtest/pflash-cfi02-test.c +++ b/tests/qtest/pflash-cfi02-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 /* * To test the pflash_cfi02 device, we run QEMU with the musicpal machine = with diff --git a/tests/qtest/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c index 2c46d5c..c8d4043 100644 --- a/tests/qtest/pnv-xscom-test.c +++ b/tests/qtest/pnv-xscom-test.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" =20 typedef enum PnvChipType { PNV_CHIP_POWER8E, /* AKA Murano (default) */ diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c index 60e6ec3..f41d801 100644 --- a/tests/qtest/prom-env-test.c +++ b/tests/qtest/prom-env-test.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/libqos-spapr.h" =20 #define MAGIC 0xcafec0de diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c index ff9176a..e576394 100644 --- a/tests/qtest/pvpanic-test.c +++ b/tests/qtest/pvpanic-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" =20 static void test_panic(void) diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c index 1161a77..32bbae3 100644 --- a/tests/qtest/pxe-test.c +++ b/tests/qtest/pxe-test.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include #include "qemu-common.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "boot-sector.h" #include "libqos/libqos-spapr.h" =20 diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c index c922d81..b7cf144 100644 --- a/tests/qtest/q35-test.c +++ b/tests/qtest/q35-test.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/pci-host/q35.h" diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index f7b1aa7..f34e688 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/error.h" #include "qapi/qapi-visit-introspect.h" #include "qapi/qmp/qdict.h" diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c index 1a8876b..5950c3e 100644 --- a/tests/qtest/qmp-test.c +++ b/tests/qtest/qmp-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/error.h" #include "qapi/qapi-visit-control.h" #include "qapi/qmp/qdict.h" diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index 1acf0d7..eb34af8 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -13,7 +13,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qemu/cutils.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 static void test_properties(QTestState *qts, const char *path, bool recurs= e) { diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c index 167b42d..a7e83e7 100644 --- a/tests/qtest/rtas-test.c +++ b/tests/qtest/rtas-test.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 #include "libqos/libqos-spapr.h" #include "libqos/rtas.h" diff --git a/tests/qtest/sdhci-test.c b/tests/qtest/sdhci-test.c index 6275e76..a110cfe 100644 --- a/tests/qtest/sdhci-test.c +++ b/tests/qtest/sdhci-test.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/registerfields.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/pci-pc.h" #include "hw/pci/pci.h" diff --git a/tests/qtest/spapr-phb-test.c b/tests/qtest/spapr-phb-test.c index 093dc22..ea8d596 100644 --- a/tests/qtest/spapr-phb-test.c +++ b/tests/qtest/spapr-phb-test.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" =20 diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c index 254f735..47bc7ad 100644 --- a/tests/qtest/tco-test.c +++ b/tests/qtest/tco-test.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" #include "qapi/qmp/qdict.h" diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mir= ror.c index 1e3ced8..bc0dee6 100644 --- a/tests/qtest/test-filter-mirror.c +++ b/tests/qtest/test-filter-mirror.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qemu/iov.h" #include "qemu/sockets.h" diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter= -redirector.c index e4d5322..829db8c 100644 --- a/tests/qtest/test-filter-redirector.c +++ b/tests/qtest/test-filter-redirector.c @@ -52,7 +52,7 @@ =20 #include "qemu/osdep.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qemu/iov.h" #include "qemu/sockets.h" diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index d5e7ebd..aea1384 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" =20 static int verbose; =20 diff --git a/tests/qtest/tpm-crb-swtpm-test.c b/tests/qtest/tpm-crb-swtpm-t= est.c index 55fdb56..1d82a48 100644 --- a/tests/qtest/tpm-crb-swtpm-test.c +++ b/tests/qtest/tpm-crb-swtpm-test.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "tpm-tests.h" #include "hw/acpi/tpm.h" diff --git a/tests/qtest/tpm-tis-device-swtpm-test.c b/tests/qtest/tpm-tis-= device-swtpm-test.c index 7b20035..f7126ef 100644 --- a/tests/qtest/tpm-tis-device-swtpm-test.c +++ b/tests/qtest/tpm-tis-device-swtpm-test.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "tpm-tests.h" #include "hw/acpi/tpm.h" diff --git a/tests/qtest/tpm-tis-swtpm-test.c b/tests/qtest/tpm-tis-swtpm-t= est.c index 90131cb..fa590e6 100644 --- a/tests/qtest/tpm-tis-swtpm-test.c +++ b/tests/qtest/tpm-tis-swtpm-test.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "tpm-tests.h" #include "hw/acpi/tpm.h" diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c index 58a9593..e2b29ef 100644 --- a/tests/qtest/tpm-util.c +++ b/tests/qtest/tpm-util.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" =20 #include "hw/acpi/tpm.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "tpm-util.h" #include "qapi/qmp/qdict.h" =20 diff --git a/tests/qtest/tulip-test.c b/tests/qtest/tulip-test.c index 2fb6c4d..da16cbf 100644 --- a/tests/qtest/tulip-test.c +++ b/tests/qtest/tulip-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/virtio-rng-test.c b/tests/qtest/virtio-rng-test.c index 092ba13..e6b8cd8 100644 --- a/tests/qtest/virtio-rng-test.c +++ b/tests/qtest/virtio-rng-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-rng.h" diff --git a/tests/qtest/virtio-test.c b/tests/qtest/virtio-test.c index f7c6afd..6313417 100644 --- a/tests/qtest/virtio-test.c +++ b/tests/qtest/virtio-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c index efba76e..6781a51 100644 --- a/tests/qtest/vmgenid-test.c +++ b/tests/qtest/vmgenid-test.c @@ -14,7 +14,7 @@ #include "hw/acpi/acpi-defs.h" #include "boot-sector.h" #include "acpi-utils.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" =20 #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87" diff --git a/tests/qtest/vmxnet3-test.c b/tests/qtest/vmxnet3-test.c index a810252..97c23fd 100644 --- a/tests/qtest/vmxnet3-test.c +++ b/tests/qtest/vmxnet3-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qtest/wdt_ib700-test.c b/tests/qtest/wdt_ib700-test.c index 797288d..6c36e43 100644 --- a/tests/qtest/wdt_ib700-test.c +++ b/tests/qtest/wdt_ib700-test.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qemu/timer.h" =20 diff --git a/tests/test-qga.c b/tests/test-qga.c index d1b4c3e..4ac4c22 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -4,7 +4,7 @@ #include #include =20 -#include "libqtest.h" +#include "libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 diff --git a/tests/test-qgraph.c b/tests/test-qgraph.c index 5c7e457..267291c 100644 --- a/tests/test-qgraph.c +++ b/tests/test-qgraph.c @@ -17,9 +17,8 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest.h" -#include "libqos/qgraph.h" -#include "libqos/qgraph_internal.h" +#include "qtest/libqos/qgraph.h" +#include "qtest/libqos/qgraph_internal.h" =20 #define MACHINE_PC "x86_64/pc" #define MACHINE_RASPI2 "arm/raspi2" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080842; cv=none; d=zohomail.com; s=zohoarc; b=Jh4na6gjAGVdwdbxso0+CbO9FTyvlILWZu1tsKmIGYs/a37zQj663cS5pjO6FfuzasqldChrk9v3iMC8ogoULPO3bQsXc4+34c47hb7xv19byxQbMGeey7GHy5HpTbm6xxYFXlgJMPsqOVGFqQl5NuWuFZw5mg1JJ0Wx8+9EE2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080842; 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=DWAtnCjJKl+asSE3wp2Q4i+l9nlHgDCMGzACJv0gWQk=; b=PWZJq/kYLG1UltQHG+ReaGPWgQi4HkHYKOtudN0OqbYuSNHvwHmEEoSawtbY3374DDfYQgOt/48iTtFfYQ3Xu9+y/KDhEyTy9a+zoel/xqwreH2ELpFewR7klzw3HLwiENLWHfZJj01WWGZWoWA4aQj8TI+7Z8oq+V5zhq508Bs= 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 1597080842342395.5357926693458; Mon, 10 Aug 2020 10:34:02 -0700 (PDT) Received: from localhost ([::1]:38296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BgP-00055B-0z for importer@patchew.org; Mon, 10 Aug 2020 13:34:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKN-0000k8-Kw for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53434 helo=us-smtp-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 1k5BKJ-00037i-Ur for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:15 -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-457-Zh9fZ0rRPwaa_cxBuG4P8Q-1; Mon, 10 Aug 2020 13:11:03 -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 0887719067F8 for ; Mon, 10 Aug 2020 17:11:03 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 466395F1E9; Mon, 10 Aug 2020 17:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079471; 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=DWAtnCjJKl+asSE3wp2Q4i+l9nlHgDCMGzACJv0gWQk=; b=L17cXsZxtzBA9wQvQWOOIdQUe5uwrm/Lh02cxvntb+PETM43D4QT4a3uLN1C3r74UJ2dLd MRFycadUSBl9u3rTKb3ChGAcWywTsuIXqyb0uJ+iJx1NjcXnQu420/d4TD/Wwdekq5tcRE /AM7UU1plQcujYmgFuS5eiRIr2EqRFg= X-MC-Unique: Zh9fZ0rRPwaa_cxBuG4P8Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 067/147] meson: convert audio directory to Meson Date: Mon, 10 Aug 2020 19:07:45 +0200 Message-Id: <1597079345-42801-68-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 7 +++++-- Makefile.target | 3 ++- audio/Makefile.objs | 35 ----------------------------------- audio/meson.build | 32 ++++++++++++++++++++++++++++++++ configure | 16 ++++++++++++++++ meson.build | 29 ++++++++++++++++++++++++++++- 6 files changed, 83 insertions(+), 39 deletions(-) delete mode 100644 audio/Makefile.objs create mode 100644 audio/meson.build diff --git a/Makefile.objs b/Makefile.objs index e43526f..ec7627a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -63,6 +63,11 @@ common-obj-$(CONFIG_LINUX) +=3D fsdev/ 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) +common-obj-$(CONFIG_AUDIO_PA) +=3D audio-pa$(DSOSUF) +common-obj-$(CONFIG_AUDIO_SDL) +=3D audio-sdl$(DSOSUF) + common-obj-$(if $(CONFIG_CURL),m) +=3D block-curl$(DSOSUF) common-obj-$(if $(CONFIG_GLUSTERFS),m) +=3D block-gluster$(DSOSUF) common-obj-$(if $(CONFIG_LIBISCSI),m) +=3D block-iscsi$(DSOSUF) @@ -73,8 +78,6 @@ common-obj-$(if $(CONFIG_RBD),m) +=3D block-rbd$(DSOSUF) common-obj-$(if $(CONFIG_LZFSE),m) +=3D block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=3D block-dmg-bz2= $(DSOSUF) =20 -common-obj-y +=3D audio/ -common-obj-m +=3D audio/ common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 diff --git a/Makefile.target b/Makefile.target index c8c4b70..ff0e1b2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -166,9 +166,10 @@ LIBS :=3D $(libs_softmmu) $(LIBS) # Temporary until emulators are linked by Meson LIBS :=3D $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) -LIBS :=3D $(LIBS) +LIBS :=3D $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) endif LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) +LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/audio/Makefile.objs b/audio/Makefile.objs deleted file mode 100644 index b4a4c11..0000000 --- a/audio/Makefile.objs +++ /dev/null @@ -1,35 +0,0 @@ -common-obj-y =3D audio.o audio_legacy.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SPICE) +=3D spiceaudio.o -common-obj-$(CONFIG_AUDIO_COREAUDIO) +=3D coreaudio.o -common-obj-$(CONFIG_AUDIO_DSOUND) +=3D dsoundaudio.o -common-obj-$(CONFIG_AUDIO_WIN_INT) +=3D audio_win_int.o -common-obj-y +=3D wavcapture.o - -coreaudio.o-libs :=3D $(COREAUDIO_LIBS) -dsoundaudio.o-libs :=3D $(DSOUND_LIBS) - -# alsa module -common-obj-$(CONFIG_AUDIO_ALSA) +=3D alsa.mo -alsa.mo-objs =3D alsaaudio.o -alsa.mo-libs :=3D $(ALSA_LIBS) - -# oss module -common-obj-$(CONFIG_AUDIO_OSS) +=3D oss.mo -oss.mo-objs =3D ossaudio.o -oss.mo-libs :=3D $(OSS_LIBS) - -# pulseaudio module -common-obj-$(CONFIG_AUDIO_PA) +=3D pa.mo -pa.mo-objs =3D paaudio.o -pa.mo-libs :=3D $(PULSE_LIBS) - -# sdl module -common-obj-$(CONFIG_AUDIO_SDL) +=3D sdl.mo -sdl.mo-objs =3D sdlaudio.o -sdl.mo-cflags :=3D $(SDL_CFLAGS) -sdl.mo-libs :=3D $(SDL_LIBS) - -# jack module -common-obj-$(CONFIG_AUDIO_JACK) +=3D jack.mo -jack.mo-objs =3D jackaudio.o -jack.mo-libs :=3D $(JACK_LIBS) diff --git a/audio/meson.build b/audio/meson.build new file mode 100644 index 0000000..0813722 --- /dev/null +++ b/audio/meson.build @@ -0,0 +1,32 @@ +softmmu_ss.add(files( + 'audio.c', + 'audio_legacy.c', + 'mixeng.c', + 'noaudio.c', + 'wavaudio.c', + 'wavcapture.c', +)) + +softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spiceaudio.c= ')) +softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], if_true: files= ('coreaudio.c')) +softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true: files('dsou= ndaudio.c')) +softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: files('audio_win_i= nt.c')) + +audio_modules =3D [] +if 'CONFIG_AUDIO_ALSA' in config_host + audio_modules +=3D [['alsa', files('alsaaudio.c'), alsa]] +endif +if 'CONFIG_AUDIO_OSS' in config_host + audio_modules +=3D [['oss', files('ossaudio.c'), oss]] +endif +if 'CONFIG_AUDIO_PA' in config_host + audio_modules +=3D [['pa', files('paaudio.c'), pulse]] +endif +if 'CONFIG_AUDIO_SDL' in config_host + audio_modules +=3D [['sdl', files('sdlaudio.c'), sdl]] +endif +if 'CONFIG_AUDIO_JACK' in config_host + audio_modules +=3D [['jack', files('jackaudio.c'), jack]] +endif + +modules +=3D {'audio': audio_modules} diff --git a/configure b/configure index 875f088..7625294 100755 --- a/configure +++ b/configure @@ -3703,6 +3703,8 @@ for drv in $audio_drv_list; do alsa | try-alsa) if $pkg_config alsa --exists; then alsa_libs=3D$($pkg_config alsa --libs) + alsa_cflags=3D$($pkg_config alsa --cflags) + alsa=3Dyes if test "$drv" =3D "try-alsa"; then audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-alsa= /alsa/') fi @@ -3718,7 +3720,9 @@ for drv in $audio_drv_list; do =20 pa | try-pa) if $pkg_config libpulse --exists; then + libpulse=3Dyes pulse_libs=3D$($pkg_config libpulse --libs) + pulse_cflags=3D$($pkg_config libpulse --cflags) if test "$drv" =3D "try-pa"; then audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa/p= a/') fi @@ -3761,6 +3765,7 @@ for drv in $audio_drv_list; do =20 jack | try-jack) if $pkg_config jack --exists; then + libjack=3Dyes jack_libs=3D$($pkg_config jack --libs) if test "$drv" =3D "try-jack"; then audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-jack= /jack/') @@ -6964,11 +6969,22 @@ for drv in $audio_drv_list; do echo "$def=3Dy" >> $config_host_mak ;; esac done +if test "$alsa" =3D "yes" ; then + echo "CONFIG_ALSA=3Dy" >> $config_host_mak +fi echo "ALSA_LIBS=3D$alsa_libs" >> $config_host_mak +echo "ALSA_CFLAGS=3D$alsa_cflags" >> $config_host_mak +if test "$libpulse" =3D "yes" ; then + echo "CONFIG_LIBPULSE=3Dy" >> $config_host_mak +fi echo "PULSE_LIBS=3D$pulse_libs" >> $config_host_mak +echo "PULSE_CFLAGS=3D$pulse_cflags" >> $config_host_mak echo "COREAUDIO_LIBS=3D$coreaudio_libs" >> $config_host_mak echo "DSOUND_LIBS=3D$dsound_libs" >> $config_host_mak echo "OSS_LIBS=3D$oss_libs" >> $config_host_mak +if test "$libjack" =3D "yes" ; then + echo "CONFIG_LIBJACK=3Dy" >> $config_host_mak +fi echo "JACK_LIBS=3D$jack_libs" >> $config_host_mak if test "$audio_win_int" =3D "yes" ; then echo "CONFIG_AUDIO_WIN_INT=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index 2ff1be0..f241901 100644 --- a/meson.build +++ b/meson.build @@ -135,6 +135,20 @@ if 'CONFIG_XKBCOMMON' in config_host xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), link_args: config_host['XKBCOMMON_LIBS'].= split()) endif +pulse =3D not_found +if 'CONFIG_LIBPULSE' in config_host + pulse =3D declare_dependency(compile_args: config_host['PULSE_CFLAGS'].s= plit(), + link_args: config_host['PULSE_LIBS'].split()) +endif +alsa =3D not_found +if 'CONFIG_ALSA' in config_host + alsa =3D declare_dependency(compile_args: config_host['ALSA_CFLAGS'].spl= it(), + link_args: config_host['ALSA_LIBS'].split()) +endif +jack =3D not_found +if 'CONFIG_LIBJACK' in config_host + jack =3D declare_dependency(link_args: config_host['JACK_LIBS'].split()) +endif spice =3D not_found if 'CONFIG_SPICE' in config_host spice =3D declare_dependency(compile_args: config_host['SPICE_CFLAGS'].s= plit(), @@ -205,6 +219,18 @@ liblzfse =3D not_found if 'CONFIG_LZFSE' in config_host liblzfse =3D declare_dependency(link_args: config_host['LZFSE_LIBS'].spl= it()) endif +oss =3D not_found +if 'CONFIG_AUDIO_OSS' in config_host + oss =3D declare_dependency(link_args: config_host['OSS_LIBS'].split()) +endif +dsound =3D not_found +if 'CONFIG_AUDIO_DSOUND' in config_host + dsound =3D declare_dependency(link_args: config_host['DSOUND_LIBS'].spli= t()) +endif +coreaudio =3D not_found +if 'CONFIG_AUDIO_COREAUDIO' in config_host + coreaudio =3D declare_dependency(link_args: config_host['COREAUDIO_LIBS'= ].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -506,6 +532,7 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') @@ -538,7 +565,7 @@ foreach d, list : modules else softmmu_mods +=3D sl endif - mods +=3D {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]} + mods +=3D {'dir': d, 'name': m[0], 'lib': [sl, libmodulecommon], 'de= ps': m[2]} else if d =3D=3D 'block' block_ss.add(when: [m.get(3, []), m[2]], if_true: m[1]) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080930; cv=none; d=zohomail.com; s=zohoarc; b=THWgnbm2wUvC6gJFpYu099+iGXhO2RA8a3B/kePsngNuqdRSKTTbDk0LZoaJmjLYizZQ6IXHcN7xEryUpjpPdn86HiAUI81POZhKhq4hNrpd5IrinK5NAA/nY3HvAxiKrlLwWP1Sg65I/7oMiZOl1DRtIuVU5GSCaJlzNOpEKVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080930; 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=U9tENlI3OSpcvUKgqzKyeWVhxVqePs0uSqYoIWW07J0=; b=YYQN8DbjqO0Mw2Nup1+svwdygeceDOom2RdQNF+NN57H4W3xuijqXpbVLDfldr3EdXApsMmQc+HJPsRc1JmewmDgUQ4x6VzRf9z7g3j/j0+oIZ5aIfGgoCix0hm5VgbqLwLtFF5feRLNcwz6fNAWAGIx2HKnrEcFVnMeJzetyrg= 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 1597080930423395.11355915569527; Mon, 10 Aug 2020 10:35:30 -0700 (PDT) Received: from localhost ([::1]:46762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bho-0008Tq-Fp for importer@patchew.org; Mon, 10 Aug 2020 13:35:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKP-0000om-E3 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BKK-00037u-Ox 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-534-72I0dqwaPLex1XeIpt0_wA-1; Mon, 10 Aug 2020 13:11:05 -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 68633800472 for ; Mon, 10 Aug 2020 17:11:04 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73EFF5F1E9; Mon, 10 Aug 2020 17:11:03 +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=U9tENlI3OSpcvUKgqzKyeWVhxVqePs0uSqYoIWW07J0=; b=RnW30lu1jkez68j3vrK8bSmn3qDYNKYCJ9AbzvEZ2rD/MN7Q0WjgTw0daXiM62y9yHHGO2 a/zseinVkL6AHIGgvjw4TU5yKwXfNd+Vtnhwy872qK3qNIMvO6aTZ6ECykzttArGHv2Mg0 pLU6vbiICofMAbpMdOBRzfLtRwiNsEk= X-MC-Unique: 72I0dqwaPLex1XeIpt0_wA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 068/147] meson: convert ui directory to Meson Date: Mon, 10 Aug 2020 19:07:46 +0200 Message-Id: <1597079345-42801-69-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=63.128.21.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/10 13:09:25 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 | 8 ++++-- Makefile.target | 8 +++--- configure | 6 ++++ meson.build | 50 ++++++++++++++++++++++++++++++++++ ui/Makefile.objs | 73 ------------------------------------------------- ui/meson.build | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++= +++- ui/shader.c | 6 ++-- 7 files changed, 150 insertions(+), 84 deletions(-) delete mode 100644 ui/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index ec7627a..72e9350 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -68,6 +68,11 @@ common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) common-obj-$(CONFIG_AUDIO_PA) +=3D audio-pa$(DSOSUF) common-obj-$(CONFIG_AUDIO_SDL) +=3D audio-sdl$(DSOSUF) =20 +common-obj-$(if $(CONFIG_CURSES),m) +=3D ui-curses$(DSOSUF) +common-obj-$(if $(CONFIG_GTK),m) +=3D ui-gtk$(DSOSUF) +common-obj-$(if $(CONFIG_SDL),m) +=3D ui-sdl$(DSOSUF) +common-obj-$(if $(CONFIG_SPICE),m) +=3D ui-spice-app$(DSOSUF) + common-obj-$(if $(CONFIG_CURL),m) +=3D block-curl$(DSOSUF) common-obj-$(if $(CONFIG_GLUSTERFS),m) +=3D block-gluster$(DSOSUF) common-obj-$(if $(CONFIG_LIBISCSI),m) +=3D block-iscsi$(DSOSUF) @@ -83,9 +88,6 @@ common-obj-m +=3D hw/ =20 common-obj-y +=3D replay/ =20 -common-obj-y +=3D ui/ -common-obj-m +=3D ui/ - common-obj-y +=3D dma-helpers.o common-obj-$(CONFIG_TPM) +=3D tpm.o =20 diff --git a/Makefile.target b/Makefile.target index ff0e1b2..16f1e78 100644 --- a/Makefile.target +++ b/Makefile.target @@ -167,8 +167,9 @@ LIBS :=3D $(libs_softmmu) $(LIBS) LIBS :=3D $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS :=3D $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) +LIBS :=3D $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICO= NV_LIBS) $(GIO_LIBS) endif -LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) +LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) =20 # Hardware support @@ -207,9 +208,8 @@ dummy :=3D $(call fix-paths,../,, \ crypto-obj-y \ io-obj-y \ qom-obj-y) -dummy :=3D $(call unnest-vars,.., \ - common-obj-y \ - common-obj-m) +dummy :=3D $(call unnest-vars,..,common-obj-y) + all-obj-y +=3D $(common-obj-y) all-obj-y +=3D $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) diff --git a/configure b/configure index 7625294..1f39fd4 100755 --- a/configure +++ b/configure @@ -6997,12 +6997,18 @@ fi if test "$vnc_sasl" =3D "yes" ; then echo "CONFIG_VNC_SASL=3Dy" >> $config_host_mak fi +echo "SASL_CFLAGS=3D$vnc_sasl_cflags" >> $config_host_mak +echo "SASL_LIBS=3D$vnc_sasl_libs" >> $config_host_mak if test "$vnc_jpeg" =3D "yes" ; then echo "CONFIG_VNC_JPEG=3Dy" >> $config_host_mak fi +echo "JPEG_CFLAGS=3D$vnc_jpeg_cflags" >> $config_host_mak +echo "JPEG_LIBS=3D$vnc_jpeg_libs" >> $config_host_mak if test "$vnc_png" =3D "yes" ; then echo "CONFIG_VNC_PNG=3Dy" >> $config_host_mak fi +echo "PNG_CFLAGS=3D$vnc_png_cflags" >> $config_host_mak +echo "PNG_LIBS=3D$vnc_png_libs" >> $config_host_mak if test "$xkbcommon" =3D "yes" ; then echo "CONFIG_XKBCOMMON=3Dy" >> $config_host_mak echo "XKBCOMMON_CFLAGS=3D$xkbcommon_cflags" >> $config_host_mak diff --git a/meson.build b/meson.build index f241901..f9e9b92 100644 --- a/meson.build +++ b/meson.build @@ -231,6 +231,56 @@ coreaudio =3D not_found if 'CONFIG_AUDIO_COREAUDIO' in config_host coreaudio =3D declare_dependency(link_args: config_host['COREAUDIO_LIBS'= ].split()) endif +opengl =3D not_found +if 'CONFIG_OPENGL' in config_host + opengl =3D declare_dependency(link_args: config_host['OPENGL_LIBS'].spli= t()) +else +endif +gtk =3D not_found +if 'CONFIG_GTK' in config_host + gtk =3D declare_dependency(compile_args: config_host['GTK_CFLAGS'].split= (), + link_args: config_host['GTK_LIBS'].split()) +endif +vte =3D not_found +if 'CONFIG_VTE' in config_host + vte =3D declare_dependency(compile_args: config_host['VTE_CFLAGS'].split= (), + link_args: config_host['VTE_LIBS'].split()) +endif +x11 =3D not_found +if 'CONFIG_X11' in config_host + x11 =3D declare_dependency(compile_args: config_host['X11_CFLAGS'].split= (), + link_args: config_host['X11_LIBS'].split()) +endif +curses =3D not_found +if 'CONFIG_CURSES' in config_host + curses =3D declare_dependency(compile_args: config_host['CURSES_CFLAGS']= .split(), + link_args: config_host['CURSES_LIBS'].split(= )) +endif +iconv =3D not_found +if 'CONFIG_ICONV' in config_host + iconv =3D declare_dependency(compile_args: config_host['ICONV_CFLAGS'].s= plit(), + link_args: config_host['ICONV_LIBS'].split()) +endif +gio =3D not_found +if 'CONFIG_GIO' in config_host + gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), + link_args: config_host['GIO_LIBS'].split()) +endif +png =3D not_found +if 'CONFIG_VNC_PNG' in config_host + png =3D declare_dependency(compile_args: config_host['PNG_CFLAGS'].split= (), + link_args: config_host['PNG_LIBS'].split()) +endif +jpeg =3D not_found +if 'CONFIG_VNC_JPEG' in config_host + jpeg =3D declare_dependency(compile_args: config_host['JPEG_CFLAGS'].spl= it(), + link_args: config_host['JPEG_LIBS'].split()) +endif +sasl =3D not_found +if 'CONFIG_VNC_SASL' in config_host + sasl =3D declare_dependency(compile_args: config_host['SASL_CFLAGS'].spl= it(), + link_args: config_host['SASL_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') diff --git a/ui/Makefile.objs b/ui/Makefile.objs deleted file mode 100644 index 504b196..0000000 --- a/ui/Makefile.objs +++ /dev/null @@ -1,73 +0,0 @@ -vnc-obj-y +=3D vnc.o -vnc-obj-y +=3D vnc-enc-zlib.o vnc-enc-hextile.o -vnc-obj-y +=3D vnc-enc-tight.o vnc-palette.o -vnc-obj-y +=3D vnc-enc-zrle.o -vnc-obj-y +=3D vnc-auth-vencrypt.o -vnc-obj-$(CONFIG_VNC_SASL) +=3D vnc-auth-sasl.o -vnc-obj-y +=3D vnc-ws.o -vnc-obj-y +=3D vnc-jobs.o - -common-obj-y +=3D keymaps.o console.o cursor.o qemu-pixman.o -common-obj-y +=3D input.o input-keymap.o input-legacy.o kbd-state.o -common-obj-y +=3D input-barrier.o -common-obj-$(CONFIG_LINUX) +=3D input-linux.o -common-obj-$(CONFIG_SPICE) +=3D spice-core.o spice-input.o spice-display.o -common-obj-$(CONFIG_COCOA) +=3D cocoa.o -common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) -common-obj-$(call lnot,$(CONFIG_VNC)) +=3D vnc-stubs.o -ifneq (,$(findstring m,$(CONFIG_SDL)$(CONFIG_GTK))) -common-obj-$(CONFIG_WIN32) +=3D win32-kbd-hook.o -endif - -# ui-sdl module -common-obj-$(CONFIG_SDL) +=3D sdl.mo -sdl.mo-objs :=3D sdl2.o sdl2-input.o sdl2-2d.o -ifeq ($(CONFIG_OPENGL),y) -sdl.mo-objs +=3D sdl2-gl.o -endif -sdl.mo-cflags :=3D $(SDL_CFLAGS) -sdl.mo-libs :=3D $(SDL_LIBS) - -# ui-gtk module -common-obj-$(CONFIG_GTK) +=3D gtk.mo -gtk.mo-objs :=3D gtk.o -gtk.mo-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk.mo-libs :=3D $(GTK_LIBS) $(VTE_LIBS) -ifeq ($(CONFIG_OPENGL),y) -gtk.mo-objs +=3D gtk-egl.o -gtk.mo-libs +=3D $(OPENGL_LIBS) -ifeq ($(CONFIG_GTK_GL),y) -gtk.mo-objs +=3D gtk-gl-area.o -endif -endif - -ifeq ($(CONFIG_X11),y) -sdl.mo-objs +=3D x_keymap.o -gtk.mo-objs +=3D x_keymap.o -x_keymap.o-cflags :=3D $(X11_CFLAGS) -x_keymap.o-libs :=3D $(X11_LIBS) -endif - -common-obj-$(CONFIG_CURSES) +=3D curses.mo -curses.mo-objs :=3D curses.o -curses.mo-cflags :=3D $(CURSES_CFLAGS) $(ICONV_CFLAGS) -curses.mo-libs :=3D $(CURSES_LIBS) $(ICONV_LIBS) - -ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) -common-obj-$(if $(CONFIG_MODULES),m,y) +=3D spice-app.mo -endif -spice-app.mo-objs :=3D spice-app.o -spice-app.mo-cflags :=3D $(GIO_CFLAGS) -spice-app.mo-libs :=3D $(GIO_LIBS) - -common-obj-$(CONFIG_OPENGL) +=3D shader.o -common-obj-$(CONFIG_OPENGL) +=3D console-gl.o -common-obj-$(CONFIG_OPENGL) +=3D egl-helpers.o -common-obj-$(CONFIG_OPENGL) +=3D egl-context.o -common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o - -shader.o-libs +=3D $(OPENGL_LIBS) -console-gl.o-libs +=3D $(OPENGL_LIBS) -egl-helpers.o-libs +=3D $(OPENGL_LIBS) -egl-context.o-libs +=3D $(OPENGL_LIBS) -egl-headless.o-libs +=3D $(OPENGL_LIBS) diff --git a/ui/meson.build b/ui/meson.build index 8cf070c..246e518 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,83 @@ +softmmu_ss.add(files( + 'console.c', + 'cursor.c', + 'input-keymap.c', + 'input-legacy.c', + 'input-barrier.c', + 'input.c', + 'kbd-state.c', + 'keymaps.c', + 'qemu-pixman.c', +)) +softmmu_ss.add(pixman) + +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) +softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice= -input.c', 'spice-display.c')) +softmmu_ss.add(when: [cocoa, 'CONFIG_COCOA'], if_true: files('cocoa.m')) + +vnc_ss =3D ss.source_set() +vnc_ss.add(files( + 'vnc.c', + 'vnc-enc-zlib.c', + 'vnc-enc-hextile.c', + 'vnc-enc-tight.c', + 'vnc-palette.c', + 'vnc-enc-zrle.c', + 'vnc-auth-vencrypt.c', + 'vnc-ws.c', + 'vnc-jobs.c', +)) +vnc_ss.add(zlib) +vnc_ss.add(when: 'CONFIG_VNC_SASL', if_true: [files('vnc-auth-sasl.c'), sa= sl]) +softmmu_ss.add_all(when: 'CONFIG_VNC', if_true: vnc_ss) +softmmu_ss.add(when: 'CONFIG_VNC', if_false: files('vnc-stubs.c')) +softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c',= 'console-gl.c', 'egl-helpers.c', 'egl-context.c')) +softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL_DMABUF'], if_true: files('egl= -headless.c')) +softmmu_ss.add(when: 'CONFIG_VNC_PNG', if_true: png) +softmmu_ss.add(when: 'CONFIG_VNC_JPEG', if_true: jpeg) + +ui_modules =3D [] + +if config_host.has_key('CONFIG_CURSES') + ui_modules +=3D [['curses', files('curses.c'), [curses, iconv]]] +endif + +if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE') + softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + + gtk_ss =3D ss.source_set() + gtk_ss.add(gtk, vte, files('gtk.c')) + gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c')) + gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.= c')) + gtk_ss =3D gtk_ss.apply(config_host, strict: false) + ui_modules +=3D [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SDL') + softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + + sdl_ss =3D ss.source_set() + sdl_ss.add(pixman, glib, files( + 'sdl2-2d.c', + 'sdl2-input.c', + 'sdl2.c', + )) + sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c')) + sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + sdl_ss =3D sdl_ss.apply(config_host, strict: false) + ui_modules +=3D [['sdl', sdl_ss.sources(), sdl_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO= ') + spice_ss =3D ss.source_set() + spice_ss.add(spice, gio, files('spice-app.c')) + spice_ss =3D spice_ss.apply(config_host, strict: false) + ui_modules +=3D [['spice-app', spice_ss.sources(), spice_ss.dependencies= ()]] +endif + +keymap_gen =3D find_program('keycodemapdb/tools/keymap-gen') + keymaps =3D [ ['atset1', 'qcode'], ['linux', 'qcode'], @@ -24,7 +104,6 @@ if have_system genh +=3D custom_target(output, output: output, capture: true, - build_by_default: true, # to be removed when added to a = target input: files('keycodemapdb/data/keymaps.csv'), command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), '--lang', 'glib2', @@ -34,3 +113,5 @@ if have_system endif =20 subdir('shader') + +modules +=3D {'ui': ui_modules} diff --git a/ui/shader.c b/ui/shader.c index d78829f..e8b8d32 100644 --- a/ui/shader.c +++ b/ui/shader.c @@ -27,9 +27,9 @@ #include "qemu/osdep.h" #include "ui/shader.h" =20 -#include "shader/texture-blit-vert.h" -#include "shader/texture-blit-flip-vert.h" -#include "shader/texture-blit-frag.h" +#include "ui/shader/texture-blit-vert.h" +#include "ui/shader/texture-blit-flip-vert.h" +#include "ui/shader/texture-blit-frag.h" =20 struct QemuGLShader { GLint texture_blit_prog; --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081269; cv=none; d=zohomail.com; s=zohoarc; b=Zs3CdphZe4vTJoI3ebD/R8CGk/dFM8Zby7OfnVJA/ejNNHMlDHKEbAGr2a2nsXKu4EEkZ0ldTGF2Pyv1H8GrR4lbFvDWdVkfoL6tv2rlrDV7s0r3N1cFXzUMoztTz1y3egnlpruGi8bpO24nG6hFsl0fhRj8vndkTp/KIPpwVoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081269; 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=7bbzlAx+bKEGE8BZmUrfcd4VfwtKaJuO6uTpY45Bj6U=; b=Y4aPJxJAotN5HS0RV45IEA4gOfwXtwLbndjbXGxICpKyV/vyAKdFwzfT3KrBM63dBlixT1imciat8E6AFoHh7vg4UmJd96MRx+Bn02mlLBDfLKm7Bb49oQ3tycPMw0rmh0Sij1+VO1t2tln+1gFyTc+I4dV7ikeMWWdgus3psmA= 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 1597081269683422.46400738758086; Mon, 10 Aug 2020 10:41:09 -0700 (PDT) Received: from localhost ([::1]:46882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BnI-00037X-5N for importer@patchew.org; Mon, 10 Aug 2020 13:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKM-0000gX-7W for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BKJ-00037P-Dv for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:13 -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-439-LKI-4HSdM_eFKTkfpcHg7w-1; Mon, 10 Aug 2020 13:11:06 -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 C7053106B243 for ; Mon, 10 Aug 2020 17:11:05 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F795F1EA; Mon, 10 Aug 2020 17:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079468; 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=7bbzlAx+bKEGE8BZmUrfcd4VfwtKaJuO6uTpY45Bj6U=; b=H/8NqBCRJZSuYCgVMX14PwSXy63Pj6YuggqFolVAy6z8t0LtHk5maNhcBMoYUIiiJkVB+j mWtHxdWrKg6ZpU6s/cBYHN9jC0/QoRE2QvuKNr3YJfN3EWSeoh6hdVF5g0k32LkeuvdLPH qDvkledgCAVF2UgLUtYnq1A1edN+hh4= X-MC-Unique: LKI-4HSdM_eFKTkfpcHg7w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 069/147] meson: convert root directory to Meson Date: Mon, 10 Aug 2020 19:07:47 +0200 Message-Id: <1597079345-42801-70-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=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/10 11:11:16 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 21 ++------------------- Makefile.target | 2 +- configure | 2 ++ meson.build | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 72e9350..ec15ebc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -48,16 +48,9 @@ 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 blockdev.o blockdev-nbd.o -common-obj-y +=3D bootdevice.o iothread.o -common-obj-y +=3D dump/ -common-obj-y +=3D job-qmp.o +common-obj-y =3D dump/ common-obj-y +=3D monitor/ common-obj-y +=3D net/ -common-obj-y +=3D qdev-monitor.o -common-obj-$(CONFIG_WIN32) +=3D os-win32.o -common-obj-$(CONFIG_POSIX) +=3D os-posix.o - common-obj-$(CONFIG_LINUX) +=3D fsdev/ =20 common-obj-y +=3D accel/ @@ -87,25 +80,15 @@ common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 common-obj-y +=3D replay/ - -common-obj-y +=3D dma-helpers.o -common-obj-$(CONFIG_TPM) +=3D tpm.o - common-obj-y +=3D backends/ =20 -common-obj-$(CONFIG_SECCOMP) +=3D qemu-seccomp.o -qemu-seccomp.o-cflags :=3D $(SECCOMP_CFLAGS) -qemu-seccomp.o-libs :=3D $(SECCOMP_LIBS) - -common-obj-$(CONFIG_FDT) +=3D device_tree.o - common-obj-y +=3D qapi/ =20 endif # CONFIG_SOFTMMU =20 ####################################################################### # Target-independent parts used in system and user emulation -common-obj-y +=3D cpus-common.o + common-obj-y +=3D hw/ common-obj-y +=3D qom/ common-obj-y +=3D disas/ diff --git a/Makefile.target b/Makefile.target index 16f1e78..5f926e5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -169,7 +169,7 @@ ifneq ($(CONFIG_MODULES),y) LIBS :=3D $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) LIBS :=3D $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICO= NV_LIBS) $(GIO_LIBS) endif -LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) +LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) = $(SECCOMP_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) =20 # Hardware support diff --git a/configure b/configure index 1f39fd4..5fb5f2a 100755 --- a/configure +++ b/configure @@ -7308,6 +7308,8 @@ if test "$preadv" =3D "yes" ; then fi if test "$fdt" !=3D "no" ; then echo "CONFIG_FDT=3Dy" >> $config_host_mak + echo "FDT_CFLAGS=3D$fdt_cflags" >> $config_host_mak + echo "FDT_LIBS=3D$fdt_ldflags $fdt_libs" >> $config_host_mak fi if test "$membarrier" =3D "yes" ; then echo "CONFIG_MEMBARRIER=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index f9e9b92..c923e89 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,7 @@ targetos =3D host_machine.system() =20 m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) +winmm =3D [] socket =3D [] version_res =3D [] coref =3D [] @@ -55,6 +56,7 @@ cocoa =3D [] hvf =3D [] if host_machine.system() =3D=3D 'windows' socket =3D cc.find_library('ws2_32') + winmm =3D cc.find_library('winmm') =20 win =3D import('windows') version_res =3D win.compile_resources('version.rc', @@ -281,6 +283,11 @@ if 'CONFIG_VNC_SASL' in config_host sasl =3D declare_dependency(compile_args: config_host['SASL_CFLAGS'].spl= it(), link_args: config_host['SASL_LIBS'].split()) endif +fdt =3D not_found +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 =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -447,6 +454,7 @@ util_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() block_ss =3D ss.source_set() +blockdev_ss =3D ss.source_set() common_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() user_ss =3D ss.source_set() @@ -600,6 +608,31 @@ subdir('nbd') subdir('scsi') subdir('block') =20 +blockdev_ss.add(files( + 'blockdev.c', + 'blockdev-nbd.c', + 'iothread.c', + 'job-qmp.c', +), sdl) + +# os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, +# os-win32.c does not +blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c')) +softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')]) + +softmmu_ss.add_all(blockdev_ss) +softmmu_ss.add(files( + 'bootdevice.c', + 'dma-helpers.c', + 'qdev-monitor.c', +), sdl) + +softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c')) +softmmu_ss.add(when: 'CONFIG_SECCOMP', if_true: [files('qemu-seccomp.c'), = seccomp]) +softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c'= )]) + +common_ss.add(files('cpus-common.c')) + # needed for fuzzing binaries subdir('tests/qtest/libqos') =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597080753; cv=none; d=zohomail.com; s=zohoarc; b=bcrNUQjh8v8ifQjr3kzU5RaYCXDUbtjNbxSqfIUrF0V+XcQHWLI8PrEknbXbiF+px7hdQpqevvuk6DaIzGdHl4NuR7nQIhbMVu/5f4Zz0DbG1y1ULuJdbt1+f+R19rvRqi4hV7qzxcojjNV6J1TxHgD8WwpBjSM8BD9MGkwfXec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080753; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+loNnJtS6lAMaHqmpwGBHg/SqQDyBtkDdFqYy6B+sOA=; b=AKKmOUbZTahzV3MuA/FLHYkl/9/eYMgsnoilHgx4VEpWwIZD8n8qcRs3T6R7bbsJrQ/6tFzkPOzrWk8WLAxKe5Z643e0AJEDE3pGOEEDXv7uWBajswNZUeiXuuh8li2erpPmiEBoJaQbyu7IdYJcT+tKYlrwJIOC9ty7T+YNAeM= 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 1597080753188969.2645091414531; Mon, 10 Aug 2020 10:32:33 -0700 (PDT) Received: from localhost ([::1]:57988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bex-0001gB-NY for importer@patchew.org; Mon, 10 Aug 2020 13:32:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKM-0000iN-Vo for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:14 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20814 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 1k5BKJ-00037V-EX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:14 -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-397-dwwRRPjyMpqRO1f2FWM0bQ-1; Mon, 10 Aug 2020 13:11:07 -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 EE48D91271 for ; Mon, 10 Aug 2020 17:11:06 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 407D687D70 for ; Mon, 10 Aug 2020 17:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+loNnJtS6lAMaHqmpwGBHg/SqQDyBtkDdFqYy6B+sOA=; b=OpHlxtGN8YovOHUx6MJeyzmb/I6tn+C7+Y3VaNJW4yiHmqXtPmp8RIKaRAK7D1/jbAnZXN p8C3NyoSLt02SWs3nEojY1GPDl5VPmUa7fVafF2/l4bYIZ2ruZqccQN8chSRHFyJzNSwBH 3HcLMnkio8NFqbQSa+7EzYdpunGL+t0= X-MC-Unique: dwwRRPjyMpqRO1f2FWM0bQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 070/147] meson: convert most of softmmu/ Date: Mon, 10 Aug 2020 19:07:48 +0200 Message-Id: <1597079345-42801-71-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> 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Leave out main.c, it's special due to fuzzing. Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ softmmu/Makefile.objs | 14 +------------- softmmu/meson.build | 10 ++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 softmmu/meson.build diff --git a/meson.build b/meson.build index c923e89..3481c5b 100644 --- a/meson.build +++ b/meson.build @@ -633,6 +633,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [fi= les('device_tree.c')]) =20 common_ss.add(files('cpus-common.c')) =20 +subdir('softmmu') + # needed for fuzzing binaries subdir('tests/qtest/libqos') =20 diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs index a414a74..ebcfd15 100644 --- a/softmmu/Makefile.objs +++ b/softmmu/Makefile.objs @@ -1,14 +1,2 @@ softmmu-main-y =3D softmmu/main.o - -obj-y +=3D arch_init.o -obj-y +=3D cpus.o -obj-y +=3D cpu-throttle.o -obj-y +=3D balloon.o -obj-y +=3D ioport.o -obj-y +=3D memory.o -obj-y +=3D memory_mapping.o - -obj-y +=3D qtest.o - -obj-y +=3D vl.o -vl.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) +main.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) diff --git a/softmmu/meson.build b/softmmu/meson.build new file mode 100644 index 0000000..95d38df --- /dev/null +++ b/softmmu/meson.build @@ -0,0 +1,10 @@ +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'arch_init.c', + 'balloon.c', + 'cpus.c', + 'cpu-throttle.c', + 'ioport.c', + 'memory.c', + 'memory_mapping.c', + 'qtest.c', + 'vl.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081390; cv=none; d=zohomail.com; s=zohoarc; b=kKT2DqevWEmteuBRT4kuO4JHqs/i5OWXlQ/YeNW1Mo6LVArbqIs/AIN6BuYTDZQEWxQYKiflRh17iiIEWvk5m3jsp1o68CmTHEy+zQgTWDKBEvA83PJHSbRWSuMo9zHidEBCOKqPYcv8NdjoUo2npbFJxDg/4Avvgxu9JA8aKbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081390; 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=rMOW6W6XS9RyLY1r/8YD04AEpdfTZBhanvC6v25ekPM=; b=hHefTRolQrSAIijtWu71OFcpW2UKXYFhr1rd3+v7vcI9l2sB/8Jh61ls4/A705gsm/DNhPwSt/BuH/FN5YLrT3FOSm6Rfafbg516T//DfPk+25qWT8Dxn374foaJHgxDDyTJLRvMnGW26cRXxYKnYBsaLfwKlaLBlaaw1effSCw= 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 1597081390431234.8388449628727; Mon, 10 Aug 2020 10:43:10 -0700 (PDT) Received: from localhost ([::1]:56276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BpF-0006tM-3n for importer@patchew.org; Mon, 10 Aug 2020 13:43:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKN-0000kl-U6 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:15 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51361 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 1k5BKJ-00037e-L8 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:15 -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-559-JUddTc3rNn6OJU2I9dd9-g-1; Mon, 10 Aug 2020 13:11:09 -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 5A75219067E0 for ; Mon, 10 Aug 2020 17:11:08 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 667F45F1EA; Mon, 10 Aug 2020 17:11:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079470; 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=rMOW6W6XS9RyLY1r/8YD04AEpdfTZBhanvC6v25ekPM=; b=dHAdSGyO6gdlrEJ+W/Lg5ls5oEcrgg83A9wmnvYKnxdes3LW1s/Tq35tHMA/Pp4ahd/XTd SnBDrIvGkNWzX2AwJNOh/rKRhqsspS5Okm15Ky01JNuh1jn07fpB2t7k3/mPP+m+Im9mGd rxEbFxD9NgZA7u8s3qTS7IsljfyRVok= X-MC-Unique: JUddTc3rNn6OJU2I9dd9-g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 071/147] meson: convert trace/ Date: Mon, 10 Aug 2020 19:07:49 +0200 Message-Id: <1597079345-42801-72-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 --- trace/Makefile.objs | 8 -------- trace/meson.build | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 trace/Makefile.objs diff --git a/trace/Makefile.objs b/trace/Makefile.objs deleted file mode 100644 index a429474..0000000 --- a/trace/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: makefile -*- - - -################################################## -# Translation level - -obj-y +=3D generated-helpers.o -obj-y +=3D control-target.o diff --git a/trace/meson.build b/trace/meson.build index cab36a2..9c3c128 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -1,3 +1,5 @@ +specific_ss.add(files('control-target.c')) + trace_events_files =3D [] foreach dir : [ '.' ] + trace_events_subdirs trace_events_file =3D meson.source_root() / dir / 'trace-events' @@ -61,12 +63,13 @@ foreach d : [ ['generated-helpers.h', 'tcg-helper-h'], ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], ] - custom_target(d[0], + gen =3D custom_target(d[0], output: d[0], input: meson.source_root() / 'trace-events', command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@' ], build_by_default: true, # to be removed when added to a ta= rget capture: true) + specific_ss.add(gen) endforeach =20 if 'CONFIG_TRACE_UST' in config_host --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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 From nobody Mon May 6 10:16:42 2024 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=1597081376; cv=none; d=zohomail.com; s=zohoarc; b=fP2VaYpQl6WF7wlIkbPG84SUp6Dpp8NrrAnzIjXCkiLxGK1F2LB7KFRnd6d0Jk3AGpsgYDNlR1Es+1xRC3ON0ErsGxhHOYKMdosGfn8Kp6HoNnIwc6/dpUFNycYs38HL0r3tlC9jfn0BEDHhpk3+7wVCjY8M8wv4DTVeZzyii50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081376; 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=bOZeBdFKXxkfGBtUpffyRHoXer0+Gb7pIrYCNxlaYXQ=; b=HDMoMp6/f29OKuUJ6finJEMDrMyFXkABWXNi/yh9aq2j5EtvrtG1ccrpu5v2e+YGsMinEzIIY3exBZKP8/2F+IYou6UrLVwvysM0aabNUYXg1LW3domLIq2aQYjM56w1/r5WsIK9sY08WoP+fW4hj9ZSWzhD2T2LriDUdUW9gHo= 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 15970813768051007.745959562129; Mon, 10 Aug 2020 10:42:56 -0700 (PDT) Received: from localhost ([::1]:55316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bp1-0006W6-Da for importer@patchew.org; Mon, 10 Aug 2020 13:42:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKP-0000pZ-P0 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:17 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60138 helo=us-smtp-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 1k5BKM-00038D-NI 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-15-8A0oRTWNM-yHhFOwBGPdXA-1; Mon, 10 Aug 2020 13:11:12 -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 280B41005504 for ; Mon, 10 Aug 2020 17:11:11 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30BF15F1E9; Mon, 10 Aug 2020 17:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079473; 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=bOZeBdFKXxkfGBtUpffyRHoXer0+Gb7pIrYCNxlaYXQ=; b=bD4euwHoq7KcRzwxda1JbF9WHAxSiGbjdg4c0TUzxRy0QlksWwzR9J2ercHLRCSwLlOCiQ J0n/r8/ffkRemsNdwHSPwxI6FHOa3i3C0jw89/H6skWLLSIbB5zZnPl82GAkms0poeqB63 Yq0r7uWkN+3/dPqnUorVqtK+S2nFMzc= X-MC-Unique: 8A0oRTWNM-yHhFOwBGPdXA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 073/147] meson: convert common QMP bits for qemu and qemu-storage-daemon Date: Mon, 10 Aug 2020 19:07:51 +0200 Message-Id: <1597079345-42801-74-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-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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 8 +++++--- Makefile.target | 1 - meson.build | 10 ++++++++++ monitor/Makefile.objs | 6 ------ monitor/meson.build | 9 +++++++++ qom/Makefile.objs | 2 -- qom/meson.build | 3 +++ 7 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 monitor/Makefile.objs create mode 100644 monitor/meson.build delete mode 100644 qom/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 6657a6c..d7826c1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -37,10 +37,11 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # storage-daemon-obj-y is code used by qemu-storage-daemon (these objects = are # used for system emulation, too, but specified separately there) =20 -storage-daemon-obj-y =3D block/ monitor/ qapi/ qom/ storage-daemon/ +storage-daemon-obj-y =3D block/ qapi/ qom/ storage-daemon/ storage-daemon-obj-y +=3D blockdev.o blockdev-nbd.o iothread.o job-qmp.o storage-daemon-obj-$(CONFIG_WIN32) +=3D os-win32.o storage-daemon-obj-$(CONFIG_POSIX) +=3D os-posix.o +storage-daemon-obj-y +=3D libqmp.fa =20 ###################################################################### # Target independent part of system emulation. The long term path is to @@ -48,8 +49,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 monitor/ -common-obj-y +=3D net/ +common-obj-y =3D net/ common-obj-$(CONFIG_LINUX) +=3D fsdev/ =20 common-obj-y +=3D accel/ @@ -83,6 +83,8 @@ common-obj-y +=3D backends/ =20 common-obj-y +=3D qapi/ =20 +common-obj-y +=3D libqmp.fa + endif # CONFIG_SOFTMMU =20 ####################################################################### diff --git a/Makefile.target b/Makefile.target index c8f7a6c..54a9ef1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU obj-y +=3D softmmu/ obj-y +=3D gdbstub.o obj-y +=3D hw/ -obj-y +=3D monitor/ obj-y +=3D qapi/ obj-y +=3D migration/ram.o LIBS :=3D $(libs_softmmu) $(LIBS) diff --git a/meson.build b/meson.build index dc14a80..a44a172 100644 --- a/meson.build +++ b/meson.build @@ -463,6 +463,7 @@ stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() block_ss =3D ss.source_set() blockdev_ss =3D ss.source_set() +qmp_ss =3D ss.source_set() common_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() user_ss =3D ss.source_set() @@ -643,6 +644,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('monitor') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') @@ -692,6 +694,14 @@ block =3D declare_dependency(link_whole: [libblock], link_args: '@block.syms', dependencies: [crypto, io]) =20 +qmp_ss =3D qmp_ss.apply(config_host, strict: false) +libqmp =3D static_library('qmp', qmp_ss.sources(), + dependencies: qmp_ss.dependencies(), + name_suffix: 'fa', + build_by_default: false) + +qmp =3D declare_dependency(link_whole: [libqmp]) + foreach m : mods shared_module(m['dir'] + '-' + m['name'], name_prefix: '', diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs deleted file mode 100644 index a8533c9..0000000 --- a/monitor/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -obj-y +=3D misc.o -common-obj-y +=3D monitor.o qmp.o hmp.o -common-obj-y +=3D qmp-cmds.o qmp-cmds-control.o -common-obj-y +=3D hmp-cmds.o - -storage-daemon-obj-y +=3D monitor.o qmp.o qmp-cmds-control.o diff --git a/monitor/meson.build b/monitor/meson.build new file mode 100644 index 0000000..0484a64 --- /dev/null +++ b/monitor/meson.build @@ -0,0 +1,9 @@ +qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c')) + +softmmu_ss.add(files( + 'hmp-cmds.c', + 'hmp.c', + 'qmp-cmds.c', +)) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('misc.c')) diff --git a/qom/Makefile.objs b/qom/Makefile.objs deleted file mode 100644 index b962904..0000000 --- a/qom/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-$(CONFIG_SOFTMMU) +=3D qom-hmp-cmds.o qom-qmp-cmds.o -storage-daemon-obj-y +=3D qom-qmp-cmds.o diff --git a/qom/meson.build b/qom/meson.build index 4af044d..35815f6 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -7,6 +7,9 @@ qom_ss.add(files( 'qom-qobject.c', )) =20 +qmp_ss.add(files('qom-qmp-cmds.c')) +softmmu_ss.add(files('qom-hmp-cmds.c')) + qom_ss =3D qom_ss.apply(config_host, strict: false) libqom =3D static_library('qom', qom_ss.sources(), dependencies: [qom_ss.dependencies()], --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081467; cv=none; d=zohomail.com; s=zohoarc; b=Xy9V2z/skNXWzLjGMeldPsv3qfC5mZ3Bc++CJ6fOtBfmksV1cwXrZap4WzA/+PuouZH+XWzbOXdqx/CWFcpCmhsws+N1LXI6ixnaGi6VQZuHUjeLX0rFhZYA//eKAW4tphEGtMYjf49Bk0upy1+BnceExCwUESB21C8UjZj/UIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081467; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=9KA14buqeSHYfZpaBCZdWTV+nJqHfH1DOufZXl0esvw=; b=FzuO5VgtfR90FPkEhwTsddz1o+BoEensPYqL88zkxWJPaX0RuGr5B36s2pmlbOeg9LHE6tk3fb9k6WKbAamp4kSKNO13c5AVDdoQUWPqhWlbfUh0q49XLVfoMOs9jyiUEc30mroVFYYJPufPkb++YM9Fc2nMMpqWfhwsytNyquI= 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 1597081467511725.213070495168; Mon, 10 Aug 2020 10:44:27 -0700 (PDT) Received: from localhost ([::1]:35436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BqU-0001QN-9R for importer@patchew.org; Mon, 10 Aug 2020 13:44:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKR-0000tM-AF for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:19 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31727 helo=us-smtp-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 1k5BKN-00038R-MX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:18 -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-304-AFuGn9QtN2aAKifLcppyVQ-1; Mon, 10 Aug 2020 13:11:13 -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 4F1EA8005B0 for ; Mon, 10 Aug 2020 17:11:12 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93C525F1E9 for ; Mon, 10 Aug 2020 17:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=9KA14buqeSHYfZpaBCZdWTV+nJqHfH1DOufZXl0esvw=; b=K/HpRqSF2JRZD0KsiOUqE8A+jrZ3CUT0W/c8c7HVGUARxL+/2v8AHGkM4z8g5HlSsQWN6l +zHwZBVGgWwJHwb0FjTbBNP49shihWsCF38J6wcEqff4L3I+mFn1WrrgqjP/WVhWcIkx1z SOxlmb9fRnB3gwo7QWtsiD9lu3DO3FI= X-MC-Unique: AFuGn9QtN2aAKifLcppyVQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 074/147] meson: convert qemu-storage-daemon Date: Mon, 10 Aug 2020 19:07:52 +0200 Message-Id: <1597079345-42801-75-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 10 ---------- meson.build | 2 +- storage-daemon/Makefile.objs | 3 --- storage-daemon/meson.build | 13 +++++++++= ++++ storage-daemon/qapi/meson.build | 5 +---- .../qemu-storage-daemon.c | 0 7 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 storage-daemon/Makefile.objs rename qemu-storage-daemon.c =3D> storage-daemon/qemu-storage-daemon.c (10= 0%) diff --git a/Makefile b/Makefile index ac1e31f..64d644d 100644 --- a/Makefile +++ b/Makefile @@ -163,8 +163,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - storage-daemon-obj-y \ - storage-daemon-obj-m \ common-obj-y \ common-obj-m) =20 @@ -180,7 +178,6 @@ TARGET_DIRS_RULES :=3D $(foreach t, all fuzz clean inst= all, $(addsuffix /$(t), $(T SOFTMMU_ALL_RULES=3D$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) $(SOFTMMU_ALL_RULES): $(authz-obj-y) $(SOFTMMU_ALL_RULES): $(block-obj-y) -$(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y) $(SOFTMMU_ALL_RULES): $(chardev-obj-y) $(SOFTMMU_ALL_RULES): $(crypto-obj-y) $(SOFTMMU_ALL_RULES): $(io-obj-y) @@ -271,8 +268,6 @@ Makefile: $(version-obj-y) =20 COMMON_LDADDS =3D libqemuutil.a =20 -qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h diff --git a/Makefile.objs b/Makefile.objs index d7826c1..e304d92 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -33,16 +33,6 @@ io-obj-y =3D io/libio.fa =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS =20 -####################################################################### -# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects = are -# used for system emulation, too, but specified separately there) - -storage-daemon-obj-y =3D block/ qapi/ qom/ storage-daemon/ -storage-daemon-obj-y +=3D blockdev.o blockdev-nbd.o iothread.o job-qmp.o -storage-daemon-obj-$(CONFIG_WIN32) +=3D os-win32.o -storage-daemon-obj-$(CONFIG_POSIX) +=3D os-posix.o -storage-daemon-obj-y +=3D libqmp.fa - ###################################################################### # Target independent part of system emulation. The long term path is to # suppress *all* target specific code in case of system emulation, i.e. a diff --git a/meson.build b/meson.build index a44a172..b5bbe01 100644 --- a/meson.build +++ b/meson.build @@ -578,7 +578,6 @@ subdir('util') subdir('qom') subdir('authz') subdir('crypto') -subdir('storage-daemon') subdir('ui') =20 =20 @@ -788,6 +787,7 @@ if have_tools dependencies: [block, qemuutil], install: true) endif =20 + subdir('storage-daemon') subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') =20 diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs deleted file mode 100644 index 41c0d02..0000000 --- a/storage-daemon/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -storage-daemon-obj-y =3D qapi/libqsd-qapi.fa - -qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/= qapi/qapi-init-commands.h diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 35f8949..0409acc 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -1 +1,14 @@ +qsd_ss =3D ss.source_set() +qsd_ss.add(files('qemu-storage-daemon.c')) +qsd_ss.add(block, chardev, qmp, qom, qemuutil) +qsd_ss.add_all(blockdev_ss) + subdir('qapi') + +if have_tools + qsd_ss =3D qsd_ss.apply(config_host, strict: false) + executable('qemu-storage-daemon', + qsd_ss.sources(), + dependencies: qsd_ss.dependencies(), + install: true) +endif diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.bu= ild index a4e24f3..cd064ac 100644 --- a/storage-daemon/qapi/meson.build +++ b/storage-daemon/qapi/meson.build @@ -4,7 +4,4 @@ qsd_qapi_files =3D custom_target('QAPI files for qemu-stora= ge-daemon', command: [ qapi_gen, '-o', 'storage-daemon/= qapi', '@INPUT@' ], depend_files: [ qapi_inputs, qapi_gen_depen= ds ]) =20 -static_library('qsd-qapi', - qsd_qapi_files.to_list(), - name_suffix: 'fa', - build_by_default: false) +qsd_ss.add(qsd_qapi_files.to_list()) diff --git a/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c similarity index 100% rename from qemu-storage-daemon.c rename to storage-daemon/qemu-storage-daemon.c --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081685; cv=none; d=zohomail.com; s=zohoarc; b=jpmuxcupGFH0Ufuzeif52qidHPXt3kOWf8DXyid//v/8YGsWrljaSYE8Qe3YjTHDIbxfP32+179ZyQK74ybp/alK3X7tpdYbYE0hDpgEeYZtUkkXs2xuEZtRWDVt6Ht+gu6972F2ccKtWWpO1CpL7LyjHWs670UtAMDTvbvaA4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081685; 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=NgmVxl+CiGdeDQY2bGHHQrg8Y07feRzHJJAbMKevueM=; b=Aq71z+gL+Qq7KRahz7UvcZ2RhTHaCK6A+krnhvqYHxAVAvqbHwtTCR4G23wFypYHq8GsL9yHm4aBNWtWBgfA6ad3xz3jsd4YrTMjGiWno3RVmwcS365CpK4LTNXYuhlTlyoPhA6kjx6YS9tDQ8DNi17O/SOGvP1K5MEqGzaSDjI= 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 1597081685668457.48349100035125; Mon, 10 Aug 2020 10:48:05 -0700 (PDT) Received: from localhost ([::1]:53558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bu0-0000JM-B7 for importer@patchew.org; Mon, 10 Aug 2020 13:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKS-0000w2-Dh for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53356 helo=us-smtp-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 1k5BKP-00038h-Ca for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:20 -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-137-Zd-OC6NtOyW7aIwIduW1Ow-1; Mon, 10 Aug 2020 13:11:14 -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 AFA24800473 for ; Mon, 10 Aug 2020 17:11:13 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBF635F1EA; Mon, 10 Aug 2020 17:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079476; 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=NgmVxl+CiGdeDQY2bGHHQrg8Y07feRzHJJAbMKevueM=; b=C9xGv9m+0jC+dxBhsPYzEGqSoJcX1QZ9z3p/L3A1ZYJE67hWUVosaZITHhpIDMNOGMnNwh 2DnlB2hzV3RRlAM0ZThuzXZfyrT6IFx2vlr+FmIZGOMymupbzIUuNflDSQPUtCDRhBGZeh wvv3HJO7zVqhg0j4pDLZpv8WKoiZwVs= X-MC-Unique: Zd-OC6NtOyW7aIwIduW1Ow-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 075/147] meson: convert replay directory to Meson Date: Mon, 10 Aug 2020 19:07:53 +0200 Message-Id: <1597079345-42801-76-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 1 - meson.build | 1 + replay/Makefile.objs | 10 ---------- replay/meson.build | 12 ++++++++++++ 4 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 replay/Makefile.objs create mode 100644 replay/meson.build diff --git a/Makefile.objs b/Makefile.objs index e304d92..cfb2cf2 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -68,7 +68,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += =3D block-dmg-bz2$(DSOSUF common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 -common-obj-y +=3D replay/ common-obj-y +=3D backends/ =20 common-obj-y +=3D qapi/ diff --git a/meson.build b/meson.build index b5bbe01..634281f 100644 --- a/meson.build +++ b/meson.build @@ -644,6 +644,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') subdir('monitor') +subdir('replay') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') diff --git a/replay/Makefile.objs b/replay/Makefile.objs deleted file mode 100644 index 939be96..0000000 --- a/replay/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-y +=3D replay.o -common-obj-y +=3D replay-internal.o -common-obj-y +=3D replay-events.o -common-obj-y +=3D replay-time.o -common-obj-y +=3D replay-input.o -common-obj-y +=3D replay-char.o -common-obj-y +=3D replay-snapshot.o -common-obj-y +=3D replay-net.o -common-obj-y +=3D replay-audio.o -common-obj-y +=3D replay-random.o diff --git a/replay/meson.build b/replay/meson.build new file mode 100644 index 0000000..8783aea --- /dev/null +++ b/replay/meson.build @@ -0,0 +1,12 @@ +softmmu_ss.add(files( + 'replay.c', + 'replay-internal.c', + 'replay-events.c', + 'replay-time.c', + 'replay-input.c', + 'replay-char.c', + 'replay-snapshot.c', + 'replay-net.c', + 'replay-audio.c', + 'replay-random.c', +)) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081277; cv=none; d=zohomail.com; s=zohoarc; b=GPOMJvGXgzkobqjwT3QD5JhYLTnDfPvyUmnR6rMzaDPFuUstLyCv/R06uza8lgvshVSScjWt6wGhMRxPLtyfU92IPnGbPfMaJVkgNS0NnMjK7A6F2dudXNVNh2nxry0ZO4HWgzcOhder1TkMKZ/VODfbA7YpurE/+QzPPKjICBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081277; 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=+245kvQBfju4/tihW3VV3ixBAqWOWOYn47kIichErTE=; b=MwOHYMsOwcCLa4KNaI5TqR2lZ7woklE3Yb/DU0LSPirDxNsRY1oHSVbZnOkYzrGEs31utYairPURUQbDq7Z43EmzmyN6AbkmWi3sCrnAYJW3QDEMUjp8MbgT9rObiP4a7GauWHYoPHXPtcmxRj6NptMMdENSeav1FQEzNWM0GNk= 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 1597081277648127.75067491440859; Mon, 10 Aug 2020 10:41:17 -0700 (PDT) Received: from localhost ([::1]:47592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BnQ-0003Q9-8r for importer@patchew.org; Mon, 10 Aug 2020 13:41:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKT-0000y7-77 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35775 helo=us-smtp-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 1k5BKQ-00038w-TS for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:20 -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-445-AE8XyxC-MAuUNVcfyykjIg-1; Mon, 10 Aug 2020 13:11:16 -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 1A7C491270 for ; Mon, 10 Aug 2020 17:11:15 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27C625F1E9; Mon, 10 Aug 2020 17:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079478; 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=+245kvQBfju4/tihW3VV3ixBAqWOWOYn47kIichErTE=; b=b6DnJ2o53BwxmEUBtjCg/TGeeMqvpqlvdL7xt6rfRztePXFvUyWIWZBqQo6KU4aryZGq7F MB64XHIRBi6dusBzlHMEbrorkPRmHEenCBCVy2IOdW44CAsSelu1sDufmQCCC/E7+172jN qCLl5qO9UpKcxxlR6mjh259kNlEkhGo= X-MC-Unique: AE8XyxC-MAuUNVcfyykjIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 076/147] meson: convert migration directory to Meson Date: Mon, 10 Aug 2020 19:07:54 +0200 Message-Id: <1597079345-42801-77-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 | 1 - Makefile.target | 1 - meson.build | 5 +++++ migration/Makefile.objs | 18 ------------------ migration/meson.build | 40 ++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 7 +++---- 6 files changed, 48 insertions(+), 24 deletions(-) delete mode 100644 migration/Makefile.objs create mode 100644 migration/meson.build diff --git a/Makefile.objs b/Makefile.objs index cfb2cf2..9d0a82d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -43,7 +43,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 634281f..d264d9e 100644 --- a/meson.build +++ b/meson.build @@ -296,6 +296,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') @@ -643,6 +647,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..ac8ff14 --- /dev/null +++ b/migration/meson.build @@ -0,0 +1,40 @@ +# Files needed by unit tests +migration_files =3D files( + 'page_cache.c', + 'xbzrle.c', + 'vmstate-types.c', + 'vmstate.c', + 'qemu-file-channel.c', + 'qemu-file.c', + 'qjson.c', +) + +libmigration =3D static_library('migration', sources: migration_files + ge= nh, + name_suffix: 'fa', + build_by_default: false) +migration =3D declare_dependency(link_with: libmigration, + dependencies: [zlib, qom, io]) +softmmu_ss.add(migration) + +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', + 'postcopy-ram.c', + 'savevm.c', + 'socket.c', + 'tls.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'), zst= d]) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('ram.c')) diff --git a/tests/Makefile.include b/tests/Makefile.include index 66acf9c..425c8ce 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -227,7 +227,8 @@ tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-o= bj-y) tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(tes= t-crypto-obj-y) tests/test-bitmap$(EXESUF): tests/test-bitmap.o $(test-util-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migrati= on/page_cache.o $(test-util-obj-y) +tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/libmigration.fa = $(test-util-obj-y) \ + $(test-io-obj-y) tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-= obj-y) tests/test-int128$(EXESUF): tests/test-int128.o tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) @@ -253,9 +254,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-= global-props.o \ hw/core/vmstate-if.o \ hw/core/clock.o hw/core/qdev-clock.o \ $(test-qapi-obj-y) -tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ - migration/vmstate.o migration/vmstate-types.o migration/qemu-file.o \ - migration/qemu-file-channel.o migration/qjson.o \ +tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.f= a \ $(test-io-obj-y) tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-= obj-y) tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081387; cv=none; d=zohomail.com; s=zohoarc; b=E5lCokm5Pdz1kXQGZeW82o+c5kLlxGv88QAk+usMChgKUPM80uI9+AWrJfGUIKiG0WVFBI00rjvFEd1/p+brinuz4+jXlyMQp6E7Q3cFotPZxGasqVj79OAKfHClAbfdQFrBkTapPNJlJ1Xi/nj6yQA7by8aWHQaHmesDmGtANM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081387; 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=ENkIFYyLsu1FU3Xb3xTVGnhFbtyurWeI2Vv4dlfeoYk=; b=Ykx6jgvUgdLkP3q6gIWiYEe1DcbWqlIUMSgXQgSe5MrWIySMji4yZ86Rv9QFJXHINPZvaluGLh3YLlhwEJRHNNFUIJIpum5Xo+5So4T4L1CBdnoZ5X4qd+nWlwhFcnPAuYSmHyH6HZeV2jA5Fqvfeynqw7xTKWHs30nwztGFtfc= 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 1597081387322923.1825995810163; Mon, 10 Aug 2020 10:43:07 -0700 (PDT) Received: from localhost ([::1]:56054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BpC-0006nz-4L for importer@patchew.org; Mon, 10 Aug 2020 13:43:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKU-00011E-Eo for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:29122 helo=us-smtp-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 1k5BKS-000394-6J for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:22 -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-521-byOfHitAMxi7PXVn9_mpuQ-1; Mon, 10 Aug 2020 13:11:17 -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 7A0D657 for ; Mon, 10 Aug 2020 17:11:16 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86D2D5F1E9; Mon, 10 Aug 2020 17:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079479; 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=ENkIFYyLsu1FU3Xb3xTVGnhFbtyurWeI2Vv4dlfeoYk=; b=MkKUMgIqT4RD3y3BOedfPjAvZo4uHZWD9+We/9dh3w/nOFxf7JYa2QhOokbcpwjcO8C710 uDKjf+QVg4i0fnYj/07Dhu/cLthHwi2wVUm8vrLxa6z1y8NtGp59FgMPxQStJwwjSdM61J O9N8TWQFohHtfGfL1YpQ8QBEaXYpbKI= X-MC-Unique: byOfHitAMxi7PXVn9_mpuQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 077/147] meson: convert net directory to Meson Date: Mon, 10 Aug 2020 19:07:55 +0200 Message-Id: <1597079345-42801-78-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 + meson.build | 10 ++++++++++ net/Makefile.objs | 32 -------------------------------- net/can/Makefile.objs | 2 -- net/can/meson.build | 5 +++++ net/meson.build | 40 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 36 deletions(-) delete mode 100644 net/Makefile.objs delete mode 100644 net/can/Makefile.objs create mode 100644 net/can/meson.build create mode 100644 net/meson.build diff --git a/Makefile.objs b/Makefile.objs index 9d0a82d..f270044 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -39,8 +39,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # single QEMU executable should support all CPUs and machines. =20 ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y =3D net/ -common-obj-$(CONFIG_LINUX) +=3D fsdev/ +common-obj-$(CONFIG_LINUX) =3D fsdev/ =20 common-obj-y +=3D accel/ =20 diff --git a/Makefile.target b/Makefile.target index 4d912df..bf3fda9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -168,6 +168,7 @@ LIBS :=3D $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $= (CURSES_LIBS) $(ICONV_LIBS) endif LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) = $(SECCOMP_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) +LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/meson.build b/meson.build index d264d9e..151f4ca 100644 --- a/meson.build +++ b/meson.build @@ -137,6 +137,15 @@ if 'CONFIG_XKBCOMMON' in config_host xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), link_args: config_host['XKBCOMMON_LIBS'].= split()) endif +slirp =3D not_found +if config_host.has_key('CONFIG_SLIRP') + slirp =3D declare_dependency(compile_args: config_host['SLIRP_CFLAGS'].s= plit(), + link_args: config_host['SLIRP_LIBS'].split()) +endif +vde =3D not_found +if config_host.has_key('CONFIG_VDE') + vde =3D declare_dependency(link_args: config_host['VDE_LIBS'].split()) +endif pulse =3D not_found if 'CONFIG_LIBPULSE' in config_host pulse =3D declare_dependency(compile_args: config_host['PULSE_CFLAGS'].s= plit(), @@ -649,6 +658,7 @@ common_ss.add(files('cpus-common.c')) subdir('softmmu') subdir('migration') subdir('monitor') +subdir('net') subdir('replay') =20 # needed for fuzzing binaries diff --git a/net/Makefile.objs b/net/Makefile.objs deleted file mode 100644 index 5ab4554..0000000 --- a/net/Makefile.objs +++ /dev/null @@ -1,32 +0,0 @@ -common-obj-y =3D net.o queue.o checksum.o util.o hub.o -common-obj-y +=3D socket.o -common-obj-y +=3D dump.o -common-obj-y +=3D eth.o -common-obj-y +=3D announce.o -common-obj-$(CONFIG_L2TPV3) +=3D l2tpv3.o -common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) +=3D= vhost-user.o -common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NE= T_USER)) +=3D vhost-user-stub.o -common-obj-$(CONFIG_ALL) +=3D vhost-user-stub.o -common-obj-$(CONFIG_SLIRP) +=3D slirp.o -slirp.o-cflags :=3D $(SLIRP_CFLAGS) -slirp.o-libs :=3D $(SLIRP_LIBS) -common-obj-$(CONFIG_VDE) +=3D vde.o -common-obj-$(CONFIG_NETMAP) +=3D netmap.o -common-obj-y +=3D filter.o -common-obj-y +=3D filter-buffer.o -common-obj-y +=3D filter-mirror.o -common-obj-y +=3D colo-compare.o -common-obj-y +=3D colo.o -common-obj-y +=3D filter-rewriter.o -common-obj-y +=3D filter-replay.o - -tap-obj-$(CONFIG_LINUX) =3D tap-linux.o -tap-obj-$(CONFIG_BSD) =3D tap-bsd.o -tap-obj-$(CONFIG_SOLARIS) =3D tap-solaris.o -tap-obj-y ?=3D tap-stub.o -common-obj-$(CONFIG_POSIX) +=3D tap.o $(tap-obj-y) -common-obj-$(CONFIG_WIN32) +=3D tap-win32.o -common-obj-$(CONFIG_VHOST_NET_VDPA) +=3D vhost-vdpa.o -vde.o-libs =3D $(VDE_LIBS) - -common-obj-$(CONFIG_CAN_BUS) +=3D can/ diff --git a/net/can/Makefile.objs b/net/can/Makefile.objs deleted file mode 100644 index 9f35dc5..0000000 --- a/net/can/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-y +=3D can_core.o can_host.o -common-obj-$(CONFIG_LINUX) +=3D can_socketcan.o diff --git a/net/can/meson.build b/net/can/meson.build new file mode 100644 index 0000000..f53d9ec --- /dev/null +++ b/net/can/meson.build @@ -0,0 +1,5 @@ +can_ss =3D ss.source_set() +can_ss.add(files('can_core.c', 'can_host.c')) +can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c')) + +softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss) diff --git a/net/meson.build b/net/meson.build new file mode 100644 index 0000000..6c2ec47 --- /dev/null +++ b/net/meson.build @@ -0,0 +1,40 @@ +softmmu_ss.add(files( + 'announce.c', + 'checksum.c', + 'colo-compare.c', + 'colo.c', + 'dump.c', + 'eth.c', + 'filter-buffer.c', + 'filter-mirror.c', + 'filter-replay.c', + 'filter-rewriter.c', + 'filter.c', + 'hub.c', + 'net.c', + 'queue.c', + 'socket.c', + 'util.c', +)) + +softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c')) +softmmu_ss.add(when: ['CONFIG_SLIRP', slirp], if_true: files('slirp.c')) +softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c')) +softmmu_ss.add(when: 'CONFIG_NETMAP', if_true: files('netmap.c')) +vhost_user_ss =3D ss.source_set() +vhost_user_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'= ), if_false: files('vhost-user-stub.c')) +softmmu_ss.add_all(when: 'CONFIG_VHOST_NET_USER', if_true: vhost_user_ss) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c')) + +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c')) +softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c')) +softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c')) +tap_posix =3D ['tap.c'] +if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CO= NFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS') + tap_posix +=3D 'tap-stub.c' +endif +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix)) +softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c= ')) + +subdir('can') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081476; cv=none; d=zohomail.com; s=zohoarc; b=QYSU1nZjOdrmF3fHjaFp6CrC/sQWyEQ1K4uZ1kVueSY/P4cTINGpMNXkleXjkW8FdQdUsAkr6zemKlco6HrgndgbNVgAJLtLHYViB0QWjMZNKk31gUXRnJSI/qC8lzOxKXkHCR8wOkhtrie9E/fKDWbWCEDgkiPcGl4xrce/4Q8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081476; 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=GEBjx1iany2QD0lBsoTZZfzIMugxH4W6T0fpRerskMk=; b=CqNbn2pUw12VB7aiyy21cyguxiaC1LUYWXSSzV4Q7XZP4kr2UlMlZzulfpiAglLCKkC8PKqlFbVEBWkMB1aWpxlP9MTx5wmVpOrjhxBdmcl3kqyohBKy6o5jTaQ160CKTXQ6uUHLYu6fz5lB0/bTJFh03IWbX87skAZFBAbNtSU= 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 1597081476285740.6036210809127; Mon, 10 Aug 2020 10:44:36 -0700 (PDT) Received: from localhost ([::1]:36288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bqd-0001lB-59 for importer@patchew.org; Mon, 10 Aug 2020 13:44:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKV-00014b-P0 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:23 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29640 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 1k5BKT-00039E-KO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:23 -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-386-6necAZYgMjiZgLzjJvS-Kg-1; Mon, 10 Aug 2020 13:11:18 -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 D9CF719067E1 for ; Mon, 10 Aug 2020 17:11:17 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5C5B5F1E9; Mon, 10 Aug 2020 17:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079480; 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=GEBjx1iany2QD0lBsoTZZfzIMugxH4W6T0fpRerskMk=; b=ecbKO2ujoZ/G+EK8NrNbxZCaCsx2r6xckAp65StWXhoyHDY3gtR/4GgSLiSv5URD6qlbsa l/YYvLgHnwd07wZ6p4V+mco/G5fxNP3PJlyc7Sp+HPS16zXb3Ya9UJfSfEW7RCRHKCivfX OwTtun5y0gRxphl4tPpE4hkkTpvpDJk= X-MC-Unique: 6necAZYgMjiZgLzjJvS-Kg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 078/147] meson: convert backends directory to Meson Date: Mon, 10 Aug 2020 19:07:56 +0200 Message-Id: <1597079345-42801-79-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 2 -- backends/Makefile.objs | 23 ----------------------- backends/meson.build | 19 +++++++++++++++++++ backends/tpm/Makefile.objs | 4 ---- backends/tpm/meson.build | 8 ++++++++ configure | 2 ++ meson.build | 5 +++++ 7 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 backends/Makefile.objs create mode 100644 backends/meson.build delete mode 100644 backends/tpm/Makefile.objs create mode 100644 backends/tpm/meson.build diff --git a/Makefile.objs b/Makefile.objs index f270044..c00851a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -66,8 +66,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += =3D block-dmg-bz2$(DSOSUF common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 -common-obj-y +=3D backends/ - common-obj-y +=3D qapi/ =20 common-obj-y +=3D libqmp.fa diff --git a/backends/Makefile.objs b/backends/Makefile.objs deleted file mode 100644 index 22d204c..0000000 --- a/backends/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -common-obj-y +=3D rng.o rng-egd.o rng-builtin.o -common-obj-$(CONFIG_POSIX) +=3D rng-random.o - -common-obj-$(CONFIG_TPM) +=3D tpm/ - -common-obj-y +=3D hostmem.o hostmem-ram.o -common-obj-$(CONFIG_POSIX) +=3D hostmem-file.o - -common-obj-y +=3D cryptodev.o -common-obj-y +=3D cryptodev-builtin.o - -ifeq ($(CONFIG_VIRTIO_CRYPTO),y) -common-obj-y +=3D cryptodev-vhost.o -common-obj-$(CONFIG_VHOST_CRYPTO) +=3D cryptodev-vhost-user.o -endif - -common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) +=3D vhost-u= ser.o - -common-obj-$(CONFIG_LINUX) +=3D hostmem-memfd.o - -common-obj-$(CONFIG_GIO) +=3D dbus-vmstate.o -dbus-vmstate.o-cflags =3D $(GIO_CFLAGS) -dbus-vmstate.o-libs =3D $(GIO_LIBS) diff --git a/backends/meson.build b/backends/meson.build new file mode 100644 index 0000000..484456e --- /dev/null +++ b/backends/meson.build @@ -0,0 +1,19 @@ +softmmu_ss.add([files( + 'cryptodev-builtin.c', + 'cryptodev.c', + 'hostmem-ram.c', + 'hostmem.c', + 'rng-builtin.c', + 'rng-egd.c', + 'rng.c', +), numa]) + +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c')) +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c')) +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c')) +softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'], if_true: file= s('vhost-user.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vho= st.c')) +softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_t= rue: files('cryptodev-vhost-user.c')) +softmmu_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus-vmstate.c'), gio]) + +subdir('tpm') diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs deleted file mode 100644 index db2731f..0000000 --- a/backends/tpm/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-y +=3D tpm_backend.o -common-obj-y +=3D tpm_util.o -common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o -common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build new file mode 100644 index 0000000..8579290 --- /dev/null +++ b/backends/tpm/meson.build @@ -0,0 +1,8 @@ +tpm_ss =3D ss.source_set() + +tpm_ss.add(files('tpm_backend.c')) +tpm_ss.add(files('tpm_util.c')) +tpm_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough= .c')) +tpm_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c')) + +softmmu_ss.add_all(when: 'CONFIG_TPM', if_true: tpm_ss) diff --git a/configure b/configure index 6f02538..f3baba1 100755 --- a/configure +++ b/configure @@ -4678,6 +4678,7 @@ EOF if compile_prog "" "-lnuma" ; then numa=3Dyes libs_softmmu=3D"-lnuma $libs_softmmu" + numa_libs=3D"-lnuma" else if test "$numa" =3D "yes" ; then feature_not_found "numa" "install numactl devel" @@ -8314,6 +8315,7 @@ fi =20 if test "$numa" =3D "yes"; then echo "CONFIG_NUMA=3Dy" >> $config_host_mak + echo "NUMA_LIBS=3D$numa_libs" >> $config_host_mak fi =20 if test "$ccache_cpp2" =3D "yes"; then diff --git a/meson.build b/meson.build index 151f4ca..67e7342 100644 --- a/meson.build +++ b/meson.build @@ -309,6 +309,10 @@ rdma =3D not_found if 'CONFIG_RDMA' in config_host rdma =3D declare_dependency(link_args: config_host['RDMA_LIBS'].split()) endif +numa =3D not_found +if 'CONFIG_NUMA' in config_host + numa =3D declare_dependency(link_args: config_host['NUMA_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -656,6 +660,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('backends') subdir('migration') subdir('monitor') subdir('net') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081572; cv=none; d=zohomail.com; s=zohoarc; b=ZyocvyRg11h166Q30eFtNVpr3KFHX2oFhb+CnUlI8Nucj+8b2gCnW/ERErunzAN5CBxPVEcCBWPLaIUbFGazKG/UjcqibnV9cq2eVVRPvxJw2DYTFQ+cnv6Ivaj47hcqrHyBrjunoEdnLSlJvNnju5UNg4cIPSJVOK0BxhYYOO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081572; 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=M1j17W9y8dWkotpCq0HoWuibzLJ0LYudG/lR6mIy3EI=; b=Ip6R7kUT/gAM4Z3ImKBvwkpGaJfPYuN8FHqRK4pO4yzCFezvdeHnnpOoCIhq8JvLo1DC935NFrYXA+Xuwz2hCMIP5DPVFyEaFdVlR92MCJ15pGQSGWijVPrPUIhpH/rxKsG7cZaHnZ2Rmg1KjBiAHHuygA9nFbjjN0rIYjEdEdo= 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 1597081572320793.6133407522985; Mon, 10 Aug 2020 10:46:12 -0700 (PDT) Received: from localhost ([::1]:44648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BsA-0005CA-UX for importer@patchew.org; Mon, 10 Aug 2020 13:46:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKZ-0001DO-9T for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BKX-00039T-An for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:26 -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-538-rc9gPekMNgi_CpUZZqBLpQ-1; Mon, 10 Aug 2020 13:11:23 -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 1B71419067E0 for ; Mon, 10 Aug 2020 17:11:22 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 519BA5F1EA; Mon, 10 Aug 2020 17:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079484; 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=M1j17W9y8dWkotpCq0HoWuibzLJ0LYudG/lR6mIy3EI=; b=QWc6DzvFBKu+Vqd1BbM/OdnDgKL4sdF39Bo81yX8Blo7o1Pk2yvV+h6+Dm19ZqbESkv9YO FhfOQH+BcUWOIZnq+Mc9k+1lfSmvLNJbQjuV3m9Bn63bzugNFd5tkW16niOBjUfPubjzic PBDN+fJk+vC3qbh/gjqDeEJ5gaVr1iA= X-MC-Unique: rc9gPekMNgi_CpUZZqBLpQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 079/147] meson: convert fsdev/ Date: Mon, 10 Aug 2020 19:07:57 +0200 Message-Id: <1597079345-42801-80-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=63.128.21.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/10 13:09:25 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 | 4 +--- fsdev/Makefile.objs | 12 ------------ fsdev/meson.build | 10 ++++++++++ 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 fsdev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index c00851a..7158031 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -39,9 +39,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # single QEMU executable should support all CPUs and machines. =20 ifeq ($(CONFIG_SOFTMMU),y) -common-obj-$(CONFIG_LINUX) =3D fsdev/ - -common-obj-y +=3D accel/ +common-obj-y =3D accel/ =20 common-obj-$(CONFIG_AUDIO_ALSA) +=3D audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs deleted file mode 100644 index 42cd70c..0000000 --- a/fsdev/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual 9p backend if we also enabled virtio or xen. -ifeq ($(CONFIG_FSDEV_9P),y) -common-obj-y =3D qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y =3D qemu-fsdev-dummy.o -endif -common-obj-y +=3D qemu-fsdev-opts.o qemu-fsdev-throttle.o - -# Toplevel always builds this; targets without virtio will put it in -# common-obj-y -common-obj-$(CONFIG_ALL) +=3D qemu-fsdev-dummy.o diff --git a/fsdev/meson.build b/fsdev/meson.build index 30e2319..7dd1cc9 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -1,3 +1,13 @@ +fsdev_ss =3D ss.source_set() +fsdev_ss.add(files('qemu-fsdev-opts.c', 'qemu-fsdev-throttle.c')) +fsdev_ss.add(when: 'CONFIG_ALL', if_true: files('qemu-fsdev-dummy.c')) +fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( + '9p-iov-marshal.c', + '9p-marshal.c', + 'qemu-fsdev.c', +), if_false: files('qemu-fsdev-dummy.c')) +softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) + have_virtfs_proxy_helper =3D have_tools and libattr.found() and libcap_ng.= found() and 'CONFIG_VIRTFS' in config_host if have_virtfs_proxy_helper executable('virtfs-proxy-helper', --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081667; cv=none; d=zohomail.com; s=zohoarc; b=AaBixiDzFAT1hefrEmsEYOlh/ZWln1jnLQUyH/OYOO6TGhr5kAM5tDpsMeJjljnBsKoUbIgr00ffBUhF+KCZ36cSOiPcVWbSZTJvtZyZc/01cfA9oabqngUaR5WgSKO0CvzLH+0arkVLi8R0EMwFu++P3JQaBCRVRMS93cAr+C8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081667; 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=80Sw0Q7bGEttjcGiAA5D1i2WGZVX9V06gNTA+9Ll2w4=; b=FHgVPDSWiHHQs6P2bDdPb9LH2ZhI1MMJJkLZTXSDh/Y5DXYgyyI8Pc2gZ9JCaB2jcjYyGcq94Jfw0F1HazF9DKQikxsSoCnly5xYa9TOgMTAP6C0z5En+rGbl8+fkADhY8F1YgU6MM01Kq/3iU0MWivXK9Tr4AAC4iJMPICz5wQ= 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 1597081667691672.866821279958; Mon, 10 Aug 2020 10:47:47 -0700 (PDT) Received: from localhost ([::1]:52322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bti-0008GH-Cr for importer@patchew.org; Mon, 10 Aug 2020 13:47:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKf-0001J9-G8 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:33 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45387 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 1k5BKa-00039f-8D for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:33 -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-100-YUFy078qPLaAYoCS9krBXg-1; Mon, 10 Aug 2020 13:11:24 -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 7A0BC1005504 for ; Mon, 10 Aug 2020 17:11:23 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87DC45F1EA; Mon, 10 Aug 2020 17:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079487; 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=80Sw0Q7bGEttjcGiAA5D1i2WGZVX9V06gNTA+9Ll2w4=; b=FSUd4tzxo1yvxBg01EteBpL66GVfL2Rdu3c510607Z+HNosIjPU8J2KBiLMUsSvK7N0Lh0 CofctAsqhApfgesRTNvkHAL8C4OO05sU3wgrc7UDXcXKsdV+t0XpPcMt+DZQdfa3Ac7UhX OUOXDeSZDP1FIGU+DgwQ45WRPXjDhCs= X-MC-Unique: YUFy078qPLaAYoCS9krBXg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 080/147] meson: convert disas directory to Meson Date: Mon, 10 Aug 2020 19:07:58 +0200 Message-Id: <1597079345-42801-81-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 2 -- disas/Makefile.objs | 30 ------------------------------ disas/libvixl/Makefile.objs | 5 ----- disas/libvixl/meson.build | 7 +++++++ disas/meson.build | 27 +++++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 35 insertions(+), 37 deletions(-) delete mode 100644 disas/Makefile.objs delete mode 100644 disas/libvixl/Makefile.objs create mode 100644 disas/libvixl/meson.build create mode 100644 disas/meson.build diff --git a/Makefile.objs b/Makefile.objs index 7158031..3b32a4c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -74,8 +74,6 @@ endif # CONFIG_SOFTMMU # Target-independent parts used in system and user emulation =20 common-obj-y +=3D hw/ -common-obj-y +=3D qom/ -common-obj-y +=3D disas/ =20 ###################################################################### # Resource file for Windows executables diff --git a/disas/Makefile.objs b/disas/Makefile.objs deleted file mode 100644 index 3c1cdce..0000000 --- a/disas/Makefile.objs +++ /dev/null @@ -1,30 +0,0 @@ - -common-obj-$(CONFIG_ALPHA_DIS) +=3D alpha.o -common-obj-$(CONFIG_ARM_DIS) +=3D arm.o -common-obj-$(CONFIG_ARM_A64_DIS) +=3D arm-a64.o -common-obj-$(CONFIG_ARM_A64_DIS) +=3D libvixl/ -libvixldir =3D $(SRC_PATH)/disas/libvixl -# The -Wno-sign-compare is needed only for gcc 4.6, which complains about -# some signed-unsigned equality comparisons in libvixl which later gcc -# versions do not. -arm-a64.o-cflags :=3D -I$(libvixldir) -Wno-sign-compare -common-obj-$(CONFIG_CRIS_DIS) +=3D cris.o -common-obj-$(CONFIG_HPPA_DIS) +=3D hppa.o -common-obj-$(CONFIG_I386_DIS) +=3D i386.o -common-obj-$(CONFIG_M68K_DIS) +=3D m68k.o -common-obj-$(CONFIG_MICROBLAZE_DIS) +=3D microblaze.o -common-obj-$(CONFIG_MIPS_DIS) +=3D mips.o -common-obj-$(CONFIG_NANOMIPS_DIS) +=3D nanomips.o -common-obj-$(CONFIG_NIOS2_DIS) +=3D nios2.o -common-obj-$(CONFIG_MOXIE_DIS) +=3D moxie.o -common-obj-$(CONFIG_PPC_DIS) +=3D ppc.o -common-obj-$(CONFIG_RISCV_DIS) +=3D riscv.o -common-obj-$(CONFIG_S390_DIS) +=3D s390.o -common-obj-$(CONFIG_SH4_DIS) +=3D sh4.o -common-obj-$(CONFIG_SPARC_DIS) +=3D sparc.o -common-obj-$(CONFIG_LM32_DIS) +=3D lm32.o -common-obj-$(CONFIG_XTENSA_DIS) +=3D xtensa.o - -# TODO: As long as the TCG interpreter and its generated code depend -# on the QEMU target, we cannot compile the disassembler here. -#common-obj-$(CONFIG_TCI_DIS) +=3D tci.o diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs deleted file mode 100644 index 99a637f..0000000 --- a/disas/libvixl/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-$(CONFIG_ARM_A64_DIS) =3D vixl/utils.o \ - vixl/compiler-intrinsics.o \ - vixl/a64/instructions-a64.o \ - vixl/a64/decoder-a64.o \ - vixl/a64/disasm-a64.o diff --git a/disas/libvixl/meson.build b/disas/libvixl/meson.build new file mode 100644 index 0000000..5e2eb33 --- /dev/null +++ b/disas/libvixl/meson.build @@ -0,0 +1,7 @@ +libvixl_ss.add(files( + 'vixl/a64/decoder-a64.cc', + 'vixl/a64/disasm-a64.cc', + 'vixl/a64/instructions-a64.cc', + 'vixl/compiler-intrinsics.cc', + 'vixl/utils.cc', +)) diff --git a/disas/meson.build b/disas/meson.build new file mode 100644 index 0000000..0527d69 --- /dev/null +++ b/disas/meson.build @@ -0,0 +1,27 @@ +libvixl_ss =3D ss.source_set() +subdir('libvixl') + +common_ss.add(when: 'CONFIG_ALPHA_DIS', if_true: files('alpha.c')) +common_ss.add(when: 'CONFIG_ARM_A64_DIS', if_true: files('arm-a64.cc')) +common_ss.add_all(when: 'CONFIG_ARM_A64_DIS', if_true: libvixl_ss) +common_ss.add(when: 'CONFIG_ARM_DIS', if_true: files('arm.c')) +common_ss.add(when: 'CONFIG_CRIS_DIS', if_true: files('cris.c')) +common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c')) +common_ss.add(when: 'CONFIG_I386_DIS', if_true: files('i386.c')) +common_ss.add(when: 'CONFIG_LM32_DIS', if_true: files('lm32.c')) +common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c')) +common_ss.add(when: 'CONFIG_MICROBLAZE_DIS', if_true: files('microblaze.c'= )) +common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c')) +common_ss.add(when: 'CONFIG_MOXIE_DIS', if_true: files('moxie.c')) +common_ss.add(when: 'CONFIG_NANOMIPS_DIS', if_true: files('nanomips.cpp')) +common_ss.add(when: 'CONFIG_NIOS2_DIS', if_true: files('nios2.c')) +common_ss.add(when: 'CONFIG_PPC_DIS', if_true: files('ppc.c')) +common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c')) +common_ss.add(when: 'CONFIG_S390_DIS', if_true: files('s390.c')) +common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c')) +common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c')) +common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c')) + +# TODO: As long as the TCG interpreter and its generated code depend +# on the QEMU target, we cannot compile the disassembler here. +#common_ss.add(when: 'CONFIG_TCI_DIS', if_true: files('tci.c')) diff --git a/meson.build b/meson.build index 67e7342..49ad9e7 100644 --- a/meson.build +++ b/meson.build @@ -661,6 +661,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') subdir('backends') +subdir('disas') subdir('migration') subdir('monitor') subdir('net') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081563; cv=none; d=zohomail.com; s=zohoarc; b=VIrH+fKviJOLMBjrGVyPzWP8cuFEryBXYmiOgcTlNQCPjM6Gu17twqPaFgFVSAJBGQrWMVXMZxLBHTtc4/2Z/2oKLfXVf8lNsFjaHz/PMkHi2Ogp96QijxIwxTBxbmlV4QHZbtOXE5W4YJPZzpRl8RCXzmh6dVBgZ84vLLE2lnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081563; 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=DBHZCUv+LbnlMiVf8wmKGyBy/5boj1eyL+HuZpC4FO8=; b=Fsc/J0MkljMg3+mPyk7/RmxF6cAyvu+lcJXZM8ZLFkVSV0XsE41o01bdhY+w0BpPpDqvmOw36Nmw7aVd9HisP9mZ6O35/BFMYFKdeJigsAr+iGE2DxaaLW4PwyJ3wgRXkzhZZHN7we9YD5yg5AMibZPpCrDX6WhSIELE/Z+cSFg= 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 1597081563982961.1981331640601; Mon, 10 Aug 2020 10:46:03 -0700 (PDT) Received: from localhost ([::1]:43828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bs2-0004qo-Mq for importer@patchew.org; Mon, 10 Aug 2020 13:46:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKe-0001Fq-8J for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:32 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36854 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 1k5BKa-00039d-3W for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:31 -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-172-nzySQKTDNA2KZcgfP1k2bw-1; Mon, 10 Aug 2020 13:11:25 -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 D8DB08064B7 for ; Mon, 10 Aug 2020 17:11:24 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E64385F1E9; Mon, 10 Aug 2020 17:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079487; 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=DBHZCUv+LbnlMiVf8wmKGyBy/5boj1eyL+HuZpC4FO8=; b=dhSLrIBrIwJwfBCv3dRbYyfNKeRh9tWcyJgL8mNcBofhu+OD87XF+I8ybX47QucbSFAOth LCv0d6C8Yt2DJwfKdcoJFchemKhRXp2oS/eb6ZMxvOfc9q/IJzRUNWHamy+baWcfb1na+9 ImOobcv97WwFN2ZA2KFPPm7hVE3LgM4= X-MC-Unique: nzySQKTDNA2KZcgfP1k2bw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 081/147] meson: convert qapi-specific to meson Date: Mon, 10 Aug 2020 19:07:59 +0200 Message-Id: <1597079345-42801-82-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 | 2 -- Makefile.target | 1 - qapi/Makefile.objs | 15 --------------- qapi/meson.build | 10 +++++++--- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 qapi/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 3b32a4c..c332323 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -64,8 +64,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += =3D block-dmg-bz2$(DSOSUF common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 -common-obj-y +=3D qapi/ - common-obj-y +=3D libqmp.fa =20 endif # CONFIG_SOFTMMU diff --git a/Makefile.target b/Makefile.target index bf3fda9..386378b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU obj-y +=3D softmmu/ obj-y +=3D gdbstub.o obj-y +=3D hw/ -obj-y +=3D qapi/ LIBS :=3D $(libs_softmmu) $(LIBS) =20 # Temporary until emulators are linked by Meson diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs deleted file mode 100644 index c0a31be..0000000 --- a/qapi/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -QAPI_TARGET_MODULES =3D machine-target misc-target - -obj-y =3D qapi-introspect.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-types-%.o) -obj-y +=3D qapi-types.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-visit-%.o) -obj-y +=3D qapi-visit.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-events-%.o) -obj-y +=3D qapi-events.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-commands-%.o) -obj-y +=3D qapi-commands.o -obj-y +=3D qapi-init-commands.o - -QAPI_MODULES_STORAGE_DAEMON =3D block-core char common control crypto -QAPI_MODULES_STORAGE_DAEMON +=3D introspect job qom sockets pragma transac= tion diff --git a/qapi/meson.build b/qapi/meson.build index 51d11ce..de5b16f 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -113,8 +113,12 @@ foreach output : qapi_util_outputs i =3D i + 1 endforeach =20 -# These are still handled by the Makefile -i +=3D qapi_nonmodule_outputs.length() -i +=3D qapi_specific_outputs.length() +foreach output : qapi_specific_outputs + qapi_nonmodule_outputs + if output.endswith('.h') + genh +=3D qapi_files[i] + endif + specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + i =3D i + 1 +endforeach =20 qapi_doc_texi =3D qapi_files[i] --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081794; cv=none; d=zohomail.com; s=zohoarc; b=IVDK7WsYZ1YpmEHLcVTy2ydAQKJIoUY3h7R/H8G8hOc57nsmqma99j5pWbmEPPRyfphuTfAOGyEwVAl7YSm/iNKbASSlIuc9ktsNrlgSL9HYEIbIU+efyRp2d63vojRtj8RCC6ZiL3oqV32b5OgWDcnCYTOfn66/kAvdPcrp1vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081794; 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=oieG5UguaHnxo9MZHtvw+tWgGhydS5IXTW7+UQFi3BA=; b=eiLXOBuwQ8Jjcozmb0glTXO+3jHTNqcoHLhJjv+v3tE49nwBkw2CEGg7eOfdE0a5q42ptYa2Dm8pqYPPkBMZDL7Z+cDMzt5iicEQYRa6LBg8/3vLN8ignJQX4m38j4u6grgDlqBzuzlmo4BCAHdO9gmImKJT9fsNyIZMga4HLdE= 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 1597081794276712.7577978349983; Mon, 10 Aug 2020 10:49:54 -0700 (PDT) Received: from localhost ([::1]:60686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bvk-0003Cy-GY for importer@patchew.org; Mon, 10 Aug 2020 13:49:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKg-0001Ki-6x for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:34 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:40308 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 1k5BKd-00039m-Sg for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:33 -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-229-NqHJqYaYP2OSmAu8pYIrUg-1; Mon, 10 Aug 2020 13:11:27 -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 455F88014D7 for ; Mon, 10 Aug 2020 17:11:26 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52E4187D61; Mon, 10 Aug 2020 17:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079488; 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=oieG5UguaHnxo9MZHtvw+tWgGhydS5IXTW7+UQFi3BA=; b=Q8VllonZ+VceRKeF8DegpYVDlf8KHaPFCwGQ1RO7EJXHgFwmKlZ7e/2WH2qdU0w5E2PKsV ky4JMDfHazyc6n66Iq4J8wkZ79G9U+KlZqi3ST6xaT/ITDRYrcCSH+UoiRwa6qAY/1X9Pr /FuvSIKOCghrVMOaYDLPrc8tNjw0FtA= X-MC-Unique: NqHJqYaYP2OSmAu8pYIrUg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 082/147] meson: convert hw/xen Date: Mon, 10 Aug 2020 19:08:00 +0200 Message-Id: <1597079345-42801-83-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 --- configure | 7 +++++-- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/xen/Makefile.objs | 7 ------- hw/xen/meson.build | 20 ++++++++++++++++++++ meson.build | 6 ++++++ 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 hw/meson.build delete mode 100644 hw/xen/Makefile.objs create mode 100644 hw/xen/meson.build diff --git a/configure b/configure index f3baba1..1bdea00 100755 --- a/configure +++ b/configure @@ -2676,6 +2676,8 @@ if test "$xen" !=3D "no" ; then fi QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)" libs_softmmu=3D"$($pkg_config --libs $xen_pc) $libs_softmmu" + xen_cflags=3D"$($pkg_config --cflags $xen_pc)" + xen_libs=3D"$($pkg_config --libs $xen_pc)" else =20 xen_libs=3D"-lxenstore -lxenctrl -lxenguest" @@ -2956,9 +2958,8 @@ EOF =20 if test "$xen" =3D yes; then if test $xen_ctrl_version -ge 40701 ; then - libs_softmmu=3D"$xen_stable_libs $libs_softmmu" + xen_libs=3D"$xen_libs $xen_stable_libs " fi - libs_softmmu=3D"$xen_libs $libs_softmmu" fi fi fi @@ -7242,6 +7243,8 @@ fi if test "$xen" =3D "yes" ; then echo "CONFIG_XEN_BACKEND=3Dy" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=3D$xen_ctrl_version" >> $config_= host_mak + echo "XEN_CFLAGS=3D$xen_cflags" >> $config_host_mak + echo "XEN_LIBS=3D$xen_libs" >> $config_host_mak fi if test "$linux_aio" =3D "yes" ; then echo "CONFIG_LINUX_AIO=3Dy" >> $config_host_mak diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 14b7ea4..d204a90 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ -devices-dirs-$(CONFIG_XEN) +=3D xen/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ devices-dirs-$(CONFIG_NUBUS) +=3D nubus/ devices-dirs-y +=3D semihosting/ diff --git a/hw/meson.build b/hw/meson.build new file mode 100644 index 0000000..08112a5 --- /dev/null +++ b/hw/meson.build @@ -0,0 +1 @@ +subdir('xen') diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs deleted file mode 100644 index 502b32d..0000000 --- a/hw/xen/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -# xen backend driver support -common-obj-y +=3D xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus= .o xen-bus-helper.o xen-backend.o - -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) +=3D xen-host-pci-device.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) +=3D xen_pt.o xen_pt_config_init.o xen_p= t_graphics.o xen_pt_msi.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) +=3D xen_pt_load_rom.o -obj-$(call lnot,$(CONFIG_XEN_PCI_PASSTHROUGH)) +=3D xen_pt_stub.o diff --git a/hw/xen/meson.build b/hw/xen/meson.build new file mode 100644 index 0000000..076954b --- /dev/null +++ b/hw/xen/meson.build @@ -0,0 +1,20 @@ +softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files( + 'xen-backend.c', + 'xen-bus-helper.c', + 'xen-bus.c', + 'xen-legacy-backend.c', + 'xen_devconfig.c', + 'xen_pvdev.c', +)) + +xen_specific_ss =3D ss.source_set() +xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files( + 'xen-host-pci-device.c', + 'xen_pt.c', + 'xen_pt_config_init.c', + 'xen_pt_graphics.c', + 'xen_pt_load_rom.c', + 'xen_pt_msi.c', +), if_false: files('xen_pt_stub.c')) + +specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) diff --git a/meson.build b/meson.build index 49ad9e7..19c81b6 100644 --- a/meson.build +++ b/meson.build @@ -313,6 +313,11 @@ numa =3D not_found if 'CONFIG_NUMA' in config_host numa =3D declare_dependency(link_args: config_host['NUMA_LIBS'].split()) endif +xen =3D not_found +if 'CONFIG_XEN_BACKEND' in config_host + xen =3D declare_dependency(compile_args: config_host['XEN_CFLAGS'].split= (), + link_args: config_host['XEN_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -666,6 +671,7 @@ subdir('migration') subdir('monitor') subdir('net') subdir('replay') +subdir('hw') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081860; cv=none; d=zohomail.com; s=zohoarc; b=b5YB5P4fdKXoCDMWHFeeN1+4zc2qCYNKnYby7zIwz2y6WIbkYw9qvduvknLKE1YFXGo8ctptUs40P3sx26s4NZW2Shu6fFIsksH5/aNUk9R8Zfa+GeopmS21YjNl1gGg7PIzjr9Xr5k1R3DLhiYnBd1inx82uopOcx3rcNWvYcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081860; 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=gpaefOQh5qevOM5HxbRK0gwyo6nToVWeTpSBc9OtOCg=; b=fLrpWUlrIwxQ9JUVVGUu/wH7IY00dPBQn8r2Xcc1PLZeucfoMNzUZBo2v5dzuDT0HWBquSyxzJ2kvX9iFk78Yt3O+pcH3OBuyfdfe6DilwOSplh84kkos5HbP2k3yuNnSs+y4eo53YmH+92k+9+jXKiovxuOGhyX8+nKnRZ8fAs= 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 159708186005353.55085503710632; Mon, 10 Aug 2020 10:51:00 -0700 (PDT) Received: from localhost ([::1]:36832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bwo-0004y4-7m for importer@patchew.org; Mon, 10 Aug 2020 13:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKg-0001M9-UL for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:34 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21740 helo=us-smtp-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 1k5BKd-0003A2-TK for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:34 -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-198-96g9N_vGPb6DzZnClToXGA-1; Mon, 10 Aug 2020 13:11:28 -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 A36FA100CCC0 for ; Mon, 10 Aug 2020 17:11:27 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B17B35F1EA; Mon, 10 Aug 2020 17:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079490; 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=gpaefOQh5qevOM5HxbRK0gwyo6nToVWeTpSBc9OtOCg=; b=LTYXxMosfYCGHBw2iTTqazm2oDR7/zi4OiXgRW2fbkPIGh2Rw44XFFwj8OIT5fjpWmG28t J+EsqFsQyx0Mx2Alwz3yeqQdhinL9R3IR8vHBWigLILgYh8iDqFU/zFejCmTa2/R4eoRjL CVb+D2mhZXLO9WMnmqDxy24mFj5Vwnk= X-MC-Unique: 96g9N_vGPb6DzZnClToXGA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 083/147] meson: convert hw/core Date: Mon, 10 Aug 2020 19:08:01 +0200 Message-Id: <1597079345-42801-84-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 --- hw/Makefile.objs | 1 - hw/core/Makefile.objs | 34 ---------------------------------- hw/core/meson.build | 49 ++++++++++++++++++++++++++++++++++++++++++++++= +++ hw/meson.build | 1 + tests/Makefile.include | 10 +--------- 5 files changed, 51 insertions(+), 44 deletions(-) delete mode 100644 hw/core/Makefile.objs create mode 100644 hw/core/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d204a90..bdf8bdf 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,3 @@ -devices-dirs-y =3D core/ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-y +=3D acpi/ diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs deleted file mode 100644 index d8fee8e..0000000 --- a/hw/core/Makefile.objs +++ /dev/null @@ -1,34 +0,0 @@ -# core qdev-related obj files, also used by *-user: -common-obj-y +=3D qdev.o qdev-properties.o -common-obj-y +=3D bus.o -common-obj-y +=3D cpu.o -common-obj-y +=3D resettable.o -common-obj-y +=3D hotplug.o -common-obj-y +=3D vmstate-if.o -# irq.o needed for qdev GPIO handling: -common-obj-y +=3D irq.o -common-obj-y +=3D clock.o qdev-clock.o - -common-obj-$(CONFIG_SOFTMMU) +=3D reset.o -common-obj-$(CONFIG_SOFTMMU) +=3D qdev-fw.o -common-obj-$(CONFIG_SOFTMMU) +=3D fw-path-provider.o -common-obj-$(CONFIG_SOFTMMU) +=3D nmi.o -common-obj-$(CONFIG_SOFTMMU) +=3D vm-change-state-handler.o -common-obj-$(CONFIG_SOFTMMU) +=3D qdev-properties-system.o -common-obj-$(CONFIG_SOFTMMU) +=3D sysbus.o -common-obj-$(CONFIG_SOFTMMU) +=3D machine.o -common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o -common-obj-$(CONFIG_SOFTMMU) +=3D loader.o -common-obj-$(CONFIG_SOFTMMU) +=3D machine-hmp-cmds.o -common-obj-$(CONFIG_SOFTMMU) +=3D numa.o -common-obj-$(CONFIG_SOFTMMU) +=3D clock-vmstate.o -obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o - -common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o -common-obj-$(CONFIG_PTIMER) +=3D ptimer.o -common-obj-$(CONFIG_FITLOADER) +=3D loader-fit.o -common-obj-$(CONFIG_REGISTER) +=3D register.o -common-obj-$(CONFIG_OR_IRQ) +=3D or-irq.o -common-obj-$(CONFIG_SPLIT_IRQ) +=3D split-irq.o -common-obj-$(CONFIG_PLATFORM_BUS) +=3D platform-bus.o -common-obj-$(CONFIG_GENERIC_LOADER) +=3D generic-loader.o diff --git a/hw/core/meson.build b/hw/core/meson.build new file mode 100644 index 0000000..fc91f98 --- /dev/null +++ b/hw/core/meson.build @@ -0,0 +1,49 @@ +# core qdev-related obj files, also used by *-user and unit tests +hwcore_files =3D files( + 'bus.c', + 'fw-path-provider.c', + 'hotplug.c', + 'qdev-properties.c', + 'qdev.c', + 'reset.c', + 'resettable.c', + 'vmstate-if.c', + # irq.c needed for qdev GPIO handling: + 'irq.c', + 'clock.c', + 'qdev-clock.c', +) + +libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, + name_suffix: 'fa', + build_by_default: false) +hwcore =3D declare_dependency(link_whole: libhwcore) +common_ss.add(hwcore) + +common_ss.add(files('cpu.c')) +common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) +common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loade= r.c')) +common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) +common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'= )) +common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) +common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) +common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) +common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) + +softmmu_ss.add(files( + 'loader.c', + 'machine-hmp-cmds.c', + 'machine.c', + 'nmi.c', + 'null-machine.c', + 'qdev-fw.c', + 'qdev-properties-system.c', + 'sysbus.c', + 'vm-change-state-handler.c', + 'clock-vmstate.c', +)) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'machine-qmp-cmds.c', + 'numa.c', +)) diff --git a/hw/meson.build b/hw/meson.build index 08112a5..fe7c466 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1 +1,2 @@ +subdir('core') subdir('xen') diff --git a/tests/Makefile.include b/tests/Makefile.include index 425c8ce..b6d9661 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -244,15 +244,7 @@ tests/test-bufferiszero$(EXESUF): tests/test-bufferisz= ero.o $(test-util-obj-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) =20 -tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ - hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\ - hw/core/bus.o \ - hw/core/resettable.o \ - hw/core/irq.o \ - hw/core/fw-path-provider.o \ - hw/core/reset.o \ - hw/core/vmstate-if.o \ - hw/core/clock.o hw/core/qdev-clock.o \ +tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o hw/c= ore/libhwcore.fa \ $(test-qapi-obj-y) tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.f= a \ $(test-io-obj-y) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081021; cv=none; d=zohomail.com; s=zohoarc; b=J3iOA7uLQJ926PW/Jw2lcJzReVeaTH0Zddh0AIv/8lUz9166GXmHmS+5SUbK7Nhrm6YvynC+gX+L1TbcnBixVsDEa0YQ+IXja0CtoicYjS2cC3J8GLUsHPt7AIsNMI1AsvQLPxM5Kg2ti/rbqzzNk6u2LGEXh7Rkxe3+mzN51LQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081021; 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=XJ9OVokfJnGAhtD/lxsDsJtm9yPBxnkQ0IWINN8PfuI=; b=LK8O57sRTFTa4jt1NZKH5+BhknD9nkUO0zWb8pKG30IM1/syQfd8M+4lsfP8MUqKFQIn8XZxRxj4vcL+slN88XmRinnLoQYFOWjQck9r57RVrBRK/QiDhG6GuU1PL2SrLdJwOPcbD6AxPtVh9uMyeFxlmz9fWaBrQpxW9FMH/1c= 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 1597081021396701.5664036899564; Mon, 10 Aug 2020 10:37:01 -0700 (PDT) Received: from localhost ([::1]:55182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BjI-0003Uj-24 for importer@patchew.org; Mon, 10 Aug 2020 13:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKh-0001MO-83 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:35 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:58537 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 1k5BKe-0003B5-AS for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:34 -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-344-lqPjHnwNNuyqn9DW-Qbg-Q-1; Mon, 10 Aug 2020 13:11:29 -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 0E271800473 for ; Mon, 10 Aug 2020 17:11:29 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B7955F1E9; Mon, 10 Aug 2020 17:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079491; 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=XJ9OVokfJnGAhtD/lxsDsJtm9yPBxnkQ0IWINN8PfuI=; b=NxLhvwGGg2jJ4LhNaVyWmI/HzE1p+HYbGlfZVdQtxGcenydWpqJCb6RqRsBLenxttxl3n6 v3O1svNIM/gl1hkZw87d9nHyK1QrbHvj3rHC2mMHWGQnL9WU8vYS5rjEj7ukWhdUnA67Jw PxH2W4zjCWkBS/3sV90BGJ2Hd4KnbcA= X-MC-Unique: lqPjHnwNNuyqn9DW-Qbg-Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 084/147] meson: convert hw/semihosting Date: Mon, 10 Aug 2020 19:08:02 +0200 Message-Id: <1597079345-42801-85-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/semihosting/Makefile.objs | 2 -- hw/semihosting/meson.build | 4 ++++ 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 hw/semihosting/Makefile.objs create mode 100644 hw/semihosting/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index bdf8bdf..6a7ca0f 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -36,7 +36,6 @@ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ devices-dirs-$(CONFIG_NUBUS) +=3D nubus/ -devices-dirs-y +=3D semihosting/ devices-dirs-y +=3D smbios/ endif =20 diff --git a/hw/meson.build b/hw/meson.build index fe7c466..66a2f6c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,2 +1,3 @@ subdir('core') +subdir('semihosting') subdir('xen') diff --git a/hw/semihosting/Makefile.objs b/hw/semihosting/Makefile.objs deleted file mode 100644 index 4ad47c0..0000000 --- a/hw/semihosting/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SEMIHOSTING) +=3D config.o -obj-$(CONFIG_SEMIHOSTING) +=3D console.o diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build new file mode 100644 index 0000000..f40ac57 --- /dev/null +++ b/hw/semihosting/meson.build @@ -0,0 +1,4 @@ +specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files( + 'config.c', + 'console.c', +)) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081128; cv=none; d=zohomail.com; s=zohoarc; b=eAIJLHaNb2vjHIev7De+6NqJH4ukNibJKy4T/E3lEjypt8vrfvKauZg8qcrSJEWZVEYMfj5KDC2uMlkLKHvw1LVIJAXjfgU4QfJrBY0c6XMGvZQT6tjXYNFr7YFTYQRpH7vk8a9TJSZc1kwPLo8mNlH8Ebxz7kzo6pGVm4JWZTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081128; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+QoBbRmjf8OdxvDcrGW1+5fPl77Do9tYK7VCqwlKR3Q=; b=NOaMArZhyvgWe/43OocYB9O1Nvw+XvaF94USPX3dT/23CGk4ht33T0KdNSaWMiaUVEMO5T5V5zAyrv6pAR1HatiBO6jV5nwgD+D3V9QEe7NdSLrkqimAmZKhEPKJdgpBVVQl3Y83HZF44778CltKY6p4PUMDHT53S1dk9jrcWSA= 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 1597081128018683.4280749107967; Mon, 10 Aug 2020 10:38:48 -0700 (PDT) Received: from localhost ([::1]:35002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bl0-0006iv-MQ for importer@patchew.org; Mon, 10 Aug 2020 13:38:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKh-0001Ny-SK for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:35 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30386 helo=us-smtp-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 1k5BKf-0003BF-8k for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:35 -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-148-BVWG_XI_OGyFK3yN10Kezw-1; Mon, 10 Aug 2020 13:11:31 -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 336D58064D1 for ; Mon, 10 Aug 2020 17:11:30 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79CB35F1E9 for ; Mon, 10 Aug 2020 17:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+QoBbRmjf8OdxvDcrGW1+5fPl77Do9tYK7VCqwlKR3Q=; b=hQ17tfj4MMnKotU5wLuAlN8wAXlGAOH/PhvErT1xUdn0T/RnXggKdvBrguKiXRMoRfOVJV WYtCqz3LMVLdxqNROx/3nS67YbQZ1a/tPsVcg+4cq9lqMr23TpkFl9r6PvbcYN3gM2Xq7n f14XnrN+sAh2YVrcRQMqYP5X6u5PxRs= X-MC-Unique: BVWG_XI_OGyFK3yN10Kezw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 085/147] meson: convert hw/nubus Date: Mon, 10 Aug 2020 19:08:03 +0200 Message-Id: <1597079345-42801-86-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/nubus/Makefile.objs | 4 ---- hw/nubus/meson.build | 7 +++++++ 4 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 hw/nubus/Makefile.objs create mode 100644 hw/nubus/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6a7ca0f..86bc201 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ -devices-dirs-$(CONFIG_NUBUS) +=3D nubus/ devices-dirs-y +=3D smbios/ endif =20 diff --git a/hw/meson.build b/hw/meson.build index 66a2f6c..03ef302 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ subdir('core') +subdir('nubus') subdir('semihosting') subdir('xen') diff --git a/hw/nubus/Makefile.objs b/hw/nubus/Makefile.objs deleted file mode 100644 index 135ba78..0000000 --- a/hw/nubus/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-y +=3D nubus-device.o -common-obj-y +=3D nubus-bus.o -common-obj-y +=3D nubus-bridge.o -common-obj-$(CONFIG_Q800) +=3D mac-nubus-bridge.o diff --git a/hw/nubus/meson.build b/hw/nubus/meson.build new file mode 100644 index 0000000..9287c63 --- /dev/null +++ b/hw/nubus/meson.build @@ -0,0 +1,7 @@ +nubus_ss =3D ss.source_set() +nubus_ss.add(files('nubus-device.c')) +nubus_ss.add(files('nubus-bus.c')) +nubus_ss.add(files('nubus-bridge.c')) +nubus_ss.add(when: 'CONFIG_Q800', if_true: files('mac-nubus-bridge.c')) + +softmmu_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081972; cv=none; d=zohomail.com; s=zohoarc; b=KyjTGh6HbEpkdK/J4rk0nNFjpQ9tTND9wqymEYaORRbYcUItu1ywuOFGhLtMRvT9rIKVK22XLVfS0EFZ+s4u/OC9Kc8ulqz2+AJN9LoDocEvb6/AaNl5zM8rk4/VKpk0IvaQ/0bMlcbQEVh+hQW8hFe6Aw+YEXNjyXRgIprvvPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081972; 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=u119I5Tl3o+vOjpgjllzRpotRemlQ188sUVcf6NqPq8=; b=OkOXIv1PDRt4TLjFzGGk2xSac1ISMxzSl329Ud6TCQ/LBpxAId23WDVClXX+7VgfbxJPFkNhAYKLz0ISYv9VU8T/vgtRZrVQsvwePkbjykoeEygnFxg1irpKZID1rbcLpo1xHjb0VeEm5g8Qt+CcQpos2y73LCEE8Sj7MoSARQk= 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 1597081972903374.6419542380736; Mon, 10 Aug 2020 10:52:52 -0700 (PDT) Received: from localhost ([::1]:45306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Byd-0008SD-Ik for importer@patchew.org; Mon, 10 Aug 2020 13:52:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKj-0001SY-Qt for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30306 helo=us-smtp-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 1k5BKh-0003Be-VJ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11: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-385-LX6jv4G_NsOHtHlrofEi_A-1; Mon, 10 Aug 2020 13:11:33 -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 E1CE11005510 for ; Mon, 10 Aug 2020 17:11:32 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A09C45F1E9; Mon, 10 Aug 2020 17:11:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079495; 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=u119I5Tl3o+vOjpgjllzRpotRemlQ188sUVcf6NqPq8=; b=Ya+3XUKVUIbQTQ3oNGRe9l36yDRg/fTS4/J0HuhdJBKXAqCFCpEACR8tWZMO75176Ou2RZ QC1DB2h//lJYhjnaMgG9iRJo98Pn9wu/T29JyMOWXk2WmU2eivz4QqJoaEEBH7gesBpDrg RtoZFGyw1Y2ksR8DclqNacqmJPACKzg= X-MC-Unique: LX6jv4G_NsOHtHlrofEi_A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 086/147] meson: convert hw/smbios Date: Mon, 10 Aug 2020 19:08:04 +0200 Message-Id: <1597079345-42801-87-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/smbios/Makefile.objs | 10 ---------- hw/smbios/meson.build | 13 +++++++++++++ 4 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 hw/smbios/Makefile.objs create mode 100644 hw/smbios/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 86bc201..73c49dd 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ -devices-dirs-y +=3D smbios/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 03ef302..dccc2d1 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') subdir('nubus') subdir('semihosting') +subdir('smbios') subdir('xen') diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs deleted file mode 100644 index 23bb2ba..0000000 --- a/hw/smbios/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -ifeq ($(CONFIG_SMBIOS),y) -common-obj-y +=3D smbios.o -common-obj-$(CONFIG_IPMI) +=3D smbios_type_38.o -common-obj-$(call lnot,$(CONFIG_IPMI)) +=3D smbios_type_38-stub.o -else -common-obj-y +=3D smbios-stub.o -endif - -common-obj-$(CONFIG_ALL) +=3D smbios-stub.o -common-obj-$(CONFIG_ALL) +=3D smbios_type_38-stub.o diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build new file mode 100644 index 0000000..9e762c7 --- /dev/null +++ b/hw/smbios/meson.build @@ -0,0 +1,13 @@ +smbios_ss =3D ss.source_set() +smbios_ss.add(files('smbios.c')) +smbios_ss.add(when: 'CONFIG_IPMI', + if_true: files('smbios_type_38.c'), + if_false: files('smbios_type_38-stub.c')) + +softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss) +softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c')) + +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files( + 'smbios-stub.c', + 'smbios_type_38-stub.c', +)) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081675; cv=none; d=zohomail.com; s=zohoarc; b=ZU5FyEHqrPU7kQf6aLwaXVGlo/3MX8li/FF0CaLmI9ZJE4jUeh01fihuvwF5Jqr8gg3xMSRehs5a7E/X3Sr4ehCxjxJ8uW4GC2pQwmRpQkpGrNgM+BYSN0Wt6wm/yyUE29ixCmGafik/G9gppJ4kxmRPMGicDFXzKuASRvbRH0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081675; 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=2o3z543BwQNJiqsu8SJSUCnvV9TS/KTwSbMD9xcgwOc=; b=ZfgLjsd8aFViZNNdvD0TEnhBhgZz61awkb+nuGhDqo8sa7TsfaVCgn9yFv1WNHgbc/q/+KVGpYOfypnp27jFX4+L5rnVEC+vrLRG9Whu964oXBlp6DGdNETa3knmtgvzeFqyhLwZ+qvb2C6DnQmvl4Jh+7J4XI9UVFONQgxdmb0= 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 1597081675206183.15156815336184; Mon, 10 Aug 2020 10:47:55 -0700 (PDT) Received: from localhost ([::1]:53106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Btq-00007l-04 for importer@patchew.org; Mon, 10 Aug 2020 13:47:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKl-0001WX-Fv for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:39 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31305 helo=us-smtp-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 1k5BKj-0003Bq-Gl for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:39 -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-209-06n86ytrONyatwB3x6lsvQ-1; Mon, 10 Aug 2020 13:11:35 -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 4CB1019067E3 for ; Mon, 10 Aug 2020 17:11:34 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A1275F1E9; Mon, 10 Aug 2020 17:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079496; 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=2o3z543BwQNJiqsu8SJSUCnvV9TS/KTwSbMD9xcgwOc=; b=B/g04wTcJPIrpUixXN3eBTfj4tCBx0uK2mmG0xH27W0obQuw6yuoZBYWaDg3V9x9FKTZMO xVVRcj8iQ7XfBTUJrAGNgUeSXYv+3YN6OvvVbRCae2cvY6XS/Jt4MkwWIHOIqIMgyFtIFP MKnhiZyvVifPSN6zqtSg5YDS2w9K6jE= X-MC-Unique: 06n86ytrONyatwB3x6lsvQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 087/147] meson: convert hw/mem Date: Mon, 10 Aug 2020 19:08:05 +0200 Message-Id: <1597079345-42801-88-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/mem/Kconfig | 1 + hw/mem/Makefile.objs | 3 --- hw/mem/meson.build | 6 ++++++ hw/meson.build | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 hw/mem/Makefile.objs create mode 100644 hw/mem/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 73c49dd..df72b25 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -34,7 +34,6 @@ devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ -devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index c278449..a0ef2cf 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -9,3 +9,4 @@ config NVDIMM bool default y depends on (PC || PSERIES || ARM_VIRT) + select MEM_DEVICE diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs deleted file mode 100644 index 56345be..0000000 --- a/hw/mem/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -common-obj-$(CONFIG_DIMM) +=3D pc-dimm.o -common-obj-y +=3D memory-device.o -common-obj-$(CONFIG_NVDIMM) +=3D nvdimm.o diff --git a/hw/mem/meson.build b/hw/mem/meson.build new file mode 100644 index 0000000..ba42462 --- /dev/null +++ b/hw/mem/meson.build @@ -0,0 +1,6 @@ +mem_ss =3D ss.source_set() +mem_ss.add(files('memory-device.c')) +mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c')) +mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) + +softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) diff --git a/hw/meson.build b/hw/meson.build index dccc2d1..542d675 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082097; cv=none; d=zohomail.com; s=zohoarc; b=dtNTsktJwPdqxfMdgE5i0JuSrxNbNKzP1wblbJcoSBbeiHmSvnk/SLrPH0YDOslxqRcD8rc+jYvQrokVSDz8L8UuximXOgD7XKQrAAXq//HMPXzCArT86K1pQhNYr4+g1Cs7oH9qm1B7RMigtjwY1mkui+mRfplZ+IuISZAHx/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082097; 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=f5KGNQlzJDQX8oGUtnF2vtSjG4aFUlN5WQeZ7PqZBqY=; b=eibkeZWtcuYKHOnP5O6iO6A0f7Kn1H0WSNAs2hPcSru0UUNaOv1187XgS+Pd9bre0OvWRaj5oVTIAtAu/YNvFcMiY6V0D2La2KthZNQSrzRszDHTfQN5sAyKzLCkGBRsU+hbhmG9HpAVfHhSQcYwlj91BMs8v/vFdS+PFR31YEI= 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 1597082097871294.84740295348263; Mon, 10 Aug 2020 10:54:57 -0700 (PDT) Received: from localhost ([::1]:53718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C0e-0003RD-Ip for importer@patchew.org; Mon, 10 Aug 2020 13:54:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKm-0001aE-WB for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46897 helo=us-smtp-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-0003Bz-4A for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:40 -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-323-cV4osJTkOpakC9rwWakQCQ-1; Mon, 10 Aug 2020 13:11:36 -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 AB13B800465 for ; Mon, 10 Aug 2020 17:11:35 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8D5F5F1E9; Mon, 10 Aug 2020 17:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079498; 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=f5KGNQlzJDQX8oGUtnF2vtSjG4aFUlN5WQeZ7PqZBqY=; b=akcKFvnhFXk93ah4v1pPU43YcKzdINVANVCEhjb2/yybhV2RLVmysTsNIwDeNhxVUW4DzZ b/nFJLVSTzES6qpndjsZh4wDLlOsU2KU/Rm8ZiD/cH+x6C1QoZT4Yb0EgDkC3qZL9Y8kV8 4BqSsXuw1dG3nsPjJjB/5i5+Pf3H1oc= X-MC-Unique: cV4osJTkOpakC9rwWakQCQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 088/147] meson: convert hw/watchdog Date: Mon, 10 Aug 2020 19:08:06 +0200 Message-Id: <1597079345-42801-89-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/watchdog/Makefile.objs | 7 ------- hw/watchdog/meson.build | 7 +++++++ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 hw/watchdog/Makefile.objs create mode 100644 hw/watchdog/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index df72b25..9ebd13d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -33,7 +33,6 @@ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ -devices-dirs-y +=3D watchdog/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 542d675..f2209d9 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,4 +3,5 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('watchdog') subdir('xen') diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs deleted file mode 100644 index 631b711..0000000 --- a/hw/watchdog/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -common-obj-y +=3D watchdog.o -common-obj-$(CONFIG_CMSDK_APB_WATCHDOG) +=3D cmsdk-apb-watchdog.o -common-obj-$(CONFIG_WDT_IB6300ESB) +=3D wdt_i6300esb.o -common-obj-$(CONFIG_WDT_IB700) +=3D wdt_ib700.o -common-obj-$(CONFIG_WDT_DIAG288) +=3D wdt_diag288.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D wdt_aspeed.o -common-obj-$(CONFIG_WDT_IMX2) +=3D wdt_imx2.o diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build new file mode 100644 index 0000000..9b8725e --- /dev/null +++ b/hw/watchdog/meson.build @@ -0,0 +1,7 @@ +softmmu_ss.add(files('watchdog.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-ap= b-watchdog.c')) +softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.= c')) +softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c')) +softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c')) +softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081216; cv=none; d=zohomail.com; s=zohoarc; b=lU1jyDlcIdubgAwOG91Y77Nm3BksPck/XliUgOrZ5TOWIX4ubEwIq61u/MspzTzHRB6wnJ1gWg0r2PL58s5S52HGahCtMqMN3mZL9MQ34m5H9Xm7qR6SG4F7rXVIQiKkxwlMX9pb4rDZGiZ+tI5CpjmA/ZuGGQxUKd/Jm52VbmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081216; 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=bAdpJ6uFzac1e0yweaVtIrh6BZyTsNYsf8fXcvTvDxc=; b=QV1hKZRFnErPdrZEHx7qdJxXcyb2541PZdz8wy5xPSZavXSFhL0kr/NR5sJwVz11dlk2H9IX/QrGblyNQ4xQOupf3HVc0rDVUZa5KK/jnV+y+tc15YaPwUnh4yN9mrui6Eb1UXocSMYiIKAjYmGme3DIsTRks7CK7tJawZjqOlI= 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 1597081216331556.127254196653; Mon, 10 Aug 2020 10:40:16 -0700 (PDT) Received: from localhost ([::1]:43150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BmQ-0001ZE-V7 for importer@patchew.org; Mon, 10 Aug 2020 13:40:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKp-0001gK-Ft for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60185 helo=us-smtp-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 1k5BKn-0003CA-9o for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:43 -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-327-n5GYCBZQMVmLL5wvkOYk9g-1; Mon, 10 Aug 2020 13:11:38 -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 172378014D7 for ; Mon, 10 Aug 2020 17:11:37 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 237815F1E9; Mon, 10 Aug 2020 17:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079500; 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=bAdpJ6uFzac1e0yweaVtIrh6BZyTsNYsf8fXcvTvDxc=; b=IVwqbZQjiy6FaNNaBlFdqw0JHBqAVn4TxFaQHPZiTLeUYbC2qVivh95X9TSWck1+/0JiYI qmxnmtwS48Fuk3uA/YSFKL1nDdBIGuAKXqFtYxoPLb9MQUZSXjXaB2B7Le3wZWFlIqYNkx vFwasJKAZrcXlCiInHI1wqqVjybIrDg= X-MC-Unique: n5GYCBZQMVmLL5wvkOYk9g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 089/147] meson: convert hw/virtio Date: Mon, 10 Aug 2020 19:08:07 +0200 Message-Id: <1597079345-42801-90-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/virtio/Makefile.objs | 48 ---------------------------------------------- hw/virtio/meson.build | 51 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 52 insertions(+), 49 deletions(-) delete mode 100644 hw/virtio/Makefile.objs create mode 100644 hw/virtio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 9ebd13d..a1cfb99 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -32,7 +32,6 @@ devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ -devices-dirs-y +=3D virtio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index f2209d9..8338fc4 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,5 +3,6 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('virtio') subdir('watchdog') subdir('xen') diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs deleted file mode 100644 index fc91719..0000000 --- a/hw/virtio/Makefile.objs +++ /dev/null @@ -1,48 +0,0 @@ -ifeq ($(CONFIG_VIRTIO),y) -common-obj-y +=3D virtio-bus.o -obj-y +=3D virtio.o - -obj-$(CONFIG_VHOST) +=3D vhost.o vhost-backend.o -common-obj-$(call lnot,$(CONFIG_VHOST)) +=3D vhost-stub.o -obj-$(CONFIG_VHOST_USER) +=3D vhost-user.o -obj-$(CONFIG_VHOST_VDPA) +=3D vhost-vdpa.o - -common-obj-$(CONFIG_VIRTIO_RNG) +=3D virtio-rng.o -common-obj-$(CONFIG_VIRTIO_PCI) +=3D virtio-pci.o -common-obj-$(CONFIG_VIRTIO_MMIO) +=3D virtio-mmio.o -obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-balloon.o -obj-$(CONFIG_VIRTIO_CRYPTO) +=3D virtio-crypto.o -obj-$(CONFIG_VHOST_USER_FS) +=3D vhost-user-fs.o -obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) +=3D virtio-= crypto-pci.o -obj-$(CONFIG_VIRTIO_PMEM) +=3D virtio-pmem.o -common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) +=3D vi= rtio-pmem-pci.o -obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) +=3D vhost-u= ser-fs-pci.o -obj-$(CONFIG_VIRTIO_IOMMU) +=3D virtio-iommu.o -obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-common.o vhost-vsock.o -obj-$(CONFIG_VHOST_USER_VSOCK) +=3D vhost-vsock-common.o vhost-user-vsock.o -obj-$(CONFIG_VIRTIO_MEM) +=3D virtio-mem.o -common-obj-$(call land,$(CONFIG_VIRTIO_MEM),$(CONFIG_VIRTIO_PCI)) +=3D vir= tio-mem-pci.o - -ifeq ($(CONFIG_VIRTIO_PCI),y) -obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-pci.o -obj-$(CONFIG_VHOST_USER_VSOCK) +=3D vhost-user-vsock-pci.o -obj-$(CONFIG_VHOST_USER_BLK) +=3D vhost-user-blk-pci.o -obj-$(CONFIG_VHOST_USER_INPUT) +=3D vhost-user-input-pci.o -obj-$(CONFIG_VHOST_USER_SCSI) +=3D vhost-user-scsi-pci.o -obj-$(CONFIG_VHOST_SCSI) +=3D vhost-scsi-pci.o -obj-$(CONFIG_VIRTIO_INPUT_HOST) +=3D virtio-input-host-pci.o -obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-input-pci.o -obj-$(CONFIG_VIRTIO_RNG) +=3D virtio-rng-pci.o -obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-balloon-pci.o -obj-$(CONFIG_VIRTIO_IOMMU) +=3D virtio-iommu-pci.o -obj-$(CONFIG_VIRTIO_9P) +=3D virtio-9p-pci.o -obj-$(CONFIG_VIRTIO_SCSI) +=3D virtio-scsi-pci.o -obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk-pci.o -obj-$(CONFIG_VIRTIO_NET) +=3D virtio-net-pci.o -obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-serial-pci.o -endif -else -common-obj-y +=3D vhost-stub.o -endif - -common-obj-$(CONFIG_ALL) +=3D vhost-stub.o diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build new file mode 100644 index 0000000..fbff9bc --- /dev/null +++ b/hw/virtio/meson.build @@ -0,0 +1,51 @@ +softmmu_virtio_ss =3D ss.source_set() +softmmu_virtio_ss.add(files('virtio-bus.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pc= i.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-m= mio.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VHOST', if_false: files('vhost-stub.c'= )) + +softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss) +softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) + +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) + +virtio_ss =3D ss.source_set() +virtio_ss.add(files('virtio.c')) +virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backe= nd.c')) +virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) +virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloo= n.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.= c')) +virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true= : files('virtio-crypto-pci.c')) +virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs.= c')) +virtio_ss.add(when: ['CONFIG_VHOST_USER_FS', 'CONFIG_VIRTIO_PCI'], if_true= : files('vhost-user-fs-pci.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem.c')) +virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', = 'vhost-vsock-common.c')) +virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-= vsock.c', 'vhost-vsock-common.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c'= )) +virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) + +virtio_pci_ss =3D ss.source_set() +virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-= pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-u= ser-vsock-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-use= r-blk-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-u= ser-input-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-us= er-scsi-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pc= i.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio= -input-host-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-inpu= t-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng-pc= i.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-ba= lloon-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-pci.= c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-scsi-= pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk-pc= i.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net-pc= i.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ser= ial-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-= pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iomm= u-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pc= i.c')) + +virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) + +specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082229; cv=none; d=zohomail.com; s=zohoarc; b=L9GdfOy1V+i9WYH2wlo3GmzR7c+fHm1PmD5tGEvlmkRAkJ7Gk3uDETTC7OYVV6LLIrGkrQk+fw0SKzZaWp2eeDwkgL5xFzReZJk2w7lOtOH6xm/SSOsX/TPX++/srhWS2EV4Mgj6cOqn0lTsGtv7JW98szbDovPjn5YadQbvIrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082229; 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=EY5xBq1uQzGsiziefS8q1NV3vGh7VRyVrHGNrGkrL3c=; b=FmHOuvnDiZkLOTPlIvJqhRJIlWoeR5TxJde3MHdK+t9s2uWKDOWws5J+wVzsyQ6SwJNmrck3AVwtYHfmrG++maCRCyhoAabimdmtsezKd013bakxnhiCw4jmuCUKTRT++PLXcGNPbDmQ1w3iTLgVMZghBj86zdFZNOzmTRri/ac= 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 1597082229804304.24869720273205; Mon, 10 Aug 2020 10:57:09 -0700 (PDT) Received: from localhost ([::1]:33952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C2m-0006wJ-G7 for importer@patchew.org; Mon, 10 Aug 2020 13:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKv-0001n2-T9 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42174 helo=us-smtp-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 1k5BKt-0003CT-7G for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:49 -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-146-tKp-W1cWNFSVejxUcZLKPA-1; Mon, 10 Aug 2020 13:11:42 -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 406AE80183C for ; Mon, 10 Aug 2020 17:11:41 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82D1487D61; Mon, 10 Aug 2020 17:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079504; 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=EY5xBq1uQzGsiziefS8q1NV3vGh7VRyVrHGNrGkrL3c=; b=jDuzfrQHVYoYr4YKMs5jeqZhr1WobfJblYKesTRo9nvNT3EDPyqZbjL9BfIU2XLFr6d+Ws +oYb+3sRVkIzNyVXP66nF/uMCsBbIhY3vCv3qyGjE/l/u8seuntdSYYa3zh6hPeAWrW8na G0MMt2Z6SXAs+LA9oiqiWmgEfDkDmaE= X-MC-Unique: tKp-W1cWNFSVejxUcZLKPA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 090/147] meson: convert hw/vfio Date: Mon, 10 Aug 2020 19:08:08 +0200 Message-Id: <1597079345-42801-91-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/vfio/Makefile.objs | 8 -------- hw/vfio/meson.build | 18 ++++++++++++++++++ 4 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 hw/vfio/Makefile.objs create mode 100644 hw/vfio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a1cfb99..f6e08f6 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -31,7 +31,6 @@ devices-dirs-y +=3D ssi/ devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-y +=3D usb/ -devices-dirs-$(CONFIG_VFIO) +=3D vfio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 8338fc4..4dafc8a 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('vfio') subdir('virtio') subdir('watchdog') subdir('xen') diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs deleted file mode 100644 index 9bb1c09..0000000 --- a/hw/vfio/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y +=3D common.o spapr.o -obj-$(CONFIG_VFIO_PCI) +=3D pci.o pci-quirks.o display.o -obj-$(CONFIG_VFIO_CCW) +=3D ccw.o -obj-$(CONFIG_VFIO_PLATFORM) +=3D platform.o -obj-$(CONFIG_VFIO_XGMAC) +=3D calxeda-xgmac.o -obj-$(CONFIG_VFIO_AMD_XGBE) +=3D amd-xgbe.o -obj-$(CONFIG_VFIO_AP) +=3D ap.o -obj-$(CONFIG_VFIO_IGD) +=3D igd.o diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build new file mode 100644 index 0000000..37efa74 --- /dev/null +++ b/hw/vfio/meson.build @@ -0,0 +1,18 @@ +vfio_ss =3D ss.source_set() +vfio_ss.add(files( + 'common.c', + 'spapr.c', +)) +vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( + 'display.c', + 'pci-quirks.c', + 'pci.c', +)) +vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) +vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) +vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) +vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) +vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) +vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) + +specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082040; cv=none; d=zohomail.com; s=zohoarc; b=AMCZKVXWovD3ONokwD/vwnCkzbj/RO6x15tUTIHk6yR4VKm9SyrIEMe8lT3J/qNiLkgsElkNK9aPYBqAV3DWO1DMOtbAvt0VZ5f5uJPBBrZQdDFWIJX0iVk18URVCpKHK9fHcXh5bzHdR8kv1ePQjbk4ZFrIG3x9pWxhsVDHYVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082040; 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=JVG9N+xGFm05XrSMUMBQFJhxy7afPpsKd7cHwY5hH0k=; b=O6mj4Ppal0Fd9ZQ3J4GeXS9COT6eMEMnjKkfOatfJjniwVFLCS6W7WBhFoKWrhDzK83DUJ66uMsPx/ro0v1G+7naLJwC1l4UuUmAYKj8D88p4+nYggVD9v0wnGVYrGbvWwNvbGASFrDRu+8Cql4O2qKKsDL2L8mZdvk/kSE3Vt8= 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 1597082040766534.9339192342582; Mon, 10 Aug 2020 10:54:00 -0700 (PDT) Received: from localhost ([::1]:49380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bzj-0001fl-DC for importer@patchew.org; Mon, 10 Aug 2020 13:53:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL0-0001yF-4O for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50973 helo=us-smtp-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 1k5BKx-0003D8-MX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:53 -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-57-_KXHDEtpOSy9jc12gOKbhQ-1; Mon, 10 Aug 2020 13:11:43 -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 A11F119067E3 for ; Mon, 10 Aug 2020 17:11:42 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD3595F1E9; Mon, 10 Aug 2020 17:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079511; 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=JVG9N+xGFm05XrSMUMBQFJhxy7afPpsKd7cHwY5hH0k=; b=GhvISc7o4lLQ62/yM420AmMOYdBpfy5+dS55PYZlXNcF44ky+TgjUafETeXIFSzrZooQC8 RSQxlpwXv/HAFIyW9G0e0NKZ28fJvkosvmlTvD1c43W1/4i9sy2I8ZyNWaWPqoO7zIzYs3 sJggrDHjTY3fMT4RcSKoXIHm/HcKyeU= X-MC-Unique: _KXHDEtpOSy9jc12gOKbhQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 091/147] meson: convert hw/usb Date: Mon, 10 Aug 2020 19:08:09 +0200 Message-Id: <1597079345-42801-92-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.target | 1 + hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/usb/Makefile.objs | 71 ------------------------------------------------= ---- hw/usb/meson.build | 69 ++++++++++++++++++++++++++++++++++++++++++++++++= ++ meson.build | 15 +++++++++++ 6 files changed, 86 insertions(+), 72 deletions(-) delete mode 100644 hw/usb/Makefile.objs create mode 100644 hw/usb/meson.build diff --git a/Makefile.target b/Makefile.target index 386378b..3d5a2af 100644 --- a/Makefile.target +++ b/Makefile.target @@ -168,6 +168,7 @@ endif LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) = $(SECCOMP_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) +LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f6e08f6..c2619bb 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,6 @@ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ -devices-dirs-y +=3D usb/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 4dafc8a..89bd6ad 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('usb') subdir('vfio') subdir('virtio') subdir('watchdog') diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs deleted file mode 100644 index e342ff5..0000000 --- a/hw/usb/Makefile.objs +++ /dev/null @@ -1,71 +0,0 @@ -# usb subsystem core -common-obj-y +=3D core.o combined-packet.o bus.o libhw.o -common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o - -# usb host adapters -common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o -common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o -common-obj-$(CONFIG_USB_OHCI_PCI) +=3D hcd-ohci-pci.o -common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o -common-obj-$(CONFIG_USB_EHCI_PCI) +=3D hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o -common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o -common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o -common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o -common-obj-$(CONFIG_USB_DWC2) +=3D hcd-dwc2.o - -common-obj-$(CONFIG_TUSB6010) +=3D tusb6010.o -common-obj-$(CONFIG_IMX) +=3D chipidea.o - -# emulated usb devices -common-obj-$(CONFIG_USB) +=3D dev-hub.o -common-obj-$(CONFIG_USB) +=3D dev-hid.o -common-obj-$(CONFIG_USB_TABLET_WACOM) +=3D dev-wacom.o -common-obj-$(CONFIG_USB_STORAGE_BOT) +=3D dev-storage.o -common-obj-$(CONFIG_USB_STORAGE_UAS) +=3D dev-uas.o -common-obj-$(CONFIG_USB_AUDIO) +=3D dev-audio.o -common-obj-$(CONFIG_USB_SERIAL) +=3D dev-serial.o -common-obj-$(CONFIG_USB_NETWORK) +=3D dev-network.o - -ifeq ($(CONFIG_USB_SMARTCARD),y) -common-obj-y +=3D dev-smartcard-reader.o -ifeq ($(CONFIG_SMARTCARD),y) -common-obj-m +=3D smartcard.mo -smartcard.mo-objs :=3D ccid-card-passthru.o ccid-card-emulated.o -smartcard.mo-cflags :=3D $(SMARTCARD_CFLAGS) -smartcard.mo-libs :=3D $(SMARTCARD_LIBS) -endif -endif - -ifeq ($(CONFIG_POSIX),y) -common-obj-$(CONFIG_USB_STORAGE_MTP) +=3D dev-mtp.o -endif - -# usb redirection -ifeq ($(CONFIG_USB),y) -ifeq ($(CONFIG_USB_REDIR),y) -common-obj-m +=3D redirect.mo -redirect.mo-objs =3D redirect.o quirks.o -redirect.mo-cflags =3D $(USB_REDIR_CFLAGS) -redirect.mo-libs =3D $(USB_REDIR_LIBS) -endif -endif - -# usb pass-through -ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) -common-obj-y +=3D host-libusb.o -else -common-obj-y +=3D host-stub.o -endif -common-obj-$(CONFIG_ALL) +=3D host-stub.o - -host-libusb.o-cflags :=3D $(LIBUSB_CFLAGS) -host-libusb.o-libs :=3D $(LIBUSB_LIBS) - -ifeq ($(CONFIG_USB_LIBUSB),y) -common-obj-$(CONFIG_XEN) +=3D xen-usb.o -xen-usb.o-cflags :=3D $(LIBUSB_CFLAGS) -xen-usb.o-libs :=3D $(LIBUSB_LIBS) -endif - -common-obj-$(CONFIG_IMX_USBPHY) +=3D imx-usb-phy.o diff --git a/hw/usb/meson.build b/hw/usb/meson.build new file mode 100644 index 0000000..f40d158 --- /dev/null +++ b/hw/usb/meson.build @@ -0,0 +1,69 @@ +hw_usb_modules =3D [] + +# usb subsystem core +softmmu_ss.add(files( + 'bus.c', + 'combined-packet.c', + 'core.c', + 'libhw.c' +)) + +softmmu_ss.add(when: 'CONFIG_USB', if_true: files( + 'desc.c', + 'desc-msos.c', +)) + +# usb host adapters +softmmu_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c')) +softmmu_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c')) +softmmu_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c'= , 'hcd-ehci-sysbus.c')) +softmmu_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c')) +softmmu_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c')) +softmmu_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c')) + +softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c')) +softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c')) + +# emulated usb devices +softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c')) +softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c')) +softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.= c')) +softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage= .c')) +softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c')) +softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c')) +softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c')) +softmmu_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c')) +softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: = files('dev-mtp.c')) + +# smartcard +softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard= -reader.c')) + +if config_host.has_key('CONFIG_SMARTCARD') + hw_usb_modules +=3D [['smartcard', files( + 'ccid-card-emulated.c', + 'ccid-card-passthru.c', + ), [cacard], ['CONFIG_USB_SMARTCARD']]] +endif + +# usb redirect +if config_host.has_key('CONFIG_USB_REDIR') + hw_usb_modules +=3D [['redirect', files( + 'redirect.c', + 'quirks.c', + ), [usbredir], ['CONFIG_USB']]] +endif + +# usb pass-through +softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_USB_LIBUSB', libusb], + if_true: files('host-libusb.c'), + if_false: files('host-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('host-stub.c')) + +softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true: files(= 'xen-usb.c')) + +modules +=3D { 'hw-usb': hw_usb_modules } diff --git a/meson.build b/meson.build index 19c81b6..696d743 100644 --- a/meson.build +++ b/meson.build @@ -318,6 +318,21 @@ if 'CONFIG_XEN_BACKEND' in config_host xen =3D declare_dependency(compile_args: config_host['XEN_CFLAGS'].split= (), link_args: config_host['XEN_LIBS'].split()) endif +cacard =3D not_found +if 'CONFIG_SMARTCARD' in config_host + cacard =3D declare_dependency(compile_args: config_host['SMARTCARD_CFLAG= S'].split(), + link_args: config_host['SMARTCARD_LIBS'].spl= it()) +endif +usbredir =3D not_found +if 'CONFIG_USB_REDIR' in config_host + usbredir =3D declare_dependency(compile_args: config_host['USB_REDIR_CFL= AGS'].split(), + link_args: config_host['USB_REDIR_LIBS'].s= plit()) +endif +libusb =3D not_found +if 'CONFIG_USB_LIBUSB' in config_host + libusb =3D declare_dependency(compile_args: config_host['LIBUSB_CFLAGS']= .split(), + link_args: config_host['LIBUSB_LIBS'].split(= )) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081912; cv=none; d=zohomail.com; s=zohoarc; b=XzJVTXheVXJCQ+/foFke0fbflpSu+XWlBPxjNCuE/yo0zkhJS1bhuEZ4DfZwRS/sUcmopTv8JbCu0lu87FTnq7eEKE2C1v1hP0827CCA/mnZLyWBlkJ2+PTvGOgSSMsITknCl76LnZtJZII4Sn81nqAp49/WzGfqT171F9g7QiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081912; 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=FeJr7xGjJhKpS36/pmB6exc5b/mrhwqIzGTHcaw4KUY=; b=KCVdIPurwiIwYYR69uEOIOz0FBPRVF6JWRddKx7cXWbxYO59eP1hJ8GkxRd0QqR+py18L2RMI8mfYC1gjgoZjtNlTU5rQK9LwHjCy2eW/KcEsKRq9mQx02zi2U5qRAHOzVE1IzXiVQpih9PCXMrI1jLIFqswynJtVRFMM2NiIsI= 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 1597081912508204.82617367099647; Mon, 10 Aug 2020 10:51:52 -0700 (PDT) Received: from localhost ([::1]:40980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bxf-0006iK-5f for importer@patchew.org; Mon, 10 Aug 2020 13:51:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKv-0001km-28 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:49 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45396 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 1k5BKt-0003CY-9w for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:48 -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-134-nfjMpXS4MH2_f5IH0hgDIw-1; Mon, 10 Aug 2020 13:11:44 -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 0D76A1005504 for ; Mon, 10 Aug 2020 17:11:44 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1809387D69; Mon, 10 Aug 2020 17:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079506; 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=FeJr7xGjJhKpS36/pmB6exc5b/mrhwqIzGTHcaw4KUY=; b=Gnw4+PrQJ3lDktBbHQsqmcU2UH9UWLWRBLamUTsC2s78dV/YGK9kNuawHaZOGmcermAql+ nhM7kftpOXrKUsX9iRbVWLdM36gCW/YS2jZUmg5dkQ0FmG/tWPtxHLv0REg4FJxz+DSfFc LaFPeJFNHqxr6mJ5cQP9NLBLG+j08uc= X-MC-Unique: nfjMpXS4MH2_f5IH0hgDIw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 092/147] meson: convert hw/tpm Date: Mon, 10 Aug 2020 19:08:10 +0200 Message-Id: <1597079345-42801-93-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/tpm/Makefile.objs | 6 ------ hw/tpm/meson.build | 8 ++++++++ 4 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 hw/tpm/Makefile.objs create mode 100644 hw/tpm/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index c2619bb..f0e5728 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -29,7 +29,6 @@ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ devices-dirs-y +=3D timer/ -devices-dirs-$(CONFIG_TPM) +=3D tpm/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 89bd6ad..2ddf6ba 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('tpm') subdir('usb') subdir('vfio') subdir('virtio') diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs deleted file mode 100644 index 6fc05be..0000000 --- a/hw/tpm/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) +=3D tpm_ppi.o -common-obj-$(CONFIG_TPM_TIS_ISA) +=3D tpm_tis_isa.o -common-obj-$(CONFIG_TPM_TIS_SYSBUS) +=3D tpm_tis_sysbus.o -common-obj-$(CONFIG_TPM_TIS) +=3D tpm_tis_common.o -common-obj-$(CONFIG_TPM_CRB) +=3D tpm_crb.o -obj-$(CONFIG_TPM_SPAPR) +=3D tpm_spapr.o diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build new file mode 100644 index 0000000..1c68d81 --- /dev/null +++ b/hw/tpm/meson.build @@ -0,0 +1,8 @@ +softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysb= us.c')) +softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) + +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true: files= ('tpm_ppi.c')) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true: files= ('tpm_ppi.c')) +specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081801; cv=none; d=zohomail.com; s=zohoarc; b=IykOgdlq0mLjUQzZemTXUVfp8Qi+fcbPupwr+wjim08QL0KQgAYaB4KGlcfcZPrEseLFcV1l9fzGAP1s8+buSXSGNYH8NXrQ5I0NFYK8QZioQhzTUt2hi+QgCz4yde5oyinwlu0obF+9YkXghBgiuIEuFniRAqNohVLnZmLTLIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081801; 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=aTLRkjnGqZmSb/9nN+/m/jn5R17dbqKw14Cn+kILblg=; b=EIMmwPVSu79zwDMfOYlyekJ41MAcDRRalOzuHdPIfcXDXjxZNpL2VIJ0LQRN4h5KeNVHTapBaHAF4xCuwHZ4QfoT0Az//ftSf321dIxAuGuJV01vee3EeQ1UXEGQMUMzPJfHyNokio2x+bDbHs+6nSYPXwUXn6vmRjEldcICKd4= 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 15970818017314.306260004672481; Mon, 10 Aug 2020 10:50:01 -0700 (PDT) Received: from localhost ([::1]:33196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bvs-0003VR-H5 for importer@patchew.org; Mon, 10 Aug 2020 13:50:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKw-0001pL-SJ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58328 helo=us-smtp-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 1k5BKu-0003Cc-GP for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:50 -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-389-WTW71WSBPJS0869oOnNhxw-1; Mon, 10 Aug 2020 13:11:46 -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 6B4288014D7 for ; Mon, 10 Aug 2020 17:11:45 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 791DF5F1E9; Mon, 10 Aug 2020 17:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079507; 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=aTLRkjnGqZmSb/9nN+/m/jn5R17dbqKw14Cn+kILblg=; b=LUWV6LtSVHp53Z1O6KSuKY0seZcTOz03+5dIaZktC7D//X+YwrHHN8yLJBsSU5te3So/14 XIldfY+ALL35EHPxSSP00Nzrxz0wuwLK9qfjmT7QdRlyLfGbPIpdyXTHnub/w3AOnypmkI w941+M0UH3PYBYsEm4as0700RjDIVVQ= X-MC-Unique: WTW71WSBPJS0869oOnNhxw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 093/147] meson: convert hw/timer Date: Mon, 10 Aug 2020 19:08:11 +0200 Message-Id: <1597079345-42801-94-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/timer/Makefile.objs | 41 ----------------------------------------- hw/timer/meson.build | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 hw/timer/Makefile.objs create mode 100644 hw/timer/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f0e5728..70ecaa8 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,7 +28,6 @@ devices-dirs-y +=3D rtc/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ -devices-dirs-y +=3D timer/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 2ddf6ba..50b26db 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('timer') subdir('tpm') subdir('usb') subdir('vfio') diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs deleted file mode 100644 index 1303b13..0000000 --- a/hw/timer/Makefile.objs +++ /dev/null @@ -1,41 +0,0 @@ -common-obj-$(CONFIG_ARM_TIMER) +=3D arm_timer.o -common-obj-$(CONFIG_ARM_MPTIMER) +=3D arm_mptimer.o -common-obj-$(CONFIG_ARM_V7M) +=3D armv7m_systick.o -common-obj-$(CONFIG_A9_GTIMER) +=3D a9gtimer.o -common-obj-$(CONFIG_CADENCE) +=3D cadence_ttc.o -common-obj-$(CONFIG_HPET) +=3D hpet.o -common-obj-$(CONFIG_I8254) +=3D i8254_common.o i8254.o -common-obj-$(CONFIG_PUV3) +=3D puv3_ost.o -common-obj-$(CONFIG_XILINX) +=3D xilinx_timer.o -common-obj-$(CONFIG_SLAVIO) +=3D slavio_timer.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_timer.o -common-obj-$(CONFIG_GRLIB) +=3D grlib_gptimer.o -common-obj-$(CONFIG_IMX) +=3D imx_epit.o -common-obj-$(CONFIG_IMX) +=3D imx_gpt.o -common-obj-$(CONFIG_LM32) +=3D lm32_timer.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-sysctl.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_timer.o - -common-obj-$(CONFIG_ALTERA_TIMER) +=3D altera_timer.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_mct.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_pwm.o -common-obj-$(CONFIG_OMAP) +=3D omap_gptimer.o -common-obj-$(CONFIG_OMAP) +=3D omap_synctimer.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx_timer.o -common-obj-$(CONFIG_SH4) +=3D sh_timer.o -common-obj-$(CONFIG_RENESAS_TMR) +=3D renesas_tmr.o -common-obj-$(CONFIG_RENESAS_CMT) +=3D renesas_cmt.o -common-obj-$(CONFIG_DIGIC) +=3D digic-timer.o -common-obj-$(CONFIG_MIPS_CPS) +=3D mips_gictimer.o - -common-obj-$(CONFIG_ALLWINNER_A10_PIT) +=3D allwinner-a10-pit.o - -common-obj-$(CONFIG_STM32F2XX_TIMER) +=3D stm32f2xx_timer.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_timer.o - -common-obj-$(CONFIG_CMSDK_APB_TIMER) +=3D cmsdk-apb-timer.o -common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) +=3D cmsdk-apb-dualtimer.o -common-obj-$(CONFIG_MSF2) +=3D mss-timer.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_systmr.o - -obj-$(CONFIG_AVR_TIMER16) +=3D avr_timer16.o diff --git a/hw/timer/meson.build b/hw/timer/meson.build new file mode 100644 index 0000000..9f0a267 --- /dev/null +++ b/hw/timer/meson.build @@ -0,0 +1,37 @@ +softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner= -a10-pit.c')) +softmmu_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c= ')) +softmmu_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c')) +softmmu_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c')) +softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c')) +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-a= pb-dualtimer.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-t= imer.c')) +softmmu_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c')) +softmmu_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c')) +softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c')) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c')) +softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c')) +softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c')) +softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i82= 54.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c')) +softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.= c')) +softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c')) +softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) +softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_t= imer.c')) +softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) + +specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'= )) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082334; cv=none; d=zohomail.com; s=zohoarc; b=MgzhRFCE0sdvzLQHrtG1hDk008TMKxeOGY/aOrOzF6uoOkawPwlwMgJCefGyOpRebZQXMLAUXjCdpFZ9lqBig1ZGMpkcUU5ntfkun3dHLWc1y8GlY/NOPmI5IvQi1lrEgAfcDxuGXlFuj+lutfpuS/yOy9OhEXFnZZ9NT6MaGpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082334; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=lMOKj2JUkDjiKQzhyDxdSKswLl4CNUMxR1j4M1JHaXA=; b=DOuNEqPBzQbaqHwDOk68zk6gqlxIko9pipyLW1vJIDeKJMvxOEXVsBY5eUO/nEJCe8f1LE/+RmiWM42Pji83DV0PRXE6uE4GQzUnkS0/niQPiwi1phiKVG8i+hqiLdiD+k7ZP8pADnV2j4aw/wMyLj7v0CasW+/WT+sVtlzpERQ= 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 1597082334144135.25756500215482; Mon, 10 Aug 2020 10:58:54 -0700 (PDT) Received: from localhost ([::1]:42364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C4S-0001t5-TQ for importer@patchew.org; Mon, 10 Aug 2020 13:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKx-0001qy-H3 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38023 helo=us-smtp-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 1k5BKv-0003Cn-Jc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:51 -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-344-gXy_ZyEPM_-1sbhXdnG3rw-1; Mon, 10 Aug 2020 13:11:47 -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 91FE157 for ; Mon, 10 Aug 2020 17:11:46 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D71F55F1E9 for ; Mon, 10 Aug 2020 17:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=lMOKj2JUkDjiKQzhyDxdSKswLl4CNUMxR1j4M1JHaXA=; b=FHELghdKQbUPVhbrCNYaZiuhMXzBWFc4YG/CcEQDoUi0DJK5e3x/2msdfu8bn+vmGPQgO6 Amlv41HDDXrAfLy2yCbPzy4ypO7glkjqjvoVRbLIvpwxtOQzzo+JHWprPOWgCfbCn2eh3O qofAXPKDv0gNOb4fSt8JGpycp93SRA4= X-MC-Unique: gXy_ZyEPM_-1sbhXdnG3rw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 094/147] meson: convert hw/rtc Date: Mon, 10 Aug 2020 19:08:12 +0200 Message-Id: <1597079345-42801-95-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/rtc/Makefile.objs | 15 --------------- hw/rtc/meson.build | 16 ++++++++++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 hw/rtc/Makefile.objs create mode 100644 hw/rtc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 70ecaa8..f60fd01 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -24,7 +24,6 @@ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-y +=3D pcmcia/ -devices-dirs-y +=3D rtc/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ diff --git a/hw/meson.build b/hw/meson.build index 50b26db..1fb1687 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('rtc') subdir('semihosting') subdir('smbios') subdir('timer') diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs deleted file mode 100644 index e4c1b86..0000000 --- a/hw/rtc/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -common-obj-$(CONFIG_DS1338) +=3D ds1338.o -common-obj-$(CONFIG_M41T80) +=3D m41t80.o -common-obj-$(CONFIG_M48T59) +=3D m48t59.o -ifeq ($(CONFIG_ISA_BUS),y) -common-obj-$(CONFIG_M48T59) +=3D m48t59-isa.o -endif -common-obj-$(CONFIG_PL031) +=3D pl031.o -common-obj-$(CONFIG_TWL92230) +=3D twl92230.o -common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-rtc.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_rtc.o -obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o -common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_rtc.o -common-obj-$(CONFIG_GOLDFISH_RTC) +=3D goldfish_rtc.o -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-rtc.o diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build new file mode 100644 index 0000000..7cecdee --- /dev/null +++ b/hw/rtc/meson.build @@ -0,0 +1,16 @@ + +softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c')) +softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c')) +softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c')) +softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c')) +softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c')) +softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('= m48t59-isa.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc= .c')) + +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c')) +softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c')) +softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c= ')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.= c')) + +specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'= )) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081331; cv=none; d=zohomail.com; s=zohoarc; b=UDd0lmhTMiQYgu33U2gxxrw6bkWJS4WIkIbGUyupXRtIMpSkMfngNJ4VxVyGUJcglRPm7ar5nasIESP6bHR0TMP+Ll9t/QP/vxcH6DuroDz03XrslECYQGsYbIHadaTaZGwTS0EgxEiNVbtVNgThXfdR2yw9XVllhW17o/dFTmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081331; 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=Yb4SZnldMsHJs48ssbsPr5n2+3G0FQv6iEnjmcqKyLY=; b=fD+6K0Gwg8UuUWV0XGrguBZgUhhcs10kQs5tlRitdiYX/GeAEpLTLFKIuY0GNLR/7HPyvazwBfYO4eZI0nDmL99qgHzVYdObkFZgUe89h/QfDXv7OyB3vDLqyvsjZT+D5hSlxDNNiTo/yeUoNdMcrdYWMbF9xLJ6/fhjdpmRqBs= 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 15970813312418.95076579532406; Mon, 10 Aug 2020 10:42:11 -0700 (PDT) Received: from localhost ([::1]:51592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BoH-00050t-RL for importer@patchew.org; Mon, 10 Aug 2020 13:42:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKz-0001vz-44 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:53 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41961 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 1k5BKx-0003Cy-3t for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:52 -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-486-h1ysMm6kPcWvK4mk8a7jFg-1; Mon, 10 Aug 2020 13:11:48 -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 F1C1A107ACCA for ; Mon, 10 Aug 2020 17:11:47 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AF285F1E9; Mon, 10 Aug 2020 17:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079510; 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=Yb4SZnldMsHJs48ssbsPr5n2+3G0FQv6iEnjmcqKyLY=; b=P06Xqb7MSCgWuWmPYtunNgHSGxHj85YUtOnAMroyxxNhuBROaogI+CL3A/yCLVbGzTZYxW m5mj6aXWcumwzJGo5X5c5rwcV9Lt0Wo8CpMUbHn8M6A3/JJBSB0OKj7yyWh+wkOTqs3jmW QV+FtUdEe9mtiejDYeT+rZFBpmohD9I= X-MC-Unique: h1ysMm6kPcWvK4mk8a7jFg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 095/147] meson: convert hw/ssi Date: Mon, 10 Aug 2020 19:08:13 +0200 Message-Id: <1597079345-42801-96-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/ssi/Makefile.objs | 10 ---------- hw/ssi/meson.build | 9 +++++++++ 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 hw/ssi/Makefile.objs create mode 100644 hw/ssi/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f60fd01..e50eb04 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -26,7 +26,6 @@ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-y +=3D pcmcia/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ -devices-dirs-y +=3D ssi/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 1fb1687..7564426 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -4,6 +4,7 @@ subdir('nubus') subdir('rtc') subdir('semihosting') subdir('smbios') +subdir('ssi') subdir('timer') subdir('tpm') subdir('usb') diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs deleted file mode 100644 index 07a85f1..0000000 --- a/hw/ssi/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-$(CONFIG_PL022) +=3D pl022.o -common-obj-$(CONFIG_SSI) +=3D ssi.o -common-obj-$(CONFIG_XILINX_SPI) +=3D xilinx_spi.o -common-obj-$(CONFIG_XILINX_SPIPS) +=3D xilinx_spips.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_smc.o -common-obj-$(CONFIG_STM32F2XX_SPI) +=3D stm32f2xx_spi.o -common-obj-$(CONFIG_MSF2) +=3D mss-spi.o - -common-obj-$(CONFIG_OMAP) +=3D omap_spi.o -common-obj-$(CONFIG_IMX) +=3D imx_spi.o diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build new file mode 100644 index 0000000..f1f5c28 --- /dev/null +++ b/hw/ssi/meson.build @@ -0,0 +1,9 @@ +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c')) +softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c')) +softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi= .c')) +softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c= ')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082171; cv=none; d=zohomail.com; s=zohoarc; b=A6nQPbJrgPDJofbUnU7QQ27YyQEkgevPQaBEYCZ0vzis9e0Gb6pAZ7olTe+sAUK8IsbqEl9CpT/1trn1lmTA5iLWt5JDDt2fNAqK/E+SkDnZU3n83kt+HOmn/baaVjVyVrFEj+SVMCRd9OcZ0AA4mzUCZOx7pne7XG4Y4lkEyUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082171; 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=2GnJE8/7S2X2Uk5TiW2ODDJsajZPMmPTCwYS7sDXl8o=; b=hf5Yafs08G4pKBi2ny4rmqionJqu2IG8FIQ5gsrr/ZGLa2ZrruQ5B9Yymrvnm4G8qyNQUMaHRELNNH3LpoYCPuttnEtz90R2sQqi2SyHm8ad04xaoqc/ulJTJLNs9z4+s34tsorJ7zC6TKCZPMvy+ckKITxB7M9u7RaFDVxED98= 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 1597082171021420.5917579784086; Mon, 10 Aug 2020 10:56:11 -0700 (PDT) Received: from localhost ([::1]:57908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C1p-0005D2-Ou for importer@patchew.org; Mon, 10 Aug 2020 13:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL0-0001z7-GY for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:54 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20990 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 1k5BKy-0003DF-H5 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:54 -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-69-9kY5HhFqMXm2Yz-OSI232Q-1; Mon, 10 Aug 2020 13:11:50 -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 5D1EB19067E0 for ; Mon, 10 Aug 2020 17:11:49 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 697D25F1EA; Mon, 10 Aug 2020 17:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079511; 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=2GnJE8/7S2X2Uk5TiW2ODDJsajZPMmPTCwYS7sDXl8o=; b=BHAa0ys9a3MXbu+pdKJnD5qyCvQlZ7pVA8t4WM7Gg8XFkYXCfv6lDK3RJkUWnCFP2ZVRYZ PlsTscQCGhkb7JKSUU6rn02hdWmPwWLxoXIb54SFitLwMwXtOoYHK1SuokO8zgj+aaCzLk I23kqAL+5wKQdKa1FLrM2n8apA/oxO4= X-MC-Unique: 9kY5HhFqMXm2Yz-OSI232Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 096/147] meson: convert hw/sd Date: Mon, 10 Aug 2020 19:08:14 +0200 Message-Id: <1597079345-42801-97-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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/sd/Makefile.objs | 12 ------------ hw/sd/meson.build | 12 ++++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 hw/sd/Makefile.objs create mode 100644 hw/sd/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e50eb04..6f9c0b7 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -25,7 +25,6 @@ devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-y +=3D pcmcia/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ -devices-dirs-y +=3D sd/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 7564426..a73f4ae 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('nubus') subdir('rtc') +subdir('sd') subdir('semihosting') subdir('smbios') subdir('ssi') diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs deleted file mode 100644 index 0d1df17..0000000 --- a/hw/sd/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -common-obj-$(CONFIG_PL181) +=3D pl181.o -common-obj-$(CONFIG_SSI_SD) +=3D ssi-sd.o -common-obj-$(CONFIG_SD) +=3D sd.o core.o sdmmc-internal.o -common-obj-$(CONFIG_SDHCI) +=3D sdhci.o -common-obj-$(CONFIG_SDHCI_PCI) +=3D sdhci-pci.o - -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-sdhost.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-memcard.o -common-obj-$(CONFIG_OMAP) +=3D omap_mmc.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx_mmci.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_sdhost.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_sdhci.o diff --git a/hw/sd/meson.build b/hw/sd/meson.build new file mode 100644 index 0000000..b43e59b --- /dev/null +++ b/hw/sd/meson.build @@ -0,0 +1,12 @@ +softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c')) +softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-= internal.c')) +softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c')) +softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c')) +softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c')) + +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard= .c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdho= st.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081920; cv=none; d=zohomail.com; s=zohoarc; b=bGUeSFLgyYSpFfh5Q+JwyPI+/fc6QGWaxU18qNkPsjkWS3PHxCQTcsIc1qTMfZRyAwJA4rTsKzQgrx9qVx561hFEChOJGnVu4hsx2mxzoG0u/AXlwbrhMc1+5vK6lq+I9YRn39ejE45YEWtIdXw4wrjQULZExfum0amXIXE8lnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081920; 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=ugDcYuIzdP8Nrf8EU2dGGi9zNntTRxfmFKqcvef77l4=; b=QvY9oT35BIGu6SIbxJcQb+rCx1fvmI3ydme0UGMGRvTyQbqqhG6m1/uZ+KSbyRVDXBt5+hqURXom4vzIMeYqVIXRrmCzQDvqkqR8uGNLEdOWPugvo1ml+at7Cw/Vo2rFTlmcoizWpRfGD4fVdSm1D81H7436Sd1pT7veX3mGSHk= 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 1597081920483126.36553002429923; Mon, 10 Aug 2020 10:52:00 -0700 (PDT) Received: from localhost ([::1]:41776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bxn-00071f-AA for importer@patchew.org; Mon, 10 Aug 2020 13:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL3-00021u-GR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:57 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:60387 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 1k5BL0-0003DP-50 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:55 -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-258-vh7P-YmTM4OYUghsmElP3A-1; Mon, 10 Aug 2020 13:11:51 -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 BDBCD1005504 for ; Mon, 10 Aug 2020 17:11:50 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C88DF5F1E9; Mon, 10 Aug 2020 17:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079513; 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=ugDcYuIzdP8Nrf8EU2dGGi9zNntTRxfmFKqcvef77l4=; b=ZnOzkwuqGGy992wXbE2wXmIGv5WPa2s1vuXQ9sNqlV3E7fQnshvfT0u7XpSmAVx0u6P687 2b4JF2UJhvrXzGLXOqVIMwmSa+RZaLs/Os4J4eT7qu9EQr3tF/QF9kC3hz9L9h1bRRJbCr AqHh+/XMr+85uhoSM9jP14A5bPH+IGk= X-MC-Unique: vh7P-YmTM4OYUghsmElP3A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 097/147] meson: convert hw/scsi Date: Mon, 10 Aug 2020 19:08:15 +0200 Message-Id: <1597079345-42801-98-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/scsi/Makefile.objs | 15 --------------- hw/scsi/meson.build | 26 ++++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 hw/scsi/Makefile.objs create mode 100644 hw/scsi/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6f9c0b7..b6461c2 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -24,7 +24,6 @@ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-y +=3D pcmcia/ -devices-dirs-$(CONFIG_SCSI) +=3D scsi/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index a73f4ae..d4abb67 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('nubus') subdir('rtc') +subdir('scsi') subdir('sd') subdir('semihosting') subdir('smbios') diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs deleted file mode 100644 index 54b36ed..0000000 --- a/hw/scsi/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -common-obj-y +=3D scsi-disk.o emulation.o -common-obj-y +=3D scsi-generic.o scsi-bus.o -common-obj-$(CONFIG_LSI_SCSI_PCI) +=3D lsi53c895a.o -common-obj-$(CONFIG_MPTSAS_SCSI_PCI) +=3D mptsas.o mptconfig.o mptendian.o -common-obj-$(CONFIG_MEGASAS_SCSI_PCI) +=3D megasas.o -common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) +=3D vmw_pvscsi.o -common-obj-$(CONFIG_ESP) +=3D esp.o -common-obj-$(CONFIG_ESP_PCI) +=3D esp-pci.o -obj-$(CONFIG_SPAPR_VSCSI) +=3D spapr_vscsi.o - -ifeq ($(CONFIG_VIRTIO_SCSI),y) -obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o -obj-$(CONFIG_VHOST_SCSI) +=3D vhost-scsi-common.o vhost-scsi.o -obj-$(CONFIG_VHOST_USER_SCSI) +=3D vhost-scsi-common.o vhost-user-scsi.o -endif diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build new file mode 100644 index 0000000..923a34f --- /dev/null +++ b/hw/scsi/meson.build @@ -0,0 +1,26 @@ +scsi_ss =3D ss.source_set() +scsi_ss.add(files( + 'emulation.c', + 'scsi-bus.c', + 'scsi-disk.c', + 'scsi-generic.c', +)) +scsi_ss.add(when: 'CONFIG_ESP', if_true: files('esp.c')) +scsi_ss.add(when: 'CONFIG_ESP_PCI', if_true: files('esp-pci.c')) +scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c')) +scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) +scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mp= tconfig.c', 'mptendian.c')) +scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi= .c')) +softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) + +specific_scsi_ss =3D ss.source_set() + +virtio_scsi_ss =3D ss.source_set() +virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) +virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-c= ommon.c', 'vhost-scsi.c')) +virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-s= csi-common.c', 'vhost-user-scsi.c')) +specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_= ss) + +specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) + +specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081461; cv=none; d=zohomail.com; s=zohoarc; b=V12EyrTbMDRtKYzfUp6WtDAdSuaOFYyp+4ckJc1Q/S5Md6DpnbweYQD7h8JRpC5W5zW9TSx4Ko1Mr4sfPQMO8M7yceZZfaQcM+B2+3iDp6U1fF4BWj1ryJkgSvDH5y3vWfNg18T6nLn3tvh8A1yDUzuKEUpWDr3dm+q6bCkpv04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081461; 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=aH+dn5Esq++hBvOi+jGAUJC5jgmLG08BzD4x6dKQaA0=; b=OOe2ExGsc3L0TbODaZVAaaB+abZf4Cq3labBIbzRJRBVjB+339GUi53Gq+0RI55GZ7fOOC/y89faAg9OYNYB7WuCzIQc1suW/sWd1Mqb/hoLuQjNVq9WA68iurnDuoQR3xM2HIUk5nKpVjUmmER16JbxvN/0vwUFZgJMOM3bStc= 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 159708146198138.04084310695089; Mon, 10 Aug 2020 10:44:21 -0700 (PDT) Received: from localhost ([::1]:34894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BqO-0001DK-Me for importer@patchew.org; Mon, 10 Aug 2020 13:44:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL5-00023c-22 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59147 helo=us-smtp-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 1k5BL1-0003Df-P5 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:58 -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-242-cDjRAQfSMcSVTgzN7ur85A-1; Mon, 10 Aug 2020 13:11:52 -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 28BF7107ACCA for ; Mon, 10 Aug 2020 17:11:52 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 366435F1E9; Mon, 10 Aug 2020 17:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079515; 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=aH+dn5Esq++hBvOi+jGAUJC5jgmLG08BzD4x6dKQaA0=; b=Vm1Mr4catpA5fJrmazk+3VK4+veaGB2Ur13Fom/g5viTwGGMPBkk6kKpoTZj1a2myKeH/K pdC1cWAhkcLHtH/Ml8LrNzze/ABa+wHKfJXUb1ItCVviG6d8tRANo0CIoHysBgM0KygM5C wDqowSOj9WpBZ4YYStx3mQCgC/c+jx0= X-MC-Unique: cDjRAQfSMcSVTgzN7ur85A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 098/147] meson: convert hw/pcmcia Date: Mon, 10 Aug 2020 19:08:16 +0200 Message-Id: <1597079345-42801-99-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/pcmcia/Makefile.objs | 2 -- hw/pcmcia/meson.build | 2 ++ 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 hw/pcmcia/Makefile.objs create mode 100644 hw/pcmcia/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b6461c2..f28da58 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -23,7 +23,6 @@ devices-dirs-y +=3D rdma/ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ -devices-dirs-y +=3D pcmcia/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index d4abb67..ed25644 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('pcmcia') subdir('rtc') subdir('scsi') subdir('sd') diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs deleted file mode 100644 index 02cd986..0000000 --- a/hw/pcmcia/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-y +=3D pcmcia.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx.o diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build new file mode 100644 index 0000000..ab50bd3 --- /dev/null +++ b/hw/pcmcia/meson.build @@ -0,0 +1,2 @@ +softmmu_ss.add(files('pcmcia.c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082468; cv=none; d=zohomail.com; s=zohoarc; b=g5rfJsbxD5L38J7FWpbIHv2kM3bGOyNqPGsekdY0nbQ9KK0tXhwtoycQXVV2arCtyLUXrIQTjpRUSlgnSuu3EaK4ZjhZJTkOhAp+g9bnCTn/ilAL6rA1022YGkYIv4EVMo5YId9M6LuA6hyufk7Hzfrb75RzZczR3M9iPRP5d+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082468; 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=TVHfqnPCLyCqcH2WZnDBBpx2lGIedhtqMSXXVfAibL4=; b=jkaKpGkDacLXYD9pOg87rb8r6PU+9U5XMKcdJSwx8BuiEsfr/tbJ5LgmaUIlr6IInERWTbPjms5WHddOFkmAnFt/NWMh5I+ySck0qn73+EcuhjeNjl3Cv+LtBOlffwkvBA9bZ2MstcXtK6CFcmd8e0QYk1AwCAqTMmw45KrSbAE= 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 1597082468565702.702095999708; Mon, 10 Aug 2020 11:01:08 -0700 (PDT) Received: from localhost ([::1]:50636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C6c-0005EE-8A for importer@patchew.org; Mon, 10 Aug 2020 14:01:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL5-00024e-KV for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28814 helo=us-smtp-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 1k5BL3-0003Dk-BC for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:59 -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-75-k8pzzNUzPi-D1uH147TZWw-1; Mon, 10 Aug 2020 13:11:54 -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 871EA106B242 for ; Mon, 10 Aug 2020 17:11:53 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94F0E5F1E9; Mon, 10 Aug 2020 17:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079516; 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=TVHfqnPCLyCqcH2WZnDBBpx2lGIedhtqMSXXVfAibL4=; b=DpK7/PtFSddG0zCfsVJmgAZcpmcIiuu/p0Bhev+UNtqvWAyVkGYZxPXTRte0BXkhDK0D/8 z/IUvleS4FAW357mcdsDMRtEMd11MRHO4lpO6bignitJg4hg3TpOaWdEYYf6NEXL9uTPyt NL7XC4rIwvffNr7C9CkOVR3ZY5io8EY= X-MC-Unique: k8pzzNUzPi-D1uH147TZWw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 099/147] meson: convert hw/pci-host Date: Mon, 10 Aug 2020 19:08:17 +0200 Message-Id: <1597079345-42801-100-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 2 +- hw/meson.build | 1 + hw/pci-host/Makefile.objs | 24 ------------------------ hw/pci-host/meson.build | 31 +++++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 hw/pci-host/Makefile.objs create mode 100644 hw/pci-host/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f28da58..0038cf8 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -22,7 +22,7 @@ devices-dirs-y +=3D net/ devices-dirs-y +=3D rdma/ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ -devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ +devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index ed25644..ca36e48 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('pci-host') subdir('pcmcia') subdir('rtc') subdir('scsi') diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs deleted file mode 100644 index e422e0a..0000000 --- a/hw/pci-host/Makefile.objs +++ /dev/null @@ -1,24 +0,0 @@ -common-obj-$(CONFIG_PAM) +=3D pam.o - -# PPC devices -common-obj-$(CONFIG_PREP_PCI) +=3D prep.o -common-obj-$(CONFIG_GRACKLE_PCI) +=3D grackle.o -# NewWorld PowerMac -common-obj-$(CONFIG_UNIN_PCI) +=3D uninorth.o -# PowerPC E500 boards -common-obj-$(CONFIG_PPCE500_PCI) +=3D ppce500.o - -# ARM devices -common-obj-$(CONFIG_VERSATILE_PCI) +=3D versatile.o - -common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o -common-obj-$(CONFIG_PCI_BONITO) +=3D bonito.o -common-obj-$(CONFIG_PCI_I440FX) +=3D i440fx.o -common-obj-$(CONFIG_XEN_IGD_PASSTHROUGH) +=3D xen_igd_pt.o -common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o -common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) +=3D gpex.o -common-obj-$(CONFIG_PCI_EXPRESS_XILINX) +=3D xilinx-pcie.o - -common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) +=3D designware.o -obj-$(CONFIG_POWERNV) +=3D pnv_phb4.o pnv_phb4_pec.o -obj-$(CONFIG_POWERNV) +=3D pnv_phb3.o pnv_phb3_msi.o pnv_phb3_pbcq.o diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build new file mode 100644 index 0000000..cd52f6f --- /dev/null +++ b/hw/pci-host/meson.build @@ -0,0 +1,31 @@ +pci_ss =3D ss.source_set() +pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c')) +pci_ss.add(when: 'CONFIG_PCI_BONITO', if_true: files('bonito.c')) +pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true: files('designwa= re.c')) +pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex= .c')) +pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c')) +pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.= c')) +pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c')) +pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c')) +pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.= c')) + +# PPC devices +pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c')) +pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c')) +# NewWorld PowerMac +pci_ss.add(when: 'CONFIG_UNIN_PCI', if_true: files('uninorth.c')) +# PowerPC E500 boards +pci_ss.add(when: 'CONFIG_PPCE500_PCI', if_true: files('ppce500.c')) + +# ARM devices +pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c')) + +softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) + +specific_ss.add(when: 'CONFIG_POWERNV', if_true: files( + 'pnv_phb3.c', + 'pnv_phb3_msi.c', + 'pnv_phb3_pbcq.c', + 'pnv_phb4.c', + 'pnv_phb4_pec.c' +)) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082604; cv=none; d=zohomail.com; s=zohoarc; b=MaRZxR9FylltVCt+o4NxMlzElzgAjSiotu/XgSNBbF9ad41I2seOGXmJsTPrVtr+oG9L5hBUDzD5R3xn491+l3fy/1BcLH29TV08lpF+csV0Xj+hH1yMcyx6BGkNvtI3vb7Oh0fTK9VFWoYCSahFUrggFiRy1h0qhR96mZ2puQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082604; 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=IMJJsIc+cf5gyLxdIWccdwznh3sTxnUR7ZqHdvZWrNo=; b=Gq7uszUs+dNAM3MtmIneIKwHco/xm/sq4L0kBT49Kir1knkHNAGcun84ipHOdm7vtigw8P6kVKfXEWA/Ua8Restv/XhjaQRd1ArcqtTjjKkawB6xKLFihtSw311grwCuvXaGleu6znkCsrXD20it0RnTeOV1BlJl/D6Ru69UKHE= 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 1597082604111102.38213150551655; Mon, 10 Aug 2020 11:03:24 -0700 (PDT) Received: from localhost ([::1]:58810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C8n-0000Hn-Ns for importer@patchew.org; Mon, 10 Aug 2020 14:03:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL7-00027D-CA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60642 helo=us-smtp-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 1k5BL4-0003Dw-QS for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:01 -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-556-HS-b2zlVM6ODxDh63OgmQw-1; Mon, 10 Aug 2020 13:11:56 -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 E538B100CCC0 for ; Mon, 10 Aug 2020 17:11:54 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F354A5F1E9; Mon, 10 Aug 2020 17:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079518; 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=IMJJsIc+cf5gyLxdIWccdwznh3sTxnUR7ZqHdvZWrNo=; b=XFncMrDi/aLW7QhkqdPxFfoaQrnnTMf+TRkdYidbxrBM5CRIBdZz3+1UNff8u/+HpHvHRR Xd5gxDq2Y3/3j8aoSGIKFtXpkDyIprHDirhHCyew/OaCIESyB7Pw97dDbLXxIWO2u2XWt2 eNG7gajyZ9DnaZV5j1sxsDKvPgvfn/o= X-MC-Unique: HS-b2zlVM6ODxDh63OgmQw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 100/147] meson: convert hw/pci-bridge Date: Mon, 10 Aug 2020 19:08:18 +0200 Message-Id: <1597079345-42801-101-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/pci-bridge/Makefile.objs | 10 ---------- hw/pci-bridge/meson.build | 14 ++++++++++++++ 4 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 hw/pci-bridge/Makefile.objs create mode 100644 hw/pci-bridge/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0038cf8..3513040 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -22,7 +22,6 @@ devices-dirs-y +=3D net/ devices-dirs-y +=3D rdma/ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ -devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index ca36e48..a7301f2 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') subdir('rtc') diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs deleted file mode 100644 index 47065f8..0000000 --- a/hw/pci-bridge/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-y +=3D pci_bridge_dev.o -common-obj-$(CONFIG_PCIE_PORT) +=3D pcie_root_port.o gen_pcie_root_port.o = pcie_pci_bridge.o -common-obj-$(CONFIG_PXB) +=3D pci_expander_bridge.o -common-obj-$(CONFIG_XIO3130) +=3D xio3130_upstream.o xio3130_downstream.o -common-obj-$(CONFIG_IOH3420) +=3D ioh3420.o -common-obj-$(CONFIG_I82801B11) +=3D i82801b11.o -# NewWorld PowerMac -common-obj-$(CONFIG_DEC_PCI) +=3D dec.o -# Sun4u -common-obj-$(CONFIG_SIMBA) +=3D simba.o diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build new file mode 100644 index 0000000..daab8ac --- /dev/null +++ b/hw/pci-bridge/meson.build @@ -0,0 +1,14 @@ +pci_ss =3D ss.source_set() +pci_ss.add(files('pci_bridge_dev.c')) +pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c')) +pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c')) +pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'g= en_pcie_root_port.c', 'pcie_pci_bridge.c')) +pci_ss.add(when: 'CONFIG_PXB', if_true: files('pci_expander_bridge.c')) +pci_ss.add(when: 'CONFIG_XIO3130', if_true: files('xio3130_upstream.c', 'x= io3130_downstream.c')) + +# NewWorld PowerMac +pci_ss.add(when: 'CONFIG_DEC_PCI', if_true: files('dec.c')) +# Sun4u +pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c')) + +softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082047; cv=none; d=zohomail.com; s=zohoarc; b=IEGnXD7RhemoKJZ/Lc4Xm7ZFmyrnj1H+BOKHyr9ZWX6zg+eLBQq6OxIYviHjm8r9nB/KqsoaA3NMFaF/TRM0WNheeZ8xsBlKZjKJT8guwZ5oEyhpZHtKbaZNFjBP2hyudXBt7S6ciMg9rwxwV4ysGyG1nIXsStmxC4/PCNT7ctg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082047; 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=b44MIC5J2BiGWng14IMIOdBGRSyZNO44AYRS8hN5N9A=; b=Qz9Xbo6XiCB8KbtZw6ZIccjexHq9dRGpkHGyYP4dvDlnmvMrAYBx8maB7sx3hIa4zaAyLXpXF+mmXIJbNtOjRFM/HAJwBFSC4B8jQh1BIoQPgLONaf/W/wg5h/ROoqp6kB+f+LnbF+8j098NVFGLz2Y1YxD1K5GQ0PEWaTnt2DQ= 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 1597082047467362.28994682279676; Mon, 10 Aug 2020 10:54:07 -0700 (PDT) Received: from localhost ([::1]:50170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bzq-0001zW-59 for importer@patchew.org; Mon, 10 Aug 2020 13:54:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BL8-000280-FO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BL5-0003E6-MX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:02 -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-535-GLg2imfVNKqZWwAOqyVLsQ-1; Mon, 10 Aug 2020 13:11:57 -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 4ECFD8014D7 for ; Mon, 10 Aug 2020 17:11:56 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C92A5F1E9; Mon, 10 Aug 2020 17:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079518; 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=b44MIC5J2BiGWng14IMIOdBGRSyZNO44AYRS8hN5N9A=; b=D4ymE5TBAA62A6NFvkvrm3UztUpDXKKluWp8mpq+fBLmTaefyXwMeNiAfpDyfHISqEPOWg tezdROHA73FGeZKod4QNcMnBdCcS1E2V9gK6fkrbhSYBGJ0UjoTb78ImgosW5pQUEjJDIG LbSLzV9kSyELoSJ4oHBVZ11+IqKoGD8= X-MC-Unique: GLg2imfVNKqZWwAOqyVLsQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 101/147] meson: convert hw/pci Date: Mon, 10 Aug 2020 19:08:19 +0200 Message-Id: <1597079345-42801-102-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=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/10 11:11:16 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/pci/Makefile.objs | 14 -------------- hw/pci/meson.build | 19 +++++++++++++++++++ 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 hw/pci/Makefile.objs create mode 100644 hw/pci/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 3513040..2083284 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -21,7 +21,6 @@ devices-dirs-y +=3D misc/ devices-dirs-y +=3D net/ devices-dirs-y +=3D rdma/ devices-dirs-y +=3D nvram/ -devices-dirs-y +=3D pci/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index a7301f2..53c347c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('pci') subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs deleted file mode 100644 index c78f2fb..0000000 --- a/hw/pci/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o -common-obj-$(CONFIG_PCI) +=3D msix.o msi.o -common-obj-$(CONFIG_PCI) +=3D shpc.o -common-obj-$(CONFIG_PCI) +=3D slotid_cap.o -common-obj-$(CONFIG_PCI) +=3D pci_host.o - -# The functions in these modules can be used by devices too. Since we -# allow plugging PCIe devices into PCI buses, include them even if -# CONFIG_PCI_EXPRESS=3Dn. -common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o -common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_host.o - -common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o -common-obj-$(CONFIG_ALL) +=3D pci-stub.o diff --git a/hw/pci/meson.build b/hw/pci/meson.build new file mode 100644 index 0000000..5c4bbac --- /dev/null +++ b/hw/pci/meson.build @@ -0,0 +1,19 @@ +pci_ss =3D ss.source_set() +pci_ss.add(files( + 'msi.c', + 'msix.c', + 'pci.c', + 'pci_bridge.c', + 'pci_host.c', + 'shpc.c', + 'slotid_cap.c' +)) +# The functions in these modules can be used by devices too. Since we +# allow plugging PCIe devices into PCI buses, include them even if +# CONFIG_PCI_EXPRESS=3Dn. +pci_ss.add(files('pcie.c', 'pcie_aer.c')) +softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', '= pcie_host.c')) +softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) + +softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082182; cv=none; d=zohomail.com; s=zohoarc; b=H7LWkvNRbqaAiTMpuW+bQ6cK3jjfR6Em6aAnWrws3DU/3vY0cAIidca/aGDiwtzt2FfzZl19Fe5Tg1hx3r/IlpFjYXrZ63H7fKCV6h6J+Ye7CxBXseldPI/NSHVqAc+ZH81Je1lTqPsRL7p+i9UD4wvgD0D71FJ1Ce0B97w6wfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082182; 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=NW3TMiLzOoUHqYw0ETNn/3bx4VcSKXeKEHAdlPbxa7c=; b=Zp3YYDA1HAm7WA8X4510Mww4DXLlQtxa8rYYy426rZPDmUOokgy7RUSmOJOyrioMtZMRKWXZzxpabb2ghQFSpfdLaCqdz8wiO247yU+af5UV3F1FfxpjeH9HuyH01VXqV3W1qI8asF1R4mZrRa9zG4THsuwxZbEsWaxr9ZpQyTs= 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 1597082182029561.8385347237815; Mon, 10 Aug 2020 10:56:22 -0700 (PDT) Received: from localhost ([::1]:58576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C20-0005UU-QS for importer@patchew.org; Mon, 10 Aug 2020 13:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLB-0002Ej-WE for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39681 helo=us-smtp-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 1k5BL9-0003EU-VE for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:05 -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-61-36ZlHLa8M_yeDNFMzXiK5Q-1; Mon, 10 Aug 2020 13:12:01 -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 97629800465 for ; Mon, 10 Aug 2020 17:12:00 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA8615F1E9; Mon, 10 Aug 2020 17:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079523; 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=NW3TMiLzOoUHqYw0ETNn/3bx4VcSKXeKEHAdlPbxa7c=; b=bZKKtkkIvZYFbf8SNOb1GUkUduX4zW0NHfFuZ+MhcKrIbp4Ctu6qU1piB5veH4DOEitTyD Oy2sX2yCvbuelGE78AtYKxC+YEFkd+d3LVFJ9oJ0lSRCn9A7x8BlfWCSdehmdib+Ym+up7 ++VvUrF6AYOjkBuvimQPCF3dYz3mxO0= X-MC-Unique: 36ZlHLa8M_yeDNFMzXiK5Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 102/147] meson: convert hw/nvram Date: Mon, 10 Aug 2020 19:08:20 +0200 Message-Id: <1597079345-42801-103-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/nvram/Makefile.objs | 8 -------- hw/nvram/meson.build | 9 +++++++++ 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 hw/nvram/Makefile.objs create mode 100644 hw/nvram/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 2083284..78860ae 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -20,7 +20,6 @@ devices-dirs-y +=3D isa/ devices-dirs-y +=3D misc/ devices-dirs-y +=3D net/ devices-dirs-y +=3D rdma/ -devices-dirs-y +=3D nvram/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 53c347c..0bdd6a2 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('nvram') subdir('pci') subdir('pci-bridge') subdir('pci-host') diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs deleted file mode 100644 index f3ad921..0000000 --- a/hw/nvram/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -common-obj-$(CONFIG_DS1225Y) +=3D ds1225y.o -common-obj-$(CONFIG_NMC93XX_EEPROM) +=3D eeprom93xx.o -common-obj-$(CONFIG_AT24C) +=3D eeprom_at24c.o -common-obj-y +=3D fw_cfg.o -common-obj-$(CONFIG_CHRP_NVRAM) +=3D chrp_nvram.o -common-obj-$(CONFIG_MAC_NVRAM) +=3D mac_nvram.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_nvm.o -obj-$(CONFIG_PSERIES) +=3D spapr_nvram.o diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build new file mode 100644 index 0000000..ba21455 --- /dev/null +++ b/hw/nvram/meson.build @@ -0,0 +1,9 @@ +softmmu_ss.add(files('fw_cfg.c')) +softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) +softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c')) +softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c= ')) +softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c')) +softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c')) + +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081786; cv=none; d=zohomail.com; s=zohoarc; b=DbehoC7BEw9a+E1CqhWr3GcNTtgrebJR8QhVyAkS7Wy5SX/tFrvaTeoP2CjYnR8A0Jnq3YIpxu5vqFbJGSQ1WoosyCxaf0fuvh9ggTDLmKoCR6XTj5W0dTaKgrjzjwSGAv9uLUjHyGIsstFKngPXw2x940D3veQNrFLio75pbp0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081786; 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=fDOD9pY4H4z+pzypGKM2Fu9H3SMyzg1wdFQ1al2nrOc=; b=Ha7P5VibHFqUmJcfO7sx8vjv4+mrJH0SEIpe5sL/EThBM4VEY+sNLjfh+kUvFmRw+6GTnn/A7isDzpeCx4W9w7+yx6065r01JFzg0lkjebp3YyH1wKUNrzhiqQaCkYDSWBRpaWpMKUDdK8sbgACBLclQpg5y5acPfjz/bd+H+kw= 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 1597081786302466.0104102565558; Mon, 10 Aug 2020 10:49:46 -0700 (PDT) Received: from localhost ([::1]:60120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Bvc-0002z9-RG for importer@patchew.org; Mon, 10 Aug 2020 13:49:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLI-0002Mt-1G for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:12 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:31330 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 1k5BLE-0003FB-O6 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:11 -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-285-X601KdRHPF-TbjK9XlN5yA-1; Mon, 10 Aug 2020 13:12:03 -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 01D9319067E0 for ; Mon, 10 Aug 2020 17:12:02 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F2AF5F1E9; Mon, 10 Aug 2020 17:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079527; 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=fDOD9pY4H4z+pzypGKM2Fu9H3SMyzg1wdFQ1al2nrOc=; b=XmiuyEKIw+/yn/z7zteSzcZge1p61OtrOfTWSAM3oOxuOPLy+2gjaEjeg0EA2LrBGgeoiw JZknt9xZRHIt61AyQ15DLuTil9AmOHV2sELfL6cGA2oV1KN79PYtv2e7hpTr/ImzwV3aeC 9qWBUvWTSkQLQL7hfFf6ajkJKaa5nnY= X-MC-Unique: X601KdRHPF-TbjK9XlN5yA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 103/147] meson: convert hw/rdma Date: Mon, 10 Aug 2020 19:08:21 +0200 Message-Id: <1597079345-42801-104-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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/rdma/Makefile.objs | 3 --- hw/rdma/meson.build | 10 ++++++++++ 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 hw/rdma/Makefile.objs create mode 100644 hw/rdma/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 78860ae..748a718 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -19,7 +19,6 @@ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ devices-dirs-y +=3D isa/ devices-dirs-y +=3D misc/ devices-dirs-y +=3D net/ -devices-dirs-y +=3D rdma/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 0bdd6a2..f704e51 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -6,6 +6,7 @@ subdir('pci') subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') +subdir('rdma') subdir('rtc') subdir('scsi') subdir('sd') diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs deleted file mode 100644 index 819bb12..0000000 --- a/hw/rdma/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_VMW_PVRDMA) +=3D rdma_utils.o rdma_backend.o rdma_rm.o rdma.o -obj-$(CONFIG_VMW_PVRDMA) +=3D vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ - vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build new file mode 100644 index 0000000..7325f40 --- /dev/null +++ b/hw/rdma/meson.build @@ -0,0 +1,10 @@ +specific_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files( + 'rdma.c', + 'rdma_backend.c', + 'rdma_rm.c', + 'rdma_utils.c', + 'vmw/pvrdma_cmd.c', + 'vmw/pvrdma_dev_ring.c', + 'vmw/pvrdma_main.c', + 'vmw/pvrdma_qp_ops.c', +)) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081558; cv=none; d=zohomail.com; s=zohoarc; b=QWfObFaXwrv0BEH0UBC45DYzPojI6C4cAoAiVkFWcyy6kIUM7xgKJEIgC6EhF1yiib/bGmb418QaUxLWCGMU8DfDTZu2qlyCECONy4llZvFyjW4vRrdQ2GGZf1ND7wWO2D1Eg8fj0eaV+9KmL/e8ddwuB89RCF//P4epdXLQqi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081558; 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=/ZnIMjoTccZk5f8PSa5vfybwIdk3xSdKpgnxMEzLOXY=; b=B5xMqoJHJWWIkrTzO5PUYSr8ALd3ImkHcMcBfHgzNanWzy9GCPkfzxENIYwWz5vJ7mOb25LlHHR/TZO3qPx/ypOHxMLmTXb5hEEKm8FcKaZNgLnosiXC+Rwqki3k3Ksfv85updG+jsWMfhPpDWu3G3xtfM7fLzwsLLjBL4LYkUQ= 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 159708155895644.15968260266084; Mon, 10 Aug 2020 10:45:58 -0700 (PDT) Received: from localhost ([::1]:43326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Brx-0004e4-5Z for importer@patchew.org; Mon, 10 Aug 2020 13:45:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLF-0002K7-Oh for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:09 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40051 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 1k5BLC-0003F3-QG for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:09 -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-444-5R9-t8XYMcic0GafX9rJHw-1; Mon, 10 Aug 2020 13:12:04 -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 61EA3106B242 for ; Mon, 10 Aug 2020 17:12:03 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E7775F1E9; Mon, 10 Aug 2020 17:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079526; 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=/ZnIMjoTccZk5f8PSa5vfybwIdk3xSdKpgnxMEzLOXY=; b=FaT10xxclkqzIqmZRRLbz0Q7QO+k1a5wGt2FIc2AYaWtbAARUVlJiKrCnkxNimp5QTItZ9 Dfhy3sGAffREkuCG8fqaO6ijWAtL0FJ7mm+012E58/TIRl3Mkv7EVsmZrs8JCQCJrrvAW9 APvM3lCd5C1jueixSpJ8w1lBpg/AP2I= X-MC-Unique: 5R9-t8XYMcic0GafX9rJHw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 104/147] meson: convert hw/net Date: Mon, 10 Aug 2020 19:08:22 +0200 Message-Id: <1597079345-42801-105-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/net/Makefile.objs | 59 ------------------------------------------ hw/net/can/Makefile.objs | 4 --- hw/net/can/meson.build | 4 +++ hw/net/meson.build | 67 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 6 files changed, 72 insertions(+), 64 deletions(-) delete mode 100644 hw/net/Makefile.objs delete mode 100644 hw/net/can/Makefile.objs create mode 100644 hw/net/can/meson.build create mode 100644 hw/net/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 748a718..d0d7816 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -18,7 +18,6 @@ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ devices-dirs-y +=3D isa/ devices-dirs-y +=3D misc/ -devices-dirs-y +=3D net/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index f704e51..1f7b2c4 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('net') subdir('nubus') subdir('nvram') subdir('pci') diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs deleted file mode 100644 index 7ccbf72..0000000 --- a/hw/net/Makefile.objs +++ /dev/null @@ -1,59 +0,0 @@ -common-obj-$(CONFIG_DP8393X) +=3D dp8393x.o -common-obj-$(CONFIG_XEN) +=3D xen_nic.o -common-obj-$(CONFIG_NE2000_COMMON) +=3D ne2000.o - -# PCI network cards -common-obj-$(CONFIG_NE2000_PCI) +=3D ne2000-pci.o -common-obj-$(CONFIG_EEPRO100_PCI) +=3D eepro100.o -common-obj-$(CONFIG_PCNET_PCI) +=3D pcnet-pci.o -common-obj-$(CONFIG_PCNET_COMMON) +=3D pcnet.o -common-obj-$(CONFIG_E1000_PCI) +=3D e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D e1000e.o e1000e_core.o e1000x= _common.o -common-obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o -common-obj-$(CONFIG_VMXNET3_PCI) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_VMXNET3_PCI) +=3D vmxnet3.o -common-obj-$(CONFIG_TULIP) +=3D tulip.o - -common-obj-$(CONFIG_SMC91C111) +=3D smc91c111.o -common-obj-$(CONFIG_LAN9118) +=3D lan9118.o -common-obj-$(CONFIG_NE2000_ISA) +=3D ne2000-isa.o -common-obj-$(CONFIG_OPENCORES_ETH) +=3D opencores_eth.o -common-obj-$(CONFIG_XGMAC) +=3D xgmac.o -common-obj-$(CONFIG_MIPSNET) +=3D mipsnet.o -common-obj-$(CONFIG_XILINX_AXI) +=3D xilinx_axienet.o -common-obj-$(CONFIG_ALLWINNER_EMAC) +=3D allwinner_emac.o -common-obj-$(CONFIG_ALLWINNER_SUN8I_EMAC) +=3D allwinner-sun8i-emac.o -common-obj-$(CONFIG_IMX_FEC) +=3D imx_fec.o - -common-obj-$(CONFIG_CADENCE) +=3D cadence_gem.o -common-obj-$(CONFIG_STELLARIS_ENET) +=3D stellaris_enet.o -common-obj-$(CONFIG_LANCE) +=3D lance.o -common-obj-$(CONFIG_LASI_82596) +=3D lasi_i82596.o -common-obj-$(CONFIG_I82596_COMMON) +=3D i82596.o -common-obj-$(CONFIG_SUNHME) +=3D sunhme.o -common-obj-$(CONFIG_FTGMAC100) +=3D ftgmac100.o -common-obj-$(CONFIG_SUNGEM) +=3D sungem.o - -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_eth.o -common-obj-$(CONFIG_COLDFIRE) +=3D mcf_fec.o -obj-$(CONFIG_MILKYMIST) +=3D milkymist-minimac2.o -obj-$(CONFIG_PSERIES) +=3D spapr_llan.o -obj-$(CONFIG_XILINX_ETHLITE) +=3D xilinx_ethlite.o - -common-obj-$(CONFIG_VIRTIO_NET) +=3D net_rx_pkt.o -obj-$(CONFIG_VIRTIO_NET) +=3D virtio-net.o -common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) +=3D vhos= t_net.o -common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET= ))) +=3D vhost_net-stub.o -common-obj-$(CONFIG_ALL) +=3D vhost_net-stub.o - -common-obj-$(CONFIG_ETSEC) +=3D fsl_etsec/etsec.o fsl_etsec/registers.o \ - fsl_etsec/rings.o fsl_etsec/miim.o - -common-obj-$(CONFIG_ROCKER) +=3D rocker/rocker.o rocker/rocker_fp.o \ - rocker/rocker_desc.o rocker/rocker_world.o \ - rocker/rocker_of_dpa.o -obj-$(call lnot,$(CONFIG_ROCKER)) +=3D rocker/qmp-norocker.o - -common-obj-$(CONFIG_CAN_BUS) +=3D can/ -common-obj-$(CONFIG_MSF2) +=3D msf2-emac.o diff --git a/hw/net/can/Makefile.objs b/hw/net/can/Makefile.objs deleted file mode 100644 index 9f0c4ee..0000000 --- a/hw/net/can/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-$(CONFIG_CAN_SJA1000) +=3D can_sja1000.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_kvaser_pci.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_pcm3680_pci.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_mioe3680_pci.o diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build new file mode 100644 index 0000000..c9cfeb7 --- /dev/null +++ b/hw/net/can/meson.build @@ -0,0 +1,4 @@ +softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'= )) diff --git a/hw/net/meson.build b/hw/net/meson.build new file mode 100644 index 0000000..4a7051b --- /dev/null +++ b/hw/net/meson.build @@ -0,0 +1,67 @@ +softmmu_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c')) +softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c')) +softmmu_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c')) + +# PCI network cards +softmmu_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c')) +softmmu_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c')) +softmmu_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c')) +softmmu_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c')) +softmmu_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x= _common.c')) +softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_p= kt.c', 'net_rx_pkt.c')) +softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c= ', 'e1000e_core.c', 'e1000x_common.c')) +softmmu_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c')) +softmmu_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c')) +softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', = 'net_rx_pkt.c')) +softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c')) + +softmmu_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c')) +softmmu_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c')) +softmmu_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c')) +softmmu_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth= .c')) +softmmu_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c')) +softmmu_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c= ')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_em= ac.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwin= ner-sun8i-emac.c')) +softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c')) + +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_en= et.c')) +softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c')) +softmmu_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c')) +softmmu_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c')) +softmmu_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c')) +softmmu_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c')) +softmmu_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c')) + +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c')) +softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c')) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-minima= c2.c')) +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c')) +specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethl= ite.c')) + +softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) +specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) + +softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: f= iles('vhost_net.c'), if_false: files('vhost_net-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) + +softmmu_ss.add(when: 'CONFIG_ETSEC', if_true: files( + 'fsl_etsec/etsec.c', + 'fsl_etsec/miim.c', + 'fsl_etsec/registers.c', + 'fsl_etsec/rings.c', +)) + +softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files( + 'rocker/rocker.c', + 'rocker/rocker_desc.c', + 'rocker/rocker_fp.c', + 'rocker/rocker_of_dpa.c', + 'rocker/rocker_world.c', +), if_false: files('rocker/qmp-norocker.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c')) + +subdir('can') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082270; cv=none; d=zohomail.com; s=zohoarc; b=QXIgGWoHuVQN+6ofqfRD+tfOYVlKtR+Rgop5ucOTCWkSuSpM3v8ImRJSV2g/k2B4opPbNmdR9chYvlDtsdXSU3N/Z77sJnMMja4rftVTxxETbeu1ENFIxiH7pRhhmcIzcL2sYpy6szkExTuXvhIGkAa1MYfPfKOTeQcoXLZB/Dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082270; 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=LYAQquAI7Okz9lK3LMfFT0A2vVtLaD/4TBT9iA1xm5o=; b=U8WZlz9LXWfQ+SrMPUZWAQCu8aZk2Trf54Phto6xUmPtCCKZxW3pDZNWyKxYdrs4H+OlLK2okO/5t5cMu0bZ3wv48YcpBYMSYLFmZS66apM1rYyZ6YYAiBnA2GZtfxQm6h2ts5IgvGl+3FwXgb4BZAcSQHjA9kXLT7UuWgrkD0k= 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 1597082270969788.1404200132139; Mon, 10 Aug 2020 10:57:50 -0700 (PDT) Received: from localhost ([::1]:38170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C3R-0000BV-NI for importer@patchew.org; Mon, 10 Aug 2020 13:57:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLH-0002Lw-K0 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:11 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35400 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 1k5BLE-0003F9-3u for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:10 -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-102-QMBKxApmPrOcHtKxQ2kfNA-1; Mon, 10 Aug 2020 13:12:05 -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 C083E1005504 for ; Mon, 10 Aug 2020 17:12:04 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD8C65F1E9; Mon, 10 Aug 2020 17:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079527; 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=LYAQquAI7Okz9lK3LMfFT0A2vVtLaD/4TBT9iA1xm5o=; b=JwlYd+Heaf1Zx5Yu3YRiZotq3zGLCXWjxvgPH7nodHcNzZf3DubFYKcJ+I3tWZ7CEPbbX3 VSCQT23+DUUmoKdyk0h6S25z0T4f8TPf/IeaHk41nkaIbK6pLkkEWgabJLiFwUQByw27i0 F2JUTzMCFxYZFt/HBghVe5Tx32Seink= X-MC-Unique: QMBKxApmPrOcHtKxQ2kfNA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 105/147] meson: convert hw/misc Date: Mon, 10 Aug 2020 19:08:23 +0200 Message-Id: <1597079345-42801-106-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/misc/Makefile.objs | 95 -----------------------------------------= -- hw/misc/macio/Makefile.objs | 5 --- hw/misc/macio/meson.build | 8 ++++ hw/misc/meson.build | 99 +++++++++++++++++++++++++++++++++++++++++= ++++ 6 files changed, 108 insertions(+), 101 deletions(-) delete mode 100644 hw/misc/Makefile.objs delete mode 100644 hw/misc/macio/Makefile.objs create mode 100644 hw/misc/macio/meson.build create mode 100644 hw/misc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d0d7816..ac8278e 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -17,7 +17,6 @@ devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ devices-dirs-y +=3D isa/ -devices-dirs-y +=3D misc/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 1f7b2c4..6ca82b0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('misc') subdir('net') subdir('nubus') subdir('nvram') diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs deleted file mode 100644 index 6be3d25..0000000 --- a/hw/misc/Makefile.objs +++ /dev/null @@ -1,95 +0,0 @@ -common-obj-$(CONFIG_APPLESMC) +=3D applesmc.o -common-obj-$(CONFIG_MAX111X) +=3D max111x.o -common-obj-$(CONFIG_TMP105) +=3D tmp105.o -common-obj-$(CONFIG_TMP421) +=3D tmp421.o -common-obj-$(CONFIG_ISA_DEBUG) +=3D debugexit.o -common-obj-$(CONFIG_SGA) +=3D sga.o -common-obj-$(CONFIG_ISA_TESTDEV) +=3D pc-testdev.o -common-obj-$(CONFIG_PCI_TESTDEV) +=3D pci-testdev.o -common-obj-$(CONFIG_EDU) +=3D edu.o -common-obj-$(CONFIG_PCA9552) +=3D pca9552.o - -common-obj-$(CONFIG_UNIMP) +=3D unimp.o -common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o -common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o - -# ARM devices -common-obj-$(CONFIG_PL310) +=3D arm_l2x0.o -common-obj-$(CONFIG_INTEGRATOR_DEBUG) +=3D arm_integrator_debug.o -common-obj-$(CONFIG_A9SCU) +=3D a9scu.o -common-obj-$(CONFIG_ARM11SCU) +=3D arm11scu.o - -# Mac devices -common-obj-$(CONFIG_MOS6522) +=3D mos6522.o - -# PKUnity SoC devices -common-obj-$(CONFIG_PUV3) +=3D puv3_pm.o - -common-obj-$(CONFIG_MACIO) +=3D macio/ - -common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o - -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o -obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-cpucfg.o -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-dramc.o -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-sid.o -common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o -common-obj-$(CONFIG_NSERIES) +=3D cbus.o -common-obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_pmu.o exynos4210_clk.o exynos= 4210_rng.o -common-obj-$(CONFIG_IMX) +=3D imx_ccm.o -common-obj-$(CONFIG_IMX) +=3D imx31_ccm.o -common-obj-$(CONFIG_IMX) +=3D imx25_ccm.o -common-obj-$(CONFIG_IMX) +=3D imx6_ccm.o -common-obj-$(CONFIG_IMX) +=3D imx6ul_ccm.o -obj-$(CONFIG_IMX) +=3D imx6_src.o -common-obj-$(CONFIG_IMX) +=3D imx7_ccm.o -common-obj-$(CONFIG_IMX) +=3D imx7_snvs.o -common-obj-$(CONFIG_IMX) +=3D imx7_gpr.o -common-obj-$(CONFIG_IMX) +=3D imx_rngc.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-hpdmc.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-pfpu.o -common-obj-$(CONFIG_MAINSTONE) +=3D mst_fpga.o -common-obj-$(CONFIG_OMAP) +=3D omap_clk.o -common-obj-$(CONFIG_OMAP) +=3D omap_gpmc.o -common-obj-$(CONFIG_OMAP) +=3D omap_l4.o -common-obj-$(CONFIG_OMAP) +=3D omap_sdrc.o -common-obj-$(CONFIG_OMAP) +=3D omap_tap.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_mbox.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_mphi.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_property.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_rng.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_thermal.o -common-obj-$(CONFIG_SLAVIO) +=3D slavio_misc.o -common-obj-$(CONFIG_ZYNQ) +=3D zynq_slcr.o -common-obj-$(CONFIG_ZYNQ) +=3D zynq-xadc.o -common-obj-$(CONFIG_STM32F2XX_SYSCFG) +=3D stm32f2xx_syscfg.o -common-obj-$(CONFIG_STM32F4XX_SYSCFG) +=3D stm32f4xx_syscfg.o -common-obj-$(CONFIG_STM32F4XX_EXTI) +=3D stm32f4xx_exti.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_cmgcr.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_cpc.o -obj-$(CONFIG_MIPS_ITU) +=3D mips_itu.o -common-obj-$(CONFIG_MPS2_FPGAIO) +=3D mps2-fpgaio.o -common-obj-$(CONFIG_MPS2_SCC) +=3D mps2-scc.o - -common-obj-$(CONFIG_TZ_MPC) +=3D tz-mpc.o -common-obj-$(CONFIG_TZ_MSC) +=3D tz-msc.o -common-obj-$(CONFIG_TZ_PPC) +=3D tz-ppc.o -common-obj-$(CONFIG_IOTKIT_SECCTL) +=3D iotkit-secctl.o -obj-$(CONFIG_IOTKIT_SYSCTL) +=3D iotkit-sysctl.o -common-obj-$(CONFIG_IOTKIT_SYSINFO) +=3D iotkit-sysinfo.o -common-obj-$(CONFIG_ARMSSE_CPUID) +=3D armsse-cpuid.o -common-obj-$(CONFIG_ARMSSE_MHU) +=3D armsse-mhu.o - -common-obj-$(CONFIG_PVPANIC) +=3D pvpanic.o -common-obj-$(CONFIG_AUX) +=3D auxbus.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_xdma.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_scu.o aspeed_sdmc.o -common-obj-$(CONFIG_MSF2) +=3D msf2-sysreg.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_rng.o -obj-$(CONFIG_MAC_VIA) +=3D mac_via.o - -common-obj-$(CONFIG_GRLIB) +=3D grlib_ahb_apb_pnp.o - -obj-$(CONFIG_AVR_POWER) +=3D avr_power.o diff --git a/hw/misc/macio/Makefile.objs b/hw/misc/macio/Makefile.objs deleted file mode 100644 index 07fdb32..0000000 --- a/hw/misc/macio/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-y +=3D macio.o -common-obj-$(CONFIG_CUDA) +=3D cuda.o -common-obj-$(CONFIG_MAC_PMU) +=3D pmu.o -common-obj-$(CONFIG_MAC_DBDMA) +=3D mac_dbdma.o -common-obj-$(CONFIG_MACIO_GPIO) +=3D gpio.o diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build new file mode 100644 index 0000000..17282da --- /dev/null +++ b/hw/misc/macio/meson.build @@ -0,0 +1,8 @@ +macio_ss =3D ss.source_set() +macio_ss.add(files('macio.c')) +macio_ss.add(when: 'CONFIG_CUDA', if_true: files('cuda.c')) +macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c')) +macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c')) +macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c')) + +softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss) diff --git a/hw/misc/meson.build b/hw/misc/meson.build new file mode 100644 index 0000000..84fed04 --- /dev/null +++ b/hw/misc/meson.build @@ -0,0 +1,99 @@ +softmmu_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c')) +softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c')) +softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c')) +softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) +softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) +softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c')) +softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) +softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) +softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c')) +softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) +softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) +softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) +softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) + +# ARM devices +softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) +softmmu_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integr= ator_debug.c')) +softmmu_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c')) +softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c')) + +# Mac devices +softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) + +# PKUnity SoC devices +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_pm.c')) + +subdir('macio') + +softmmu_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c')) + +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-c= cu.c')) +specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpu= cfg.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-d= ramc.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-s= ysctrl.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.= c')) +softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c')) +softmmu_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c')) +softmmu_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', = 'exynos4210_clk.c', 'exynos4210_rng.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files( + 'imx25_ccm.c', + 'imx31_ccm.c', + 'imx6_ccm.c', + 'imx6ul_ccm.c', + 'imx7_ccm.c', + 'imx7_gpr.c', + 'imx7_snvs.c', + 'imx_ccm.c', + 'imx_rngc.c', +)) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-hpdmc.c= ', 'milkymist-pfpu.c')) +softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files( + 'omap_clk.c', + 'omap_gpmc.c', + 'omap_l4.c', + 'omap_sdrc.c', + 'omap_tap.c', +)) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files( + 'bcm2835_mbox.c', + 'bcm2835_mphi.c', + 'bcm2835_property.c', + 'bcm2835_rng.c', + 'bcm2835_thermal.c', +)) +softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c')) +softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-xa= dc.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_= syscfg.c')) +softmmu_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_= syscfg.c')) +softmmu_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_ex= ti.c')) +softmmu_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c')) +softmmu_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c')) + +softmmu_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c')) +softmmu_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c')) +softmmu_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c')) +softmmu_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl= .c')) +softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysin= fo.c')) +softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c= ')) +softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) + +softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) +softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', '= aspeed_sdmc.c', 'aspeed_xdma.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c')) + +softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c')) + +specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c')) + +specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx6_src.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysct= l.c')) + +specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c')) + +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'm= ips_cpc.c')) +specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c')) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081661; cv=none; d=zohomail.com; s=zohoarc; b=cqnZzvzc8+OaG2C3ZO7IAtMmsqA9TvGWVuHkOMULwiwDq3C1maorYmwgBic3sWw0ql7mei46rP5zhyY9TCnSmVtepDkn6K3J9GkM65Sy21jwS/YhXXpsmmWyvkCLpucST1Clk15MXMM/R3mRBJJCS75Uxww933xGdXqP5uPaP+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081661; 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=ZEckp85hEASX/c9Pi/aHv0+vFvZQymj5t3VUndnI1GA=; b=hU0MRU5aGJmixtHJuS8ztpV4aVz1dXQlPG+QVVT0TO6gcrrlKwyE6/wEw6rZKcZbGONbZivVW+vq1CGiAkgSh83I0XBmMZE9YtTLaAWDfBWrS3XMOeQDUosXde2ozh+9OKmgGuYYkyeUrQ09bWi/q7HJivkPefhH+DxyngL/rLI= 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 1597081661876325.8949587735642; Mon, 10 Aug 2020 10:47:41 -0700 (PDT) Received: from localhost ([::1]:51722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Btc-00081d-Dr for importer@patchew.org; Mon, 10 Aug 2020 13:47:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLH-0002Mj-Uj for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLF-0003FM-EX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:11 -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-340-3qPG8aZtMzexK6cOmZbwQw-1; Mon, 10 Aug 2020 13:12:07 -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 2BDD21005510 for ; Mon, 10 Aug 2020 17:12:06 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37D515F1E9; Mon, 10 Aug 2020 17:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079528; 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=ZEckp85hEASX/c9Pi/aHv0+vFvZQymj5t3VUndnI1GA=; b=Gv4WGdydAevJK6LsaGfw5yxibgoZFsNZsBAF9YBfSRRx4j5g0o8kzE7RZTLtdiJ8PwV1tS 8ym67W3+UgoIX0cbBzdukn20FcpmIrqvyHXVdDvVxGq09grALvdAccdutxIQZvNfBXDpKJ D1l3B4aWUuFT8oZPuBcUGNsLef87ZCs= X-MC-Unique: 3qPG8aZtMzexK6cOmZbwQw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 106/147] meson: convert hw/isa Date: Mon, 10 Aug 2020 19:08:24 +0200 Message-Id: <1597079345-42801-107-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=63.128.21.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/10 13:09:25 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 --- hw/Makefile.objs | 1 - hw/isa/Makefile.objs | 11 ----------- hw/isa/meson.build | 11 +++++++++++ hw/meson.build | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 hw/isa/Makefile.objs create mode 100644 hw/isa/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index ac8278e..a28e211 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -16,7 +16,6 @@ devices-dirs-y +=3D input/ devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ -devices-dirs-y +=3D isa/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs deleted file mode 100644 index 8e73960..0000000 --- a/hw/isa/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -common-obj-$(CONFIG_ISA_BUS) +=3D isa-bus.o -common-obj-$(CONFIG_ISA_SUPERIO) +=3D isa-superio.o -common-obj-$(CONFIG_APM) +=3D apm.o -common-obj-$(CONFIG_I82378) +=3D i82378.o -common-obj-$(CONFIG_PC87312) +=3D pc87312.o -common-obj-$(CONFIG_PIIX3) +=3D piix3.o -common-obj-$(CONFIG_PIIX4) +=3D piix4.o -common-obj-$(CONFIG_VT82C686) +=3D vt82c686.o -common-obj-$(CONFIG_SMC37C669) +=3D smc37c669-superio.o - -obj-$(CONFIG_LPC_ICH9) +=3D lpc_ich9.o diff --git a/hw/isa/meson.build b/hw/isa/meson.build new file mode 100644 index 0000000..8bf678c --- /dev/null +++ b/hw/isa/meson.build @@ -0,0 +1,11 @@ +softmmu_ss.add(when: 'CONFIG_APM', if_true: files('apm.c')) +softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c')) +softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c')) +softmmu_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c')) +softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c')) +softmmu_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c')) +softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c')) +softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio= .c')) +softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c')) + +specific_ss.add(when: 'CONFIG_LPC_ICH9', if_true: files('lpc_ich9.c')) diff --git a/hw/meson.build b/hw/meson.build index 6ca82b0..8659854 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('isa') subdir('mem') subdir('misc') subdir('net') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082279; cv=none; d=zohomail.com; s=zohoarc; b=lONHzClzfo7s6BCr7ps3vz6xinmUzeN1HaWDJdLR7qsQ43uFQXGfEz+QbDcdCmwSecvBYjJfrwaR1HpJzo1zUxbjYh5gdtI2C8IAJoDv59LcGa5wZ2bWB8CPnue2W7U38v+r3/Mp64O39KRN0x4oJAgT671G9ldnw4inOj8iNvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082279; 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=PXO7UJiyNBOPWwUKbFoA/JToYA23FDBnGmtgzSN7HGI=; b=aBJujnQ3pN3kfR4vHQU9y3gTQpMZUFVMUWI9Lg5AjlctfhC6Cn7a1F5HeHoHz4Ear78kX0VuywAm3opmZJxWmc6DlNK57nPw0s7C6F1ksLX0b7A6DIYRV3nVv5kXTb60m1IGguWm3axJddU2PJCnjw+UgcnEyis3R4F2+MC65Xc= 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 1597082279052674.7663187099918; Mon, 10 Aug 2020 10:57:59 -0700 (PDT) Received: from localhost ([::1]:38782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C3Z-0000RI-IN for importer@patchew.org; Mon, 10 Aug 2020 13:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLJ-0002Qg-FY for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34069 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 1k5BLH-0003Ff-C2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:13 -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-279-GgIoKfjdNiGlG83EOUoNyQ-1; Mon, 10 Aug 2020 13:12:08 -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 8A8EE57 for ; Mon, 10 Aug 2020 17:12:07 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97EEA5F1E9; Mon, 10 Aug 2020 17:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079530; 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=PXO7UJiyNBOPWwUKbFoA/JToYA23FDBnGmtgzSN7HGI=; b=ds/KHVtZC7ToSwe1QMPltrFKmDToVDpU3ugQXrLwnX60zGaGZC/s4Rj0tYBKDmNn1bB39V 1C9QWI70JA81It77ZfOUdkjUPKO/nMhONQjMtsE2kwny/0RlUqo8m5wSu2pbvOOWm8zmJ3 UDe5MlbjQMSxhXEs21azaXPYIrtp6Ss= X-MC-Unique: GgIoKfjdNiGlG83EOUoNyQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 107/147] meson: convert hw/ipmi Date: Mon, 10 Aug 2020 19:08:25 +0200 Message-Id: <1597079345-42801-108-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 Reviewed-by: Corey Minyard Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/ipmi/Makefile.objs | 8 -------- hw/ipmi/meson.build | 11 +++++++++++ hw/meson.build | 1 + 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 hw/ipmi/Makefile.objs create mode 100644 hw/ipmi/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a28e211..f136377 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -15,7 +15,6 @@ devices-dirs-y +=3D ide/ devices-dirs-y +=3D input/ devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ -devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs deleted file mode 100644 index 3cca10b..0000000 --- a/hw/ipmi/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -common-obj-$(CONFIG_IPMI) +=3D ipmi.o ipmi_kcs.o ipmi_bt.o -common-obj-$(CONFIG_IPMI_LOCAL) +=3D ipmi_bmc_sim.o -common-obj-$(CONFIG_IPMI_EXTERN) +=3D ipmi_bmc_extern.o -common-obj-$(CONFIG_ISA_IPMI_KCS) +=3D isa_ipmi_kcs.o -common-obj-$(CONFIG_PCI_IPMI_KCS) +=3D pci_ipmi_kcs.o -common-obj-$(CONFIG_ISA_IPMI_BT) +=3D isa_ipmi_bt.o -common-obj-$(CONFIG_PCI_IPMI_BT) +=3D pci_ipmi_bt.o -common-obj-$(CONFIG_IPMI_SSIF) +=3D smbus_ipmi.o diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build new file mode 100644 index 0000000..9622ea2 --- /dev/null +++ b/hw/ipmi/meson.build @@ -0,0 +1,11 @@ +ipmi_ss =3D ss.source_set() +ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c', 'i= pmi_bt.c')) +ipmi_ss.add(when: 'CONFIG_IPMI_LOCAL', if_true: files('ipmi_bmc_sim.c')) +ipmi_ss.add(when: 'CONFIG_IPMI_EXTERN', if_true: files('ipmi_bmc_extern.c'= )) +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_KCS', if_true: files('isa_ipmi_kcs.c')) +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c')) +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c')) +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c')) +ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c')) + +softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss) diff --git a/hw/meson.build b/hw/meson.build index 8659854..9796f95 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipmi') subdir('isa') subdir('mem') subdir('misc') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597081904; cv=none; d=zohomail.com; s=zohoarc; b=gDkODfRT2Ho2aN9eKWO4Uil8XUFM6zCSmrAGKgj43jbtR/eRPIq2eJzFjGNMEEJSJ9Akl6X5LO9WQ0sRflHEzraJX3FE8IBVFveAJVZT/CvN0EZb+/Hjbx2T5NxvKDi6CE4Bb9vElVGZqOtnwS6qtWBY7MKF/Gfd4t1mGQM0xEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597081904; 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=/Ws839GXkHo0pgCx+WvKMCFqme1u/aoxjR4dtBjX32A=; b=Rd6bcaCkhtfCGnyjrc4ujfHg6ZuiQ4eYisuWEtavFKiV1C5AWVj0Fx5sPvCln+qXUBbDRn3aoYQCv4+So+XMpxB+Z08kA+dXSfNk1cbt40co3xv0ITF9s+TCwUSWLPXJBnd3KfDs3T09LYk2JFtGibY8Tdh0NAZg3fZ9DJut+G0= 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 1597081904151567.8977026392885; Mon, 10 Aug 2020 10:51:44 -0700 (PDT) Received: from localhost ([::1]:40240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BxW-0006Q9-In for importer@patchew.org; Mon, 10 Aug 2020 13:51:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLN-0002YB-77 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:23662 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 1k5BLK-0003GO-9t for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:16 -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-197-b6rlVItIM_6ER0EDTsXRwg-1; Mon, 10 Aug 2020 13:12:09 -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 E802A8014D7 for ; Mon, 10 Aug 2020 17:12:08 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0228B5F1E9; Mon, 10 Aug 2020 17:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079533; 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=/Ws839GXkHo0pgCx+WvKMCFqme1u/aoxjR4dtBjX32A=; b=WwhNjr/7y7tfB3nJ9fwDV5GX1A/agdnK8lFxMHPscnaOyuUEVBRpkv98Aqf1Hyahf/J1rT 1P9qNbyup5HRmLL9XAX5l0C4rCa4Bil2wtV0lct4wTiQP2QIlJ0zKk12NHA6fy/lYRmadB BYFyh+Iy70HKA3eVvXFyIzfEwpVhSTM= X-MC-Unique: b6rlVItIM_6ER0EDTsXRwg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 108/147] meson: convert hw/ipack Date: Mon, 10 Aug 2020 19:08:26 +0200 Message-Id: <1597079345-42801-109-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 --- hw/Makefile.objs | 1 - hw/ipack/Makefile.objs | 2 -- hw/ipack/meson.build | 1 + hw/meson.build | 1 + 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 hw/ipack/Makefile.objs create mode 100644 hw/ipack/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f136377..76d9305 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -14,7 +14,6 @@ devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-y +=3D ide/ devices-dirs-y +=3D input/ devices-dirs-y +=3D intc/ -devices-dirs-$(CONFIG_IPACK) +=3D ipack/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/ipack/Makefile.objs b/hw/ipack/Makefile.objs deleted file mode 100644 index 8b9bdcb..0000000 --- a/hw/ipack/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-$(CONFIG_IPACK) +=3D ipack.o -common-obj-$(CONFIG_IPACK) +=3D tpci200.o diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build new file mode 100644 index 0000000..3f8138b --- /dev/null +++ b/hw/ipack/meson.build @@ -0,0 +1 @@ +softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'= )) diff --git a/hw/meson.build b/hw/meson.build index 9796f95..ec4bb48 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipack') subdir('ipmi') subdir('isa') subdir('mem') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082703; cv=none; d=zohomail.com; s=zohoarc; b=R8NNi7I/BveaWHkeSeEq4qFJsrz4HilILYbS5/U4iFYx+30/xuwf1qqNIDYEEC6DpSqWUntJLQVpNpgkB8YKFXaPhWq7kuQ299H1kdQwwXs1KVwoPtLG5o3k4jp20EsRNgkIdLAOnlPo007KUv/ix3pXKIgeYHxrGzy17EqYCJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082703; 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=EC/XPUAop3rV2Wbzm8z2tnnzIvn+p4q70kl28D8LflU=; b=H7gtk5mFgImGQIDM8Vp1cgZ2aJgxybQ7v+Wl3zGIUhhTH0iYiyV14fJBaJNxEzIV1H+BQEpxcNQvKfseCFhf2Hur27QbzY3EtxVQU8x4H8bEzk3obBY0T7vCYA6bZALMrgd8HPZzr0GiX55fy2E+eiaOfvcHhY+MDESzjNlL+0c= 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 1597082703398674.7146979273208; Mon, 10 Aug 2020 11:05:03 -0700 (PDT) Received: from localhost ([::1]:38616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CAQ-0003aB-7b for importer@patchew.org; Mon, 10 Aug 2020 14:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLN-0002Xx-4o for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46207 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 1k5BLJ-0003GF-Kc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:16 -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-51-D4VwUXz7OIip1fcugCVGGQ-1; Mon, 10 Aug 2020 13:12:11 -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 539FD800473 for ; Mon, 10 Aug 2020 17:12:10 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 608CC5F1E9; Mon, 10 Aug 2020 17:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079533; 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=EC/XPUAop3rV2Wbzm8z2tnnzIvn+p4q70kl28D8LflU=; b=gaBq+rtzoZdr/+QJN8olpjVwIMN4YaLfkGjOQ0A2DCKlfLtjYJzLQUmidcah1zGOeZhwmY 7+W7JVxVU9eVQ6T9/8isVoeCa2m6PdQUGVtoshXVvp+zZP+EBMRMEngQCMDcQi26Mx4evy FKNc0bMkeJ2qbdRPcAKt49fTN9Wt+k4= X-MC-Unique: D4VwUXz7OIip1fcugCVGGQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 109/147] meson: convert hw/intc Date: Mon, 10 Aug 2020 19:08:27 +0200 Message-Id: <1597079345-42801-110-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 --- hw/Makefile.objs | 1 - hw/intc/Makefile.objs | 54 -----------------------------------------------= --- hw/intc/meson.build | 55 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/meson.build | 1 + 4 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 hw/intc/Makefile.objs create mode 100644 hw/intc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 76d9305..80b1041 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -13,7 +13,6 @@ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-y +=3D ide/ devices-dirs-y +=3D input/ -devices-dirs-y +=3D intc/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs deleted file mode 100644 index 3ac2b40..0000000 --- a/hw/intc/Makefile.objs +++ /dev/null @@ -1,54 +0,0 @@ -common-obj-$(CONFIG_HEATHROW_PIC) +=3D heathrow_pic.o -common-obj-$(CONFIG_I8259) +=3D i8259_common.o i8259.o -common-obj-$(CONFIG_PL190) +=3D pl190.o -common-obj-$(CONFIG_PUV3) +=3D puv3_intc.o -common-obj-$(CONFIG_XILINX) +=3D xilinx_intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) +=3D xlnx-pmu-iomod-intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-ipi.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_pic.o -common-obj-$(CONFIG_IMX) +=3D imx_avic.o imx_gpcv2.o -common-obj-$(CONFIG_LM32) +=3D lm32_pic.o -common-obj-$(CONFIG_REALVIEW) +=3D realview_gic.o -common-obj-$(CONFIG_SLAVIO) +=3D slavio_intctl.o -common-obj-$(CONFIG_IOAPIC) +=3D ioapic_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv2m.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_dist.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_redist.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_its_common.o -common-obj-$(CONFIG_OPENPIC) +=3D openpic.o -common-obj-$(CONFIG_RX_ICU) +=3D rx_icu.o -common-obj-y +=3D intc.o - -obj-$(CONFIG_APIC) +=3D apic.o apic_common.o -obj-$(CONFIG_ARM_GIC_KVM) +=3D arm_gic_kvm.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_kv= m.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_it= s_kvm.o -obj-$(CONFIG_ARM_V7M) +=3D armv7m_nvic.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_gic.o exynos4210_combiner.o -obj-$(CONFIG_GRLIB) +=3D grlib_irqmp.o -obj-$(CONFIG_IOAPIC) +=3D ioapic.o -obj-$(CONFIG_OMAP) +=3D omap_intc.o -obj-$(CONFIG_OPENPIC_KVM) +=3D openpic_kvm.o -obj-$(CONFIG_RASPI) +=3D bcm2835_ic.o bcm2836_control.o -obj-$(CONFIG_SH4) +=3D sh_intc.o -obj-$(CONFIG_XICS) +=3D xics.o -obj-$(CONFIG_XICS_SPAPR) +=3D xics_spapr.o -obj-$(CONFIG_XICS_KVM) +=3D xics_kvm.o -obj-$(CONFIG_XIVE) +=3D xive.o -obj-$(CONFIG_XIVE_SPAPR) +=3D spapr_xive.o -obj-$(CONFIG_XIVE_KVM) +=3D spapr_xive_kvm.o -obj-$(CONFIG_POWERNV) +=3D xics_pnv.o pnv_xive.o -obj-$(CONFIG_ALLWINNER_A10_PIC) +=3D allwinner-a10-pic.o -obj-$(CONFIG_S390_FLIC) +=3D s390_flic.o -obj-$(CONFIG_S390_FLIC_KVM) +=3D s390_flic_kvm.o -obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_vic.o -obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_cpuif.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_gic.o -obj-$(CONFIG_NIOS2) +=3D nios2_iic.o -obj-$(CONFIG_OMPIC) +=3D ompic.o -obj-$(CONFIG_IBEX) +=3D ibex_plic.o -obj-$(CONFIG_LOONGSON_LIOINTC) +=3D loongson_liointc.o diff --git a/hw/intc/meson.build b/hw/intc/meson.build new file mode 100644 index 0000000..c16f7f0 --- /dev/null +++ b/hw/intc/meson.build @@ -0,0 +1,55 @@ +softmmu_ss.add(files('intc.c')) +softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( + 'arm_gic.c', + 'arm_gic_common.c', + 'arm_gicv2m.c', + 'arm_gicv3.c', + 'arm_gicv3_common.c', + 'arm_gicv3_dist.c', + 'arm_gicv3_its_common.c', + 'arm_gicv3_redist.c', +)) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) +softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c= ')) +softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i82= 59.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2= .c')) +softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c')) +softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c')) +softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c')) +softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c')) +softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c')) +softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c')) +softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi= .c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-io= mod-intc.c')) + +specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinne= r-a10-pic.c')) +specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common= .c')) +specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif.c'= )) +specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) +specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) +specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) +specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c',= 'exynos4210_combiner.c')) +specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) +specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_plic.c')) +specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) +specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_= liointc.c')) +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c')) +specific_ss.add(when: 'CONFIG_NIOS2', if_true: files('nios2_iic.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) +specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c')) +specific_ss.add(when: 'CONFIG_OPENPIC_KVM', if_true: files('openpic_kvm.c'= )) +specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_= xive.c')) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2= 836_control.c')) +specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c')) +specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c')) +specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kv= m.c')) +specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) +specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) +specific_ss.add(when: 'CONFIG_XICS_KVM', if_true: files('xics_kvm.c')) +specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c')) +specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) +specific_ss.add(when: 'CONFIG_XIVE_KVM', if_true: files('spapr_xive_kvm.c'= )) +specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c')) diff --git a/hw/meson.build b/hw/meson.build index ec4bb48..986e710 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('intc') subdir('ipack') subdir('ipmi') subdir('isa') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082022; cv=none; d=zohomail.com; s=zohoarc; b=j4Y+Sf+Hk2NSeuCO02n+X1cK69n7e37+Diw7aCtwtC3HQ5iUx+Cy5QB74YTxSdhYzK+UEWqJjOIMX4eBmc/RKC1jB9SWfG07k0ZKRkQmqKrOiKlfrnl1H+gepYOSmNZ+4udfzhnfOmg7RFQYgy5qt6nsB246unGSZuzv7KopR2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082022; 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=pD/znTM3VWdZ2i9Ib+TwtJhrv1ezxOo5dCi6gP7yJxw=; b=aX5krSjbnUb1Kxzh5cHTi2u3qAALW9zNgS2QTfvlb2sPLbBcWByo14eU8tV0sX1R1/L4CP6vxR1qVC2vJ1zfRLfOUcsD09hS9JmY0HXT7dNZ/AJ3fsoBrt2MOPJdmk/4L6Abz4jgP0weCbXjMeGlQCPQ17z4hFVMRlCS5qweGaU= 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 1597082022960524.3230595716295; Mon, 10 Aug 2020 10:53:42 -0700 (PDT) Received: from localhost ([::1]:48848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BzR-0001Sh-Ic for importer@patchew.org; Mon, 10 Aug 2020 13:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLO-0002by-No for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22836 helo=us-smtp-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 1k5BLM-0003GX-01 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:18 -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-537-ORy0JR7JO_6HV-F16atZIw-1; Mon, 10 Aug 2020 13:12:12 -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 B39C7107ACCA for ; Mon, 10 Aug 2020 17:12:11 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF9145F1E9; Mon, 10 Aug 2020 17:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079534; 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=pD/znTM3VWdZ2i9Ib+TwtJhrv1ezxOo5dCi6gP7yJxw=; b=Wzk0tVStKc5hrPDGVGPwHUG0UdfQqmaDPjj2y/5c9idYHwvxX5Y7fhqlOaVNW8IWP1U+VT A14PyFEb4pybyay70v/xt3ieBNHlGYIdt3cnyxab7wyzupLszS8BKtV6vrP9kZ9wLmSh8S LMjAialTLtycaO1psKUB+/VEOo8o0Hk= X-MC-Unique: ORy0JR7JO_6HV-F16atZIw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 110/147] meson: convert hw/input Date: Mon, 10 Aug 2020 19:08:28 +0200 Message-Id: <1597079345-42801-111-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/input/Makefile.objs | 18 ------------------ hw/input/meson.build | 18 ++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 hw/input/Makefile.objs create mode 100644 hw/input/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 80b1041..3feccd8 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -12,7 +12,6 @@ devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-y +=3D ide/ -devices-dirs-y +=3D input/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs deleted file mode 100644 index abc1ff0..0000000 --- a/hw/input/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -common-obj-$(CONFIG_ADB) +=3D adb.o adb-mouse.o adb-kbd.o -common-obj-y +=3D hid.o -common-obj-$(CONFIG_LM832X) +=3D lm832x.o -common-obj-$(CONFIG_PCKBD) +=3D pckbd.o -common-obj-$(CONFIG_PL050) +=3D pl050.o -common-obj-$(CONFIG_PS2) +=3D ps2.o -common-obj-$(CONFIG_STELLARIS_INPUT) +=3D stellaris_input.o -common-obj-$(CONFIG_TSC2005) +=3D tsc2005.o - -common-obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-input.o -common-obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-input-hid.o -common-obj-$(CONFIG_VIRTIO_INPUT_HOST) +=3D virtio-input-host.o -common-obj-$(CONFIG_VHOST_USER_INPUT) +=3D vhost-user-input.o - -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-softusb.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx_keypad.o -common-obj-$(CONFIG_TSC210X) +=3D tsc210x.o -common-obj-$(CONFIG_LASIPS2) +=3D lasips2.o diff --git a/hw/input/meson.build b/hw/input/meson.build new file mode 100644 index 0000000..e7285b1 --- /dev/null +++ b/hw/input/meson.build @@ -0,0 +1,18 @@ +softmmu_ss.add(files('hid.c')) +softmmu_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', = 'adb-kbd.c')) +softmmu_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c')) +softmmu_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c')) +softmmu_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c')) +softmmu_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_i= nput.c')) +softmmu_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c')) + +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c= ')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-h= id.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-in= put-host.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user= -input.c')) + +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-softusb= .c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c')) +softmmu_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c')) +softmmu_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c')) diff --git a/hw/meson.build b/hw/meson.build index 986e710..b15c8d0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('input') subdir('intc') subdir('ipack') subdir('ipmi') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082400; cv=none; d=zohomail.com; s=zohoarc; b=Bnip1nLdiPYHiWvdMFdGADuQBWRTmcsg6Vvl0siKJGZBl6r9mQSx8YKN43R9xnEfhAS9hrwH5TweiytA78yH5L8LEG/5VVX9IzSbVQEV+AKH9iEm1/HC/uQif1K/t3z7ABBZeME+qdLnX9qJXRLbiqFT6eNrouK+8QMBq8ZPJgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082400; 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=S6T2YffQWdjYoVOqXU1E3+XqicDKVBnQ5DL2bFHz2ZU=; b=kmeUlZ5htGCOuxQW/3WJpaLZH3A5cWUrmueMiXTddDBB2u5mJTSOLTIhy9Ln89JpciZVxaZZWsyFVwv1BIa55N3f7DVvn+1LyVJVN3rvFeT7EVDsyh1uhXJEOoRbGymDcxpq6utLckjxclXljlKap/8MnqIURamfoJ0y7CMvHNY= 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 1597082400513341.02803565512295; Mon, 10 Aug 2020 11:00:00 -0700 (PDT) Received: from localhost ([::1]:47164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C5X-0003oy-6c for importer@patchew.org; Mon, 10 Aug 2020 13:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLP-0002da-CO for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLM-0003Gg-4W for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:19 -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-308-6swGCw40MlmsyXxNkjNN-g-1; Mon, 10 Aug 2020 13:12:13 -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 1F2E51DE5 for ; Mon, 10 Aug 2020 17:12:13 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B9F65F1E9; Mon, 10 Aug 2020 17:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079535; 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=S6T2YffQWdjYoVOqXU1E3+XqicDKVBnQ5DL2bFHz2ZU=; b=CXZFWJrEujPGv6k+gN+bdELYMMlabW2fH0PbwAMMcrBmRuj3D6OUfWv2lzWUQ5zeVAiJZx x4PirmMvo+Pc8ubuwqT+2kggu8pm5MvfzDU4dY0JRptJ1dqun0OwpdUctpTVVfD2ihBylj hr3QGl9GM8girWPNMkjymYAk7kWczNo= X-MC-Unique: 6swGCw40MlmsyXxNkjNN-g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 111/147] meson: convert hw/ide Date: Mon, 10 Aug 2020 19:08:29 +0200 Message-Id: <1597079345-42801-112-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=63.128.21.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/10 13:09:25 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 --- hw/Makefile.objs | 1 - hw/ide/Makefile.objs | 14 -------------- hw/ide/meson.build | 14 ++++++++++++++ hw/meson.build | 1 + 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 hw/ide/Makefile.objs create mode 100644 hw/ide/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 3feccd8..02c5c0d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -11,7 +11,6 @@ devices-dirs-y +=3D dma/ devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ -devices-dirs-y +=3D ide/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs deleted file mode 100644 index faf04e0..0000000 --- a/hw/ide/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_IDE_CORE) +=3D core.o atapi.o -common-obj-$(CONFIG_IDE_QDEV) +=3D qdev.o -common-obj-$(CONFIG_IDE_PCI) +=3D pci.o -common-obj-$(CONFIG_IDE_ISA) +=3D isa.o ioport.o -common-obj-$(CONFIG_IDE_PIIX) +=3D piix.o ioport.o -common-obj-$(CONFIG_IDE_CMD646) +=3D cmd646.o -common-obj-$(CONFIG_IDE_MACIO) +=3D macio.o -common-obj-$(CONFIG_IDE_MMIO) +=3D mmio.o -common-obj-$(CONFIG_IDE_VIA) +=3D via.o -common-obj-$(CONFIG_MICRODRIVE) +=3D microdrive.o -common-obj-$(CONFIG_AHCI) +=3D ahci.o -common-obj-$(CONFIG_AHCI_ICH9) +=3D ich.o -common-obj-$(CONFIG_ALLWINNER_A10) +=3D ahci-allwinner.o -common-obj-$(CONFIG_IDE_SII3112) +=3D sii3112.o diff --git a/hw/ide/meson.build b/hw/ide/meson.build new file mode 100644 index 0000000..ddcb3b2 --- /dev/null +++ b/hw/ide/meson.build @@ -0,0 +1,14 @@ +softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c')) +softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinne= r.c')) +softmmu_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c')) +softmmu_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'= )) +softmmu_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c')) +softmmu_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c')) +softmmu_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c')) +softmmu_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c')) +softmmu_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c= ')) +softmmu_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c')) +softmmu_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c')) +softmmu_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c')) +softmmu_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c')) diff --git a/hw/meson.build b/hw/meson.build index b15c8d0..4d7c31c6 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ide') subdir('input') subdir('intc') subdir('ipack') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082562; cv=none; d=zohomail.com; s=zohoarc; b=V9ln068y/CnmQ84ZVTt9YsoxKSJGOjGApvQztw4rSX6TU+I88vbZdPf/svDbi52d5Xa6cBnslNbaX8ldankTzSdU53pVNHljADP80wXpQgStMMvgV8ikhFsBcbr7Ohwwa+mGQsuucgeZ3+KTFAyvsRnxZDM9kaidyS1/mq6/zWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082562; 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=UuXbkFoGbxq05qB/ax0fctVgCavbi3MjE3Kf6Q71lhM=; b=cFTmOhv7r70zFHQ5SjwMReUlP+LGVhkvUeDQ74ZLRJvqJug81wlbVMJrWCgVBeM9buAo89Ts57BsoDzJIbFa348VObFLkbpbD0lHbA9BJZLUTLphRXUuAFgE/uDbXu9NYjea8DSKazSoKF3CC/kQ7a9RlJ3WVGq2LB8MDK61mzk= 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 159708256258168.07201875052726; Mon, 10 Aug 2020 11:02:42 -0700 (PDT) Received: from localhost ([::1]:55364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C89-0007Iq-9p for importer@patchew.org; Mon, 10 Aug 2020 14:02:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLP-0002f8-VD for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:19 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:55569 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 1k5BLN-0003H2-UX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:19 -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-508-FPPcj81mPq2Wk61ve4qoJw-1; Mon, 10 Aug 2020 13:12:15 -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 801B51005510 for ; Mon, 10 Aug 2020 17:12:14 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B0765F1E9; Mon, 10 Aug 2020 17:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079537; 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=UuXbkFoGbxq05qB/ax0fctVgCavbi3MjE3Kf6Q71lhM=; b=F9L1oB4kYHb1NVA0uS985JjW48a31HwiLTm8WeRj0WqIG3jDP5rYSZBdRTamhoujtx+IG8 zTqrjAiJ+Pk6io7kodZBC1U9/zqUJqUlc983NSjyBCKkWsN2xR9hJ9eP/mh2+08GJ7TZtH RCuoOrKDmd6tK63rxBi2lbOjG/KXo2Y= X-MC-Unique: FPPcj81mPq2Wk61ve4qoJw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 112/147] meson: convert hw/i2c Date: Mon, 10 Aug 2020 19:08:30 +0200 Message-Id: <1597079345-42801-113-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 Reviewed-by: Corey Minyard Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/i2c/Makefile.objs | 14 -------------- hw/i2c/meson.build | 16 ++++++++++++++++ hw/meson.build | 1 + 4 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 hw/i2c/Makefile.objs create mode 100644 hw/i2c/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 02c5c0d..22eb804 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,6 @@ devices-dirs-y +=3D display/ devices-dirs-y +=3D dma/ devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ -devices-dirs-$(CONFIG_I2C) +=3D i2c/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs deleted file mode 100644 index f2c61ea..0000000 --- a/hw/i2c/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_I2C) +=3D core.o -common-obj-$(CONFIG_SMBUS) +=3D smbus_slave.o smbus_master.o -common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o -common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86_ICH) +=3D smbus_ich9.o -common-obj-$(CONFIG_ACPI_SMBUS) +=3D pm_smbus.o -common-obj-$(CONFIG_BITBANG_I2C) +=3D bitbang_i2c.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_i2c.o -common-obj-$(CONFIG_IMX_I2C) +=3D imx_i2c.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_i2c.o -common-obj-$(CONFIG_NRF51_SOC) +=3D microbit_i2c.o -common-obj-$(CONFIG_MPC_I2C) +=3D mpc_i2c.o -common-obj-$(CONFIG_OMAP) +=3D omap_i2c.o -common-obj-$(CONFIG_PPC4XX) +=3D ppc4xx_i2c.o diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build new file mode 100644 index 0000000..3a51153 --- /dev/null +++ b/hw/i2c/meson.build @@ -0,0 +1,16 @@ +i2c_ss =3D ss.source_set() +i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c')) +i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_ma= ster.c')) +i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c')) +i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c')) +i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c')) +i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c')) +i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c')) +i2c_ss.add(when: 'CONFIG_IMX_I2C', if_true: files('imx_i2c.c')) +i2c_ss.add(when: 'CONFIG_MPC_I2C', if_true: files('mpc_i2c.c')) +i2c_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('microbit_i2c.c')) +i2c_ss.add(when: 'CONFIG_SMBUS_EEPROM', if_true: files('smbus_eeprom.c')) +i2c_ss.add(when: 'CONFIG_VERSATILE_I2C', if_true: files('versatile_i2c.c')) +i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c')) +i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c')) +softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss) diff --git a/hw/meson.build b/hw/meson.build index 4d7c31c6..983edc1 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('i2c') subdir('ide') subdir('input') subdir('intc') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082794; cv=none; d=zohomail.com; s=zohoarc; b=SDy2L/3Oy5DRM1h7nCsfntarul2q3EmkqZUmK5z1IgVLEmFw1yWzJVtADFQPkRBbQlKWY2eV7KT71qCuCR6Ypnoz4oAH1HM7hfqjZOthYjbCARMX5Bs6sbIsD6y4AN6ymHI/jLh+JipZeJjyyIG8lvUeorjE99wqVBdaKtYyGRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082794; 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=4ljzT9uBW3oam26OBDL4h2fJTNj7LbFlqlVlhCS6FiY=; b=fkefSB8lIHMQ6mMlJXcAhEwf1mMXCcVw8mZxoi9auXU32pUaluhmPLqMlm3G5e6ciNFJC3mRQjxBLvFEduVt+zyi1iil/B5TtrEFXdywosw5k00nbWruh58zW8lA1G9Yn6QX5clstkiCRyI6ZQQaDeMlvSuBHWDvsQu5j3VQepk= 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 1597082794685971.6044214139145; Mon, 10 Aug 2020 11:06:34 -0700 (PDT) Received: from localhost ([::1]:47188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CBs-00074l-WB for importer@patchew.org; Mon, 10 Aug 2020 14:06:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLT-0002nT-VZ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:24 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:37449 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 1k5BLS-0003Hg-28 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:23 -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-165-YmFlaOf1MempQB8wPUmhaA-1; Mon, 10 Aug 2020 13:12:19 -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 BD99480183C for ; Mon, 10 Aug 2020 17:12:18 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB6DB5F1E9; Mon, 10 Aug 2020 17:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079541; 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=4ljzT9uBW3oam26OBDL4h2fJTNj7LbFlqlVlhCS6FiY=; b=IaCqUttt/Prnwu89CLqnthqeDvJuu9C/pMzVPvmprCicayhL0TGuuM53La1mN9wJSbAmtf HvgOKicYPdyhPqCUSBD1lLFV6F7vUQ81KRfMfQzuxJdhLMtZvIGLn+yfLWOrSbUhyaHmd+ Ozxu8Z/q/sTCy/WPQHzbXRPT/BiId4Y= X-MC-Unique: YmFlaOf1MempQB8wPUmhaA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 113/147] meson: convert hw/hyperv Date: Mon, 10 Aug 2020 19:08:31 +0200 Message-Id: <1597079345-42801-114-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 --- hw/Makefile.objs | 1 - hw/hyperv/Makefile.objs | 3 --- hw/hyperv/meson.build | 3 +++ hw/meson.build | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 hw/hyperv/Makefile.objs create mode 100644 hw/hyperv/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 22eb804..a2c2f6d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -9,7 +9,6 @@ devices-dirs-y +=3D cpu/ devices-dirs-y +=3D display/ devices-dirs-y +=3D dma/ devices-dirs-y +=3D gpio/ -devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/hyperv/Makefile.objs b/hw/hyperv/Makefile.objs deleted file mode 100644 index 5b614e0..0000000 --- a/hw/hyperv/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D hyperv.o -obj-$(CONFIG_HYPERV_TESTDEV) +=3D hyperv_testdev.o -obj-$(CONFIG_VMBUS) +=3D vmbus.o diff --git a/hw/hyperv/meson.build b/hw/hyperv/meson.build new file mode 100644 index 0000000..1367e29 --- /dev/null +++ b/hw/hyperv/meson.build @@ -0,0 +1,3 @@ +specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c')) +specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true: files('hyperv_test= dev.c')) +specific_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c')) diff --git a/hw/meson.build b/hw/meson.build index 983edc1..f9e5adf 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('hyperv') subdir('i2c') subdir('ide') subdir('input') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082162; cv=none; d=zohomail.com; s=zohoarc; b=VG3m55IqH8W0P/qIN2+uvOc4e9nAmZUD1ZnNoE0Su66uybc7Wdj6Xvx2q++s4CXKzMVS5gctyk3zS2pzM+CI1zH4LJwb9rVPzPrf9ho8+RRqZdwv93k/gDsNtCvacXWZNXN4aPh6UD9aPKx1eh40tao2+/MEl0QsL9Px3wNYbx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082162; 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=XhQB4ICFW6AJbBPIjPKbDMY18H8bit53HVqzaUS2BM0=; b=dbNqKqbe9g6rwYXEwW1m2JAk0XJlN+ujj+3oJYMrWPckzVy/HtsRRrt6pqaxmD0QOCGJmNa0NyZ/xzM1fVQzjmr3HbB4IkkbrDvRHU6PC3XnhQKJA1JpY9tzrwO7om3Jj8LIEcDaylDLGNwzz+o3ipx0ZER3OPRCz3i3qTiazCw= 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 1597082162545636.4285856232925; Mon, 10 Aug 2020 10:56:02 -0700 (PDT) Received: from localhost ([::1]:57300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C1g-0004xl-Ra for importer@patchew.org; Mon, 10 Aug 2020 13:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLV-0002py-AN for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:25 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:51852 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 1k5BLT-0003Hm-7U for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:24 -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-436-dmW7-_XuOBGtPMHF6KZDIA-1; Mon, 10 Aug 2020 13:12:20 -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 2A5F91DE4 for ; Mon, 10 Aug 2020 17:12:20 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 373B85F1E9; Mon, 10 Aug 2020 17:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079542; 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=XhQB4ICFW6AJbBPIjPKbDMY18H8bit53HVqzaUS2BM0=; b=Pd5dF8m308Bp5yaKTT9wmPfO/Jaos8XHKRJJyxCI6pOSqEj0G/K0MI1TLVqkAwMLv/B8aZ IN+6dlZyfCrYfYDte+9k9VD3bjMmRRgl2hd0vKDOYfJPE/hFEhsUwBzpamA57MAK90/oCB mnn2X2kQHbVNHizHIEWfivi8UbJ/EnI= X-MC-Unique: dmW7-_XuOBGtPMHF6KZDIA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 114/147] meson: convert hw/gpio Date: Mon, 10 Aug 2020 19:08:32 +0200 Message-Id: <1597079345-42801-115-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/gpio/Makefile.objs | 12 ------------ hw/gpio/meson.build | 12 ++++++++++++ hw/meson.build | 1 + 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 hw/gpio/Makefile.objs create mode 100644 hw/gpio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a2c2f6d..c04dfe5 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -8,7 +8,6 @@ devices-dirs-y +=3D char/ devices-dirs-y +=3D cpu/ devices-dirs-y +=3D display/ devices-dirs-y +=3D dma/ -devices-dirs-y +=3D gpio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs deleted file mode 100644 index 3cfc261..0000000 --- a/hw/gpio/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -common-obj-$(CONFIG_MAX7310) +=3D max7310.o -common-obj-$(CONFIG_PL061) +=3D pl061.o -common-obj-$(CONFIG_PUV3) +=3D puv3_gpio.o -common-obj-$(CONFIG_ZAURUS) +=3D zaurus.o -common-obj-$(CONFIG_E500) +=3D mpc8xxx.o -common-obj-$(CONFIG_GPIO_KEY) +=3D gpio_key.o - -common-obj-$(CONFIG_OMAP) +=3D omap_gpio.o -common-obj-$(CONFIG_IMX) +=3D imx_gpio.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_gpio.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_gpio.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_gpio.o diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build new file mode 100644 index 0000000..6bcdfa6 --- /dev/null +++ b/hw/gpio/meson.build @@ -0,0 +1,12 @@ +softmmu_ss.add(when: 'CONFIG_E500', if_true: files('mpc8xxx.c')) +softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c')) +softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c')) +softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c')) +softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) + +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c')) diff --git a/hw/meson.build b/hw/meson.build index f9e5adf..52577c3 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('gpio') subdir('hyperv') subdir('i2c') subdir('ide') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082446; cv=none; d=zohomail.com; s=zohoarc; b=i1wjAlZ4L05xcrbKm4o+snlmv4igjSgvYnlBXgj/qG5Q8/BA/ich6/lqicFGzt73E+cLzQmV4eVBmubFu25NTqQvEvJbevjt5DbHbsJXwMj78BUzzl1NMyu4nXoy0FO+sZ74NgsElzXWoGyLawXQKP5cCz+lXCkBq8ADjgQmY3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082446; 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=jgf3c/81Sz8+zccu3dp02ligzGaHLYd1poS2Bpj3JP8=; b=A5MHdj8+4KYvfGaCb1+I9F87C6NUt7qAq8+jdCgw1NEx8ZdNiZ46vQGB0hmJSX/4e9ICKRxl4b4XFuEfNQ+3O0fqdgGiicpe0GDD5RGXN+OyGbjFTX7O8HmW0x1MNS263Gckl78hLyROUM8dEJugtpIQVzlBllx/31Vai7xe3tY= 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 1597082445981786.0604534258142; Mon, 10 Aug 2020 11:00:45 -0700 (PDT) Received: from localhost ([::1]:49714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C6E-0004rT-JO for importer@patchew.org; Mon, 10 Aug 2020 14:00:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLZ-0002uo-5F for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:30 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:58459 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 1k5BLU-0003Hy-TI for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:28 -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-391-SXuxtq7bNSyK2jRL4ljaIg-1; Mon, 10 Aug 2020 13:12:22 -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 8938880183C for ; Mon, 10 Aug 2020 17:12:21 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9671C5F1E9; Mon, 10 Aug 2020 17:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079544; 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=jgf3c/81Sz8+zccu3dp02ligzGaHLYd1poS2Bpj3JP8=; b=A28i0ywxNowMO2I1liDFow2tP7wMA9dn0uzqvulzWFi72Cx8jpDMODlZXYpWqdsX+B+4PN OJZdil89sUBQy89llyaO36SCbzK8rtndU7S8iGxx5qnRDlsuDrSMkjqRhdzdS9px5lmVS9 2BHIfSs4VYTwzrhF35zOUApXqCLDiwA= X-MC-Unique: SXuxtq7bNSyK2jRL4ljaIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 115/147] meson: convert hw/dma Date: Mon, 10 Aug 2020 19:08:33 +0200 Message-Id: <1597079345-42801-116-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 --- hw/Makefile.objs | 1 - hw/dma/Makefile.objs | 16 ---------------- hw/dma/meson.build | 15 +++++++++++++++ hw/meson.build | 1 + 4 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 hw/dma/Makefile.objs create mode 100644 hw/dma/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index c04dfe5..26917a4 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -7,7 +7,6 @@ devices-dirs-y +=3D block/ devices-dirs-y +=3D char/ devices-dirs-y +=3D cpu/ devices-dirs-y +=3D display/ -devices-dirs-y +=3D dma/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs deleted file mode 100644 index f4b1cfe..0000000 --- a/hw/dma/Makefile.objs +++ /dev/null @@ -1,16 +0,0 @@ -common-obj-$(CONFIG_PUV3) +=3D puv3_dma.o -common-obj-$(CONFIG_RC4030) +=3D rc4030.o -common-obj-$(CONFIG_PL080) +=3D pl080.o -common-obj-$(CONFIG_PL330) +=3D pl330.o -common-obj-$(CONFIG_I82374) +=3D i82374.o -common-obj-$(CONFIG_I8257) +=3D i8257.o -common-obj-$(CONFIG_XILINX_AXI) +=3D xilinx_axidma.o -common-obj-$(CONFIG_ZYNQ_DEVCFG) +=3D xlnx-zynq-devcfg.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_dma.o -common-obj-$(CONFIG_STP2000) +=3D sparc32_dma.o -common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dpdma.o -common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zdma.o - -common-obj-$(CONFIG_OMAP) +=3D omap_dma.o soc_dma.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx_dma.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_dma.o diff --git a/hw/dma/meson.build b/hw/dma/meson.build new file mode 100644 index 0000000..ff5bb37 --- /dev/null +++ b/hw/dma/meson.build @@ -0,0 +1,15 @@ +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_dma.c')) +softmmu_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c')) +softmmu_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c')) +softmmu_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c')) +softmmu_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c')) +softmmu_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'= )) +softmmu_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcf= g.c')) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c')) +softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.= c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c= ')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.= c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c')) diff --git a/hw/meson.build b/hw/meson.build index 52577c3..96da0bb 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('dma') subdir('gpio') subdir('hyperv') subdir('i2c') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082760; cv=none; d=zohomail.com; s=zohoarc; b=mT98B+TW6fwdMXyaJiPGQ48qMBVD8JX3os/e62TExzTG8MXbZW8xEPeQrKGferrdhHuMa9CmALY8x1O/b8kY1PJjmz76x6R6yTjpN3ziPg6mVrwoP6zSyHODvyxlFryjIdxf+IeFJyxUMwlKEm/qOC8f4JHHeEMKCwOQ5YMQUIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082760; 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=AOf7PRk0gGHn0Vn5hBkgYNk8/y1JhdQDiLRDcmdns1c=; b=MKEFfU/F+jhiU8upDgb47E477neuIu+Ap2wTTylF6zGTDuysj32iHyvLmhjIUqdRJiJXl4rQ2mry1cxTB9z+yAVPh3leqdX6ayucT+gwbvhuzK982ZOKmgDvrBIB0D/ECJsb2rGl0RYzYbjKzilwwCBZbiMyVvZpNViDdvVgnZs= 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 1597082760014693.6022203818842; Mon, 10 Aug 2020 11:06:00 -0700 (PDT) Received: from localhost ([::1]:43464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CBK-0005V4-OI for importer@patchew.org; Mon, 10 Aug 2020 14:05:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLi-000305-ET for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:40 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:57097 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 1k5BLb-0003IO-JN for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:35 -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-168-rjj3y9CbMFuWI2ty2H1Psw-1; Mon, 10 Aug 2020 13:12:23 -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 E80F119067E3 for ; Mon, 10 Aug 2020 17:12:22 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01B0E5F1E9; Mon, 10 Aug 2020 17:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079548; 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=AOf7PRk0gGHn0Vn5hBkgYNk8/y1JhdQDiLRDcmdns1c=; b=iBCVfiXDG81RSd2LkttpyHL5YiF201G6DJjF89GI0tqtodpD6WMTRcdh9G2IySu1qYBWCX NTxfZnstNmUnImD0L1ZdOUuLu2tmlCbkZS0n3uMo+CQQKVqiCaFOG+8qd6HpHraIIS5FEa HBh6/84IrCouj9pu75Z5Z+0YU7EhIIQ= X-MC-Unique: rjj3y9CbMFuWI2ty2H1Psw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 116/147] meson: convert hw/display Date: Mon, 10 Aug 2020 19:08:34 +0200 Message-Id: <1597079345-42801-117-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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.target | 1 + hw/Makefile.objs | 1 - hw/display/Makefile.objs | 65 ------------------------------------ hw/display/meson.build | 87 ++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/meson.build | 1 + 5 files changed, 89 insertions(+), 66 deletions(-) delete mode 100644 hw/display/Makefile.objs create mode 100644 hw/display/meson.build diff --git a/Makefile.target b/Makefile.target index 3d5a2af..3534ece 100644 --- a/Makefile.target +++ b/Makefile.target @@ -169,6 +169,7 @@ LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LI= BS) $(OPENGL_LIBS) $(SECCOM LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) +LIBS :=3D $(LIBS) $(VIRGL_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 26917a4..6fce6a1 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -6,7 +6,6 @@ devices-dirs-y +=3D audio/ devices-dirs-y +=3D block/ devices-dirs-y +=3D char/ devices-dirs-y +=3D cpu/ -devices-dirs-y +=3D display/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs deleted file mode 100644 index d619594..0000000 --- a/hw/display/Makefile.objs +++ /dev/null @@ -1,65 +0,0 @@ -common-obj-$(CONFIG_DDC) +=3D i2c-ddc.o -common-obj-$(CONFIG_EDID) +=3D edid-generate.o edid-region.o - -common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb.o -common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb-standalone.o - -common-obj-$(CONFIG_ADS7846) +=3D ads7846.o -common-obj-$(CONFIG_VGA_CIRRUS) +=3D cirrus_vga.o -common-obj-$(call land,$(CONFIG_VGA_CIRRUS),$(CONFIG_VGA_ISA))+=3Dcirrus_v= ga_isa.o -common-obj-$(CONFIG_G364FB) +=3D g364fb.o -common-obj-$(CONFIG_JAZZ_LED) +=3D jazz_led.o -common-obj-$(CONFIG_PL110) +=3D pl110.o -common-obj-$(CONFIG_SII9022) +=3D sii9022.o -common-obj-$(CONFIG_SSD0303) +=3D ssd0303.o -common-obj-$(CONFIG_SSD0323) +=3D ssd0323.o -common-obj-$(CONFIG_XEN) +=3D xenfb.o - -common-obj-$(CONFIG_VGA_PCI) +=3D vga-pci.o -common-obj-$(CONFIG_VGA_ISA) +=3D vga-isa.o -common-obj-$(CONFIG_VGA_ISA_MM) +=3D vga-isa-mm.o -common-obj-$(CONFIG_VMWARE_VGA) +=3D vmware_vga.o -common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D bochs-display.o - -common-obj-$(CONFIG_BLIZZARD) +=3D blizzard.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_fimd.o -common-obj-$(CONFIG_FRAMEBUFFER) +=3D framebuffer.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-vgafb.o -common-obj-$(CONFIG_ZAURUS) +=3D tc6393xb.o -common-obj-$(CONFIG_MACFB) +=3D macfb.o - -obj-$(CONFIG_MILKYMIST_TMU2) +=3D milkymist-tmu2.o -milkymist-tmu2.o-cflags :=3D $(X11_CFLAGS) $(OPENGL_CFLAGS) -milkymist-tmu2.o-libs :=3D $(X11_LIBS) $(OPENGL_LIBS) - -common-obj-$(CONFIG_OMAP) +=3D omap_dss.o -obj-$(CONFIG_OMAP) +=3D omap_lcdc.o -common-obj-$(CONFIG_PXA2XX) +=3D pxa2xx_lcd.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_fb.o -common-obj-$(CONFIG_SM501) +=3D sm501.o -common-obj-$(CONFIG_TCX) +=3D tcx.o -common-obj-$(CONFIG_CG3) +=3D cg3.o -common-obj-$(CONFIG_NEXTCUBE) +=3D next-fb.o -common-obj-$(CONFIG_ARTIST) +=3D artist.o - -obj-$(CONFIG_VGA) +=3D vga.o - -ifeq ($(CONFIG_QXL),y) -common-obj-m +=3D qxl.mo -qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o -endif - -common-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o virtio= -gpu-3d.o -common-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o -common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D vir= tio-gpu-pci.o -common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= vhost-user-gpu-pci.o -common-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o -common-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o -virtio-gpu.o-cflags :=3D $(VIRGL_CFLAGS) -virtio-gpu.o-libs +=3D $(VIRGL_LIBS) -virtio-gpu-3d.o-cflags :=3D $(VIRGL_CFLAGS) -virtio-gpu-3d.o-libs +=3D $(VIRGL_LIBS) -common-obj-$(CONFIG_DPCD) +=3D dpcd.o -common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dp.o - -common-obj-$(CONFIG_ATI_VGA) +=3D ati.o ati_2d.o ati_dbg.o diff --git a/hw/display/meson.build b/hw/display/meson.build new file mode 100644 index 0000000..fa4f806 --- /dev/null +++ b/hw/display/meson.build @@ -0,0 +1,87 @@ +hw_display_modules =3D [] + +softmmu_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c')) +softmmu_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edi= d-region.c')) + +softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c')) +softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone= .c')) + +softmmu_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c')) +softmmu_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c')) +softmmu_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: fil= es('cirrus_vga_isa.c')) +softmmu_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c')) +softmmu_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c')) +softmmu_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c')) +softmmu_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c')) +softmmu_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c')) +softmmu_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c')) +softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xenfb.c')) + +softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c')) +softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c')) +softmmu_ss.add(when: 'CONFIG_VGA_ISA_MM', if_true: files('vga-isa-mm.c')) +softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c')) +softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display= .c')) + +softmmu_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c')) +softmmu_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c')) +softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c')) + +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c')) +softmmu_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c')) +softmmu_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c')) +softmmu_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c')) +softmmu_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c')) +softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c')) + +specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c')) + +if config_all_devices.has_key('CONFIG_QXL') + hw_display_modules +=3D [[ 'qxl', + files('qxl.c', 'qxl-logger.c', 'qxl-render.c'), [], + ['CONFIG_QXL']]] +endif + +softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c',= 'qxl-render.c')) + +softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c')) + +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-vgafb.c= ')) +softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c')) + +softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', '= ati_2d.c', 'ati_dbg.c')) + +if config_all_devices.has_key('CONFIG_VIRTIO_GPU') + virtio_gpu_ss =3D ss.source_set() + virtio_gpu_ss.add(files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu= -3d.c'), virgl) + virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-u= ser-gpu.c')) + virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-gpu-= pci.c')) + virtio_gpu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], = if_true: files('vhost-user-gpu-pci.c')) + virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.= c')) + virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-u= ser-vga.c')) + + # FIXME: this was attempted in the Makefile build system; it was then re= verted + # as it would try to load all devices when the module is loaded, even if + # config_devices for this target only has some of them. Since virtio-gp= u-pci + # and virtio-vga both instantiate a virtio-gpu-device, fixing it probabl= y does + # not even require a dependency system, just splitting the module in thr= ee + # for CONFIG_VIRTIO_GPU/CONFIG_VHOST_USER_GPU, CONFIG_VIRTIO_PCI and + # CONFIG_VIRTIO_VGA/CONFIG_VHOST_USER_VGA. + # Sourcesets are a dime a dozen, so keep it and just disable module buil= ds. + + #virtio_gpu =3D virtio_gpu_ss.apply(config_all_devices, strict: false) + #hw_display_modules +=3D [[ 'virtio-gpu', virtio_gpu.sources(), [pixman,= virgl], + # ['CONFIG_VIRTIO_GPU']]] + + softmmu_ss.add_all(when: [pixman, 'CONFIG_VIRTIO_GPU'], + if_true: virtio_gpu_ss) +endif + +specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: fil= es('milkymist-tmu2.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) + +modules +=3D { 'hw-display': hw_display_modules } diff --git a/hw/meson.build b/hw/meson.build index 96da0bb..dacd26c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('display') subdir('dma') subdir('gpio') subdir('hyperv') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082896; cv=none; d=zohomail.com; s=zohoarc; b=TIz7dGI3cZTlf2I0vrkT2nvK3+x94Jdt5VGm5QQlgkd2AQVjNtqzdFNveP6QdlFhO1OCGtQCzvrAs0U95poaYfjXqMs0Ex9zppWdB3CQN3j/dZMnK2UlkbguO/ogHyhiSQpBbTd2snr36AXBfDMbYUhHSilmR9hX6BL9KQntOAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082896; 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=4zUtG2BrTOmP13fH7T0/kK5F7ny8mbMrnn7XYfvatdE=; b=nnwRkUy6HuDZtq8nt2csEHd8vkhnXot0YLmQnujo35tizF3gm+gK3TpNanTtUHnXA0C9g4QYB3YPZoj5S9wWu8KQ7qADEOj97grQsFPcT/T7SwRd7BUnHDkh+Hn8MlJi6pyel24mrw/Lb46pPGO/lbdF1SJvjUB68f5Q7aZXesQ= 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 1597082896350435.7913637529002; Mon, 10 Aug 2020 11:08:16 -0700 (PDT) Received: from localhost ([::1]:55394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CDW-0001t6-3m for importer@patchew.org; Mon, 10 Aug 2020 14:08:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLc-0002wb-T2 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:33 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39334 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 1k5BLY-0003ID-DV for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:31 -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-552-pQoyj3PUP6SFEaNmsOOL2A-1; Mon, 10 Aug 2020 13:12:25 -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 53C1580183C for ; Mon, 10 Aug 2020 17:12:24 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 612555F1E9; Mon, 10 Aug 2020 17:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079546; 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=4zUtG2BrTOmP13fH7T0/kK5F7ny8mbMrnn7XYfvatdE=; b=EIRCUyxb49h/ZrhOHBXTyzRmpvSVn0Lp7UtjFIyePzmPQtEb/Y72S9sXDnI9ZGRu8NZ1tC 0/ffw8RtDVB1BBCM9gT43kYhkND49OyGqvK1ZrRGwcVuOO8B5S8di+9E+4f28ZsLkw807J YepRQz2JiM4+7yGuV8QqwmWqhknAJb4= X-MC-Unique: pQoyj3PUP6SFEaNmsOOL2A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 117/147] meson: convert hw/cpu Date: Mon, 10 Aug 2020 19:08:35 +0200 Message-Id: <1597079345-42801-118-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 --- hw/Makefile.objs | 1 - hw/cpu/Makefile.objs | 5 ----- hw/cpu/meson.build | 6 ++++++ hw/meson.build | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 hw/cpu/Makefile.objs create mode 100644 hw/cpu/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6fce6a1..97ad302 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -5,7 +5,6 @@ devices-dirs-y +=3D adc/ devices-dirs-y +=3D audio/ devices-dirs-y +=3D block/ devices-dirs-y +=3D char/ -devices-dirs-y +=3D cpu/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs deleted file mode 100644 index 8db9e8a..0000000 --- a/hw/cpu/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_ARM11MPCORE) +=3D arm11mpcore.o -obj-$(CONFIG_REALVIEW) +=3D realview_mpcore.o -obj-$(CONFIG_A9MPCORE) +=3D a9mpcore.o -obj-$(CONFIG_A15MPCORE) +=3D a15mpcore.o -common-obj-y +=3D core.o cluster.o diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build new file mode 100644 index 0000000..9e52fee --- /dev/null +++ b/hw/cpu/meson.build @@ -0,0 +1,6 @@ +softmmu_ss.add(files('core.c', 'cluster.c')) + +specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'= )) +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c= ')) +specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c')) +specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c')) diff --git a/hw/meson.build b/hw/meson.build index dacd26c..103da48 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('cpu') subdir('display') subdir('dma') subdir('gpio') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082655; cv=none; d=zohomail.com; s=zohoarc; b=IdNGi+bSI6NpQFlyP02uk/5ahxGwryHCF+38zJicbaqkxUNbz+nHhJgtKAcmd0YBC7tLFq1nT8XTdRSk1wBPsfBcUxz6Azn7bG4K3Peet1B9A2GYYFfrlxZZGtzc8k17X4lBNY7DFzKvEt5h8xMXzJMkAe/G3CBuLUu/Nf5Ikss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082655; 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=zO4e7K01MHJ7AGB+vRclaGY++76QE/unXSxoCHpUo6s=; b=RSrgItbG8U0Ne6/koZLmtjvZ4Fzf0yg6afPYWYVzkQRJfgRzOlQOUiTYATGcNWfkCgurDHmQDGyr6aEqGeXVxaHBJzyIMnhny/918o6fimYRKVeQTg6gDXWNpLFOWG7QdCm7F+tF0/XLnxqXlNjutGqFVDYEmfmgewpEhJhI9C8= 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 1597082655718698.4513966193273; Mon, 10 Aug 2020 11:04:15 -0700 (PDT) Received: from localhost ([::1]:35192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C9e-0002Bj-FP for importer@patchew.org; Mon, 10 Aug 2020 14:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLf-0002yC-U4 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54159 helo=us-smtp-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 1k5BLZ-0003IL-CU for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:33 -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-511-HKqyj_67PnKA0RE7OreHlw-1; Mon, 10 Aug 2020 13:12:26 -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 B2976106B242 for ; Mon, 10 Aug 2020 17:12:25 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C00B45F1E9; Mon, 10 Aug 2020 17:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079548; 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=zO4e7K01MHJ7AGB+vRclaGY++76QE/unXSxoCHpUo6s=; b=WRwkxOBuoYa1vI4kXKGoJKQNzfBW6nEk9yNwKJyETTkRlRKIrAvqsqQ7ymt5JSo03an2Oy nXU3y0aBcBWZamTL8V1DWZqBmcI8JSMvcRNMZuTTmgE88uC46+G9QnqBDisLU7AIUubxVb /sF+6LS+jjKDW9IiBFfnaYxV42RiS8Y= X-MC-Unique: HKqyj_67PnKA0RE7OreHlw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 118/147] meson: convert hw/char Date: Mon, 10 Aug 2020 19:08:36 +0200 Message-Id: <1597079345-42801-119-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/char/Makefile.objs | 39 --------------------------------------- hw/char/meson.build | 38 ++++++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 hw/char/Makefile.objs create mode 100644 hw/char/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 97ad302..04cfb6c 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -4,7 +4,6 @@ devices-dirs-y +=3D acpi/ devices-dirs-y +=3D adc/ devices-dirs-y +=3D audio/ devices-dirs-y +=3D block/ -devices-dirs-y +=3D char/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs deleted file mode 100644 index bf177ac..0000000 --- a/hw/char/Makefile.objs +++ /dev/null @@ -1,39 +0,0 @@ -common-obj-$(CONFIG_IPACK) +=3D ipoctal232.o -common-obj-$(CONFIG_ESCC) +=3D escc.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_uart.o -common-obj-$(CONFIG_PARALLEL) +=3D parallel.o -common-obj-$(CONFIG_ISA_BUS) +=3D parallel-isa.o -common-obj-$(CONFIG_PL011) +=3D pl011.o -common-obj-$(CONFIG_SERIAL) +=3D serial.o -common-obj-$(CONFIG_SERIAL_ISA) +=3D serial-isa.o -common-obj-$(CONFIG_SERIAL_PCI) +=3D serial-pci.o -common-obj-$(CONFIG_SERIAL_PCI_MULTI) +=3D serial-pci-multi.o -common-obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-console.o -common-obj-$(CONFIG_XILINX) +=3D xilinx_uartlite.o -common-obj-$(CONFIG_XEN) +=3D xen_console.o -common-obj-$(CONFIG_CADENCE) +=3D cadence_uart.o -common-obj-$(CONFIG_IBEX) +=3D ibex_uart.o - -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_uart.o -common-obj-$(CONFIG_COLDFIRE) +=3D mcf_uart.o -common-obj-$(CONFIG_OMAP) +=3D omap_uart.o -common-obj-$(CONFIG_SH4) +=3D sh_serial.o -common-obj-$(CONFIG_DIGIC) +=3D digic-uart.o -common-obj-$(CONFIG_STM32F2XX_USART) +=3D stm32f2xx_usart.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_aux.o -common-obj-$(CONFIG_RENESAS_SCI) +=3D renesas_sci.o -common-obj-$(CONFIG_AVR_USART) +=3D avr_usart.o - -common-obj-$(CONFIG_CMSDK_APB_UART) +=3D cmsdk-apb-uart.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_ser.o -common-obj-$(CONFIG_ISA_DEBUG) +=3D debugcon.o -common-obj-$(CONFIG_GRLIB) +=3D grlib_apbuart.o -common-obj-$(CONFIG_IMX) +=3D imx_serial.o -common-obj-$(CONFIG_LM32) +=3D lm32_juart.o -common-obj-$(CONFIG_LM32) +=3D lm32_uart.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-uart.o -common-obj-$(CONFIG_SCLPCONSOLE) +=3D sclpconsole.o sclpconsole-lm.o - -obj-$(CONFIG_VIRTIO) +=3D virtio-serial-bus.o -obj-$(CONFIG_PSERIES) +=3D spapr_vty.o -obj-$(CONFIG_TERMINAL3270) +=3D terminal3270.o diff --git a/hw/char/meson.build b/hw/char/meson.build new file mode 100644 index 0000000..e888215 --- /dev/null +++ b/hw/char/meson.build @@ -0,0 +1,38 @@ +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-ua= rt.c')) +softmmu_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c')) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c')) +softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c')) +softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) +softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) +softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) +softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) +softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c')) +softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'= )) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c')) +softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c')) +softmmu_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c')) +softmmu_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c',= 'sclpconsole-lm.c')) +softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c')) +softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c')) +softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c')) +softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci= -multi.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-consol= e.c')) +softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_console.c')) +softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c')) + +softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c')) +softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c')) +softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) +softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c')) +softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_u= sart.c')) + +specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.= c')) +specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c= ')) +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) diff --git a/hw/meson.build b/hw/meson.build index 103da48..dd0c77e 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('char') subdir('core') subdir('cpu') subdir('display') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082844; cv=none; d=zohomail.com; s=zohoarc; b=EqbvpAgpVZWPgMz3vt06fMg8xjHANkl5cBA6D+5M0Zjfa09y2jVbKo7Z2egYQ3fICaUTcodRp1ESOuSXpkZ7a0n4Salv2XdnM+PzoPrUzhzNtaZsn6StH+GNxiXZLQ4dwNGOH0Ho3uHokdmyI2sL/+4I2O2jnWKH+3hatGqKqXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082844; 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=/83xfaOygaLxyY//8kwq5BKN5UauDG55mdMBi9Apvj8=; b=f+9oVCrEBdHc1En2OEorDXaeKF7w/opLt4h0GhPu+FS4AEXFRz+pAYDic+t7ZkNAQ6jZCHyMDopI+GomfUsPl00UeaZP5vKovWiM00BLOfMB0c04dc/9PAuL3BMloH6kyqc/gcisnvo/t63GoLWfBMBmdkOovU9vR+JD0SffPVw= 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 1597082844668654.3435266157733; Mon, 10 Aug 2020 11:07:24 -0700 (PDT) Received: from localhost ([::1]:51892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CCh-0000VM-DI for importer@patchew.org; Mon, 10 Aug 2020 14:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLk-00030L-5w for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLc-0003IZ-De for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:38 -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-101-G1gY2DhLPrC3TREqLbQYlA-1; Mon, 10 Aug 2020 13:12:27 -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 1E09919067E0 for ; Mon, 10 Aug 2020 17:12:27 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BCC65F1E9; Mon, 10 Aug 2020 17:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079549; 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=/83xfaOygaLxyY//8kwq5BKN5UauDG55mdMBi9Apvj8=; b=NJhMXgeYNjSGNXPCNOh8v+Y65ChbizYW34x9xAbwCALuzpBt+30h1WtKDoT94PGkp9I9D9 D7bbHm1irRIYDUV2IfteGblmNdOg3j3SA9o03QGPxmHIBvkdF+dz1KXS7Z5b+gcSx9ZHhf JKwd7n5LP+beOn5WdvMdTyEnSgdQ/kk= X-MC-Unique: G1gY2DhLPrC3TREqLbQYlA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 119/147] meson: convert hw/block Date: Mon, 10 Aug 2020 19:08:37 +0200 Message-Id: <1597079345-42801-120-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=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/10 11:11:16 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 --- hw/Makefile.objs | 1 - hw/block/Makefile.objs | 18 ------------------ hw/block/dataplane/Makefile.objs | 2 -- hw/block/dataplane/meson.build | 2 ++ hw/block/meson.build | 21 +++++++++++++++++++++ hw/meson.build | 1 + 6 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 hw/block/Makefile.objs delete mode 100644 hw/block/dataplane/Makefile.objs create mode 100644 hw/block/dataplane/meson.build create mode 100644 hw/block/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 04cfb6c..9068859 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -3,7 +3,6 @@ devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(C= ONFIG_VIRTFS),$(CONFI devices-dirs-y +=3D acpi/ devices-dirs-y +=3D adc/ devices-dirs-y +=3D audio/ -devices-dirs-y +=3D block/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs deleted file mode 100644 index 8855c22..0000000 --- a/hw/block/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -common-obj-y +=3D block.o cdrom.o hd-geometry.o -common-obj-$(CONFIG_FDC) +=3D fdc.o -common-obj-$(CONFIG_SSI_M25P80) +=3D m25p80.o -common-obj-$(CONFIG_NAND) +=3D nand.o -common-obj-$(CONFIG_PFLASH_CFI01) +=3D pflash_cfi01.o -common-obj-$(CONFIG_PFLASH_CFI02) +=3D pflash_cfi02.o -common-obj-$(CONFIG_XEN) +=3D xen-block.o -common-obj-$(CONFIG_ECC) +=3D ecc.o -common-obj-$(CONFIG_ONENAND) +=3D onenand.o -common-obj-$(CONFIG_SWIM) +=3D swim.o - -common-obj-$(CONFIG_SH4) +=3D tc58128.o - -obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o -obj-$(CONFIG_VHOST_USER_BLK) +=3D vhost-user-blk.o -common-obj-$(CONFIG_NVME_PCI) +=3D nvme.o - -obj-y +=3D dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile= .objs deleted file mode 100644 index 0c52702..0000000 --- a/hw/block/dataplane/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o -obj-$(CONFIG_XEN) +=3D xen-block.o diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build new file mode 100644 index 0000000..12c6a26 --- /dev/null +++ b/hw/block/dataplane/meson.build @@ -0,0 +1,2 @@ +specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) diff --git a/hw/block/meson.build b/hw/block/meson.build new file mode 100644 index 0000000..78cad8f --- /dev/null +++ b/hw/block/meson.build @@ -0,0 +1,21 @@ +softmmu_ss.add(files( + 'block.c', + 'cdrom.c', + 'hd-geometry.c' +)) +softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c')) +softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c')) +softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c')) +softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c')) +softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c= ')) +softmmu_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c= ')) +softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c')) +softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c')) +softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) +softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) +softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c')) + +specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-= blk.c')) + +subdir('dataplane') diff --git a/hw/meson.build b/hw/meson.build index dd0c77e..f968aa8 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('block') subdir('char') subdir('core') subdir('cpu') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082990; cv=none; d=zohomail.com; s=zohoarc; b=gKkYvF0zQT72IBny2xsbQEFScGqZrIY9ja/Zianr8bqGzdvTCQ0uomu0TuESGd+um+IW62+Tkt7RZ/AcGISn0FFIA3kVWLvWDp1PHBct3kXGNFJ2UDjrflHlSX/hq3GkJFcl6rnzPS+dNLT/XhXW8WpUpA8fKZEVGoxRCHY67v4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082990; 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=0Fsag6NNlvrRMOXzEODrkAFhBspEazhjN9jO0uivwZE=; b=X+W9nb+qRqoWJke6KKoXNxA8nNbE/AgVgrJDFoG7B5c21XnCvEno/OgdJISEjHztQfUn4GxCzPRUoToem5Kx3N/uqTj1Y6iu3UV/ebSWyE9kvk9gsh0AKjTJ6F7H7SsqgMf6P/uGtUj2b93OuagKBE7dOW1Nc0ki5fpv9z/Y5Ts= 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 1597082990621178.37773306202894; Mon, 10 Aug 2020 11:09:50 -0700 (PDT) Received: from localhost ([::1]:35726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CF3-0005Hj-7J for importer@patchew.org; Mon, 10 Aug 2020 14:09:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLk-00030M-70 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42779 helo=us-smtp-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 1k5BLd-0003Jo-QF for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:39 -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-312-vbDUshxANtST-6N4koWs2g-1; Mon, 10 Aug 2020 13:12:29 -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 7D790100CCC0 for ; Mon, 10 Aug 2020 17:12:28 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A11F5F1E9; Mon, 10 Aug 2020 17:12:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079551; 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=0Fsag6NNlvrRMOXzEODrkAFhBspEazhjN9jO0uivwZE=; b=gNv1Cc3XrM2y47YF3UJQTIIIn/U7/DrJmjUI04+yizvTqzqbqgj5ZxIHZ/bQEBpjPg6fJY HC7oE02I/zE6XxlsPrwNnB9hQJVTPoxtTv1qa6zeb1m6Z+EmBF5KlRf64yCAFVAw4rZti4 h7YnAyEcq7vcIufY6+dTjLQ3kHEgP4I= X-MC-Unique: vbDUshxANtST-6N4koWs2g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 120/147] meson: convert hw/audio Date: Mon, 10 Aug 2020 19:08:38 +0200 Message-Id: <1597079345-42801-121-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 --- hw/Makefile.objs | 1 - hw/audio/Makefile.objs | 18 ------------------ hw/audio/meson.build | 14 ++++++++++++++ hw/meson.build | 1 + 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 hw/audio/Makefile.objs create mode 100644 hw/audio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 9068859..c0cbc0f 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -2,7 +2,6 @@ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-y +=3D acpi/ devices-dirs-y +=3D adc/ -devices-dirs-y +=3D audio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs deleted file mode 100644 index 63db383..0000000 --- a/hw/audio/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -# Sound -common-obj-$(CONFIG_SB16) +=3D sb16.o -common-obj-$(CONFIG_ES1370) +=3D es1370.o -common-obj-$(CONFIG_AC97) +=3D ac97.o -common-obj-$(CONFIG_ADLIB) +=3D fmopl.o adlib.o -common-obj-$(CONFIG_GUS) +=3D gus.o gusemu_hal.o gusemu_mixer.o -common-obj-$(CONFIG_CS4231A) +=3D cs4231a.o -common-obj-$(CONFIG_HDA) +=3D intel-hda.o hda-codec.o - -common-obj-$(CONFIG_PCSPK) +=3D pcspk.o -common-obj-$(CONFIG_WM8750) +=3D wm8750.o -common-obj-$(CONFIG_PL041) +=3D pl041.o lm4549.o - -common-obj-$(CONFIG_CS4231) +=3D cs4231.o -common-obj-$(CONFIG_MARVELL_88W8618) +=3D marvell_88w8618.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-ac97.o - -common-obj-y +=3D soundhw.o diff --git a/hw/audio/meson.build b/hw/audio/meson.build new file mode 100644 index 0000000..549e9a0 --- /dev/null +++ b/hw/audio/meson.build @@ -0,0 +1,14 @@ +softmmu_ss.add(files('soundhw.c')) +softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c')) +softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c')) +softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c')) +softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c')) +softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c')) +softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c',= 'gusemu_mixer.c')) +softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-code= c.c')) +softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w= 8618.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-ac97.c'= )) +softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c')) +softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c')) +softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c')) +softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c')) diff --git a/hw/meson.build b/hw/meson.build index f968aa8..624335b 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('audio') subdir('block') subdir('char') subdir('core') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082592; cv=none; d=zohomail.com; s=zohoarc; b=BisUgzhuDMlG/s3lgFFfpjW3nxJye2Hl8egm9LxWWWb9kAtfVsZydJhjcuqSZE+EHtLu+sGEusmSatZ/RQpKlsA6UxRv4mgJFyBCkMpZphHT9migYkqIztRBPEOo9GPM5CheCXyZJFbrG5Np36VV+OxtBlBocs1SIX7Qo5rZX8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082592; 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=mcUBHQ8o0pTkLVDI132Dp4XMNtQa7fWUU610LOpCqzA=; b=ItkvdQnKRqSWzR8dam/c659rW9zJ2mP/5jCetrnNEKMCHN7VqiigpO4n5hyIQMW8YMq1hgk+yPE0ZtMuBs31YNWtX/fnQu+NbXtGPB+frDnhZsygylJ4mcM3Yx8EXeqikrs365BxMMxIHI1wpTjH88howoKoHN9calK1hTnrsAk= 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 1597082592135415.6187483097309; Mon, 10 Aug 2020 11:03:12 -0700 (PDT) Received: from localhost ([::1]:57890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C8c-0008M3-Op for importer@patchew.org; Mon, 10 Aug 2020 14:03:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLm-00032K-5O for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLd-0003Jx-RE for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:41 -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-44-BTxyVGh_M0anukHBmGROgA-1; Mon, 10 Aug 2020 13:12:30 -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 DC06F106B242 for ; Mon, 10 Aug 2020 17:12:29 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA7505F1E9; Mon, 10 Aug 2020 17:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079552; 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=mcUBHQ8o0pTkLVDI132Dp4XMNtQa7fWUU610LOpCqzA=; b=Et3Qb274lbm9V0uX6XV/4BacteF2qFPbI8LWaCeKMReoD6McSNfzbBJnldLq+BJYltMq24 oAYu7wjw/C47CnoYHAu8pgk8zwW8v9BaskJ6Uq9CvYndiA7s7wnruC5SZQc+XzsKrvz3CY 0Wq/JbwppmndpLhSG49aKDTv60nHQt0= X-MC-Unique: BTxyVGh_M0anukHBmGROgA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 121/147] meson: convert hw/adc Date: Mon, 10 Aug 2020 19:08:39 +0200 Message-Id: <1597079345-42801-122-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=63.128.21.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/10 13:09:25 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 --- hw/Makefile.objs | 1 - hw/adc/Makefile.objs | 1 - hw/adc/meson.build | 1 + hw/meson.build | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 hw/adc/Makefile.objs create mode 100644 hw/adc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index c0cbc0f..4bdb674 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,7 +1,6 @@ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-y +=3D acpi/ -devices-dirs-y +=3D adc/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs deleted file mode 100644 index 2b9dc36..0000000 --- a/hw/adc/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -common-obj-$(CONFIG_STM32F2XX_ADC) +=3D stm32f2xx_adc.o diff --git a/hw/adc/meson.build b/hw/adc/meson.build new file mode 100644 index 0000000..0d62ae9 --- /dev/null +++ b/hw/adc/meson.build @@ -0,0 +1 @@ +softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc= .c')) diff --git a/hw/meson.build b/hw/meson.build index 624335b..ffa3f06 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('adc') subdir('audio') subdir('block') subdir('char') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082265; cv=none; d=zohomail.com; s=zohoarc; b=jdAdrvnUBmbsiSd5zmTDlZxlux0taYUkvn/KVaCq42zi2N5QMVKEAK7QzPOjqcS6MCLwjrue37h6x+3Td28RM0Ykemaoptyb/X17w/TPw0n7DUGr6Qd/IxcmgjyIrIZA0s56LGUe8OkXlb1+K7Kna8V1bq6uwquOm4aJfNorNko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082265; 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=uMwCXBbuAcSBH1xta3qaNV59S+O7BdB/TdI6Kh9HkK4=; b=nQBBoML0uEXMd/l5d+VsYHyL+PIEQZgu7vE3Tm+uxepKfYrRJDqTN/I36a/vVznMFHq9tkRqHZh0ydqE0x2KBMXC6Yiut7w224CV/pR6NXF5NP9J6MYL6HfneDsJj5tXk+3izMFFxgtHKqC547q+Hui/duxJJFJjZ7hrro6CpZQ= 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 1597082265625179.38828269320607; Mon, 10 Aug 2020 10:57:45 -0700 (PDT) Received: from localhost ([::1]:37538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C3L-0008NH-4p for importer@patchew.org; Mon, 10 Aug 2020 13:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLl-00031Q-LT for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:32202 helo=us-smtp-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 1k5BLh-0003KG-Dc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:41 -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-389-R9gzsRukPmSQAjVqvGI6Tw-1; Mon, 10 Aug 2020 13:12:32 -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 46FFB19067E0 for ; Mon, 10 Aug 2020 17:12:31 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53E5A5F1E9; Mon, 10 Aug 2020 17:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079553; 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=uMwCXBbuAcSBH1xta3qaNV59S+O7BdB/TdI6Kh9HkK4=; b=MdG641oZeUSjA4gY08Cji23o1oIHnEYG50WIuAkW+Y1/9oXhnZ74DSzprTIbfE6/i8uuAA zQZH/Qve39i51C2gdyI3xJID2sKxuIokqenBioe7yvtp6lJsdTLTvhld0UBdW6djQdoNn9 jd9gaZ3akeNPPvX+eIueTPNC5eWtjUU= X-MC-Unique: R9gzsRukPmSQAjVqvGI6Tw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 122/147] meson: convert hw/acpi Date: Mon, 10 Aug 2020 19:08:40 +0200 Message-Id: <1597079345-42801-123-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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 --- hw/Makefile.objs | 1 - hw/acpi/Makefile.objs | 26 -------------------------- hw/acpi/meson.build | 25 +++++++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 hw/acpi/Makefile.objs create mode 100644 hw/acpi/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4bdb674..ebae00a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,6 +1,5 @@ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ -devices-dirs-y +=3D acpi/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs deleted file mode 100644 index 72886c7..0000000 --- a/hw/acpi/Makefile.objs +++ /dev/null @@ -1,26 +0,0 @@ -ifeq ($(CONFIG_ACPI),y) -common-obj-$(CONFIG_ACPI_X86) +=3D core.o piix4.o pcihp.o -common-obj-$(CONFIG_ACPI_X86_ICH) +=3D ich9.o tco.o -common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) +=3D cpu_hotplug.o -common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) +=3D memory_hotplug.o -common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) +=3D cpu.o -common-obj-$(CONFIG_ACPI_NVDIMM) +=3D nvdimm.o -common-obj-$(CONFIG_ACPI_VMGENID) +=3D vmgenid.o -common-obj-$(CONFIG_ACPI_HW_REDUCED) +=3D generic_event_device.o -common-obj-$(CONFIG_ACPI_HMAT) +=3D hmat.o -common-obj-$(CONFIG_ACPI_APEI) +=3D ghes.o -common-obj-$(call lnot,$(CONFIG_ACPI_X86)) +=3D acpi-stub.o -common-obj-$(call lnot,$(CONFIG_PC)) +=3D acpi-x86-stub.o - -common-obj-y +=3D acpi_interface.o -common-obj-y +=3D bios-linker-loader.o -common-obj-y +=3D aml-build.o utils.o -common-obj-$(CONFIG_ACPI_PCI) +=3D pci.o -common-obj-$(CONFIG_TPM) +=3D tpm.o - -common-obj-$(CONFIG_IPMI) +=3D ipmi.o -common-obj-$(call lnot,$(CONFIG_IPMI)) +=3D ipmi-stub.o -else -common-obj-y +=3D acpi-stub.o aml-build-stub.o -endif -common-obj-$(CONFIG_ALL) +=3D acpi-stub.o aml-build-stub.o acpi-x86-stub.o= ipmi-stub.o diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build new file mode 100644 index 0000000..dd69577 --- /dev/null +++ b/hw/acpi/meson.build @@ -0,0 +1,25 @@ +acpi_ss =3D ss.source_set() +acpi_ss.add(files( + 'acpi_interface.c', + 'aml-build.c', + 'bios-linker-loader.c', + 'utils.c', +)) +acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) +acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c= ')) +acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true: files('memory_hot= plug.c')) +acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c')) +acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) +acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_= device.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) +acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) +acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', '= pcihp.c'), if_false: files('acpi-stub.c')) +acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) +acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files= ('ipmi-stub.c')) +acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) +acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c')) +softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-bu= ild-stub.c')) +softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-buil= d-stub.c', + 'acpi-x86-stub.c', 'ipmi= -stub.c')) diff --git a/hw/meson.build b/hw/meson.build index ffa3f06..55ca2b2 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('acpi') subdir('adc') subdir('audio') subdir('block') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082948; cv=none; d=zohomail.com; s=zohoarc; b=HPo78LXT9yjvWUOpHhuSTrJ6HTPEIiov0lzE9NjR6uDNySIFLIvxtdh3budJh0FhJCo/nD8wZb+vKh9vo5czGjNZ2CkV3+ieMys0D1RP5vZmRAkFx4/MWuyBX2q7lvd2FDPRBSO9qkXdpPXxYYMUI9u9Q2t+2tY3h/XPmyzfF+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082948; 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=22dwj85rzdT+HxwYJs0P94NicLX513UhiS2yw3vRXtk=; b=ApufNBU/D2tyROPmfdXXQSGSIZB8U+Z4EP2biqpVZfJ//ESynsd2DihWm73G0Q2mvQzzyPoymXldkg9zaYBwiz6Em2gIvDcYlk9Gn2m1M5OK0dDyDVEx1mpPmh9fdHkvfAQ7i+s6gb1q5nT6uXGNrDrCzf1VNlNb6LaZg/PHUK8= 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 1597082948680728.8394729536119; Mon, 10 Aug 2020 11:09:08 -0700 (PDT) Received: from localhost ([::1]:60360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CEN-0003r9-F1 for importer@patchew.org; Mon, 10 Aug 2020 14:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLo-00032y-1a for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34463 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 1k5BLi-0003KR-5y for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:43 -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-432-e1Berxm6MyKVT0D1c1H_BQ-1; Mon, 10 Aug 2020 13:12:33 -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 A58EE8005B0 for ; Mon, 10 Aug 2020 17:12:32 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2E695F1E9; Mon, 10 Aug 2020 17:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079555; 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=22dwj85rzdT+HxwYJs0P94NicLX513UhiS2yw3vRXtk=; b=Kcb8/3IBNsYSgS9ZQo8hw3wnRR2cZRVrwJ7OivGtC+NmY+aO+lSBKFkLEPSXHlQqQZa47P sgzbN9gegVV6vBPi+ryla01IdlbwOp2tc55EfRqPIylMubfIhUDt1GqJIfKWYqYO8ER7Fs paDCgVIeK+B997koAYs+QHZm7j8lAF8= X-MC-Unique: e1Berxm6MyKVT0D1c1H_BQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 123/147] meson: convert hw/9pfs, cleanup Date: Mon, 10 Aug 2020 19:08:41 +0200 Message-Id: <1597079345-42801-124-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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 hw/Makefile.objs is gone so there is more code that can be removed. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 4 ---- Makefile.objs | 8 -------- Makefile.target | 15 --------------- hw/9pfs/Kconfig | 4 ++++ hw/9pfs/Makefile.objs | 9 --------- hw/9pfs/meson.build | 20 ++++++++++++++++++++ hw/Makefile.objs | 8 -------- hw/meson.build | 1 + 8 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 hw/9pfs/Makefile.objs create mode 100644 hw/9pfs/meson.build delete mode 100644 hw/Makefile.objs diff --git a/Makefile b/Makefile index 64d644d..5e8f281 100644 --- a/Makefile +++ b/Makefile @@ -162,10 +162,6 @@ ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs endif =20 -dummy :=3D $(call unnest-vars,, \ - common-obj-y \ - common-obj-m) - include $(SRC_PATH)/tests/Makefile.include =20 all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules diff --git a/Makefile.objs b/Makefile.objs index c332323..c9720a9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -61,18 +61,10 @@ common-obj-$(if $(CONFIG_RBD),m) +=3D block-rbd$(DSOSUF) common-obj-$(if $(CONFIG_LZFSE),m) +=3D block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=3D block-dmg-bz2= $(DSOSUF) =20 -common-obj-y +=3D hw/ -common-obj-m +=3D hw/ - common-obj-y +=3D libqmp.fa =20 endif # CONFIG_SOFTMMU =20 -####################################################################### -# Target-independent parts used in system and user emulation - -common-obj-y +=3D hw/ - ###################################################################### # Resource file for Windows executables version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o diff --git a/Makefile.target b/Makefile.target index 3534ece..c95e0de 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 hw/ LIBS :=3D $(libs_softmmu) $(LIBS) =20 # Temporary until emulators are linked by Meson @@ -185,20 +184,6 @@ endif # CONFIG_SOFTMMU dummy :=3D $(call unnest-vars,,obj-y) all-obj-y :=3D $(obj-y) =20 -# -# common-obj-m has some crap here, probably as side effect from -# unnest-vars recursing into target directories to fill obj-y and not -# properly handling the -m case. -# -# Clear common-obj-m as workaround. Fixes suspious dependency errors -# when building devices as modules. A bit hackish, but should be ok -# as long as we do not have any target-specific modules. -# -# The meson-based build system currently in development doesn't need -# unnest-vars and will obsolete this workaround. -# -common-obj-m :=3D - include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 3ae5749..d3ebd73 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -2,8 +2,12 @@ config FSDEV_9P bool depends on VIRTFS =20 +config 9PFS + bool + config VIRTIO_9P bool default y depends on VIRTFS && VIRTIO select FSDEV_9P + select 9PFS diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs deleted file mode 100644 index 70ded6f..0000000 --- a/hw/9pfs/Makefile.objs +++ /dev/null @@ -1,9 +0,0 @@ -common-obj-y =3D 9p.o 9p-util.o -common-obj-y +=3D 9p-local.o 9p-xattr.o -common-obj-y +=3D 9p-xattr-user.o 9p-posix-acl.o -common-obj-y +=3D coth.o cofs.o codir.o cofile.o -common-obj-y +=3D coxattr.o 9p-synth.o -common-obj-y +=3D 9p-proxy.o - -common-obj-$(CONFIG_XEN) +=3D xen-9p-backend.o -obj-$(CONFIG_VIRTIO_9P) +=3D virtio-9p-device.o diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build new file mode 100644 index 0000000..cc09426 --- /dev/null +++ b/hw/9pfs/meson.build @@ -0,0 +1,20 @@ +fs_ss =3D ss.source_set() +fs_ss.add(files( + '9p-local.c', + '9p-posix-acl.c', + '9p-proxy.c', + '9p-synth.c', + '9p-util.c', + '9p-xattr-user.c', + '9p-xattr.c', + '9p.c', + 'codir.c', + 'cofile.c', + 'cofs.c', + 'coth.c', + 'coxattr.c', +)) +fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) +softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) + +specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device= .c')) diff --git a/hw/Makefile.objs b/hw/Makefile.objs deleted file mode 100644 index ebae00a..0000000 --- a/hw/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -ifeq ($(CONFIG_SOFTMMU), y) -devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ -endif - -common-obj-y +=3D $(devices-dirs-y) -common-obj-m +=3D display/ -common-obj-m +=3D usb/ -obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 55ca2b2..ba8763c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('9pfs') subdir('acpi') subdir('adc') subdir('audio') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083056; cv=none; d=zohomail.com; s=zohoarc; b=bwNMgRbKecRTHYVgIIe0JTg/hRuakf4pU0OQPpnUARdVIEpIpCprWiyv1yLjj5T5mpldZrnNxwnQrEx/nyZwTTssv9g/8LDet9BYatdgUIr60v69mlyx+tttL3L6hEFRgiq7PfjuUVVskksgOTXvUGbtvuQ2LVOI/InqxwBdFy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083056; 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=1UdiDMafw/fSVfYhnYxUJwt5fGri63IaejaV2z0A+9w=; b=Y7oIRld0YovNzleJiJqf6HMqVrfqThEpeN+22IiDifEz5+ZC8HHMmMWSdWmmlthRk1d9PhQ95LQug2/fLRdil63qnpDOuLPTVvFU5sohrLlxkqic0vp4ezQV7HfJoSLcsLazg51Jwd+Gm5udaoXjmfJgtCatRaWBxv1Z9PrITrY= 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 1597083056271951.9453409708996; Mon, 10 Aug 2020 11:10:56 -0700 (PDT) Received: from localhost ([::1]:40750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CG6-0007Hz-PO for importer@patchew.org; Mon, 10 Aug 2020 14:10:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLp-00036a-CC for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:45 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:59697 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 1k5BLj-0003Kh-UX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:44 -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-97-iQL54fS2MSeW_RMIXEMFhg-1; Mon, 10 Aug 2020 13:12:34 -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 0D07A107ACCA for ; Mon, 10 Aug 2020 17:12:34 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E55C5F1E9; Mon, 10 Aug 2020 17:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079557; 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=1UdiDMafw/fSVfYhnYxUJwt5fGri63IaejaV2z0A+9w=; b=DIk0X1KpL8ocnfVTLORBBO4CxyAreYqbLmWe/60lJbESqwu/015dgxhhCsV5xeknWC4O9l JfKEYekw9eHbXCd5t/2qYuuo4ffUIIycD9ufJX4UzMV1I2yGnAbir7xXQf5e3codXaYTcp PIoi0AeuHaGz8pW6oAeDDRQCutiCdVo= X-MC-Unique: iQL54fS2MSeW_RMIXEMFhg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 124/147] meson: convert hw/arch* Date: Mon, 10 Aug 2020 19:08:42 +0200 Message-Id: <1597079345-42801-125-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.target | 7 ---- hw/alpha/Makefile.objs | 1 - hw/alpha/meson.build | 8 +++++ hw/arm/Makefile.objs | 56 ------------------------------- hw/arm/meson.build | 59 +++++++++++++++++++++++++++++++++ hw/avr/Makefile.objs | 3 -- hw/avr/meson.build | 6 ++++ hw/cris/Makefile.objs | 2 -- hw/cris/meson.build | 5 +++ hw/hppa/Makefile.objs | 1 - hw/hppa/meson.build | 4 +++ hw/i386/Makefile.objs | 20 ------------ hw/i386/kvm/Makefile.objs | 5 --- hw/i386/kvm/meson.build | 8 +++++ hw/i386/meson.build | 32 ++++++++++++++++++ hw/i386/xen/Makefile.objs | 1 - hw/i386/xen/meson.build | 7 ++++ hw/lm32/Makefile.objs | 3 -- hw/lm32/meson.build | 6 ++++ hw/m68k/Makefile.objs | 4 --- hw/m68k/meson.build | 7 ++++ hw/meson.build | 25 ++++++++++++++ hw/microblaze/Makefile.objs | 4 --- hw/microblaze/meson.build | 7 ++++ hw/mips/Makefile.objs | 8 ----- hw/mips/meson.build | 11 +++++++ hw/moxie/Makefile.objs | 2 -- hw/moxie/meson.build | 4 +++ hw/nios2/Makefile.objs | 3 -- hw/nios2/meson.build | 6 ++++ hw/openrisc/Makefile.objs | 2 -- hw/openrisc/meson.build | 5 +++ hw/ppc/Makefile.objs | 35 -------------------- hw/ppc/meson.build | 80 +++++++++++++++++++++++++++++++++++++++++= ++++ hw/riscv/Makefile.objs | 16 --------- hw/riscv/meson.build | 19 +++++++++++ hw/rx/Makefile.objs | 2 -- hw/rx/meson.build | 5 +++ hw/s390x/Makefile.objs | 37 --------------------- hw/s390x/meson.build | 46 ++++++++++++++++++++++++++ hw/sh4/Makefile.objs | 4 --- hw/sh4/meson.build | 10 ++++++ hw/sparc/Makefile.objs | 3 -- hw/sparc/meson.build | 6 ++++ hw/sparc64/Makefile.objs | 4 --- hw/sparc64/meson.build | 6 ++++ hw/tricore/Makefile.objs | 1 - hw/tricore/meson.build | 4 +++ hw/unicore32/Makefile.objs | 4 --- hw/unicore32/meson.build | 5 +++ hw/xenpv/Makefile.objs | 2 -- hw/xenpv/meson.build | 3 ++ hw/xtensa/Makefile.objs | 6 ---- hw/xtensa/meson.build | 11 +++++++ meson.build | 4 +++ 55 files changed, 399 insertions(+), 236 deletions(-) delete mode 100644 hw/alpha/Makefile.objs create mode 100644 hw/alpha/meson.build delete mode 100644 hw/arm/Makefile.objs create mode 100644 hw/arm/meson.build delete mode 100644 hw/avr/Makefile.objs create mode 100644 hw/avr/meson.build delete mode 100644 hw/cris/Makefile.objs create mode 100644 hw/cris/meson.build delete mode 100644 hw/hppa/Makefile.objs create mode 100644 hw/hppa/meson.build delete mode 100644 hw/i386/Makefile.objs delete mode 100644 hw/i386/kvm/Makefile.objs create mode 100644 hw/i386/kvm/meson.build create mode 100644 hw/i386/meson.build delete mode 100644 hw/i386/xen/Makefile.objs create mode 100644 hw/i386/xen/meson.build delete mode 100644 hw/lm32/Makefile.objs create mode 100644 hw/lm32/meson.build delete mode 100644 hw/m68k/Makefile.objs create mode 100644 hw/m68k/meson.build delete mode 100644 hw/microblaze/Makefile.objs create mode 100644 hw/microblaze/meson.build delete mode 100644 hw/mips/Makefile.objs create mode 100644 hw/mips/meson.build delete mode 100644 hw/moxie/Makefile.objs create mode 100644 hw/moxie/meson.build delete mode 100644 hw/nios2/Makefile.objs create mode 100644 hw/nios2/meson.build delete mode 100644 hw/openrisc/Makefile.objs create mode 100644 hw/openrisc/meson.build delete mode 100644 hw/ppc/Makefile.objs create mode 100644 hw/ppc/meson.build delete mode 100644 hw/riscv/Makefile.objs create mode 100644 hw/riscv/meson.build delete mode 100644 hw/rx/Makefile.objs create mode 100644 hw/rx/meson.build delete mode 100644 hw/s390x/Makefile.objs create mode 100644 hw/s390x/meson.build delete mode 100644 hw/sh4/Makefile.objs create mode 100644 hw/sh4/meson.build delete mode 100644 hw/sparc/Makefile.objs create mode 100644 hw/sparc/meson.build delete mode 100644 hw/sparc64/Makefile.objs create mode 100644 hw/sparc64/meson.build delete mode 100644 hw/tricore/Makefile.objs create mode 100644 hw/tricore/meson.build delete mode 100644 hw/unicore32/Makefile.objs create mode 100644 hw/unicore32/meson.build delete mode 100644 hw/xenpv/Makefile.objs create mode 100644 hw/xenpv/meson.build delete mode 100644 hw/xtensa/Makefile.objs create mode 100644 hw/xtensa/meson.build diff --git a/Makefile.target b/Makefile.target index c95e0de..28cefba 100644 --- a/Makefile.target +++ b/Makefile.target @@ -170,13 +170,6 @@ LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) LIBS :=3D $(LIBS) $(VIRGL_LIBS) =20 -# Hardware support -ifeq ($(TARGET_NAME), sparc64) -obj-y +=3D hw/sparc64/ -else -obj-y +=3D hw/$(TARGET_BASE_ARCH)/ -endif - generated-files-y +=3D hmp-commands.h hmp-commands-info.h =20 endif # CONFIG_SOFTMMU diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs deleted file mode 100644 index 62fdf3e..0000000 --- a/hw/alpha/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_DP264) +=3D dp264.o pci.o typhoon.o diff --git a/hw/alpha/meson.build b/hw/alpha/meson.build new file mode 100644 index 0000000..81ca215 --- /dev/null +++ b/hw/alpha/meson.build @@ -0,0 +1,8 @@ +alpha_ss =3D ss.source_set() +alpha_ss.add(when: 'CONFIG_DP264', if_true: files( + 'dp264.c', + 'pci.c', + 'typhoon.c', +)) + +hw_arch +=3D {'alpha': alpha_ss} diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs deleted file mode 100644 index 534a6a1..0000000 --- a/hw/arm/Makefile.objs +++ /dev/null @@ -1,56 +0,0 @@ -obj-y +=3D boot.o -obj-$(CONFIG_PLATFORM_BUS) +=3D sysbus-fdt.o -obj-$(CONFIG_ARM_VIRT) +=3D virt.o -obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o -obj-$(CONFIG_DIGIC) +=3D digic_boards.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o -obj-$(CONFIG_EMCRAFT_SF2) +=3D msf2-som.o -obj-$(CONFIG_HIGHBANK) +=3D highbank.o -obj-$(CONFIG_INTEGRATOR) +=3D integratorcp.o -obj-$(CONFIG_MAINSTONE) +=3D mainstone.o -obj-$(CONFIG_MICROBIT) +=3D microbit.o -obj-$(CONFIG_MUSICPAL) +=3D musicpal.o -obj-$(CONFIG_NETDUINO2) +=3D netduino2.o -obj-$(CONFIG_NETDUINOPLUS2) +=3D netduinoplus2.o -obj-$(CONFIG_NSERIES) +=3D nseries.o -obj-$(CONFIG_SX1) +=3D omap_sx1.o -obj-$(CONFIG_CHEETAH) +=3D palm.o -obj-$(CONFIG_GUMSTIX) +=3D gumstix.o -obj-$(CONFIG_SPITZ) +=3D spitz.o -obj-$(CONFIG_TOSA) +=3D tosa.o -obj-$(CONFIG_Z2) +=3D z2.o -obj-$(CONFIG_REALVIEW) +=3D realview.o -obj-$(CONFIG_SBSA_REF) +=3D sbsa-ref.o -obj-$(CONFIG_STELLARIS) +=3D stellaris.o -obj-$(CONFIG_COLLIE) +=3D collie.o -obj-$(CONFIG_VERSATILE) +=3D versatilepb.o -obj-$(CONFIG_VEXPRESS) +=3D vexpress.o -obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o -obj-$(CONFIG_SABRELITE) +=3D sabrelite.o - -obj-$(CONFIG_ARM_V7M) +=3D armv7m.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210.o -obj-$(CONFIG_PXA2XX) +=3D pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o -obj-$(CONFIG_DIGIC) +=3D digic.o -obj-$(CONFIG_OMAP) +=3D omap1.o omap2.o -obj-$(CONFIG_STRONGARM) +=3D strongarm.o -obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o -obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3.o orangepi.o -obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o -obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o -obj-$(CONFIG_STM32F405_SOC) +=3D stm32f405_soc.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zynqmp.o xlnx-zcu102.o -obj-$(CONFIG_XLNX_VERSAL) +=3D xlnx-versal.o xlnx-versal-virt.o -obj-$(CONFIG_FSL_IMX25) +=3D fsl-imx25.o imx25_pdk.o -obj-$(CONFIG_FSL_IMX31) +=3D fsl-imx31.o kzm.o -obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o -obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_soc.o aspeed.o aspeed_ast2600.o -obj-$(CONFIG_MPS2) +=3D mps2.o -obj-$(CONFIG_MPS2) +=3D mps2-tz.o -obj-$(CONFIG_MSF2) +=3D msf2-soc.o -obj-$(CONFIG_MUSCA) +=3D musca.o -obj-$(CONFIG_ARMSSE) +=3D armsse.o -obj-$(CONFIG_FSL_IMX7) +=3D fsl-imx7.o mcimx7d-sabre.o -obj-$(CONFIG_ARM_SMMUV3) +=3D smmu-common.o smmuv3.o -obj-$(CONFIG_FSL_IMX6UL) +=3D fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) +=3D nrf51_soc.o diff --git a/hw/arm/meson.build b/hw/arm/meson.build new file mode 100644 index 0000000..1ae5e17 --- /dev/null +++ b/hw/arm/meson.build @@ -0,0 +1,59 @@ +arm_ss =3D ss.source_set() +arm_ss.add(files('boot.c')) +arm_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c')) +arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) +arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) +arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) +arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) +arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) +arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) +arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) +arm_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mainstone.c')) +arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) +arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c')) +arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) +arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) +arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c')) +arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) +arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) +arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c')) +arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c')) +arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) +arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) +arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) +arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) +arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) +arm_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) +arm_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) +arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) +arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) +arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c')) + +arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c')) +arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c')) +arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.= c', 'pxa2xx_pic.c')) +arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c')) +arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c')) +arm_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) +arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c',= 'cubieboard.c')) +arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', '= orangepi.c')) +arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c', '= bcm2836.c', 'raspi.c')) +arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) +arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) +arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c',= 'xlnx-zcu102.c')) +arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xl= nx-versal-virt.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_= pdk.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c'= )) +arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) +arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_soc.c', 'aspe= ed.c', 'aspeed_ast2600.c')) +arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) +arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) +arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) +arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) +arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-= sabre.c')) +arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smm= uv3.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcim= x6ul-evk.c')) +arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) + +hw_arch +=3D {'arm': arm_ss} diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs deleted file mode 100644 index 4dca064..0000000 --- a/hw/avr/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D boot.o -obj-$(CONFIG_AVR_ATMEGA_MCU) +=3D atmega.o -obj-$(CONFIG_ARDUINO) +=3D arduino.o diff --git a/hw/avr/meson.build b/hw/avr/meson.build new file mode 100644 index 0000000..46d53fb --- /dev/null +++ b/hw/avr/meson.build @@ -0,0 +1,6 @@ +avr_ss =3D ss.source_set() +avr_ss.add(files('boot.c')) +avr_ss.add(when: 'CONFIG_AVR_ATMEGA_MCU', if_true: files('atmega.c')) +avr_ss.add(when: 'CONFIG_ARDUINO', if_true: files('arduino.c')) + +hw_arch +=3D {'avr': avr_ss} diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs deleted file mode 100644 index a4a27b3..0000000 --- a/hw/cris/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y +=3D boot.o -obj-$(CONFIG_AXIS) +=3D axis_dev88.o diff --git a/hw/cris/meson.build b/hw/cris/meson.build new file mode 100644 index 0000000..dc808a4 --- /dev/null +++ b/hw/cris/meson.build @@ -0,0 +1,5 @@ +cris_ss =3D ss.source_set() +cris_ss.add(files('boot.c')) +cris_ss.add(when: 'CONFIG_AXIS', if_true: files('axis_dev88.c')) + +hw_arch +=3D {'cris': cris_ss} diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs deleted file mode 100644 index eac3467..0000000 --- a/hw/hppa/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_DINO) +=3D pci.o machine.o dino.o lasi.o diff --git a/hw/hppa/meson.build b/hw/hppa/meson.build new file mode 100644 index 0000000..1deae83 --- /dev/null +++ b/hw/hppa/meson.build @@ -0,0 +1,4 @@ +hppa_ss =3D ss.source_set() +hppa_ss.add(when: 'CONFIG_DINO', if_true: files('pci.c', 'machine.c', 'din= o.c', 'lasi.c')) + +hw_arch +=3D {'hppa': hppa_ss} diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs deleted file mode 100644 index 6abc745..0000000 --- a/hw/i386/Makefile.objs +++ /dev/null @@ -1,20 +0,0 @@ -obj-$(CONFIG_KVM) +=3D kvm/ -obj-y +=3D e820_memory_layout.o multiboot.o -obj-y +=3D x86.o -obj-$(CONFIG_PC) +=3D pc.o pc_sysfw.o -obj-$(CONFIG_I440FX) +=3D pc_piix.o -obj-$(CONFIG_Q35) +=3D pc_q35.o -obj-$(CONFIG_MICROVM) +=3D microvm.o -obj-y +=3D fw_cfg.o -obj-$(CONFIG_X86_IOMMU) +=3D x86-iommu.o -obj-$(call lnot,$(CONFIG_X86_IOMMU)) +=3D x86-iommu-stub.o -obj-$(CONFIG_VTD) +=3D intel_iommu.o -obj-$(CONFIG_AMD_IOMMU) +=3D amd_iommu.o -obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ -obj-$(CONFIG_VMPORT) +=3D vmport.o -obj-$(CONFIG_VMMOUSE) +=3D vmmouse.o -obj-$(CONFIG_PC) +=3D port92.o - -obj-y +=3D kvmvapic.o -obj-$(CONFIG_ACPI) +=3D acpi-common.o -obj-$(CONFIG_PC) +=3D acpi-build.o diff --git a/hw/i386/kvm/Makefile.objs b/hw/i386/kvm/Makefile.objs deleted file mode 100644 index 0c8d5f2..0000000 --- a/hw/i386/kvm/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y +=3D clock.o -obj-$(CONFIG_APIC) +=3D apic.o -obj-$(CONFIG_IOAPIC) +=3D ioapic.o -obj-$(CONFIG_I8254) +=3D i8254.o -obj-$(CONFIG_I8259) +=3D i8259.o diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build new file mode 100644 index 0000000..95467f1 --- /dev/null +++ b/hw/i386/kvm/meson.build @@ -0,0 +1,8 @@ +i386_kvm_ss =3D ss.source_set() +i386_kvm_ss.add(files('clock.c')) +i386_kvm_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c')) +i386_kvm_ss.add(when: 'CONFIG_I8254', if_true: files('i8254.c')) +i386_kvm_ss.add(when: 'CONFIG_I8259', if_true: files('i8259.c')) +i386_kvm_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) + +i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss) diff --git a/hw/i386/meson.build b/hw/i386/meson.build new file mode 100644 index 0000000..63918fb --- /dev/null +++ b/hw/i386/meson.build @@ -0,0 +1,32 @@ +i386_ss =3D ss.source_set() +i386_ss.add(files( + 'fw_cfg.c', + 'kvmvapic.c', + 'e820_memory_layout.c', + 'multiboot.c', + 'x86.c', +)) + +i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'), + if_false: files('x86-iommu-stub.c')) +i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c')) +i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c')) +i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('microvm.c')) +i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c')) +i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c')) +i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c')) +i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c')) + +i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c')) +i386_ss.add(when: 'CONFIG_PC', if_true: files( + 'pc.c', + 'pc_sysfw.c', + 'acpi-build.c', + 'port92.c')) + +subdir('kvm') +subdir('xen') + +i386_ss.add_all(xenpv_ss) + +hw_arch +=3D {'i386': i386_ss} diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs deleted file mode 100644 index be9d10c..0000000 --- a/hw/i386/xen/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y +=3D xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o xen-mapcache= .o diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build new file mode 100644 index 0000000..be84130 --- /dev/null +++ b/hw/i386/xen/meson.build @@ -0,0 +1,7 @@ +i386_ss.add(when: 'CONFIG_XEN', if_true: files( + 'xen-hvm.c', + 'xen-mapcache.c', + 'xen_apic.c', + 'xen_platform.c', + 'xen_pvdevice.c', +)) diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs deleted file mode 100644 index c394186..0000000 --- a/hw/lm32/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -# LM32 boards -obj-$(CONFIG_LM32) +=3D lm32_boards.o -obj-$(CONFIG_MILKYMIST) +=3D milkymist.o diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build new file mode 100644 index 0000000..8caf0a7 --- /dev/null +++ b/hw/lm32/meson.build @@ -0,0 +1,6 @@ +lm32_ss =3D ss.source_set() +# LM32 boards +lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c')) +lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c')) + +hw_arch +=3D {'lm32': lm32_ss} diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs deleted file mode 100644 index b2c9e5a..0000000 --- a/hw/m68k/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_AN5206) +=3D an5206.o mcf5206.o -obj-$(CONFIG_MCF5208) +=3D mcf5208.o mcf_intc.o -obj-$(CONFIG_NEXTCUBE) +=3D next-kbd.o next-cube.o -obj-$(CONFIG_Q800) +=3D q800.o diff --git a/hw/m68k/meson.build b/hw/m68k/meson.build new file mode 100644 index 0000000..ca0044c6 --- /dev/null +++ b/hw/m68k/meson.build @@ -0,0 +1,7 @@ +m68k_ss =3D ss.source_set() +m68k_ss.add(when: 'CONFIG_AN5206', if_true: files('an5206.c', 'mcf5206.c')) +m68k_ss.add(when: 'CONFIG_MCF5208', if_true: files('mcf5208.c', 'mcf_intc.= c')) +m68k_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-kbd.c', 'next-cu= be.c')) +m68k_ss.add(when: 'CONFIG_Q800', if_true: files('q800.c')) + +hw_arch +=3D {'m68k': m68k_ss} diff --git a/hw/meson.build b/hw/meson.build index ba8763c..010de72 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -40,3 +40,28 @@ subdir('vfio') subdir('virtio') subdir('watchdog') subdir('xen') +subdir('xenpv') + +subdir('alpha') +subdir('arm') +subdir('avr') +subdir('cris') +subdir('hppa') +subdir('i386') +subdir('lm32') +subdir('m68k') +subdir('microblaze') +subdir('mips') +subdir('moxie') +subdir('nios2') +subdir('openrisc') +subdir('ppc') +subdir('riscv') +subdir('rx') +subdir('s390x') +subdir('sh4') +subdir('sparc') +subdir('sparc64') +subdir('tricore') +subdir('unicore32') +subdir('xtensa') diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs deleted file mode 100644 index 8595a62..0000000 --- a/hw/microblaze/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_PETALOGIX_S3ADSP1800) +=3D petalogix_s3adsp1800_mmu.o -obj-$(CONFIG_PETALOGIX_ML605) +=3D petalogix_ml605_mmu.o -obj-$(CONFIG_XLNX_ZYNQMP_PMU) +=3D xlnx-zynqmp-pmu.o -obj-y +=3D boot.o diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build new file mode 100644 index 0000000..bb9e4eb --- /dev/null +++ b/hw/microblaze/meson.build @@ -0,0 +1,7 @@ +microblaze_ss =3D ss.source_set() +microblaze_ss.add(files('boot.c')) +microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true: files('pet= alogix_s3adsp1800_mmu.c')) +microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true: files('petalogi= x_ml605_mmu.c')) +microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-zyn= qmp-pmu.c')) + +hw_arch +=3D {'microblaze': microblaze_ss} diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs deleted file mode 100644 index 739e2b7..0000000 --- a/hw/mips/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y +=3D addr.o mips_int.o -obj-$(CONFIG_R4K) +=3D r4k.o -obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o malta.o -obj-$(CONFIG_MIPSSIM) +=3D mipssim.o -obj-$(CONFIG_JAZZ) +=3D jazz.o -obj-$(CONFIG_FULOONG) +=3D fuloong2e.o -obj-$(CONFIG_MIPS_CPS) +=3D cps.o -obj-$(CONFIG_MIPS_BOSTON) +=3D boston.o diff --git a/hw/mips/meson.build b/hw/mips/meson.build new file mode 100644 index 0000000..6ac9dc4 --- /dev/null +++ b/hw/mips/meson.build @@ -0,0 +1,11 @@ +mips_ss =3D ss.source_set() +mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) +mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) +mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c= ')) +mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) +mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: files('boston.c')) +mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) +mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c')) + +hw_arch +=3D {'mips': mips_ss} diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs deleted file mode 100644 index ddbf300..0000000 --- a/hw/moxie/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -# moxie boards -obj-$(CONFIG_MOXIESIM) +=3D moxiesim.o diff --git a/hw/moxie/meson.build b/hw/moxie/meson.build new file mode 100644 index 0000000..05a7c2e --- /dev/null +++ b/hw/moxie/meson.build @@ -0,0 +1,4 @@ +moxie_ss =3D ss.source_set() +moxie_ss.add(when: 'CONFIG_MOXIESIM', if_true: files('moxiesim.c')) + +hw_arch +=3D {'moxie': moxie_ss} diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs deleted file mode 100644 index 3e01798..0000000 --- a/hw/nios2/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y =3D boot.o cpu_pic.o -obj-$(CONFIG_NIOS2_10M50) +=3D 10m50_devboard.o -obj-$(CONFIG_NIOS2_GENERIC_NOMMU) +=3D generic_nommu.o diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build new file mode 100644 index 0000000..dd66ebb --- /dev/null +++ b/hw/nios2/meson.build @@ -0,0 +1,6 @@ +nios2_ss =3D ss.source_set() +nios2_ss.add(files('boot.c', 'cpu_pic.c')) +nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c'= )) +nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true: files('generic_n= ommu.c')) + +hw_arch +=3D {'nios2': nios2_ss} diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs deleted file mode 100644 index aa04de7..0000000 --- a/hw/openrisc/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y =3D pic_cpu.o cputimer.o -obj-$(CONFIG_OR1K_SIM) +=3D openrisc_sim.o diff --git a/hw/openrisc/meson.build b/hw/openrisc/meson.build new file mode 100644 index 0000000..57c4255 --- /dev/null +++ b/hw/openrisc/meson.build @@ -0,0 +1,5 @@ +openrisc_ss =3D ss.source_set() +openrisc_ss.add(files('pic_cpu.c', 'cputimer.c')) +openrisc_ss.add(when: 'CONFIG_OR1K_SIM', if_true: files('openrisc_sim.c')) + +hw_arch +=3D {'openrisc': openrisc_ss} diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs deleted file mode 100644 index c3d3cc5..0000000 --- a/hw/ppc/Makefile.objs +++ /dev/null @@ -1,35 +0,0 @@ -# shared objects -obj-y +=3D ppc.o ppc_booke.o -obj-$(CONFIG_FDT_PPC) +=3D fdt.o -obj-$(CONFIG_FW_CFG_PPC) +=3D fw_cfg.o -# IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events.o -obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o -obj-$(CONFIG_PSERIES) +=3D spapr_pci.o spapr_rtc.o spapr_drc.o -obj-$(CONFIG_PSERIES) +=3D spapr_cpu_core.o spapr_ovec.o spapr_irq.o -obj-$(CONFIG_PSERIES) +=3D spapr_tpm_proxy.o spapr_nvdimm.o -obj-$(CONFIG_SPAPR_RNG) +=3D spapr_rng.o -obj-$(call land,$(CONFIG_PSERIES),$(CONFIG_LINUX)) +=3D spapr_pci_vfio.o s= papr_pci_nvlink2.o -# IBM PowerNV -obj-$(CONFIG_POWERNV) +=3D pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.= o pnv_occ.o pnv_bmc.o -obj-$(CONFIG_POWERNV) +=3D pnv_homer.o pnv_pnor.o - -obj-$(CONFIG_PSERIES) +=3D spapr_rtas_ddw.o -# PowerPC 4xx boards -obj-$(CONFIG_PPC405) +=3D ppc405_boards.o ppc405_uc.o -obj-$(CONFIG_PPC440) +=3D ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o -obj-$(CONFIG_PPC4XX) +=3D ppc4xx_pci.o ppc4xx_devs.o -obj-$(CONFIG_SAM460EX) +=3D sam460ex.o -# PReP -obj-$(CONFIG_PREP) +=3D prep.o -obj-$(CONFIG_PREP) +=3D prep_systemio.o -obj-${CONFIG_RS6000_MC} +=3D rs6000_mc.o -# OldWorld PowerMac -obj-$(CONFIG_MAC_OLDWORLD) +=3D mac_oldworld.o -# NewWorld PowerMac -obj-$(CONFIG_MAC_NEWWORLD) +=3D mac_newworld.o -# e500 -obj-$(CONFIG_E500) +=3D e500.o mpc8544ds.o e500plat.o -obj-$(CONFIG_E500) +=3D mpc8544_guts.o ppce500_spin.o -# PowerPC 440 Xilinx ML507 reference board. -obj-$(CONFIG_VIRTEX) +=3D virtex_ml507.o diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build new file mode 100644 index 0000000..918969b --- /dev/null +++ b/hw/ppc/meson.build @@ -0,0 +1,80 @@ +ppc_ss =3D ss.source_set() +ppc_ss.add(files( + 'ppc.c', + 'ppc_booke.c', +)) +ppc_ss.add(when: 'CONFIG_FDT_PPC', if_true: [files( + 'fdt.c', +), fdt]) +ppc_ss.add(when: 'CONFIG_FW_CFG_PPC', if_true: files('fw_cfg.c')) + +# IBM pSeries (sPAPR) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( + 'spapr.c', + 'spapr_caps.c', + 'spapr_vio.c', + 'spapr_events.c', + 'spapr_hcall.c', + 'spapr_iommu.c', + 'spapr_rtas.c', + 'spapr_pci.c', + 'spapr_rtc.c', + 'spapr_drc.c', + 'spapr_cpu_core.c', + 'spapr_ovec.c', + 'spapr_irq.c', + 'spapr_tpm_proxy.c', + 'spapr_nvdimm.c', + 'spapr_rtas_ddw.c' +)) +ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) +ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files( + 'spapr_pci_vfio.c', + 'spapr_pci_nvlink2.c' +)) + +# IBM PowerNV +ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( + 'pnv.c', + 'pnv_xscom.c', + 'pnv_core.c', + 'pnv_lpc.c', + 'pnv_psi.c', + 'pnv_occ.c', + 'pnv_bmc.c', + 'pnv_homer.c', + 'pnv_pnor.c', +)) +# PowerPC 4xx boards +ppc_ss.add(when: 'CONFIG_PPC405', if_true: files( + 'ppc405_boards.c', + 'ppc405_uc.c')) +ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( + 'ppc440_bamboo.c', + 'ppc440_pcix.c', 'ppc440_uc.c')) +ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( + 'ppc4xx_pci.c', + 'ppc4xx_devs.c')) +ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c')) +# PReP +ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c')) +ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep_systemio.c')) +ppc_ss.add(when: 'CONFIG_RS6000_MC', if_true: files('rs6000_mc.c')) +# OldWorld PowerMac +ppc_ss.add(when: 'CONFIG_MAC_OLDWORLD', if_true: files('mac_oldworld.c')) +# NewWorld PowerMac +ppc_ss.add(when: 'CONFIG_MAC_NEWWORLD', if_true: files('mac_newworld.c')) +# e500 +ppc_ss.add(when: 'CONFIG_E500', if_true: files( + 'e500.c', + 'mpc8544ds.c', + 'e500plat.c' +)) +ppc_ss.add(when: 'CONFIG_E500', if_true: files( + 'mpc8544_guts.c', + 'ppce500_spin.c' +)) +# PowerPC 440 Xilinx ML507 reference board. +ppc_ss.add(when: 'CONFIG_VIRTEX', if_true: files('virtex_ml507.c')) + +hw_arch +=3D {'ppc': ppc_ss} diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs deleted file mode 100644 index 57cc708..0000000 --- a/hw/riscv/Makefile.objs +++ /dev/null @@ -1,16 +0,0 @@ -obj-y +=3D boot.o -obj-$(CONFIG_SPIKE) +=3D riscv_htif.o -obj-$(CONFIG_HART) +=3D riscv_hart.o -obj-$(CONFIG_OPENTITAN) +=3D opentitan.o -obj-$(CONFIG_SIFIVE_E) +=3D sifive_e.o -obj-$(CONFIG_SIFIVE_E) +=3D sifive_e_prci.o -obj-$(CONFIG_SIFIVE) +=3D sifive_clint.o -obj-$(CONFIG_SIFIVE) +=3D sifive_gpio.o -obj-$(CONFIG_SIFIVE) +=3D sifive_plic.o -obj-$(CONFIG_SIFIVE) +=3D sifive_test.o -obj-$(CONFIG_SIFIVE_U) +=3D sifive_u.o -obj-$(CONFIG_SIFIVE_U) +=3D sifive_u_otp.o -obj-$(CONFIG_SIFIVE_U) +=3D sifive_u_prci.o -obj-$(CONFIG_SIFIVE) +=3D sifive_uart.o -obj-$(CONFIG_SPIKE) +=3D spike.o -obj-$(CONFIG_RISCV_VIRT) +=3D virt.o diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build new file mode 100644 index 0000000..2de8e5a --- /dev/null +++ b/hw/riscv/meson.build @@ -0,0 +1,19 @@ +riscv_ss =3D ss.source_set() +riscv_ss.add(files('boot.c')) +riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c')) +riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) +riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_clint.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_gpio.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_plic.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_test.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_uart.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e_prci.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_otp.c')) +riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_prci.c')) +riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('riscv_htif.c')) +riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c')) + +hw_arch +=3D {'riscv': riscv_ss} diff --git a/hw/rx/Makefile.objs b/hw/rx/Makefile.objs deleted file mode 100644 index 4ef6b9e..0000000 --- a/hw/rx/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_RX62N_MCU) +=3D rx62n.o -obj-$(CONFIG_RX_GDBSIM) +=3D rx-gdbsim.o diff --git a/hw/rx/meson.build b/hw/rx/meson.build new file mode 100644 index 0000000..d223512 --- /dev/null +++ b/hw/rx/meson.build @@ -0,0 +1,5 @@ +rx_ss =3D ss.source_set() +rx_ss.add(when: 'CONFIG_RX_GDBSIM', if_true: files('rx-gdbsim.c')) +rx_ss.add(when: 'CONFIG_RX62N_MCU', if_true: files('rx62n.c')) + +hw_arch +=3D {'rx': rx_ss} diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs deleted file mode 100644 index a46a1c7..0000000 --- a/hw/s390x/Makefile.objs +++ /dev/null @@ -1,37 +0,0 @@ -obj-y +=3D s390-virtio-hcall.o -obj-y +=3D sclp.o -obj-y +=3D event-facility.o -obj-y +=3D sclpquiesce.o -obj-y +=3D sclpcpu.o -obj-y +=3D ipl.o -obj-y +=3D css.o -obj-$(CONFIG_S390_CCW_VIRTIO) +=3D s390-virtio-ccw.o -obj-$(CONFIG_TERMINAL3270) +=3D 3270-ccw.o -ifeq ($(CONFIG_VIRTIO_CCW),y) -obj-y +=3D virtio-ccw.o -obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-ccw-serial.o -obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-ccw-balloon.o -obj-$(CONFIG_VIRTIO_SCSI) +=3D virtio-ccw-scsi.o -obj-$(CONFIG_VIRTIO_RNG) +=3D virtio-ccw-rng.o -obj-$(CONFIG_VIRTIO_CRYPTO) +=3D virtio-ccw-crypto.o -obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-ccw-gpu.o -obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-ccw-input.o -obj-$(CONFIG_VIRTIO_NET) +=3D virtio-ccw-net.o -obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-ccw-blk.o -obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) +=3D virtio-ccw-9p.o -obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-ccw.o -endif -obj-y +=3D css-bridge.o -obj-y +=3D ccw-device.o -obj-y +=3D s390-pci-bus.o s390-pci-inst.o -obj-y +=3D s390-skeys.o -obj-y +=3D s390-stattrib.o -obj-y +=3D tod.o -obj-y +=3D tod-qemu.o -obj-$(CONFIG_KVM) +=3D tod-kvm.o -obj-$(CONFIG_KVM) +=3D s390-skeys-kvm.o -obj-$(CONFIG_KVM) +=3D s390-stattrib-kvm.o -obj-$(CONFIG_KVM) +=3D pv.o -obj-y +=3D s390-ccw.o -obj-y +=3D ap-device.o -obj-y +=3D ap-bridge.o diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build new file mode 100644 index 0000000..b63782d --- /dev/null +++ b/hw/s390x/meson.build @@ -0,0 +1,46 @@ +s390x_ss =3D ss.source_set() +s390x_ss.add(files( + 'ap-bridge.c', + 'ap-device.c', + 'ccw-device.c', + 'css-bridge.c', + 'css.c', + 'event-facility.c', + 'ipl.c', + 's390-ccw.c', + 's390-pci-bus.c', + 's390-pci-inst.c', + 's390-skeys.c', + 's390-stattrib.c', + 's390-virtio-hcall.c', + 'sclp.c', + 'sclpcpu.c', + 'sclpquiesce.c', + 'tod-qemu.c', + 'tod.c', +)) +s390x_ss.add(when: 'CONFIG_KVM', if_true: files( + 'tod-kvm.c', + 's390-skeys-kvm.c', + 's390-stattrib-kvm.c', + 'pv.c', +)) +s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-c= cw.c')) +s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) + +virtio_ss =3D ss.source_set() +virtio_ss.add(files('virtio-ccw.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-ccw-ba= lloon.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-ccw-blk.c'= )) +virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-ccw-cry= pto.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: files('virtio-ccw-gpu.c'= )) +virtio_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-ccw-inpu= t.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'= )) +virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'= )) +virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.= c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-ser= ial.c')) +virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files(= 'virtio-ccw-blk.c')) +virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.= c')) +s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss) + +hw_arch +=3D {'s390x': s390x_ss} diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs deleted file mode 100644 index 2a707f9..0000000 --- a/hw/sh4/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y +=3D sh7750.o sh7750_regnames.o -obj-y +=3D sh_pci.o -obj-$(CONFIG_R2D) +=3D r2d.o -obj-$(CONFIG_SHIX) +=3D shix.o diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build new file mode 100644 index 0000000..303c0f4 --- /dev/null +++ b/hw/sh4/meson.build @@ -0,0 +1,10 @@ +sh4_ss =3D ss.source_set() +sh4_ss.add(files( + 'sh7750.c', + 'sh7750_regnames.c', + 'sh_pci.c' +)) +sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) +sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) + +hw_arch +=3D {'sh4': sh4_ss} diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs deleted file mode 100644 index d57e33f..0000000 --- a/hw/sparc/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_SUN4M) +=3D sun4m_iommu.o -obj-$(CONFIG_SUN4M) +=3D sun4m.o -obj-$(CONFIG_LEON3) +=3D leon3.o diff --git a/hw/sparc/meson.build b/hw/sparc/meson.build new file mode 100644 index 0000000..19c442c --- /dev/null +++ b/hw/sparc/meson.build @@ -0,0 +1,6 @@ +sparc_ss =3D ss.source_set() +sparc_ss.add(when: 'CONFIG_LEON3', if_true: files('leon3.c')) +sparc_ss.add(when: 'CONFIG_SUN4M', if_true: files('sun4m.c')) +sparc_ss.add(when: 'CONFIG_SUN4M', if_true: files('sun4m_iommu.c')) + +hw_arch +=3D {'sparc': sparc_ss} diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs deleted file mode 100644 index af0525c..0000000 --- a/hw/sparc64/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y +=3D sparc64.o -obj-$(CONFIG_SUN4U) +=3D sun4u_iommu.o -obj-$(CONFIG_SUN4U) +=3D sun4u.o -obj-$(CONFIG_NIAGARA) +=3D niagara.o diff --git a/hw/sparc64/meson.build b/hw/sparc64/meson.build new file mode 100644 index 0000000..58b5504 --- /dev/null +++ b/hw/sparc64/meson.build @@ -0,0 +1,6 @@ +sparc64_ss =3D ss.source_set() +sparc64_ss.add(files('sparc64.c')) +sparc64_ss.add(when: 'CONFIG_NIAGARA', if_true: files('niagara.c')) +sparc64_ss.add(when: 'CONFIG_SUN4U', if_true: files('sun4u.c', 'sun4u_iomm= u.c')) + +hw_arch +=3D {'sparc64': sparc64_ss} diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs deleted file mode 100644 index 5501f6c..0000000 --- a/hw/tricore/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_TRICORE) +=3D tricore_testboard.o diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build new file mode 100644 index 0000000..579aa13 --- /dev/null +++ b/hw/tricore/meson.build @@ -0,0 +1,4 @@ +tricore_ss =3D ss.source_set() +tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c= ')) + +hw_arch +=3D {'tricore': tricore_ss} diff --git a/hw/unicore32/Makefile.objs b/hw/unicore32/Makefile.objs deleted file mode 100644 index e0fd628..0000000 --- a/hw/unicore32/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -# For UniCore32 machines and boards - -# PKUnity-v3 SoC and board information -obj-${CONFIG_PUV3} +=3D puv3.o diff --git a/hw/unicore32/meson.build b/hw/unicore32/meson.build new file mode 100644 index 0000000..fc26d6b --- /dev/null +++ b/hw/unicore32/meson.build @@ -0,0 +1,5 @@ +unicore32_ss =3D ss.source_set() +# PKUnity-v3 SoC and board information +unicore32_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3.c')) + +hw_arch +=3D {'unicore32': unicore32_ss} diff --git a/hw/xenpv/Makefile.objs b/hw/xenpv/Makefile.objs deleted file mode 100644 index 8bfa458..0000000 --- a/hw/xenpv/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -# Xen PV machine support -obj-$(CONFIG_XEN) +=3D xen_machine_pv.o diff --git a/hw/xenpv/meson.build b/hw/xenpv/meson.build new file mode 100644 index 0000000..40f911a --- /dev/null +++ b/hw/xenpv/meson.build @@ -0,0 +1,3 @@ +xenpv_ss =3D ss.source_set() + +xenpv_ss.add(when: 'CONFIG_XEN', if_true: files('xen_machine_pv.c')) diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs deleted file mode 100644 index 2b40e1b..0000000 --- a/hw/xtensa/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -obj-y +=3D mx_pic.o -obj-y +=3D pic_cpu.o -obj-y +=3D xtensa_memory.o -obj-$(CONFIG_XTENSA_SIM) +=3D sim.o -obj-$(CONFIG_XTENSA_VIRT) +=3D virt.o -obj-$(CONFIG_XTENSA_XTFPGA) +=3D xtfpga.o diff --git a/hw/xtensa/meson.build b/hw/xtensa/meson.build new file mode 100644 index 0000000..1d5835d --- /dev/null +++ b/hw/xtensa/meson.build @@ -0,0 +1,11 @@ +xtensa_ss =3D ss.source_set() +xtensa_ss.add(files( + 'mx_pic.c', + 'pic_cpu.c', + 'xtensa_memory.c', +)) +xtensa_ss.add(when: 'CONFIG_XTENSA_SIM', if_true: files('sim.c')) +xtensa_ss.add(when: 'CONFIG_XTENSA_VIRT', if_true: files('virt.c')) +xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: files('xtfpga.c')) + +hw_arch +=3D {'xtensa': xtensa_ss} diff --git a/meson.build b/meson.build index 696d743..e4b77dd 100644 --- a/meson.build +++ b/meson.build @@ -775,6 +775,10 @@ foreach target : target_dirs if target.endswith('-softmmu') qemu_target_name =3D 'qemu-system-' + target_name target_type=3D'system' + hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch + hw =3D hw_arch[hw_dir].apply(config_target, strict: false) + arch_srcs +=3D hw.sources() + arch_srcs +=3D config_devices_h[target] else target_type=3D'user' --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082553; cv=none; d=zohomail.com; s=zohoarc; b=OkaFfLGHrhyBx2jcmlyuHrzXKOMmOA4iTg193wBmgWrcaiUCyHh3N6r2Y49zEvWC6KvKRKGACZ7hS22Lcw0sF9hqxcQs1m+qfqsYYAban3oai5Bf7Lp+ZtxaXXMWEn82LfXNGerk5b5vnIeBJsYpavekgAOOBiBPs4EqT0dgqMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082553; 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=ZXRL26tMUgX/OYDKYp/UIFNxY+RfJeSIgw8mgq5CfWA=; b=U7PGYE+MYrlTrOPjv71euM0ByQjlDiQ/WEg8e1twFbHGyjPWBpVegfk4E8HoD7dWVNLbL0eg3uezYNz3oOuY8JmEzgLazhOeEybveINZCD2ntCGdM4IBxjRjDA7A4VL5I+p0z/6SRXvpU1WW7LLP19oSXLjuOKXT0lbOUdjNuV0= 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 1597082553261226.69979011518046; Mon, 10 Aug 2020 11:02:33 -0700 (PDT) Received: from localhost ([::1]:54610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C7z-0006z9-OW for importer@patchew.org; Mon, 10 Aug 2020 14:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLs-0003FF-QP for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36092 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 1k5BLn-0003LP-KR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:48 -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-496-GcKi8WcGNwKuwofsDA5ReQ-1; Mon, 10 Aug 2020 13:12:39 -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 381A28014D7 for ; Mon, 10 Aug 2020 17:12:38 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C5B35F1E9; Mon, 10 Aug 2020 17:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079563; 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=ZXRL26tMUgX/OYDKYp/UIFNxY+RfJeSIgw8mgq5CfWA=; b=GgXazH6vWCXYQYIYrIqYJ9PKgPdJYLoLaS1NGDlR0ritQK4EWSTcwqGERnW2rBAbWxIujX C+2euM5+eL+3eEGGfvP2XcDJJF4/t3sP9PG4ATMAlprm7XOyh5syWrs2EpEmrETsCWv4Nf 4lolWTRc/asOXHu+AXecHNDBHWV6XA4= X-MC-Unique: GcKi8WcGNwKuwofsDA5ReQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 125/147] meson: target Date: Mon, 10 Aug 2020 19:08:43 +0200 Message-Id: <1597079345-42801-126-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.target | 3 +- libdecnumber/Makefile.objs | 5 --- libdecnumber/meson.build | 7 ++++ meson.build | 11 +++++ scripts/decodetree.py | 2 +- target/alpha/Makefile.objs | 4 -- target/alpha/meson.build | 18 +++++++++ target/arm/Makefile.objs | 89 -------------------------------------= ---- target/arm/meson.build | 62 ++++++++++++++++++++++++++++ target/avr/Makefile.objs | 34 ---------------- target/avr/disas.c | 2 +- target/avr/meson.build | 20 +++++++++ target/avr/translate.c | 2 +- target/cris/Makefile.objs | 3 -- target/cris/meson.build | 14 +++++++ target/hppa/Makefile.objs | 11 ----- target/hppa/meson.build | 19 +++++++++ target/hppa/translate.c | 2 +- target/i386/Makefile.objs | 23 ----------- target/i386/hvf/Makefile.objs | 2 - target/i386/hvf/meson.build | 12 ++++++ target/i386/meson.build | 40 ++++++++++++++++++ target/lm32/Makefile.objs | 4 -- target/lm32/meson.build | 15 +++++++ target/m68k/Makefile.objs | 5 --- target/m68k/meson.build | 17 ++++++++ target/meson.build | 22 ++++++++++ target/microblaze/Makefile.objs | 3 -- target/microblaze/meson.build | 14 +++++++ target/mips/Makefile.objs | 6 --- target/mips/meson.build | 24 +++++++++++ target/moxie/Makefile.objs | 2 - target/moxie/meson.build | 14 +++++++ target/nios2/Makefile.objs | 4 -- target/nios2/meson.build | 15 +++++++ target/openrisc/Makefile.objs | 15 ------- target/openrisc/disas.c | 2 +- target/openrisc/meson.build | 23 +++++++++++ target/openrisc/translate.c | 2 +- target/ppc/Makefile.objs | 20 --------- target/ppc/meson.build | 37 +++++++++++++++++ target/riscv/Makefile.objs | 28 ------------- target/riscv/meson.build | 34 ++++++++++++++++ target/riscv/translate.c | 4 +- target/rx/Makefile.objs | 11 ----- target/rx/disas.c | 2 +- target/rx/meson.build | 16 ++++++++ target/rx/translate.c | 2 +- target/s390x/Makefile.objs | 10 ----- target/s390x/meson.build | 42 ++++++++++++++++++- target/sh4/Makefile.objs | 3 -- target/sh4/meson.build | 14 +++++++ target/sparc/Makefile.objs | 7 ---- target/sparc/meson.build | 23 +++++++++++ target/tilegx/Makefile.objs | 1 - target/tilegx/meson.build | 13 ++++++ target/tricore/Makefile.objs | 1 - target/tricore/meson.build | 15 +++++++ target/unicore32/Makefile.objs | 8 ---- target/unicore32/meson.build | 14 +++++++ target/xtensa/Makefile.objs | 16 -------- target/xtensa/meson.build | 30 ++++++++++++++ 62 files changed, 595 insertions(+), 328 deletions(-) delete mode 100644 libdecnumber/Makefile.objs create mode 100644 libdecnumber/meson.build mode change 100755 =3D> 100644 scripts/decodetree.py delete mode 100644 target/alpha/Makefile.objs create mode 100644 target/alpha/meson.build delete mode 100644 target/arm/Makefile.objs create mode 100644 target/arm/meson.build delete mode 100644 target/avr/Makefile.objs create mode 100644 target/avr/meson.build delete mode 100644 target/cris/Makefile.objs create mode 100644 target/cris/meson.build delete mode 100644 target/hppa/Makefile.objs create mode 100644 target/hppa/meson.build delete mode 100644 target/i386/Makefile.objs delete mode 100644 target/i386/hvf/Makefile.objs create mode 100644 target/i386/hvf/meson.build create mode 100644 target/i386/meson.build delete mode 100644 target/lm32/Makefile.objs create mode 100644 target/lm32/meson.build delete mode 100644 target/m68k/Makefile.objs create mode 100644 target/m68k/meson.build delete mode 100644 target/microblaze/Makefile.objs create mode 100644 target/microblaze/meson.build delete mode 100644 target/mips/Makefile.objs create mode 100644 target/mips/meson.build delete mode 100644 target/moxie/Makefile.objs create mode 100644 target/moxie/meson.build delete mode 100644 target/nios2/Makefile.objs create mode 100644 target/nios2/meson.build delete mode 100644 target/openrisc/Makefile.objs create mode 100644 target/openrisc/meson.build delete mode 100644 target/ppc/Makefile.objs create mode 100644 target/ppc/meson.build delete mode 100644 target/riscv/Makefile.objs create mode 100644 target/riscv/meson.build delete mode 100644 target/rx/Makefile.objs create mode 100644 target/rx/meson.build delete mode 100644 target/s390x/Makefile.objs delete mode 100644 target/sh4/Makefile.objs create mode 100644 target/sh4/meson.build delete mode 100644 target/sparc/Makefile.objs create mode 100644 target/sparc/meson.build delete mode 100644 target/tilegx/Makefile.objs create mode 100644 target/tilegx/meson.build delete mode 100644 target/tricore/Makefile.objs create mode 100644 target/tricore/meson.build delete mode 100644 target/unicore32/Makefile.objs create mode 100644 target/unicore32/meson.build delete mode 100644 target/xtensa/Makefile.objs create mode 100644 target/xtensa/meson.build diff --git a/Makefile.target b/Makefile.target index 28cefba..1ab8773 100644 --- a/Makefile.target +++ b/Makefile.target @@ -116,7 +116,6 @@ obj-$(CONFIG_TCG) +=3D tcg/tcg-common.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) +=3D tcg/tci.o obj-$(CONFIG_TCG_INTERPRETER) +=3D disas/tci.o obj-$(CONFIG_TCG) +=3D fpu/softfloat.o -obj-y +=3D target/$(TARGET_BASE_ARCH)/ obj-y +=3D disas.o obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o LIBS :=3D $(libs_cpu) $(LIBS) @@ -168,7 +167,7 @@ LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LI= BS) $(OPENGL_LIBS) $(SECCOM LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) -LIBS :=3D $(LIBS) $(VIRGL_LIBS) +LIBS :=3D $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS) =20 generated-files-y +=3D hmp-commands.h hmp-commands-info.h =20 diff --git a/libdecnumber/Makefile.objs b/libdecnumber/Makefile.objs deleted file mode 100644 index d81db04..0000000 --- a/libdecnumber/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y +=3D decContext.o -obj-y +=3D decNumber.o -obj-y +=3D dpd/decimal32.o -obj-y +=3D dpd/decimal64.o -obj-y +=3D dpd/decimal128.o diff --git a/libdecnumber/meson.build b/libdecnumber/meson.build new file mode 100644 index 0000000..4d04139 --- /dev/null +++ b/libdecnumber/meson.build @@ -0,0 +1,7 @@ +libdecnumber =3D files( + 'decContext.c', + 'decNumber.c', + 'dpd/decimal128.c', + 'dpd/decimal32.c', + 'dpd/decimal64.c', +) diff --git a/meson.build b/meson.build index e4b77dd..1a78fa8 100644 --- a/meson.build +++ b/meson.build @@ -635,10 +635,15 @@ libqemuutil =3D static_library('qemuutil', qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 +decodetree =3D generator(find_program('scripts/decodetree.py'), + output: 'decode-@BASENAME@.inc', + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTP= UT@']) + subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') +subdir('libdecnumber') subdir('target') subdir('dump') =20 @@ -775,6 +780,9 @@ foreach target : target_dirs if target.endswith('-softmmu') qemu_target_name =3D 'qemu-system-' + target_name target_type=3D'system' + t =3D target_softmmu_arch[arch].apply(config_target, strict: false) + arch_srcs +=3D t.sources() + hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch hw =3D hw_arch[hw_dir].apply(config_target, strict: false) arch_srcs +=3D hw.sources() @@ -795,6 +803,9 @@ foreach target : target_dirs ) endif =20 + t =3D target_arch[arch].apply(config_target, strict: false) + arch_srcs +=3D t.sources() + target_common =3D common_ss.apply(config_target, strict: false) objects =3D common_all.extract_objects(target_common.sources()) =20 diff --git a/scripts/decodetree.py b/scripts/decodetree.py old mode 100755 new mode 100644 index 694757b..4cd1e10 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -1257,7 +1257,7 @@ def main(): long_opts =3D ['decode=3D', 'translate=3D', 'output=3D', 'insnwidth=3D= ', 'static-decode=3D', 'varinsnwidth=3D'] try: - (opts, args) =3D getopt.getopt(sys.argv[1:], 'o:vw:', long_opts) + (opts, args) =3D getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opt= s) except getopt.GetoptError as err: error(0, err) for o, a in opts: diff --git a/target/alpha/Makefile.objs b/target/alpha/Makefile.objs deleted file mode 100644 index 6366462..0000000 --- a/target/alpha/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_SOFTMMU) +=3D machine.o -obj-y +=3D translate.o helper.o cpu.o -obj-y +=3D int_helper.o fpu_helper.o vax_helper.o sys_helper.o mem_helper.o -obj-y +=3D gdbstub.o diff --git a/target/alpha/meson.build b/target/alpha/meson.build new file mode 100644 index 0000000..1aec55a --- /dev/null +++ b/target/alpha/meson.build @@ -0,0 +1,18 @@ +alpha_ss =3D ss.source_set() +alpha_ss.add(files( + 'cpu.c', + 'fpu_helper.c', + 'gdbstub.c', + 'helper.c', + 'int_helper.c', + 'mem_helper.c', + 'sys_helper.c', + 'translate.c', + 'vax_helper.c', +)) + +alpha_softmmu_ss =3D ss.source_set() +alpha_softmmu_ss.add(files('machine.c')) + +target_arch +=3D {'alpha': alpha_ss} +target_softmmu_arch +=3D {'alpha': alpha_softmmu_ss} diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs deleted file mode 100644 index 4a177ad..0000000 --- a/target/arm/Makefile.objs +++ /dev/null @@ -1,89 +0,0 @@ -obj-$(CONFIG_TCG) +=3D arm-semi.o -obj-y +=3D helper.o vfp_helper.o -obj-y +=3D cpu.o gdbstub.o -obj-$(TARGET_AARCH64) +=3D cpu64.o gdbstub64.o - -obj-$(CONFIG_SOFTMMU) +=3D machine.o arch_dump.o monitor.o -obj-$(CONFIG_SOFTMMU) +=3D arm-powerctl.o - -obj-$(CONFIG_KVM) +=3D kvm.o -obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) +=3D kvm32.o -obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) +=3D kvm64.o -obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py - -target/arm/decode-sve.inc: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --decode disas_sve -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-neon-shared.inc: $(SRC_PATH)/target/arm/neon-shared.deco= de $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_neon_shared -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-neon-dp.inc: $(SRC_PATH)/target/arm/neon-dp.decode $(DEC= ODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_neon_dp -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-neon-ls.inc: $(SRC_PATH)/target/arm/neon-ls.decode $(DEC= ODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_neon_ls -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-vfp.inc: $(SRC_PATH)/target/arm/vfp.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_vfp -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-vfp-uncond.inc: $(SRC_PATH)/target/arm/vfp-uncond.decode= $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-a32.inc: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_a32 -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-a32-uncond.inc: $(SRC_PATH)/target/arm/a32-uncond.decode= $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_a32_uncond -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-t32.inc: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_t32 -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-t16.inc: $(SRC_PATH)/target/arm/t16.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) -w 16 --static-decode disas_t16 -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/translate-sve.o: target/arm/decode-sve.inc -target/arm/translate.o: target/arm/decode-neon-shared.inc -target/arm/translate.o: target/arm/decode-neon-dp.inc -target/arm/translate.o: target/arm/decode-neon-ls.inc -target/arm/translate.o: target/arm/decode-vfp.inc -target/arm/translate.o: target/arm/decode-vfp-uncond.inc -target/arm/translate.o: target/arm/decode-a32.inc -target/arm/translate.o: target/arm/decode-a32-uncond.inc -target/arm/translate.o: target/arm/decode-t32.inc -target/arm/translate.o: target/arm/decode-t16.inc - -obj-y +=3D tlb_helper.o debug_helper.o -obj-y +=3D translate.o op_helper.o -obj-y +=3D crypto_helper.o -obj-y +=3D iwmmxt_helper.o vec_helper.o neon_helper.o -obj-y +=3D m_helper.o -obj-y +=3D cpu_tcg.o - -obj-$(CONFIG_SOFTMMU) +=3D psci.o - -obj-$(TARGET_AARCH64) +=3D translate-a64.o helper-a64.o -obj-$(TARGET_AARCH64) +=3D translate-sve.o sve_helper.o -obj-$(TARGET_AARCH64) +=3D pauth_helper.o -obj-$(TARGET_AARCH64) +=3D mte_helper.o diff --git a/target/arm/meson.build b/target/arm/meson.build new file mode 100644 index 0000000..056223a --- /dev/null +++ b/target/arm/meson.build @@ -0,0 +1,62 @@ +gen =3D [ + decodetree.process('sve.decode', extra_args: '--decode=3Ddisas_sve'), + decodetree.process('neon-shared.decode', extra_args: '--static-decode=3D= disas_neon_shared'), + decodetree.process('neon-dp.decode', extra_args: '--static-decode=3Ddisa= s_neon_dp'), + decodetree.process('neon-ls.decode', extra_args: '--static-decode=3Ddisa= s_neon_ls'), + decodetree.process('vfp.decode', extra_args: '--static-decode=3Ddisas_vf= p'), + decodetree.process('vfp-uncond.decode', extra_args: '--static-decode=3Dd= isas_vfp_uncond'), + decodetree.process('a32.decode', extra_args: '--static-decode=3Ddisas_a3= 2'), + decodetree.process('a32-uncond.decode', extra_args: '--static-decode=3Dd= isas_a32_uncond'), + decodetree.process('t32.decode', extra_args: '--static-decode=3Ddisas_t3= 2'), + decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-deco= de=3Ddisas_t16']), +] + +arm_ss =3D ss.source_set() +arm_ss.add(gen) +arm_ss.add(files( + 'cpu.c', + 'crypto_helper.c', + 'debug_helper.c', + 'gdbstub.c', + 'helper.c', + 'iwmmxt_helper.c', + 'm_helper.c', + 'neon_helper.c', + 'op_helper.c', + 'tlb_helper.c', + 'translate.c', + 'vec_helper.c', + 'vfp_helper.c', + 'cpu_tcg.c', +)) +arm_ss.add(zlib) + +arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) + +kvm_ss =3D ss.source_set() +kvm_ss.add(when: 'TARGET_AARCH64', if_true: 'kvm64.c', if_false: 'kvm32.c') +arm_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss) +arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('k= vm-stub.c')) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', + 'helper-a64.c', + 'mte_helper.c', + 'pauth_helper.c', + 'sve_helper.c', + 'translate-a64.c', + 'translate-sve.c', +)) + +arm_softmmu_ss =3D ss.source_set() +arm_softmmu_ss.add(files( + 'arch_dump.c', + 'arm-powerctl.c', + 'machine.c', + 'monitor.c', + 'psci.c', +)) + +target_arch +=3D {'arm': arm_ss} +target_softmmu_arch +=3D {'arm': arm_softmmu_ss} diff --git a/target/avr/Makefile.objs b/target/avr/Makefile.objs deleted file mode 100644 index 81d9bcd..0000000 --- a/target/avr/Makefile.objs +++ /dev/null @@ -1,34 +0,0 @@ -# -# QEMU AVR -# -# Copyright (c) 2016-2020 Michael Rolnik -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, see -# -# - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py -decode-y =3D $(SRC_PATH)/target/avr/insn.decode - -target/avr/decode_insn.inc: $(decode-y) $(DECODETREE) - $(call quiet-command, \ - $(PYTHON) $(DECODETREE) -o $@ --decode decode_insn --insnwidth 16 $<, \ - "GEN", $(TARGET_DIR)$@) - -target/avr/translate.o: target/avr/decode_insn.inc - -obj-y +=3D translate.o cpu.o helper.o -obj-y +=3D gdbstub.o -obj-y +=3D disas.o -obj-$(CONFIG_SOFTMMU) +=3D machine.o diff --git a/target/avr/disas.c b/target/avr/disas.c index c45ab2c..5e20cbb 100644 --- a/target/avr/disas.c +++ b/target/avr/disas.c @@ -60,7 +60,7 @@ static int append_16(DisasContext *ctx, int x) =20 /* Include the auto-generated decoder. */ static bool decode_insn(DisasContext *ctx, uint16_t insn); -#include "decode_insn.inc" +#include "decode-insn.inc" =20 #define output(mnemonic, format, ...) \ (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ diff --git a/target/avr/meson.build b/target/avr/meson.build new file mode 100644 index 0000000..7e8e29c --- /dev/null +++ b/target/avr/meson.build @@ -0,0 +1,20 @@ +gen =3D [ + decodetree.process('insn.decode', extra_args: [ '--decode', 'decode_insn= ', + '--insnwidth', '16' ]) +] + +avr_ss =3D ss.source_set() +avr_softmmu_ss =3D ss.source_set() + +avr_ss.add(gen) +avr_ss.add(files( + 'translate.c', + 'helper.c', + 'cpu.c', + 'gdbstub.c', + 'disas.c')) + +avr_softmmu_ss.add(files('machine.c')) + +target_arch +=3D {'avr': avr_ss} +target_softmmu_arch +=3D {'avr': avr_softmmu_ss} diff --git a/target/avr/translate.c b/target/avr/translate.c index 8deb126..ad5706a 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -198,7 +198,7 @@ static bool avr_have_feature(DisasContext *ctx, int fea= ture) } =20 static bool decode_insn(DisasContext *ctx, uint16_t insn); -#include "decode_insn.inc" +#include "decode-insn.inc" =20 /* * Arithmetic Instructions diff --git a/target/cris/Makefile.objs b/target/cris/Makefile.objs deleted file mode 100644 index 7779227..0000000 --- a/target/cris/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-y +=3D gdbstub.o -obj-$(CONFIG_SOFTMMU) +=3D mmu.o machine.o diff --git a/target/cris/meson.build b/target/cris/meson.build new file mode 100644 index 0000000..67c3793 --- /dev/null +++ b/target/cris/meson.build @@ -0,0 +1,14 @@ +cris_ss =3D ss.source_set() +cris_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +cris_softmmu_ss =3D ss.source_set() +cris_softmmu_ss.add(files('mmu.c', 'machine.c')) + +target_arch +=3D {'cris': cris_ss} +target_softmmu_arch +=3D {'cris': cris_softmmu_ss} diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs deleted file mode 100644 index 40dcb86..0000000 --- a/target/hppa/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -obj-y +=3D translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o -obj-y +=3D int_helper.o -obj-$(CONFIG_SOFTMMU) +=3D machine.o - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py - -target/hppa/decode.inc: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) - -target/hppa/translate.o: target/hppa/decode.inc diff --git a/target/hppa/meson.build b/target/hppa/meson.build new file mode 100644 index 0000000..8a7ff82 --- /dev/null +++ b/target/hppa/meson.build @@ -0,0 +1,19 @@ +gen =3D decodetree.process('insns.decode') + +hppa_ss =3D ss.source_set() +hppa_ss.add(gen) +hppa_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'int_helper.c', + 'mem_helper.c', + 'op_helper.c', + 'translate.c', +)) + +hppa_softmmu_ss =3D ss.source_set() +hppa_softmmu_ss.add(files('machine.c')) + +target_arch +=3D {'hppa': hppa_ss} +target_softmmu_arch +=3D {'hppa': hppa_softmmu_ss} diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 31e2926..4869999 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -334,7 +334,7 @@ static int expand_shl11(DisasContext *ctx, int val) =20 =20 /* Include the auto-generated decoder. */ -#include "decode.inc" +#include "decode-insns.inc" =20 /* We are not using a goto_tb (for whatever reason), but have updated the iaq (for whatever reason), so don't do it again on exit. */ diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs deleted file mode 100644 index 0b93143..0000000 --- a/target/i386/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -obj-y +=3D helper.o cpu.o gdbstub.o xsave_helper.o -obj-$(CONFIG_TCG) +=3D translate.o -obj-$(CONFIG_TCG) +=3D bpt_helper.o cc_helper.o excp_helper.o fpu_helper.o -obj-$(CONFIG_TCG) +=3D int_helper.o mem_helper.o misc_helper.o mpx_helper.o -obj-$(CONFIG_TCG) +=3D seg_helper.o smm_helper.o svm_helper.o -obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o -obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o -ifeq ($(CONFIG_SOFTMMU),y) -obj-y +=3D machine.o arch_memory_mapping.o arch_dump.o monitor.o -obj-$(CONFIG_KVM) +=3D kvm.o -obj-$(CONFIG_HYPERV) +=3D hyperv.o -obj-$(call lnot,$(CONFIG_HYPERV)) +=3D hyperv-stub.o -ifeq ($(CONFIG_WIN32),y) -obj-$(CONFIG_HAX) +=3D hax-all.o hax-mem.o hax-windows.o -endif -ifeq ($(CONFIG_POSIX),y) -obj-$(CONFIG_HAX) +=3D hax-all.o hax-mem.o hax-posix.o -endif -obj-$(CONFIG_HVF) +=3D hvf/ -obj-$(CONFIG_WHPX) +=3D whpx-all.o -endif -obj-$(CONFIG_SEV) +=3D sev.o -obj-$(call lnot,$(CONFIG_SEV)) +=3D sev-stub.o diff --git a/target/i386/hvf/Makefile.objs b/target/i386/hvf/Makefile.objs deleted file mode 100644 index 927b86b..0000000 --- a/target/i386/hvf/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y +=3D hvf.o -obj-y +=3D x86.o x86_cpuid.o x86_decode.o x86_descr.o x86_emu.o x86_flags.= o x86_mmu.o x86hvf.o x86_task.o diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build new file mode 100644 index 0000000..c8a4371 --- /dev/null +++ b/target/i386/hvf/meson.build @@ -0,0 +1,12 @@ +i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files( + 'hvf.c', + 'x86.c', + 'x86_cpuid.c', + 'x86_decode.c', + 'x86_descr.c', + 'x86_emu.c', + 'x86_flags.c', + 'x86_mmu.c', + 'x86_task.c', + 'x86hvf.c', +)) diff --git a/target/i386/meson.build b/target/i386/meson.build new file mode 100644 index 0000000..e0b71ad --- /dev/null +++ b/target/i386/meson.build @@ -0,0 +1,40 @@ +i386_ss =3D ss.source_set() +i386_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'xsave_helper.c', +)) +i386_ss.add(when: 'CONFIG_TCG', if_true: files( + 'bpt_helper.c', + 'cc_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'int_helper.c', + 'mem_helper.c', + 'misc_helper.c', + 'mpx_helper.c', + 'seg_helper.c', + 'smm_helper.c', + 'svm_helper.c', + 'translate.c'), if_false: files('tcg-stub.c')) +i386_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +i386_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('= sev-stub.c')) + +i386_softmmu_ss =3D ss.source_set() +i386_softmmu_ss.add(files( + 'arch_dump.c', + 'arch_memory_mapping.c', + 'machine.c', + 'monitor.c', +)) +i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_= false: files('hyperv-stub.c')) +i386_softmmu_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) +i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files('whpx-all.c')) +i386_softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_HAX'], if_true: files('= hax-all.c', 'hax-mem.c', 'hax-posix.c')) +i386_softmmu_ss.add(when: ['CONFIG_WIN32', 'CONFIG_HAX'], if_true: files('= hax-all.c', 'hax-mem.c', 'hax-windows.c')) + +subdir('hvf') + +target_arch +=3D {'i386': i386_ss} +target_softmmu_arch +=3D {'i386': i386_softmmu_ss} diff --git a/target/lm32/Makefile.objs b/target/lm32/Makefile.objs deleted file mode 100644 index c3e1bd6..0000000 --- a/target/lm32/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-y +=3D gdbstub.o -obj-y +=3D lm32-semi.o -obj-$(CONFIG_SOFTMMU) +=3D machine.o diff --git a/target/lm32/meson.build b/target/lm32/meson.build new file mode 100644 index 0000000..ef0eef0 --- /dev/null +++ b/target/lm32/meson.build @@ -0,0 +1,15 @@ +lm32_ss =3D ss.source_set() +lm32_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'lm32-semi.c', + 'op_helper.c', + 'translate.c', +)) + +lm32_softmmu_ss =3D ss.source_set() +lm32_softmmu_ss.add(files('machine.c')) + +target_arch +=3D {'lm32': lm32_ss} +target_softmmu_arch +=3D {'lm32': lm32_softmmu_ss} diff --git a/target/m68k/Makefile.objs b/target/m68k/Makefile.objs deleted file mode 100644 index ac61948..0000000 --- a/target/m68k/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y +=3D m68k-semi.o -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-y +=3D fpu_helper.o softfloat.o -obj-y +=3D gdbstub.o -obj-$(CONFIG_SOFTMMU) +=3D monitor.o diff --git a/target/m68k/meson.build b/target/m68k/meson.build new file mode 100644 index 0000000..05cd9fb --- /dev/null +++ b/target/m68k/meson.build @@ -0,0 +1,17 @@ +m68k_ss =3D ss.source_set() +m68k_ss.add(files( + 'cpu.c', + 'fpu_helper.c', + 'gdbstub.c', + 'helper.c', + 'm68k-semi.c', + 'op_helper.c', + 'softfloat.c', + 'translate.c', +)) + +m68k_softmmu_ss =3D ss.source_set() +m68k_softmmu_ss.add(files('monitor.c')) + +target_arch +=3D {'m68k': m68k_ss} +target_softmmu_arch +=3D {'m68k': m68k_softmmu_ss} diff --git a/target/meson.build b/target/meson.build index e29dd3e..9f0ae93 100644 --- a/target/meson.build +++ b/target/meson.build @@ -1 +1,23 @@ +subdir('alpha') +subdir('arm') +subdir('avr') +subdir('cris') +subdir('hppa') +subdir('i386') +subdir('lm32') +subdir('m68k') +subdir('microblaze') +subdir('mips') +subdir('moxie') +subdir('nios2') +subdir('openrisc') +subdir('ppc') +subdir('riscv') +subdir('rx') subdir('s390x') +subdir('sh4') +subdir('sparc') +subdir('tilegx') +subdir('tricore') +subdir('unicore32') +subdir('xtensa') diff --git a/target/microblaze/Makefile.objs b/target/microblaze/Makefile.o= bjs deleted file mode 100644 index f3d7b44..0000000 --- a/target/microblaze/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-y +=3D gdbstub.o -obj-$(CONFIG_SOFTMMU) +=3D mmu.o diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build new file mode 100644 index 0000000..b8fe4af --- /dev/null +++ b/target/microblaze/meson.build @@ -0,0 +1,14 @@ +microblaze_ss =3D ss.source_set() +microblaze_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +microblaze_softmmu_ss =3D ss.source_set() +microblaze_softmmu_ss.add(files('mmu.c')) + +target_arch +=3D {'microblaze': microblaze_ss} +target_softmmu_arch +=3D {'microblaze': microblaze_softmmu_ss} diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs deleted file mode 100644 index b820b3b..0000000 --- a/target/mips/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -obj-y +=3D translate.o cpu.o gdbstub.o helper.o -obj-y +=3D op_helper.o cp0_helper.o fpu_helper.o -obj-y +=3D dsp_helper.o lmmi_helper.o msa_helper.o -obj-$(CONFIG_SOFTMMU) +=3D mips-semi.o -obj-$(CONFIG_SOFTMMU) +=3D machine.o cp0_timer.o -obj-$(CONFIG_KVM) +=3D kvm.o diff --git a/target/mips/meson.build b/target/mips/meson.build new file mode 100644 index 0000000..fa1f024 --- /dev/null +++ b/target/mips/meson.build @@ -0,0 +1,24 @@ +mips_ss =3D ss.source_set() +mips_ss.add(files( + 'cp0_helper.c', + 'cpu.c', + 'dsp_helper.c', + 'fpu_helper.c', + 'gdbstub.c', + 'helper.c', + 'lmmi_helper.c', + 'msa_helper.c', + 'op_helper.c', + 'translate.c', +)) +mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) + +mips_softmmu_ss =3D ss.source_set() +mips_softmmu_ss.add(files( + 'cp0_timer.c', + 'machine.c', + 'mips-semi.c', +)) + +target_arch +=3D {'mips': mips_ss} +target_softmmu_arch +=3D {'mips': mips_softmmu_ss} diff --git a/target/moxie/Makefile.objs b/target/moxie/Makefile.objs deleted file mode 100644 index 6381d4d..0000000 --- a/target/moxie/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y +=3D translate.o helper.o machine.o cpu.o machine.o -obj-$(CONFIG_SOFTMMU) +=3D mmu.o diff --git a/target/moxie/meson.build b/target/moxie/meson.build new file mode 100644 index 0000000..b4beb52 --- /dev/null +++ b/target/moxie/meson.build @@ -0,0 +1,14 @@ +moxie_ss =3D ss.source_set() +moxie_ss.add(files( + 'cpu.c', + 'helper.c', + 'machine.c', + 'machine.c', + 'translate.c', +)) + +moxie_softmmu_ss =3D ss.source_set() +moxie_softmmu_ss.add(files('mmu.c')) + +target_arch +=3D {'moxie': moxie_ss} +target_softmmu_arch +=3D {'moxie': moxie_softmmu_ss} diff --git a/target/nios2/Makefile.objs b/target/nios2/Makefile.objs deleted file mode 100644 index 010de0e..0000000 --- a/target/nios2/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o mmu.o nios2-semi.o -obj-$(CONFIG_SOFTMMU) +=3D monitor.o - -$(obj)/op_helper.o: QEMU_CFLAGS +=3D $(HELPER_CFLAGS) diff --git a/target/nios2/meson.build b/target/nios2/meson.build new file mode 100644 index 0000000..e643917 --- /dev/null +++ b/target/nios2/meson.build @@ -0,0 +1,15 @@ +nios2_ss =3D ss.source_set() +nios2_ss.add(files( + 'cpu.c', + 'helper.c', + 'mmu.c', + 'nios2-semi.c', + 'op_helper.c', + 'translate.c', +)) + +nios2_softmmu_ss =3D ss.source_set() +nios2_softmmu_ss.add(files('monitor.c')) + +target_arch +=3D {'nios2': nios2_ss} +target_softmmu_arch +=3D {'nios2': nios2_softmmu_ss} diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs deleted file mode 100644 index 0f2fcff..0000000 --- a/target/openrisc/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -obj-$(CONFIG_SOFTMMU) +=3D machine.o -obj-y +=3D cpu.o exception.o interrupt.o mmu.o translate.o disas.o -obj-y +=3D exception_helper.o fpu_helper.o \ - interrupt_helper.o sys_helper.o -obj-y +=3D gdbstub.o - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py - -target/openrisc/decode.inc: \ - $(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) - -target/openrisc/translate.o: target/openrisc/decode.inc -target/openrisc/disas.o: target/openrisc/decode.inc diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c index 3f75316..d5e0a43 100644 --- a/target/openrisc/disas.c +++ b/target/openrisc/disas.c @@ -25,7 +25,7 @@ typedef disassemble_info DisasContext; =20 /* Include the auto-generated decoder. */ -#include "decode.inc" +#include "decode-insns.inc" =20 #define output(mnemonic, format, ...) \ (info->fprintf_func(info->stream, "%-9s " format, \ diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build new file mode 100644 index 0000000..9774a58 --- /dev/null +++ b/target/openrisc/meson.build @@ -0,0 +1,23 @@ +gen =3D decodetree.process('insns.decode') + +openrisc_ss =3D ss.source_set() +openrisc_ss.add(gen) +openrisc_ss.add(files( + 'cpu.c', + 'disas.c', + 'exception.c', + 'exception_helper.c', + 'fpu_helper.c', + 'gdbstub.c', + 'interrupt.c', + 'interrupt_helper.c', + 'mmu.c', + 'sys_helper.c', + 'translate.c', +)) + +openrisc_softmmu_ss =3D ss.source_set() +openrisc_softmmu_ss.add(files('machine.c')) + +target_arch +=3D {'openrisc': openrisc_ss} +target_softmmu_arch +=3D {'openrisc': openrisc_softmmu_ss} diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index a119be2..ffd268d 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -65,7 +65,7 @@ static inline bool is_user(DisasContext *dc) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc" +#include "decode-insns.inc" =20 static TCGv cpu_sr; static TCGv cpu_regs[32]; diff --git a/target/ppc/Makefile.objs b/target/ppc/Makefile.objs deleted file mode 100644 index e8fa18c..0000000 --- a/target/ppc/Makefile.objs +++ /dev/null @@ -1,20 +0,0 @@ -obj-y +=3D cpu-models.o -obj-y +=3D cpu.o -obj-y +=3D translate.o -ifeq ($(CONFIG_SOFTMMU),y) -obj-y +=3D machine.o mmu_helper.o mmu-hash32.o monitor.o arch_dump.o -obj-$(TARGET_PPC64) +=3D mmu-hash64.o mmu-book3s-v3.o compat.o -obj-$(TARGET_PPC64) +=3D mmu-radix64.o -endif -obj-$(CONFIG_KVM) +=3D kvm.o -obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o -obj-y +=3D dfp_helper.o -obj-y +=3D excp_helper.o -obj-y +=3D fpu_helper.o -obj-y +=3D int_helper.o -obj-y +=3D timebase_helper.o -obj-y +=3D misc_helper.o -obj-y +=3D mem_helper.o -obj-y +=3D ../../libdecnumber/ -obj-$(CONFIG_USER_ONLY) +=3D user_only_helper.o -obj-y +=3D gdbstub.o diff --git a/target/ppc/meson.build b/target/ppc/meson.build new file mode 100644 index 0000000..bbfef90 --- /dev/null +++ b/target/ppc/meson.build @@ -0,0 +1,37 @@ +ppc_ss =3D ss.source_set() +ppc_ss.add(files( + 'cpu-models.c', + 'cpu.c', + 'dfp_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'gdbstub.c', + 'int_helper.c', + 'mem_helper.c', + 'misc_helper.c', + 'timebase_helper.c', + 'translate.c', +)) + +ppc_ss.add(libdecnumber) + +ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('k= vm-stub.c')) +ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c')) + +ppc_softmmu_ss =3D ss.source_set() +ppc_softmmu_ss.add(files( + 'arch_dump.c', + 'machine.c', + 'mmu-hash32.c', + 'mmu_helper.c', + 'monitor.c', +)) +ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files( + 'compat.c', + 'mmu-book3s-v3.c', + 'mmu-hash64.c', + 'mmu-radix64.c', +)) + +target_arch +=3D {'ppc': ppc_ss} +target_softmmu_arch +=3D {'ppc': ppc_softmmu_ss} diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs deleted file mode 100644 index 1a66d8a..0000000 --- a/target/riscv/Makefile.objs +++ /dev/null @@ -1,28 +0,0 @@ -obj-y +=3D translate.o op_helper.o cpu_helper.o cpu.o csr.o fpu_helper.o v= ector_helper.o gdbstub.o -obj-$(CONFIG_SOFTMMU) +=3D pmp.o - -ifeq ($(CONFIG_SOFTMMU),y) -obj-y +=3D monitor.o -endif - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py - -decode32-y =3D $(SRC_PATH)/target/riscv/insn32.decode -decode32-$(TARGET_RISCV64) +=3D $(SRC_PATH)/target/riscv/insn32-64.decode - -decode16-y =3D $(SRC_PATH)/target/riscv/insn16.decode -decode16-$(TARGET_RISCV32) +=3D $(SRC_PATH)/target/riscv/insn16-32.decode -decode16-$(TARGET_RISCV64) +=3D $(SRC_PATH)/target/riscv/insn16-64.decode - -target/riscv/decode_insn32.inc: $(decode32-y) $(DECODETREE) - $(call quiet-command, \ - $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \ - $(decode32-y), "GEN", $(TARGET_DIR)$@) - -target/riscv/decode_insn16.inc: $(decode16-y) $(DECODETREE) - $(call quiet-command, \ - $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn16 \ - --insnwidth 16 $(decode16-y), "GEN", $(TARGET_DIR)$@) - -target/riscv/translate.o: target/riscv/decode_insn32.inc \ - target/riscv/decode_insn16.inc diff --git a/target/riscv/meson.build b/target/riscv/meson.build new file mode 100644 index 0000000..abd647f --- /dev/null +++ b/target/riscv/meson.build @@ -0,0 +1,34 @@ +# FIXME extra_args should accept files() +dir =3D meson.current_source_dir() +gen32 =3D [ + decodetree.process('insn16.decode', extra_args: [dir / 'insn16-32.decode= ', '--static-decode=3Ddecode_insn16', '--insnwidth=3D16']), + decodetree.process('insn32.decode', extra_args: '--static-decode=3Ddecod= e_insn32'), +] + +gen64 =3D [ + decodetree.process('insn16.decode', extra_args: [dir / 'insn16-64.decode= ', '--static-decode=3Ddecode_insn16', '--insnwidth=3D16']), + decodetree.process('insn32.decode', extra_args: [dir / 'insn32-64.decode= ', '--static-decode=3Ddecode_insn32']), +] + +riscv_ss =3D ss.source_set() +riscv_ss.add(when: 'TARGET_RISCV32', if_true: gen32) +riscv_ss.add(when: 'TARGET_RISCV64', if_true: gen64) +riscv_ss.add(files( + 'cpu.c', + 'cpu_helper.c', + 'csr.c', + 'fpu_helper.c', + 'gdbstub.c', + 'op_helper.c', + 'vector_helper.c', + 'translate.c', +)) + +riscv_softmmu_ss =3D ss.source_set() +riscv_softmmu_ss.add(files( + 'pmp.c', + 'monitor.c' +)) + +target_arch +=3D {'riscv': riscv_ss} +target_softmmu_arch +=3D {'riscv': riscv_softmmu_ss} diff --git a/target/riscv/translate.c b/target/riscv/translate.c index aa7f56d..9be49c4 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -583,7 +583,7 @@ static int ex_rvc_shifti(DisasContext *ctx, int imm) } =20 /* Include the auto-generated decoder for 32 bit insn */ -#include "decode_insn32.inc" +#include "decode-insn32.inc" =20 static bool gen_arith_imm_fn(DisasContext *ctx, arg_i *a, void (*func)(TCGv, TCGv, target_long)) @@ -728,7 +728,7 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, #include "insn_trans/trans_privileged.inc" =20 /* Include the auto-generated decoder for 16 bit insn */ -#include "decode_insn16.inc" +#include "decode-insn16.inc" =20 static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opc= ode) { diff --git a/target/rx/Makefile.objs b/target/rx/Makefile.objs deleted file mode 100644 index eddc62a..0000000 --- a/target/rx/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o gdbstub.o disas.o - -DECODETREE =3D $(SRC_PATH)/scripts/decodetree.py - -target/rx/decode.inc: \ - $(SRC_PATH)/target/rx/insns.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --varinsnwidth 32 -o $@ $<, "GEN", $(TARGET_DIR= )$@) - -target/rx/translate.o: target/rx/decode.inc -target/rx/disas.o: target/rx/decode.inc diff --git a/target/rx/disas.c b/target/rx/disas.c index 6450892..6584509 100644 --- a/target/rx/disas.c +++ b/target/rx/disas.c @@ -100,7 +100,7 @@ static int bdsp_s(DisasContext *ctx, int d) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc" +#include "decode-insns.inc" =20 static void dump_bytes(DisasContext *ctx) { diff --git a/target/rx/meson.build b/target/rx/meson.build new file mode 100644 index 0000000..8de0ad4 --- /dev/null +++ b/target/rx/meson.build @@ -0,0 +1,16 @@ +gen =3D [ + decodetree.process('insns.decode', extra_args: [ '--varinsnwidth', '32' = ]) +] + +rx_ss =3D ss.source_set() +rx_ss.add(gen) +rx_ss.add(files( + 'translate.c', + 'op_helper.c', + 'helper.c', + 'cpu.c', + 'gdbstub.c', + 'disas.c')) + +target_arch +=3D {'rx': rx_ss} +target_softmmu_arch +=3D {'rx': ss.source_set()} diff --git a/target/rx/translate.c b/target/rx/translate.c index 272619c..d688c9d 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -124,7 +124,7 @@ static int bdsp_s(DisasContext *ctx, int d) } =20 /* Include the auto-generated decoder. */ -#include "decode.inc" +#include "decode-insns.inc" =20 void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags) { diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs deleted file mode 100644 index 9b9accc..0000000 --- a/target/s390x/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -obj-y +=3D cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o -obj-$(CONFIG_TCG) +=3D translate.o cc_helper.o excp_helper.o fpu_helper.o -obj-$(CONFIG_TCG) +=3D int_helper.o mem_helper.o misc_helper.o crypto_help= er.o -obj-$(CONFIG_TCG) +=3D vec_helper.o vec_int_helper.o vec_string_helper.o -obj-$(CONFIG_TCG) +=3D vec_fpu_helper.o -obj-$(CONFIG_SOFTMMU) +=3D machine.o ioinst.o arch_dump.o mmu_helper.o dia= g.o -obj-$(CONFIG_SOFTMMU) +=3D sigp.o -obj-$(CONFIG_KVM) +=3D kvm.o -obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o -obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o diff --git a/target/s390x/meson.build b/target/s390x/meson.build index ddf8d20..27d248e 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -1,3 +1,30 @@ +s390x_ss =3D ss.source_set() +s390x_ss.add(files( + 'cpu.c', + 'cpu_features.c', + 'cpu_models.c', + 'gdbstub.c', + 'helper.c', + 'interrupt.c', +)) + +s390x_ss.add(when: 'CONFIG_TCG', if_true: files( + 'cc_helper.c', + 'crypto_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'int_helper.c', + 'mem_helper.c', + 'misc_helper.c', + 'translate.c', + 'vec_fpu_helper.c', + 'vec_helper.c', + 'vec_int_helper.c', + 'vec_string_helper.c', +), if_false: 'tcg-stub.c') + +s390x_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files(= 'kvm-stub.c')) + gen_features =3D executable('gen-features', 'gen-features.c', native: true, build_by_default: false) =20 @@ -6,4 +33,17 @@ gen_features_h =3D custom_target('gen-features.h', capture: true, command: gen_features) =20 -specific_ss.add(gen_features_h) +s390x_ss.add(gen_features_h) + +s390x_softmmu_ss =3D ss.source_set() +s390x_softmmu_ss.add(files( + 'arch_dump.c', + 'diag.c', + 'ioinst.c', + 'machine.c', + 'mmu_helper.c', + 'sigp.c', +)) + +target_arch +=3D {'s390x': s390x_ss} +target_softmmu_arch +=3D {'s390x': s390x_softmmu_ss} diff --git a/target/sh4/Makefile.objs b/target/sh4/Makefile.objs deleted file mode 100644 index 2c25d96..0000000 --- a/target/sh4/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) +=3D monitor.o -obj-y +=3D gdbstub.o diff --git a/target/sh4/meson.build b/target/sh4/meson.build new file mode 100644 index 0000000..56a5757 --- /dev/null +++ b/target/sh4/meson.build @@ -0,0 +1,14 @@ +sh4_ss =3D ss.source_set() +sh4_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +sh4_softmmu_ss =3D ss.source_set() +sh4_softmmu_ss.add(files('monitor.c')) + +target_arch +=3D {'sh4': sh4_ss} +target_softmmu_arch +=3D {'sh4': sh4_softmmu_ss} diff --git a/target/sparc/Makefile.objs b/target/sparc/Makefile.objs deleted file mode 100644 index ec90569..0000000 --- a/target/sparc/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -obj-$(CONFIG_SOFTMMU) +=3D machine.o monitor.o -obj-y +=3D translate.o helper.o cpu.o -obj-y +=3D fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o -obj-$(TARGET_SPARC) +=3D int32_helper.o -obj-$(TARGET_SPARC64) +=3D int64_helper.o -obj-$(TARGET_SPARC64) +=3D vis_helper.o -obj-y +=3D gdbstub.o diff --git a/target/sparc/meson.build b/target/sparc/meson.build new file mode 100644 index 0000000..a3638b9 --- /dev/null +++ b/target/sparc/meson.build @@ -0,0 +1,23 @@ +sparc_ss =3D ss.source_set() +sparc_ss.add(files( + 'cc_helper.c', + 'cpu.c', + 'fop_helper.c', + 'gdbstub.c', + 'helper.c', + 'ldst_helper.c', + 'mmu_helper.c', + 'translate.c', + 'win_helper.c', +)) +sparc_ss.add(when: 'TARGET_SPARC', if_true: files('int32_helper.c')) +sparc_ss.add(when: 'TARGET_SPARC64', if_true: files('int64_helper.c', 'vis= _helper.c')) + +sparc_softmmu_ss =3D ss.source_set() +sparc_softmmu_ss.add(files( + 'machine.c', + 'monitor.c', +)) + +target_arch +=3D {'sparc': sparc_ss} +target_softmmu_arch +=3D {'sparc': sparc_softmmu_ss} diff --git a/target/tilegx/Makefile.objs b/target/tilegx/Makefile.objs deleted file mode 100644 index 0db778f..0000000 --- a/target/tilegx/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y +=3D cpu.o translate.o helper.o simd_helper.o diff --git a/target/tilegx/meson.build b/target/tilegx/meson.build new file mode 100644 index 0000000..6785904 --- /dev/null +++ b/target/tilegx/meson.build @@ -0,0 +1,13 @@ +tilegx_ss =3D ss.source_set() +tilegx_ss.add(files( + 'cpu.c', + 'helper.c', + 'simd_helper.c', + 'translate.c', +)) +tilegx_ss.add(zlib) + +tilegx_softmmu_ss =3D ss.source_set() + +target_arch +=3D {'tilegx': tilegx_ss} +target_softmmu_arch +=3D {'tilegx': tilegx_softmmu_ss} diff --git a/target/tricore/Makefile.objs b/target/tricore/Makefile.objs deleted file mode 100644 index 281b55f..0000000 --- a/target/tricore/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y +=3D translate.o helper.o cpu.o op_helper.o fpu_helper.o gdbstub.o diff --git a/target/tricore/meson.build b/target/tricore/meson.build new file mode 100644 index 0000000..0ccc829 --- /dev/null +++ b/target/tricore/meson.build @@ -0,0 +1,15 @@ +tricore_ss =3D ss.source_set() +tricore_ss.add(files( + 'cpu.c', + 'fpu_helper.c', + 'helper.c', + 'op_helper.c', + 'translate.c', + 'gdbstub.c', +)) +tricore_ss.add(zlib) + +tricore_softmmu_ss =3D ss.source_set() + +target_arch +=3D {'tricore': tricore_ss} +target_softmmu_arch +=3D {'tricore': tricore_softmmu_ss} diff --git a/target/unicore32/Makefile.objs b/target/unicore32/Makefile.objs deleted file mode 100644 index 35d8bf5..0000000 --- a/target/unicore32/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-y +=3D ucf64_helper.o - -obj-$(CONFIG_SOFTMMU) +=3D softmmu.o - -# Huh? Uses curses directly instead of using ui/console.h interfaces ... -helper.o-cflags :=3D $(CURSES_CFLAGS) -helper.o-libs :=3D $(CURSES_LIBS) diff --git a/target/unicore32/meson.build b/target/unicore32/meson.build new file mode 100644 index 0000000..0fa7877 --- /dev/null +++ b/target/unicore32/meson.build @@ -0,0 +1,14 @@ +unicore32_ss =3D ss.source_set() +unicore32_ss.add(files( + 'cpu.c', + 'helper.c', + 'op_helper.c', + 'translate.c', + 'ucf64_helper.c', +), curses) + +unicore32_softmmu_ss =3D ss.source_set() +unicore32_softmmu_ss.add(files('softmmu.c')) + +target_arch +=3D {'unicore32': unicore32_ss} +target_softmmu_arch +=3D {'unicore32': unicore32_softmmu_ss} diff --git a/target/xtensa/Makefile.objs b/target/xtensa/Makefile.objs deleted file mode 100644 index c7e7fe6..0000000 --- a/target/xtensa/Makefile.objs +++ /dev/null @@ -1,16 +0,0 @@ -obj-y +=3D core-dc232b.o -obj-y +=3D core-dc233c.o -obj-y +=3D core-de212.o -obj-y +=3D core-fsf.o -obj-y +=3D core-sample_controller.o -obj-y +=3D core-test_kc705_be.o -obj-y +=3D core-test_mmuhifi_c3.o -obj-$(CONFIG_SOFTMMU) +=3D monitor.o xtensa-semi.o -obj-y +=3D xtensa-isa.o -obj-y +=3D translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) +=3D dbg_helper.o -obj-y +=3D exc_helper.o -obj-y +=3D fpu_helper.o -obj-y +=3D gdbstub.o -obj-$(CONFIG_SOFTMMU) +=3D mmu_helper.o -obj-y +=3D win_helper.o diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build new file mode 100644 index 0000000..27e453e --- /dev/null +++ b/target/xtensa/meson.build @@ -0,0 +1,30 @@ +xtensa_ss =3D ss.source_set() +xtensa_ss.add(files( + 'core-dc232b.c', + 'core-dc233c.c', + 'core-de212.c', + 'core-fsf.c', + 'core-sample_controller.c', + 'core-test_kc705_be.c', + 'core-test_mmuhifi_c3.c', + 'cpu.c', + 'exc_helper.c', + 'fpu_helper.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', + 'win_helper.c', + 'xtensa-isa.c', +)) + +xtensa_softmmu_ss =3D ss.source_set() +xtensa_softmmu_ss.add(files( + 'dbg_helper.c', + 'mmu_helper.c', + 'monitor.c', + 'xtensa-semi.c', +)) + +target_arch +=3D {'xtensa': xtensa_ss} +target_softmmu_arch +=3D {'xtensa': xtensa_softmmu_ss} --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082388; cv=none; d=zohomail.com; s=zohoarc; b=dKATKcysnnBJ+qROiQaQisLxSLvxpnrSKSdOwcGYo1bkt+fjtvupbkZG8ghtm6tdBz1+F7m5tYBVTKyrChCaSf1kuTQW/bu6Sa8YUPoNCxUOVwxKlxZNBxFbS/ZpK4JleuTiPcUydwnBP1VCLR6wsyzXVWaGCOk/w2CY0RutH7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082388; 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=5fLbHnL8wwCJ7uaMNpepNN7NMRNPGWbY9q2Zpxb/SeQ=; b=leCQI81waK85ac7JG2TLFOS3/Tn3jQ2fp+Cuha59HihkNE6GI5MprOOz4s8NBvg7t0wEWR1urwqbeKOrXm0MeyzbJGxOXrM+oVnRQ21APQwJ+77Vz9arW9OX8OrgJ9Neih0aPJfqb5QpVTPkFiKcppOfozheQEpsWM2e7qpu5po= 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 1597082388583681.5118713064287; Mon, 10 Aug 2020 10:59:48 -0700 (PDT) Received: from localhost ([::1]:45950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C5L-0003Kt-Az for importer@patchew.org; Mon, 10 Aug 2020 13:59:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLq-00039X-KY for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLo-0003La-6w for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:46 -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-451-ZvO3d4bjNjGAe7Ryf2irAw-1; Mon, 10 Aug 2020 13:12:40 -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 8888A19067E0 for ; Mon, 10 Aug 2020 17:12:39 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9655A5F1E9; Mon, 10 Aug 2020 17:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079563; 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=5fLbHnL8wwCJ7uaMNpepNN7NMRNPGWbY9q2Zpxb/SeQ=; b=KkJZv1r9rbNIlUY0LyZ0d1ovpITls61EQBskGzoFAUyAoLkL66XwgbDR5VWaqLRFwC+Vxn pE8tI1eWhh5J3j/bip7iJ7veL1B/vcS0gcnsz/W+ibplLcRJapsawAHCJOKkgZCrReq2B4 WiQpWYbh+9YT+oa3jhQt0AXqyYwEDkc= X-MC-Unique: ZvO3d4bjNjGAe7Ryf2irAw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 126/147] meson: accel Date: Mon, 10 Aug 2020 19:08:44 +0200 Message-Id: <1597079345-42801-127-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=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/10 11:11:16 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 | 2 +- Makefile.target | 1 - accel/Makefile.objs | 6 ------ accel/kvm/Makefile.objs | 2 -- accel/kvm/meson.build | 5 +++++ accel/meson.build | 7 +++++++ accel/stubs/Makefile.objs | 6 ------ accel/stubs/meson.build | 6 ++++++ accel/tcg/Makefile.objs | 9 --------- accel/tcg/meson.build | 15 +++++++++++++++ accel/xen/Makefile.objs | 1 - accel/xen/meson.build | 1 + meson.build | 1 + 13 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 accel/Makefile.objs delete mode 100644 accel/kvm/Makefile.objs create mode 100644 accel/kvm/meson.build create mode 100644 accel/meson.build delete mode 100644 accel/stubs/Makefile.objs create mode 100644 accel/stubs/meson.build delete mode 100644 accel/tcg/Makefile.objs create mode 100644 accel/tcg/meson.build delete mode 100644 accel/xen/Makefile.objs create mode 100644 accel/xen/meson.build diff --git a/Makefile.objs b/Makefile.objs index c9720a9..83622c5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -39,7 +39,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # single QEMU executable should support all CPUs and machines. =20 ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y =3D accel/ +common-obj-y =3D =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 1ab8773..8633e2b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -110,7 +110,6 @@ obj-y +=3D trace/ ######################################################### # cpu emulator library obj-y +=3D exec.o exec-vary.o -obj-y +=3D accel/ obj-$(CONFIG_TCG) +=3D tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-= gvec.o obj-$(CONFIG_TCG) +=3D tcg/tcg-common.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) +=3D tcg/tci.o diff --git a/accel/Makefile.objs b/accel/Makefile.objs deleted file mode 100644 index ff72f0d..0000000 --- a/accel/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -common-obj-$(CONFIG_SOFTMMU) +=3D accel.o -obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) +=3D qtest.o -obj-$(CONFIG_KVM) +=3D kvm/ -obj-$(CONFIG_TCG) +=3D tcg/ -obj-$(CONFIG_XEN) +=3D xen/ -obj-y +=3D stubs/ diff --git a/accel/kvm/Makefile.objs b/accel/kvm/Makefile.objs deleted file mode 100644 index fdfa481..0000000 --- a/accel/kvm/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y +=3D kvm-all.o -obj-$(call lnot,$(CONFIG_SEV)) +=3D sev-stub.o diff --git a/accel/kvm/meson.build b/accel/kvm/meson.build new file mode 100644 index 0000000..4db2388 --- /dev/null +++ b/accel/kvm/meson.build @@ -0,0 +1,5 @@ +kvm_ss =3D ss.source_set() +kvm_ss.add(files('kvm-all.c')) +kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c')) + +specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss) diff --git a/accel/meson.build b/accel/meson.build new file mode 100644 index 0000000..26c503e --- /dev/null +++ b/accel/meson.build @@ -0,0 +1,7 @@ +softmmu_ss.add(files('accel.c')) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: files('= qtest.c')) + +subdir('kvm') +subdir('tcg') +subdir('xen') +subdir('stubs') diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs deleted file mode 100644 index bbd14e7..0000000 --- a/accel/stubs/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(call lnot,$(CONFIG_HAX)) +=3D hax-stub.o -obj-$(call lnot,$(CONFIG_HVF)) +=3D hvf-stub.o -obj-$(call lnot,$(CONFIG_WHPX)) +=3D whpx-stub.o -obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o -obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o -obj-$(call lnot,$(CONFIG_XEN)) +=3D xen-stub.o diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build new file mode 100644 index 0000000..314e3cf --- /dev/null +++ b/accel/stubs/meson.build @@ -0,0 +1,6 @@ +specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) +specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +specific_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) +specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +specific_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c')) diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs deleted file mode 100644 index a92f2c4..0000000 --- a/accel/tcg/Makefile.objs +++ /dev/null @@ -1,9 +0,0 @@ -obj-$(CONFIG_SOFTMMU) +=3D tcg-all.o -obj-$(CONFIG_SOFTMMU) +=3D cputlb.o -obj-y +=3D tcg-runtime.o tcg-runtime-gvec.o -obj-y +=3D cpu-exec.o cpu-exec-common.o translate-all.o -obj-y +=3D translator.o - -obj-$(CONFIG_USER_ONLY) +=3D user-exec.o -obj-$(call lnot,$(CONFIG_SOFTMMU)) +=3D user-exec-stub.o -obj-$(CONFIG_PLUGIN) +=3D plugin-gen.o diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build new file mode 100644 index 0000000..2a335b5 --- /dev/null +++ b/accel/tcg/meson.build @@ -0,0 +1,15 @@ +tcg_ss =3D ss.source_set() +tcg_ss.add(files( + 'cpu-exec-common.c', + 'cpu-exec.c', + 'tcg-runtime-gvec.c', + 'tcg-runtime.c', + 'translate-all.c', + 'translator.c', +)) +tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) +tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) +tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: files('plugin-gen.c')) +specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) + +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tc= g-all.c', 'cputlb.c')) diff --git a/accel/xen/Makefile.objs b/accel/xen/Makefile.objs deleted file mode 100644 index 7482cfb..0000000 --- a/accel/xen/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y +=3D xen-all.o diff --git a/accel/xen/meson.build b/accel/xen/meson.build new file mode 100644 index 0000000..002bdb0 --- /dev/null +++ b/accel/xen/meson.build @@ -0,0 +1 @@ +specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c')) diff --git a/meson.build b/meson.build index 1a78fa8..e4abee4 100644 --- a/meson.build +++ b/meson.build @@ -692,6 +692,7 @@ subdir('monitor') subdir('net') subdir('replay') subdir('hw') +subdir('accel') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082654; cv=none; d=zohomail.com; s=zohoarc; b=dueVjOR9bYKPx2NPY8qwG0VZtru8S/u6efs3VpSrJBiNiUR2kJwoWQaRhVw/NzMZxoLfLStfGoGxp9B66i/CV7fhE+eOaDyJuH7n3J1sjEANotzx0FYtjcjs5ypvwokq9bOJNx4Zh/JmlSW0qYXuqiu8jnYkUKFSVeHgjx+8xOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082654; 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=NiGoYBjzaHVyjtTRvq3+jNh9dok9B5VIHL9ZWFLNmwo=; b=PZ529AbA2vxnXW4kQHUJ/Ew6Pcoxpc2sizSW8mFDal/mezngKqtJTjk1Z4iWEJwUoTw9zTOOpcsDCAj7bEZ//5Ud162fVLbWLDVOfb5Xf4uSDnv5Rs6kBBTaQCzfUz6lQlXW9egRYDRg9pDPNysHqnK8oHw2JQWs1nSYKXBA8e8= 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 1597082654312620.0220738953375; Mon, 10 Aug 2020 11:04:14 -0700 (PDT) Received: from localhost ([::1]:34958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C9c-00025v-Md for importer@patchew.org; Mon, 10 Aug 2020 14:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLt-0003HX-MW for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29143 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 1k5BLq-0003M3-9g for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:49 -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-227-bWeuTO46MuC8C-Uo3nfddw-1; Mon, 10 Aug 2020 13:12:41 -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 E529F800472 for ; Mon, 10 Aug 2020 17:12:40 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0021F87D61; Mon, 10 Aug 2020 17:12:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079565; 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=NiGoYBjzaHVyjtTRvq3+jNh9dok9B5VIHL9ZWFLNmwo=; b=Tvy6BS97KnFnjPgKUN31rbnPdDjvxRCXXy0Ie98bR2kxMriOH12I9SZjDvmY/v1LWb5J7Q An5/z4D6XwAtWc+2JyN854BxZ50t/HrdpBgQkppzkhC2641oDI3rZ9rdhWSWFtwFnoJmi7 yEuk4Ql9LLHI+ohQP+Q62xIpywX27Vg= X-MC-Unique: bWeuTO46MuC8C-Uo3nfddw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 127/147] meson: linux-user Date: Mon, 10 Aug 2020 19:08:45 +0200 Message-Id: <1597079345-42801-128-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.target | 3 --- configure | 27 ++++++++++++--------------- linux-user/Makefile.objs | 25 ------------------------- linux-user/alpha/Makefile.objs | 5 ----- linux-user/alpha/meson.build | 5 +++++ linux-user/arm/Makefile.objs | 8 -------- linux-user/arm/meson.build | 10 ++++++++++ linux-user/arm/nwfpe/Makefile.objs | 2 -- linux-user/arm/nwfpe/meson.build | 10 ++++++++++ linux-user/hppa/Makefile.objs | 5 ----- linux-user/hppa/meson.build | 5 +++++ linux-user/i386/Makefile.objs | 5 ----- linux-user/i386/meson.build | 5 +++++ linux-user/i386/syscall_nr.h | 1 + linux-user/m68k/Makefile.objs | 5 ----- linux-user/m68k/meson.build | 5 +++++ linux-user/meson.build | 37 +++++++++++++++++++++++++++++++++= ++++ linux-user/microblaze/Makefile.objs | 5 ----- linux-user/microblaze/meson.build | 5 +++++ linux-user/mips/Makefile.objs | 5 ----- linux-user/mips/meson.build | 5 +++++ linux-user/mips/syscall_nr.h | 1 + linux-user/mips64/Makefile.objs | 12 ------------ linux-user/mips64/meson.build | 6 ++++++ linux-user/mips64/syscall_nr.h | 7 +++++++ linux-user/ppc/Makefile.objs | 6 ------ linux-user/ppc/meson.build | 5 +++++ linux-user/s390x/Makefile.objs | 5 ----- linux-user/s390x/meson.build | 5 +++++ linux-user/sh4/Makefile.objs | 5 ----- linux-user/sh4/meson.build | 5 +++++ linux-user/sparc/Makefile.objs | 5 ----- linux-user/sparc/meson.build | 5 +++++ linux-user/sparc64/Makefile.objs | 5 ----- linux-user/sparc64/meson.build | 5 +++++ linux-user/x86_64/Makefile.objs | 5 ----- linux-user/x86_64/meson.build | 5 +++++ linux-user/x86_64/syscall_nr.h | 1 + linux-user/xtensa/Makefile.objs | 5 ----- linux-user/xtensa/meson.build | 5 +++++ meson.build | 16 +++++++++++++++- 41 files changed, 165 insertions(+), 132 deletions(-) delete mode 100644 linux-user/Makefile.objs delete mode 100644 linux-user/alpha/Makefile.objs create mode 100644 linux-user/alpha/meson.build delete mode 100644 linux-user/arm/Makefile.objs create mode 100644 linux-user/arm/meson.build delete mode 100644 linux-user/arm/nwfpe/Makefile.objs create mode 100644 linux-user/arm/nwfpe/meson.build delete mode 100644 linux-user/hppa/Makefile.objs create mode 100644 linux-user/hppa/meson.build delete mode 100644 linux-user/i386/Makefile.objs create mode 100644 linux-user/i386/meson.build create mode 100644 linux-user/i386/syscall_nr.h delete mode 100644 linux-user/m68k/Makefile.objs create mode 100644 linux-user/m68k/meson.build create mode 100644 linux-user/meson.build delete mode 100644 linux-user/microblaze/Makefile.objs create mode 100644 linux-user/microblaze/meson.build delete mode 100644 linux-user/mips/Makefile.objs create mode 100644 linux-user/mips/meson.build create mode 100644 linux-user/mips/syscall_nr.h delete mode 100644 linux-user/mips64/Makefile.objs create mode 100644 linux-user/mips64/meson.build create mode 100644 linux-user/mips64/syscall_nr.h delete mode 100644 linux-user/ppc/Makefile.objs create mode 100644 linux-user/ppc/meson.build delete mode 100644 linux-user/s390x/Makefile.objs create mode 100644 linux-user/s390x/meson.build delete mode 100644 linux-user/sh4/Makefile.objs create mode 100644 linux-user/sh4/meson.build delete mode 100644 linux-user/sparc/Makefile.objs create mode 100644 linux-user/sparc/meson.build delete mode 100644 linux-user/sparc64/Makefile.objs create mode 100644 linux-user/sparc64/meson.build delete mode 100644 linux-user/x86_64/Makefile.objs create mode 100644 linux-user/x86_64/meson.build create mode 100644 linux-user/x86_64/syscall_nr.h delete mode 100644 linux-user/xtensa/Makefile.objs create mode 100644 linux-user/xtensa/meson.build diff --git a/Makefile.target b/Makefile.target index 8633e2b..a68859d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -131,9 +131,6 @@ QEMU_CFLAGS+=3D-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DI= R) \ -I$(SRC_PATH)/linux-user \ -Ilinux-user/$(TARGET_ABI_DIR) =20 -obj-y +=3D linux-user/ -obj-y +=3D gdbstub.o thunk.o - endif #CONFIG_LINUX_USER =20 ######################################################### diff --git a/configure b/configure index 1bdea00..ca3cd83 100755 --- a/configure +++ b/configure @@ -1945,20 +1945,6 @@ fi # Remove old dependency files to make sure that they get properly regenera= ted rm -f */config-devices.mak.d =20 -# Remove syscall_nr.h to be sure they will be regenerated in the build -# directory, not in the source directory -for arch in alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc spar= c64 \ - i386 x86_64 mips mips64 ; do - # remove the file if it has been generated in the source directory - rm -f "${source_path}/linux-user/${arch}/syscall_nr.h" - # remove the dependency files - for target in ${arch}*-linux-user ; do - test -d "${target}" && find "${target}" -type f -name "*.d" \ - -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h= " {} \; \ - -print | while read file ; do rm "${file}" "${file%.d}.o" ; d= one - done -done - if test -z "$python" then error_exit "Python not found. Use --python=3D/path/to/python" @@ -7929,18 +7915,22 @@ gdb_xml_files=3D"" TARGET_ARCH=3D"$target_name" TARGET_BASE_ARCH=3D"" TARGET_ABI_DIR=3D"" +TARGET_SYSTBL_ABI=3D"" +TARGET_SYSTBL=3D"" =20 case "$target_name" in i386) mttcg=3D"yes" gdb_xml_files=3D"i386-32bit.xml" TARGET_SYSTBL_ABI=3Di386 + TARGET_SYSTBL=3Dsyscall_32.tbl ;; x86_64) TARGET_BASE_ARCH=3Di386 TARGET_SYSTBL_ABI=3Dcommon,64 + TARGET_SYSTBL=3Dsyscall_64.tbl mttcg=3D"yes" - gdb_xml_files=3D"i386-64bit.xml" + gdb_xml_files=3D"i386-64bit.xml" ;; alpha) mttcg=3D"yes" @@ -7988,6 +7978,7 @@ case "$target_name" in TARGET_ARCH=3Dmips echo "TARGET_ABI_MIPSO32=3Dy" >> $config_target_mak TARGET_SYSTBL_ABI=3Do32 + TARGET_SYSTBL=3Dsyscall_o32.tbl ;; mipsn32|mipsn32el) mttcg=3D"yes" @@ -7996,6 +7987,7 @@ case "$target_name" in echo "TARGET_ABI_MIPSN32=3Dy" >> $config_target_mak echo "TARGET_ABI32=3Dy" >> $config_target_mak TARGET_SYSTBL_ABI=3Dn32 + TARGET_SYSTBL=3Dsyscall_n32.tbl ;; mips64|mips64el) mttcg=3D"no" @@ -8003,6 +7995,7 @@ case "$target_name" in TARGET_BASE_ARCH=3Dmips echo "TARGET_ABI_MIPSN64=3Dy" >> $config_target_mak TARGET_SYSTBL_ABI=3Dn64 + TARGET_SYSTBL=3Dsyscall_n64.tbl ;; moxie) ;; @@ -8101,6 +8094,9 @@ esac if [ "$TARGET_BASE_ARCH" =3D "" ]; then TARGET_BASE_ARCH=3D$TARGET_ARCH fi +if [ "$TARGET_SYSTBL_ABI" !=3D "" ] && [ "$TARGET_SYSTBL" =3D "" ]; then + TARGET_SYSTBL=3Dsyscall.tbl +fi =20 symlink "$source_path/Makefile.target" "$target_dir/Makefile" =20 @@ -8121,6 +8117,7 @@ if [ "$HOST_VARIANT_DIR" !=3D "" ]; then fi if [ "$TARGET_SYSTBL_ABI" !=3D "" ]; then echo "TARGET_SYSTBL_ABI=3D$TARGET_SYSTBL_ABI" >> $config_target_mak + echo "TARGET_SYSTBL=3D$TARGET_SYSTBL" >> $config_target_mak fi =20 if supported_xen_target $target; then diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs deleted file mode 100644 index 1940910..0000000 --- a/linux-user/Makefile.objs +++ /dev/null @@ -1,25 +0,0 @@ -obj-y =3D main.o syscall.o strace.o mmap.o signal.o \ - elfload.o linuxload.o uaccess.o uname.o \ - safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o - -obj-$(TARGET_HAS_BFLT) +=3D flatload.o -obj-$(TARGET_I386) +=3D vm86.o -obj-$(TARGET_AARCH64) +=3D arm/semihost.o - -obj-$(TARGET_ALPHA) +=3D alpha/ -obj-$(TARGET_ARM) +=3D arm/ -obj-$(TARGET_HPPA) +=3D hppa/ -obj-$(TARGET_I386) +=3D i386/ -obj-$(TARGET_M68K) +=3D m68k/ -obj-$(TARGET_MICROBLAZE) +=3D microblaze/ -obj-$(TARGET_MIPS) +=3D mips/ -obj-$(TARGET_MIPS64) +=3D mips64/ -obj-$(TARGET_PPC) +=3D ppc/ -obj-$(TARGET_PPC64) +=3D ppc/ -obj-$(TARGET_S390X) +=3D s390x/ -obj-$(TARGET_SH4) +=3D sh4/ -obj-$(TARGET_SPARC) +=3D sparc/ -obj-$(TARGET_SPARC64) +=3D $(TARGET_ABI_DIR)/ -obj-$(TARGET_X86_64) +=3D x86_64/ -obj-$(TARGET_XTENSA) +=3D xtensa/ diff --git a/linux-user/alpha/Makefile.objs b/linux-user/alpha/Makefile.objs deleted file mode 100644 index d6397a7..0000000 --- a/linux-user/alpha/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/alpha/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/alpha/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/alpha/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/alpha/meson.build b/linux-user/alpha/meson.build new file mode 100644 index 0000000..a3cd22d --- /dev/null +++ b/linux-user/alpha/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'alpha': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr= .sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/arm/Makefile.objs b/linux-user/arm/Makefile.objs deleted file mode 100644 index c7eb94d..0000000 --- a/linux-user/arm/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-$(TARGET_ARM) +=3D nwfpe/ -obj-$(TARGET_ARM) +=3D semihost.o - -generated-files-y +=3D linux-user/arm/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/arm/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/arm/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/arm/meson.build b/linux-user/arm/meson.build new file mode 100644 index 0000000..432984b --- /dev/null +++ b/linux-user/arm/meson.build @@ -0,0 +1,10 @@ +linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('semihost.c')) +linux_user_ss.add(when: 'TARGET_ARM', if_true: files('semihost.c')) + +subdir('nwfpe') + +syscall_nr_generators +=3D { + 'arm': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.s= h', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/arm/nwfpe/Makefile.objs b/linux-user/arm/nwfpe/Make= file.objs deleted file mode 100644 index 51b0c32..0000000 --- a/linux-user/arm/nwfpe/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y =3D fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o -obj-y +=3D single_cpdo.o double_cpdo.o extended_cpdo.o diff --git a/linux-user/arm/nwfpe/meson.build b/linux-user/arm/nwfpe/meson.= build new file mode 100644 index 0000000..1c27e55 --- /dev/null +++ b/linux-user/arm/nwfpe/meson.build @@ -0,0 +1,10 @@ +linux_user_ss.add(when: 'TARGET_ARM', if_true: files( + 'double_cpdo.c', + 'extended_cpdo.c', + 'fpa11.c', + 'fpa11_cpdo.c', + 'fpa11_cpdt.c', + 'fpa11_cprt.c', + 'fpopcode.c', + 'single_cpdo.c', +)) diff --git a/linux-user/hppa/Makefile.objs b/linux-user/hppa/Makefile.objs deleted file mode 100644 index f8368be..0000000 --- a/linux-user/hppa/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/hppa/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/hppa/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/hppa/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/hppa/meson.build b/linux-user/hppa/meson.build new file mode 100644 index 0000000..4709508 --- /dev/null +++ b/linux-user/hppa/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'hppa': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/i386/Makefile.objs b/linux-user/i386/Makefile.objs deleted file mode 100644 index c25cf17..0000000 --- a/linux-user/i386/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/i386/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/i386/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/i386/syscall_32.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/i386/meson.build b/linux-user/i386/meson.build new file mode 100644 index 0000000..ee52301 --- /dev/null +++ b/linux-user/i386/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'i386': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h new file mode 100644 index 0000000..976caab --- /dev/null +++ b/linux-user/i386/syscall_nr.h @@ -0,0 +1 @@ +#include "syscall_32_nr.h" diff --git a/linux-user/m68k/Makefile.objs b/linux-user/m68k/Makefile.objs deleted file mode 100644 index 961bd05..0000000 --- a/linux-user/m68k/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/m68k/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/m68k/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/m68k/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/m68k/meson.build b/linux-user/m68k/meson.build new file mode 100644 index 0000000..c0f436f --- /dev/null +++ b/linux-user/m68k/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'm68k': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/meson.build b/linux-user/meson.build new file mode 100644 index 0000000..2b94e4b --- /dev/null +++ b/linux-user/meson.build @@ -0,0 +1,37 @@ +linux_user_ss.add(files( + 'elfload.c', + 'exit.c', + 'fd-trans.c', + 'linuxload.c', + 'main.c', + 'mmap.c', + 'safe-syscall.S', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', + 'uname.c', +)) +linux_user_ss.add(rt) + +linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c')) +linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c')) + + +syscall_nr_generators =3D {} + +subdir('alpha') +subdir('arm') +subdir('hppa') +subdir('i386') +subdir('m68k') +subdir('microblaze') +subdir('mips64') +subdir('mips') +subdir('ppc') +subdir('s390x') +subdir('sh4') +subdir('sparc64') +subdir('sparc') +subdir('x86_64') +subdir('xtensa') diff --git a/linux-user/microblaze/Makefile.objs b/linux-user/microblaze/Ma= kefile.objs deleted file mode 100644 index bb8b318..0000000 --- a/linux-user/microblaze/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/microblaze/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/microblaze/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/microblaze/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/microblaze/meson.build b/linux-user/microblaze/meso= n.build new file mode 100644 index 0000000..f749d89 --- /dev/null +++ b/linux-user/microblaze/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'microblaze': generator(sh, + arguments: [ meson.current_source_dir() / 'sysca= llhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/mips/Makefile.objs b/linux-user/mips/Makefile.objs deleted file mode 100644 index 9be4de0..0000000 --- a/linux-user/mips/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/mips/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/mips/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/mips/syscall_o32.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI) "" 4000,"GE= N","$@") diff --git a/linux-user/mips/meson.build b/linux-user/mips/meson.build new file mode 100644 index 0000000..6066a50 --- /dev/null +++ b/linux-user/mips/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'mips': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/mips/syscall_nr.h b/linux-user/mips/syscall_nr.h new file mode 100644 index 0000000..45d133c --- /dev/null +++ b/linux-user/mips/syscall_nr.h @@ -0,0 +1 @@ +#include "syscall_o32_nr.h" diff --git a/linux-user/mips64/Makefile.objs b/linux-user/mips64/Makefile.o= bjs deleted file mode 100644 index 573448f..0000000 --- a/linux-user/mips64/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -generated-files-y +=3D linux-user/$(TARGET_ABI_DIR)/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh - -ifeq ($(TARGET_SYSTBL_ABI),n32) -%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n32.tbl $= (syshdr) - $(call quiet-command, sh $(syshdr) $< $@ n32 "" 6000,"GEN","$@") -endif -ifeq ($(TARGET_SYSTBL_ABI),n64) -%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n64.tbl $= (syshdr) - $(call quiet-command, sh $(syshdr) $< $@ n64 "" 5000,"GEN","$@") -endif diff --git a/linux-user/mips64/meson.build b/linux-user/mips64/meson.build new file mode 100644 index 0000000..0caab5f --- /dev/null +++ b/linux-user/mips64/meson.build @@ -0,0 +1,6 @@ +syscall_nr_generators +=3D { + 'mips64': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhd= r.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', + '', 'TARGET_SYSCALL_OFFSET' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/mips64/syscall_nr.h b/linux-user/mips64/syscall_nr.h new file mode 100644 index 0000000..672f2fa --- /dev/null +++ b/linux-user/mips64/syscall_nr.h @@ -0,0 +1,7 @@ +#ifdef TARGET_ABI_MIPSN32 +#define TARGET_SYSCALL_OFFSET 6000 +#include "syscall_n32_nr.h" +#else +#define TARGET_SYSCALL_OFFSET 5000 +#include "syscall_n64_nr.h" +#endif diff --git a/linux-user/ppc/Makefile.objs b/linux-user/ppc/Makefile.objs deleted file mode 100644 index be92e67..0000000 --- a/linux-user/ppc/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -generated-files-y +=3D linux-user/$(TARGET_ABI_DIR)/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh - -%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall.tbl $(sys= hdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/ppc/meson.build b/linux-user/ppc/meson.build new file mode 100644 index 0000000..19fead7 --- /dev/null +++ b/linux-user/ppc/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'ppc': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.s= h', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/s390x/Makefile.objs b/linux-user/s390x/Makefile.objs deleted file mode 100644 index f30f162..0000000 --- a/linux-user/s390x/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/s390x/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/s390x/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/s390x/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/s390x/meson.build b/linux-user/s390x/meson.build new file mode 100644 index 0000000..0781cce --- /dev/null +++ b/linux-user/s390x/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 's390x': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr= .sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/sh4/Makefile.objs b/linux-user/sh4/Makefile.objs deleted file mode 100644 index 83fc939..0000000 --- a/linux-user/sh4/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/sh4/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/sh4/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/sh4/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/sh4/meson.build b/linux-user/sh4/meson.build new file mode 100644 index 0000000..3bc3a69 --- /dev/null +++ b/linux-user/sh4/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'sh4': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr.s= h', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/sparc/Makefile.objs b/linux-user/sparc/Makefile.objs deleted file mode 100644 index 29d3f06..0000000 --- a/linux-user/sparc/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/sparc/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/sparc/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/sparc/meson.build b/linux-user/sparc/meson.build new file mode 100644 index 0000000..51a9c77 --- /dev/null +++ b/linux-user/sparc/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'sparc': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhdr= .sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/sparc64/Makefile.objs b/linux-user/sparc64/Makefile= .objs deleted file mode 100644 index afcd535..0000000 --- a/linux-user/sparc64/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/sparc64/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/sparc64/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/sparc64/meson.build b/linux-user/sparc64/meson.build new file mode 100644 index 0000000..9527a40 --- /dev/null +++ b/linux-user/sparc64/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'sparc64': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallh= dr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/x86_64/Makefile.objs b/linux-user/x86_64/Makefile.o= bjs deleted file mode 100644 index 2cef1d4..0000000 --- a/linux-user/x86_64/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/x86_64/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/x86_64/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/x86_64/syscall_64.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/x86_64/meson.build b/linux-user/x86_64/meson.build new file mode 100644 index 0000000..203af9a --- /dev/null +++ b/linux-user/x86_64/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'x86_64': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhd= r.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h new file mode 100644 index 0000000..760302c --- /dev/null +++ b/linux-user/x86_64/syscall_nr.h @@ -0,0 +1 @@ +#include "syscall_64_nr.h" diff --git a/linux-user/xtensa/Makefile.objs b/linux-user/xtensa/Makefile.o= bjs deleted file mode 100644 index d4be1b7..0000000 --- a/linux-user/xtensa/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -generated-files-y +=3D linux-user/xtensa/syscall_nr.h - -syshdr :=3D $(SRC_PATH)/linux-user/xtensa/syscallhdr.sh -%/syscall_nr.h: $(SRC_PATH)/linux-user/xtensa/syscall.tbl $(syshdr) - $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@") diff --git a/linux-user/xtensa/meson.build b/linux-user/xtensa/meson.build new file mode 100644 index 0000000..de77f3b --- /dev/null +++ b/linux-user/xtensa/meson.build @@ -0,0 +1,5 @@ +syscall_nr_generators +=3D { + 'xtensa': generator(sh, + arguments: [ meson.current_source_dir() / 'syscallhd= r.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], + output: '@BASENAME@_nr.h') +} diff --git a/meson.build b/meson.build index e4abee4..53f640d 100644 --- a/meson.build +++ b/meson.build @@ -693,6 +693,10 @@ subdir('net') subdir('replay') subdir('hw') subdir('accel') +subdir('linux-user') + +linux_user_ss.add(files('gdbstub.c', 'thunk.c')) +specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') @@ -790,6 +794,7 @@ foreach target : target_dirs =20 arch_srcs +=3D config_devices_h[target] else + abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' qemu_target_name =3D 'qemu-' + target_name if 'CONFIG_LINUX_USER' in config_target @@ -800,8 +805,17 @@ foreach target : target_dirs endif target_inc +=3D include_directories( base_dir, - base_dir / config_target['TARGET_ABI_DIR'], + base_dir / abi, ) + if 'CONFIG_LINUX_USER' in config_target + dir =3D base_dir / abi + arch_srcs +=3D files(dir / 'signal.c', dir / 'cpu_loop.c') + if config_target.has_key('TARGET_SYSTBL_ABI') + arch_srcs +=3D \ + syscall_nr_generators[abi].process(base_dir / abi / config_targe= t['TARGET_SYSTBL'], + extra_args : config_target['T= ARGET_SYSTBL_ABI']) + endif + endif endif =20 t =3D target_arch[arch].apply(config_target, strict: false) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083120; cv=none; d=zohomail.com; s=zohoarc; b=grIAxX3uuF87PWeJr2x70biqplsebvS+Mv64Bv4c/3wbA8wEpjIrN7e4Be7bW3h4aO/oriAa4062mVZW2EXoD5S8RRphTgTQvw3QY5hZ3XO+P+QkddXoUlhMd7JMzhsXXGrYItxY+5/uB3ZvmAQyDEse9GLv5ioezFDkTLAUXXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083120; 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=iyEOhtSpxG49zghYTRru/PngJtWX4drjbewU4v2iXj8=; b=ZYp2wCHkmpN4fOIXn37+EX1IBeTDBeNM1odjBo3Wih2kmS02M2thJAkirsPd+ADLTtEu5sjBTNhVRj0dVdsSwP2aFSQbBxxEWd2h7FepvvNsA9B5tvyG/j7zCOQCbxkBnv7uxq67FWHUyQdej+DJHdMHPZCAQVe90h1a25tPKyQ= 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 1597083120229841.2369133708743; Mon, 10 Aug 2020 11:12:00 -0700 (PDT) Received: from localhost ([::1]:43924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CH8-0000D8-Jc for importer@patchew.org; Mon, 10 Aug 2020 14:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLr-0003Cf-TA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52606 helo=us-smtp-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 1k5BLp-0003Lv-SU for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:47 -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-399-hNwINnLrMmyykZG0niQNQg-1; Mon, 10 Aug 2020 13:12:43 -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 503C2106B242 for ; Mon, 10 Aug 2020 17:12:42 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D9715F1E9; Mon, 10 Aug 2020 17:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079565; 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=iyEOhtSpxG49zghYTRru/PngJtWX4drjbewU4v2iXj8=; b=SPgnC3L4TDlTBmWsT9H1f56Imx384/67VEZ0ufHixr4IUCyLQDqhszala549U/xn5yhssO 07Dv6A4vH5+F9wOmsq1b0A4p/mgCE9/0bdqJk7cEtnfNwAhvrYo1kLhr9aSSk7M3KSDHRO gnWoSlSgdPzWvPZatukPi76aRy3wQDU= X-MC-Unique: hNwINnLrMmyykZG0niQNQg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 128/147] meson: bsd-user Date: Mon, 10 Aug 2020 19:08:46 +0200 Message-Id: <1597079345-42801-129-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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.target | 3 --- bsd-user/Makefile.objs | 2 -- bsd-user/meson.build | 10 ++++++++++ meson.build | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 bsd-user/Makefile.objs create mode 100644 bsd-user/meson.build diff --git a/Makefile.target b/Makefile.target index a68859d..5c099fa 100644 --- a/Makefile.target +++ b/Makefile.target @@ -141,9 +141,6 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_= DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) =20 -obj-y +=3D bsd-user/ -obj-y +=3D gdbstub.o - endif #CONFIG_BSD_USER =20 ######################################################### diff --git a/bsd-user/Makefile.objs b/bsd-user/Makefile.objs deleted file mode 100644 index 5e77f57..0000000 --- a/bsd-user/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y =3D main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ - uaccess.o diff --git a/bsd-user/meson.build b/bsd-user/meson.build new file mode 100644 index 0000000..0369549 --- /dev/null +++ b/bsd-user/meson.build @@ -0,0 +1,10 @@ +bsd_user_ss.add(files( + 'bsdload.c', + 'elfload.c', + 'main.c', + 'mmap.c', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', +)) diff --git a/meson.build b/meson.build index 53f640d..6490301 100644 --- a/meson.build +++ b/meson.build @@ -693,8 +693,12 @@ subdir('net') subdir('replay') subdir('hw') subdir('accel') +subdir('bsd-user') subdir('linux-user') =20 +bsd_user_ss.add(files('gdbstub.c')) +specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) + linux_user_ss.add(files('gdbstub.c', 'thunk.c')) specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082734; cv=none; d=zohomail.com; s=zohoarc; b=N2ekQUU/2ARrSLhvjyU7LULAka8UIcHTRBV68YKZ5MVaEt2glrSJqeLrP7G1WrJcOQZCLgL5EoHPzYNxRz1kFXBJ5ZkuwY16HuD9F1aiRX63ggDhtfqmytyp7Ql+nfm1jcsUbzsyGEA5FURFFInpJr/YW+a6jg9gmZA6His7w1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082734; 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=BGyMOleRKraS/VLuVwHLJo6BrzNvMRmHU3dardeanKQ=; b=SvrBlrBq2r3+Edt+Uq6kx9dFbSvg8hFDr15PaKxzmkAX+28EWd7eYVDOlqYDp1il3DJYPyHHIZYV7agwZZQ5Dve106Ng0S02kA2FDElPtb5ktu1g4uAbC/MpHluKPG7jxFAfusXgFbBGSRwrhk5L+4VdrClINpEwQZJcugeGjLA= 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 1597082734553868.1985709742845; Mon, 10 Aug 2020 11:05:34 -0700 (PDT) Received: from localhost ([::1]:40958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CAv-0004W5-AN for importer@patchew.org; Mon, 10 Aug 2020 14:05:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLv-0003LS-BW for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLs-0003MT-CC for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:51 -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-460-qE7jzfx1P0ihG0ORImTMwQ-1; Mon, 10 Aug 2020 13:12:44 -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 ADB938064B5 for ; Mon, 10 Aug 2020 17:12:43 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC8C187D61; Mon, 10 Aug 2020 17:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079567; 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=BGyMOleRKraS/VLuVwHLJo6BrzNvMRmHU3dardeanKQ=; b=eLZxhZdcuJyA/FUKQSyOWovhBwFuT1ZNULaziBA0yL9teMLuFx/7rDWNMfEPMkauNkAES1 aZPpiP9dSdMbqlNPzHrVPjC5MyIhQ5cV7UO9HtOPMeKCo2KTULNstiAJMQhYFAr/RGpS8z MBb+UdDq6wf2ybMoZpAEldD+BmsFjug= X-MC-Unique: qE7jzfx1P0ihG0ORImTMwQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 129/147] meson: cpu-emu Date: Mon, 10 Aug 2020 19:08:47 +0200 Message-Id: <1597079345-42801-130-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=63.128.21.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/10 13:09:25 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.target | 12 ------------ configure | 8 ++++++++ meson.build | 37 +++++++++++++++++++++++++++++++++++++ scripts/feature_to_c.sh | 24 ++++++++---------------- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/Makefile.target b/Makefile.target index 5c099fa..c180b4c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -108,15 +108,6 @@ obj-y +=3D $(LIBQEMU) obj-y +=3D trace/ =20 ######################################################### -# cpu emulator library -obj-y +=3D exec.o exec-vary.o -obj-$(CONFIG_TCG) +=3D tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-= gvec.o -obj-$(CONFIG_TCG) +=3D tcg/tcg-common.o tcg/optimize.o -obj-$(CONFIG_TCG_INTERPRETER) +=3D tcg/tci.o -obj-$(CONFIG_TCG_INTERPRETER) +=3D disas/tci.o -obj-$(CONFIG_TCG) +=3D fpu/softfloat.o -obj-y +=3D disas.o -obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o LIBS :=3D $(libs_cpu) $(LIBS) =20 obj-$(CONFIG_PLUGIN) +=3D plugins/ @@ -200,9 +191,6 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif =20 -gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh - $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_= c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@") - clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') diff --git a/configure b/configure index ca3cd83..a912055 100755 --- a/configure +++ b/configure @@ -5418,9 +5418,13 @@ case "$capstone" in LIBCAPSTONE=3Dlibcapstone.a fi libs_cpu=3D"-L$PWD/capstone -lcapstone $libs_cpu" + capstone_libs=3D"-L$PWD/capstone -lcapstone" + capstone_cflags=3D"-I${source_path}/capstone/include" ;; =20 system) + capstone_libs=3D"$($pkg_config --libs capstone)" + capstone_cflags=3D"$($pkg_config --cflags capstone)" QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" libs_cpu=3D"$($pkg_config --libs capstone) $libs_cpu" ;; @@ -7641,6 +7645,8 @@ if test "$ivshmem" =3D "yes" ; then fi if test "$capstone" !=3D "no" ; then echo "CONFIG_CAPSTONE=3Dy" >> $config_host_mak + echo "CAPSTONE_CFLAGS=3D$capstone_cflags" >> $config_host_mak + echo "CAPSTONE_LIBS=3D$capstone_libs" >> $config_host_mak fi if test "$debug_mutex" =3D "yes" ; then echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak @@ -7661,6 +7667,8 @@ fi =20 if test "$libpmem" =3D "yes" ; then echo "CONFIG_LIBPMEM=3Dy" >> $config_host_mak + echo "LIBPMEM_LIBS=3D$libpmem_libs" >> $config_host_mak + echo "LIBPMEM_CFLAGS=3D$libpmem_cflags" >> $config_host_mak fi =20 if test "$libdaxctl" =3D "yes" ; then diff --git a/meson.build b/meson.build index 6490301..2190d98 100644 --- a/meson.build +++ b/meson.build @@ -333,6 +333,16 @@ if 'CONFIG_USB_LIBUSB' in config_host libusb =3D declare_dependency(compile_args: config_host['LIBUSB_CFLAGS']= .split(), link_args: config_host['LIBUSB_LIBS'].split(= )) endif +capstone =3D not_found +if 'CONFIG_CAPSTONE' in config_host + capstone =3D declare_dependency(compile_args: config_host['CAPSTONE_CFLA= GS'].split(), + link_args: config_host['CAPSTONE_LIBS'].sp= lit()) +endif +libpmem =3D not_found +if 'CONFIG_LIBPMEM' in config_host + libpmem =3D declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS= '].split(), + link_args: config_host['LIBPMEM_LIBS'].spli= t()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -517,6 +527,8 @@ target_softmmu_arch =3D {} # Trace files # ############### =20 +# TODO: add each directory to the subdirs from its own meson.build, once +# we have those trace_events_subdirs =3D [ 'accel/kvm', 'accel/tcg', @@ -685,6 +697,20 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [f= iles('device_tree.c')]) common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') + +specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem) +specific_ss.add(files('exec-vary.c')) +specific_ss.add(when: 'CONFIG_TCG', if_true: files( + 'fpu/softfloat.c', + 'tcg/optimize.c', + 'tcg/tcg-common.c', + 'tcg/tcg-op-gvec.c', + 'tcg/tcg-op-vec.c', + 'tcg/tcg-op.c', + 'tcg/tcg.c', +)) +specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.= c', 'tcg/tci.c')) + subdir('backends') subdir('disas') subdir('migration') @@ -776,6 +802,8 @@ common_all =3D static_library('common', dependencies: common_all.dependencies(), name_suffix: 'fa') =20 +feature_to_c =3D find_program('scripts/feature_to_c.sh') + foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] @@ -822,6 +850,15 @@ foreach target : target_dirs endif endif =20 + if 'TARGET_XML_FILES' in config_target + gdbstub_xml =3D custom_target(target + '-gdbstub-xml.c', + output: target + '-gdbstub-xml.c', + input: files(config_target['TARGET_XML_FIL= ES'].split()), + command: [feature_to_c, '@INPUT@'], + capture: true) + arch_srcs +=3D gdbstub_xml + endif + t =3D target_arch[arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() =20 diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh index c8ce9b8..b116989 100644 --- a/scripts/feature_to_c.sh +++ b/scripts/feature_to_c.sh @@ -19,16 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . =20 -output=3D$1 -shift - -if test -z "$output" || test -z "$1"; then - echo "Usage: $0 OUTPUTFILE INPUTFILE..." - exit 1 -fi - -if test -e "$output"; then - echo "Output file \"$output\" already exists; refusing to overwrite." +if test -z "$1"; then + echo "Usage: $0 INPUTFILE..." exit 1 fi =20 @@ -60,17 +52,17 @@ for input; do printf "'\''\\n'\'', \n" } END { print " 0 };" - }' < $input >> $output + }' < $input done =20 -echo >> $output -echo "const char *const xml_builtin[][2] =3D {" >> $output +echo +echo "const char *const xml_builtin[][2] =3D {" =20 for input; do basename=3D$(echo $input | sed 's,.*/,,') arrayname=3Dxml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g') - echo " { \"$basename\", $arrayname }," >> $output + echo " { \"$basename\", $arrayname }," done =20 -echo " { (char *)0, (char *)0 }" >> $output -echo "};" >> $output +echo " { (char *)0, (char *)0 }" +echo "};" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082759; cv=none; d=zohomail.com; s=zohoarc; b=hDDYxfG5d6zU9kVD8n95UuPVmcRtUpB00iefUvNLSbQzPF6RyoSvrswyYAdRT/JypxlNVgglJRyuoV2AgHcrNPxg5tvcxAKSjqLzL9YbLDtWLvygjaIVzL8yI3QWUCV/Uy2zt2liEdDjN6B55MY6Lt6ivekiGSL3dX/rod+wkOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082759; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=L5kT7YC92E9ItCT0APvjB6kCqOqqaEGiVBS1dbBXCbE=; b=PLbINDbCjj3jsnmQcNziCf4tl4NGAzRq2iq+Klzw226PrC+1cUefz4gD0QtKTsQ2WcsY0rn8u5n8z32rE0fpu55+//VaTMFAAkduniLM0syAlNZfQUmbNdOxHRorOH/Es7/341PJQID1uwr9+NUd1Sgi2nSiSSjyGg7VtbMi6hw= 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 1597082759196987.3948852083415; Mon, 10 Aug 2020 11:05:59 -0700 (PDT) Received: from localhost ([::1]:43366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CBJ-0005Sa-SF for importer@patchew.org; Mon, 10 Aug 2020 14:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLu-0003J6-EK for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:50 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33114 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 1k5BLs-0003MW-BG for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:50 -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-84-gIXiGT-uNq6d3j_ktEBUfA-1; Mon, 10 Aug 2020 13:12:45 -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 D85A6106B242 for ; Mon, 10 Aug 2020 17:12:44 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25DF95F1E9 for ; Mon, 10 Aug 2020 17:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=L5kT7YC92E9ItCT0APvjB6kCqOqqaEGiVBS1dbBXCbE=; b=XfszISQKwftn+/NnrEi7LhyuDwZjre0hJk4/PvIFk6gpMScRA3piEqjryeaETV/w47b/k/ Q15cxZSFldj4RsPBNr2Jh4JT5oKXe0A1fm4fAhKpN7ZJxL2zNDuUqGLtY/P3z7jWQh3nSI dO0bHbnobx1v5F4qllvjuc/MSdvoQfw= X-MC-Unique: gIXiGT-uNq6d3j_ktEBUfA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 130/147] meson: plugins Date: Mon, 10 Aug 2020 19:08:48 +0200 Message-Id: <1597079345-42801-131-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For now link arguments end up in Makefile.target, they will move to the right place soon. Signed-off-by: Paolo Bonzini --- Makefile | 8 +------- Makefile.target | 12 ++++++++++-- meson.build | 5 +++++ plugins/Makefile.objs | 21 --------------------- plugins/meson.build | 5 +++++ 5 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 plugins/Makefile.objs create mode 100644 plugins/meson.build diff --git a/Makefile b/Makefile index 5e8f281..e3ccea0 100644 --- a/Makefile +++ b/Makefile @@ -413,13 +413,10 @@ endif =20 ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 =20 -install-includedir: - $(INSTALL_DIR) "$(DESTDIR)$(includedir)" - # Needed by "meson install" export DESTDIR install: all $(if $(BUILD_DOCS),install-doc) \ - install-datadir install-localstatedir install-includedir \ + install-datadir install-localstatedir \ recurse-install ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) @@ -446,9 +443,6 @@ endif ifdef CONFIG_GTK $(MAKE) -C po $@ endif -ifeq ($(CONFIG_PLUGIN),y) - $(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(inclu= dedir)/qemu-plugin.h" -endif $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ diff --git a/Makefile.target b/Makefile.target index c180b4c..2b7280b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -110,8 +110,6 @@ obj-y +=3D trace/ ######################################################### LIBS :=3D $(libs_cpu) $(LIBS) =20 -obj-$(CONFIG_PLUGIN) +=3D plugins/ - ######################################################### # Linux user emulator target =20 @@ -153,6 +151,16 @@ LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) LIBS :=3D $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS) =20 +ifeq ($(CONFIG_PLUGIN),y) +ifdef CONFIG_HAS_LD_DYNAMIC_LIST +LIBS +=3D -Wl,--dynamic-list=3D$(BUILD_DIR)/qemu-plugins-ld.symbols +else +ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST +LIBS +=3D -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols +endif +endif +endif + generated-files-y +=3D hmp-commands.h hmp-commands-info.h =20 endif # CONFIG_SOFTMMU diff --git a/meson.build b/meson.build index 2190d98..420e60b 100644 --- a/meson.build +++ b/meson.build @@ -719,6 +719,7 @@ subdir('net') subdir('replay') subdir('hw') subdir('accel') +subdir('plugins') subdir('bsd-user') subdir('linux-user') =20 @@ -887,6 +888,10 @@ endforeach =20 # Other build targets =20 +if 'CONFIG_PLUGIN' in config_host + install_headers('include/qemu/qemu-plugin.h') +endif + if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif diff --git a/plugins/Makefile.objs b/plugins/Makefile.objs deleted file mode 100644 index 6f14d91..0000000 --- a/plugins/Makefile.objs +++ /dev/null @@ -1,21 +0,0 @@ -# -# Plugin Support -# - -obj-y +=3D loader.o -obj-y +=3D core.o -obj-y +=3D api.o - -# Abuse -libs suffix to only link with --dynamic-list/-exported_symbols_li= st -# when the final binary includes the plugin object. -# -# Note that simply setting LDFLAGS is not enough: we build binaries that -# never link plugin.o, and the linker might fail (at least ld64 does) -# if the symbols in the list are not in the output binary. -ifdef CONFIG_HAS_LD_DYNAMIC_LIST -api.o-libs :=3D -Wl,--dynamic-list=3D$(BUILD_DIR)/qemu-plugins-ld.symbols -else -ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST -api.o-libs :=3D -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.= symbols -endif -endif diff --git a/plugins/meson.build b/plugins/meson.build new file mode 100644 index 0000000..9608e52 --- /dev/null +++ b/plugins/meson.build @@ -0,0 +1,5 @@ +specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files( + 'loader.c', + 'core.c', + 'api.c', +)]) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082825; cv=none; d=zohomail.com; s=zohoarc; b=KbRN9Zm6qTzj8lkVVj14UK1cLf3xkWFRXiI6R/jipEvdCfFHWnvJCkNJcYekgljskLHsuDT38gzfLvhK4I3EXFbXqmmMzn+ZUuxqfn4LklTgAliJvAuTmNH/1cgwiNgr6WoVhx5EphObImbrZueXd8J0DGsf/oR2nqvL/gGsSAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082825; 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=uwOpWu1aIgBDoVYU9A9YnjLGgBlisAxmRrWn0a5gX1o=; b=jSjuPyXc/mfMuOCqrnOJQuiqU7l9hT35l31aZaOdASAfbtDv/9HL/CXMtHECdGdbC/AFt7YKVK53zaOABc12rW3487l2x3DdE3CpsgwwbjCP6dOimU2Frps/gkOca7D1WSZ0eJnbhnt0Y1zoc/4WI5PbTOa+fJJSsE0ps1SAKn8= 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 1597082825364496.37521775218306; Mon, 10 Aug 2020 11:07:05 -0700 (PDT) Received: from localhost ([::1]:49716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CCN-00083r-Tb for importer@patchew.org; Mon, 10 Aug 2020 14:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLz-0003W0-8t for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21036 helo=us-smtp-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 1k5BLu-0003Mz-Oh for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:54 -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-294-jr5XfcXJMhKQ1luXd-j1Qg-1; Mon, 10 Aug 2020 13:12:47 -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 3E158800472 for ; Mon, 10 Aug 2020 17:12:46 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6A75F1E9; Mon, 10 Aug 2020 17:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079570; 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=uwOpWu1aIgBDoVYU9A9YnjLGgBlisAxmRrWn0a5gX1o=; b=ccvRutTM21DQ9h6oOjAxdDzbVTIrebrld8FgqZ7gsV4UGeYLNYjrV4C0APm+L1g0JUdyA8 guJ+ABNnIPvbtvRAWdOZUJqTUeAL49AmYlAiF6LohyQSr0qk/q/BPNn1taHO6vOXX21kxh aneS6Wa5epzJ5w3aE75YUwEn7OaSB+Q= X-MC-Unique: jr5XfcXJMhKQ1luXd-j1Qg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 131/147] meson: link emulators without Makefile.target Date: Mon, 10 Aug 2020 19:08:49 +0200 Message-Id: <1597079345-42801-132-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- .gitlab-ci.yml | 6 +- Makefile | 34 +------ Makefile.objs | 32 ------- Makefile.target | 153 +-------------------------= ---- configure | 24 ++--- docs/devel/blkverify.txt | 4 +- docs/devel/testing.rst | 4 +- docs/interop/live-block-operations.rst | 4 +- meson.build | 73 +++++++++++++- os-posix.c | 2 +- plugins/meson.build | 10 +- rules.mak | 1 - scripts/device-crash-test | 2 +- scripts/oss-fuzz/build.sh | 20 ++-- softmmu/Makefile.objs | 2 - tests/Makefile.include | 4 +- tests/acceptance/avocado_qemu/__init__.py | 3 +- tests/data/acpi/rebuild-expected-aml.sh | 2 +- tests/multiboot/run_test.sh | 2 +- tests/qemu-iotests/check | 6 +- tests/qtest/fuzz/Makefile.include | 39 -------- tests/qtest/fuzz/i440fx_fuzz.c | 4 +- tests/qtest/fuzz/meson.build | 35 +++++++ tests/qtest/fuzz/qtest_wrappers.c | 2 +- tests/qtest/fuzz/virtio_net_fuzz.c | 3 +- tests/qtest/fuzz/virtio_scsi_fuzz.c | 8 +- tests/qtest/libqos/qgraph.h | 2 +- tests/qtest/meson.build | 2 +- tests/qtest/rtas-test.c | 2 +- tests/tcg/configure.sh | 4 +- 30 files changed, 168 insertions(+), 321 deletions(-) delete mode 100644 softmmu/Makefile.objs delete mode 100644 tests/qtest/fuzz/Makefile.include create mode 100644 tests/qtest/fuzz/meson.build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9820066..b7967b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,9 +265,9 @@ build-tci: - make run-tcg-tests-x86_64-softmmu - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test - for tg in $TARGETS ; do - export QTEST_QEMU_BINARY=3D"${tg}-softmmu/qemu-system-${tg}" ; + export QTEST_QEMU_BINARY=3D"./qemu-system-${tg}" ; ./tests/qtest/boot-serial-test || exit 1 ; ./tests/qtest/cdrom-test || exit 1 ; done - - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/qtes= t/pxe-test - - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" ./tests/qtest/= pxe-test -m slow + - QTEST_QEMU_BINARY=3D"./qemu-system-x86_64" ./tests/qtest/pxe-test + - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow diff --git a/Makefile b/Makefile index e3ccea0..ebda912 100644 --- a/Makefile +++ b/Makefile @@ -105,9 +105,6 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 -generated-files-y +=3D target/s390x/gen-features.h -target/s390x/gen-features.h: Makefile.ninja - generated-files-y +=3D .git-submodule-status =20 # Don't try to regenerate Makefile or configure @@ -171,29 +168,6 @@ config-host.h-timestamp: config-host.mak =20 TARGET_DIRS_RULES :=3D $(foreach t, all fuzz clean install, $(addsuffix /$= (t), $(TARGET_DIRS))) =20 -SOFTMMU_ALL_RULES=3D$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) -$(SOFTMMU_ALL_RULES): $(authz-obj-y) -$(SOFTMMU_ALL_RULES): $(block-obj-y) -$(SOFTMMU_ALL_RULES): $(chardev-obj-y) -$(SOFTMMU_ALL_RULES): $(crypto-obj-y) -$(SOFTMMU_ALL_RULES): $(io-obj-y) -$(SOFTMMU_ALL_RULES): $(qom-obj-y) -$(SOFTMMU_ALL_RULES): config-all-devices.mak - -SOFTMMU_FUZZ_RULES=3D$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES)) -$(SOFTMMU_FUZZ_RULES): $(authz-obj-y) -$(SOFTMMU_FUZZ_RULES): $(block-obj-y) -$(SOFTMMU_FUZZ_RULES): $(chardev-obj-y) -$(SOFTMMU_FUZZ_RULES): $(crypto-obj-y) -$(SOFTMMU_FUZZ_RULES): $(io-obj-y) -$(SOFTMMU_FUZZ_RULES): config-all-devices.mak -$(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) - -# meson: this is sub-optimal but going away after conversion -TARGET_DEPS =3D $(patsubst %,%-config-target.h, $(TARGET_DIRS)) -TARGET_DEPS +=3D $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TAR= GET_DIRS))) -TARGET_DEPS +=3D $(patsubst %,libqemu-%.fa, $(TARGET_DIRS)) - .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that # $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal @@ -236,11 +210,7 @@ slirp/all: .git-submodule-status CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ CFLAGS=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)") =20 -$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) block.syms qemu.syms - -$(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY)) +$(filter %/all, $(TARGET_DIRS_RULES)): =20 ROM_DIRS =3D $(addprefix pc-bios/, $(ROMS)) ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) @@ -262,8 +232,6 @@ Makefile: $(version-obj-y) =20 ###################################################################### =20 -COMMON_LDADDS =3D libqemuutil.a - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h diff --git a/Makefile.objs b/Makefile.objs index 83622c5..5295c3a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -34,37 +34,5 @@ io-obj-y =3D io/libio.fa endif # CONFIG_SOFTMMU or CONFIG_TOOLS =20 ###################################################################### -# Target independent part of system emulation. The long term path is to -# suppress *all* target specific code in case of system emulation, i.e. a -# single QEMU executable should support all CPUs and machines. - -ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y =3D - -common-obj-$(CONFIG_AUDIO_ALSA) +=3D audio-alsa$(DSOSUF) -common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) -common-obj-$(CONFIG_AUDIO_PA) +=3D audio-pa$(DSOSUF) -common-obj-$(CONFIG_AUDIO_SDL) +=3D audio-sdl$(DSOSUF) - -common-obj-$(if $(CONFIG_CURSES),m) +=3D ui-curses$(DSOSUF) -common-obj-$(if $(CONFIG_GTK),m) +=3D ui-gtk$(DSOSUF) -common-obj-$(if $(CONFIG_SDL),m) +=3D ui-sdl$(DSOSUF) -common-obj-$(if $(CONFIG_SPICE),m) +=3D ui-spice-app$(DSOSUF) - -common-obj-$(if $(CONFIG_CURL),m) +=3D block-curl$(DSOSUF) -common-obj-$(if $(CONFIG_GLUSTERFS),m) +=3D block-gluster$(DSOSUF) -common-obj-$(if $(CONFIG_LIBISCSI),m) +=3D block-iscsi$(DSOSUF) -common-obj-$(if $(CONFIG_LIBNFS),m) +=3D block-nfs$(DSOSUF) -common-obj-$(if $(CONFIG_LIBSSH),m) +=3D block-ssh$(DSOSUF) -common-obj-$(if $(CONFIG_RBD),m) +=3D block-rbd$(DSOSUF) - -common-obj-$(if $(CONFIG_LZFSE),m) +=3D block-dmg-lzfse$(DSOSUF) -common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=3D block-dmg-bz2= $(DSOSUF) - -common-obj-y +=3D libqmp.fa - -endif # CONFIG_SOFTMMU - -###################################################################### # Resource file for Windows executables version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o diff --git a/Makefile.target b/Makefile.target index 2b7280b..8ee4c78 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,43 +6,16 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak =20 -FULL_TARGET_NAME=3D$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-use= r) - -ifdef CONFIG_SOFTMMU -include ../$(FULL_TARGET_NAME)-config-devices.mak -endif - $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) -ifdef CONFIG_LINUX -QEMU_CFLAGS +=3D -isystem ../linux-headers -endif -QEMU_CFLAGS +=3D -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH)= -DNEED_CPU_H - -QEMU_CFLAGS+=3D-iquote $(SRC_PATH)/include - -QEMU_CFLAGS +=3D -DCONFIG_TARGET=3D\"../$(FULL_TARGET_NAME)-config-target.= h\" -QEMU_CFLAGS +=3D -DCONFIG_DEVICES=3D\"../$(FULL_TARGET_NAME)-config-device= s.h\" =20 ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=3Dqemu-$(TARGET_NAME) -QEMU_PROG_BUILD =3D $(QEMU_PROG) else # system emulator name QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) -ifneq (,$(findstring -mwindows,$(SDL_LIBS))) -# Terminate program name with a 'w' because the linker builds a windows ex= ecutable. -QEMU_PROGW=3Dqemu-system-$(TARGET_NAME)w$(EXESUF) -$(QEMU_PROG): $(QEMU_PROGW) - $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_= PROG),"GEN","$(TARGET_DIR)$(QEMU_PROG)") -QEMU_PROG_BUILD =3D $(QEMU_PROGW) -else -QEMU_PROG_BUILD =3D $(QEMU_PROG) -endif endif =20 -LIBQEMU =3D ../libqemu-$(FULL_TARGET_NAME).fa -PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) STPFILES=3D =20 ifdef CONFIG_TRACE_SYSTEMTAP @@ -98,109 +71,10 @@ stap: endif .PHONY: stap =20 -all: $(PROGS) stap - -# Dummy command so that make thinks it has done something - @true - -obj-y +=3D $(LIBQEMU) - -obj-y +=3D trace/ - -######################################################### -LIBS :=3D $(libs_cpu) $(LIBS) - -######################################################### -# Linux user emulator target - -ifdef CONFIG_LINUX_USER - -QEMU_CFLAGS+=3D-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ - -I$(SRC_PATH)/linux-user/host/$(ARCH) \ - -I$(SRC_PATH)/linux-user \ - -Ilinux-user/$(TARGET_ABI_DIR) - -endif #CONFIG_LINUX_USER - -######################################################### -# BSD user emulator target - -ifdef CONFIG_BSD_USER - -QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_= DIR) \ - -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) - -endif #CONFIG_BSD_USER - -######################################################### -# System emulator target -ifdef CONFIG_SOFTMMU -obj-y +=3D softmmu/ -obj-y +=3D gdbstub.o -LIBS :=3D $(libs_softmmu) $(LIBS) - -# Temporary until emulators are linked by Meson -LIBS :=3D $(LIBS) @../block.syms @../qemu.syms -ifneq ($(CONFIG_MODULES),y) -LIBS :=3D $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) -LIBS :=3D $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICO= NV_LIBS) $(GIO_LIBS) -endif -LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) = $(SECCOMP_LIBS) -LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) -LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) -LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) -LIBS :=3D $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS) - -ifeq ($(CONFIG_PLUGIN),y) -ifdef CONFIG_HAS_LD_DYNAMIC_LIST -LIBS +=3D -Wl,--dynamic-list=3D$(BUILD_DIR)/qemu-plugins-ld.symbols -else -ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST -LIBS +=3D -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols -endif -endif -endif - -generated-files-y +=3D hmp-commands.h hmp-commands-info.h - -endif # CONFIG_SOFTMMU - -dummy :=3D $(call unnest-vars,,obj-y) -all-obj-y :=3D $(obj-y) - -include $(SRC_PATH)/Makefile.objs -dummy :=3D $(call fix-paths,../,, \ - authz-obj-y \ - block-obj-y \ - chardev-obj-y \ - crypto-obj-y \ - io-obj-y \ - qom-obj-y) -dummy :=3D $(call unnest-vars,..,common-obj-y) - -all-obj-y +=3D $(common-obj-y) -all-obj-y +=3D $(qom-obj-y) -all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) -all-obj-$(CONFIG_SOFTMMU) +=3D $(block-obj-y) $(chardev-obj-y) -all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) -all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) - -ifdef CONFIG_SOFTMMU -$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak -endif - -COMMON_LDADDS =3D ../libqemuutil.a - -# build either PROG or PROGW -$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(softmmu-main-y) - $(call LINK, $(filter-out %.mak, $^)) -ifdef CONFIG_DARWIN - $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ= ","$(TARGET_DIR)$@") - $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") -endif +all: stap =20 -clean: clean-target - rm -f *.a *~ $(PROGS) +clean: + rm -f *.a *~ rm -f $(shell find . -name '*.[od]') rm -f hmp-commands.h gdbstub-xml.c rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp @@ -208,26 +82,7 @@ ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stp endif =20 -ifdef CONFIG_FUZZ -include $(SRC_PATH)/tests/qtest/fuzz/Makefile.include -include $(SRC_PATH)/tests/qtest/Makefile.include - -fuzz: fuzz-vars -fuzz-vars: QEMU_CFLAGS :=3D $(FUZZ_CFLAGS) $(QEMU_CFLAGS) -fuzz-vars: QEMU_LDFLAGS :=3D $(FUZZ_LDFLAGS) $(QEMU_LDFLAGS) -fuzz-vars: $(QEMU_PROG_FUZZ) -dummy :=3D $(call unnest-vars,, fuzz-obj-y) - - -$(QEMU_PROG_FUZZ): config-devices.mak $(all-obj-y) $(COMMON_LDADDS) $(fuzz= -obj-y) - $(call LINK, $(filter-out %.mak, $^)) - -endif - install: all -ifneq ($(PROGS),) - $(call install-prog,$(PROGS),$(DESTDIR)$(bindir)) -endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../= systemtap/tapset/$(QEMU_PROG).stp" @@ -235,4 +90,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../system= tap/tapset/$(QEMU_PROG)-log.stp" endif =20 -Makefile: $(generated-files-y) +.PHONY: all clean install diff --git a/configure b/configure index a912055..23e93aa 100755 --- a/configure +++ b/configure @@ -316,7 +316,6 @@ audio_drv_list=3D"" block_drv_rw_whitelist=3D"" block_drv_ro_whitelist=3D"" host_cc=3D"cc" -libs_cpu=3D"" libs_softmmu=3D"" libs_tools=3D"" audio_win_int=3D"" @@ -5417,7 +5416,6 @@ case "$capstone" in else LIBCAPSTONE=3Dlibcapstone.a fi - libs_cpu=3D"-L$PWD/capstone -lcapstone $libs_cpu" capstone_libs=3D"-L$PWD/capstone -lcapstone" capstone_cflags=3D"-I${source_path}/capstone/include" ;; @@ -5426,7 +5424,6 @@ case "$capstone" in capstone_libs=3D"$($pkg_config --libs capstone)" capstone_cflags=3D"$($pkg_config --cflags capstone)" QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" - libs_cpu=3D"$($pkg_config --libs capstone) $libs_cpu" ;; =20 no) @@ -6344,7 +6341,10 @@ fi if test "$fuzzing" =3D "yes" ; then write_c_fuzzer_skeleton if compile_prog "$CPU_CFLAGS -Werror -fsanitize=3Dfuzzer" ""; then - have_fuzzer=3Dyes + have_fuzzer=3Dyes + else + error_exit "Your compiler doesn't support -fsanitize=3Dfuzzer" + exit 1 fi fi =20 @@ -6844,7 +6844,6 @@ echo "qemu_helperdir=3D$libexecdir" >> $config_host_m= ak echo "qemu_localedir=3D$qemu_localedir" >> $config_host_mak echo "qemu_icondir=3D$qemu_icondir" >> $config_host_mak echo "qemu_desktopdir=3D$qemu_desktopdir" >> $config_host_mak -echo "libs_cpu=3D$libs_cpu" >> $config_host_mak echo "libs_softmmu=3D$libs_softmmu" >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak @@ -7709,14 +7708,7 @@ if test "$have_mlockall" =3D "yes" ; then echo "HAVE_MLOCKALL=3Dy" >> $config_host_mak fi if test "$fuzzing" =3D "yes" ; then - if test "$have_fuzzer" =3D "yes"; then - FUZZ_LDFLAGS=3D" -fsanitize=3Dfuzzer" - FUZZ_CFLAGS=3D" -fsanitize=3Dfuzzer" - QEMU_CFLAGS=3D"$QEMU_CFLAGS -fsanitize=3Dfuzzer-no-link" - else - error_exit "Your compiler doesn't support -fsanitize=3Dfuzzer" - exit 1 - fi + QEMU_CFLAGS=3D"$QEMU_CFLAGS -fsanitize=3Dfuzzer-no-link" fi =20 if test "$plugins" =3D "yes" ; then @@ -7832,8 +7824,6 @@ if test "$libudev" !=3D "no"; then fi if test "$fuzzing" !=3D "no"; then echo "CONFIG_FUZZ=3Dy" >> $config_host_mak - echo "FUZZ_CFLAGS=3D$FUZZ_CFLAGS" >> $config_host_mak - echo "FUZZ_LDFLAGS=3D$FUZZ_LDFLAGS" >> $config_host_mak fi =20 if test "$edk2_blobs" =3D "yes" ; then @@ -8303,8 +8293,8 @@ if test "$TARGET_ARCH" =3D "s390x" && test "$target_s= oftmmu" =3D "yes" && \ fi fi =20 -echo "QEMU_LDFLAGS+=3D$ldflags" >> $config_target_mak -echo "QEMU_CFLAGS+=3D$cflags" >> $config_target_mak +echo "QEMU_LDFLAGS=3D$ldflags" >> $config_target_mak +echo "QEMU_CFLAGS=3D$cflags" >> $config_target_mak =20 done # for target in $targets =20 diff --git a/docs/devel/blkverify.txt b/docs/devel/blkverify.txt index d556dc4..aca826c 100644 --- a/docs/devel/blkverify.txt +++ b/docs/devel/blkverify.txt @@ -62,8 +62,8 @@ A more realistic scenario is verifying the installation o= f a guest OS: =20 $ ./qemu-img create raw.img 16G $ ./qemu-img create -f qcow2 test.qcow2 16G - $ x86_64-softmmu/qemu-system-x86_64 -cdrom debian.iso \ - -drive file=3Dblkverify:raw.img:te= st.qcow2 + $ ./qemu-system-x86_64 -cdrom debian.iso \ + -drive file=3Dblkverify:raw.img:test.qcow2 =20 If the installation is aborted when blkverify detects corruption, use qemu= -io to explore the contents of the disk image at the sector in question. diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index a426469..196e3bc 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -819,7 +819,7 @@ the following approaches: 1) Set ``qemu_bin``, and use the given binary =20 2) Do not set ``qemu_bin``, and use a QEMU binary named like - "${arch}-softmmu/qemu-system-${arch}", either in the current + "qemu-system-${arch}", either in the current working directory, or in the current source tree. =20 The resulting ``qemu_bin`` value will be preserved in the @@ -886,7 +886,7 @@ like the following: =20 .. code:: =20 - PARAMS (key=3Dqemu_bin, path=3D*, default=3Dx86_64-softmmu/qemu-system-x= 86_64) =3D> 'x86_64-softmmu/qemu-system-x86_64 + PARAMS (key=3Dqemu_bin, path=3D*, default=3D./qemu-system-x86_64) =3D> '= ./qemu-system-x86_64 =20 arch ~~~~ diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-blo= ck-operations.rst index 48afdc7..e13f5a2 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -129,7 +129,7 @@ To show some example invocations of command-line, we wi= ll use the following invocation of QEMU, with a QMP server running over UNIX socket:: =20 - $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \ + $ ./qemu-system-x86_64 -display none -no-user-config \ -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-A,driver=3Dqcow2,file.driver=3Dfile,fil= e.node-name=3Dfile,file.filename=3D./a.qcow2 \ -device virtio-blk,drive=3Dnode-A,id=3Dvirtio0 \ @@ -694,7 +694,7 @@ instance, with the following invocation. (As noted ear= lier, for simplicity's sake, the destination QEMU is started on the same host, but it could be located elsewhere):: =20 - $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \ + $ ./qemu-system-x86_64 -display none -no-user-config \ -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-TargetDisk,driver=3Dqcow2,file.driver= =3Dfile,file.node-name=3Dfile,file.filename=3D./target-disk.qcow2 \ -device virtio-blk,drive=3Dnode-TargetDisk,id=3Dvirtio0 \ diff --git a/meson.build b/meson.build index 420e60b..797e69d 100644 --- a/meson.build +++ b/meson.build @@ -203,10 +203,12 @@ brlapi =3D not_found if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) endif +sdlwindows =3D false sdl =3D not_found if 'CONFIG_SDL' in config_host sdl =3D declare_dependency(compile_args: config_host['SDL_CFLAGS'].split= (), link_args: config_host['SDL_LIBS'].split()) + sdlwindows =3D config_host['SDL_LIBS'].contains('-mwindows') endif rbd =3D not_found if 'CONFIG_RBD' in config_host @@ -517,6 +519,7 @@ user_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() specific_ss =3D ss.source_set() +specific_fuzz_ss =3D ss.source_set() =20 modules =3D {} hw_arch =3D {} @@ -731,6 +734,7 @@ specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true:= linux_user_ss) =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') +subdir('tests/qtest/fuzz') =20 mods =3D [] block_mods =3D [] @@ -785,6 +789,9 @@ libqmp =3D static_library('qmp', qmp_ss.sources(), =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +softmmu_ss.add(authz, block, chardev, crypto, io, qmp) +common_ss.add(qom, qemuutil) + foreach m : mods shared_module(m['dir'] + '-' + m['name'], name_prefix: '', @@ -793,7 +800,7 @@ foreach m : mods install_dir: config_host['qemu_moddir']) endforeach =20 -common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) +common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) =20 common_all =3D common_ss.apply(config_all, strict: false) @@ -805,11 +812,17 @@ common_all =3D static_library('common', =20 feature_to_c =3D find_program('scripts/feature_to_c.sh') =20 +emulators =3D [] foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] arch =3D config_target['TARGET_BASE_ARCH'] arch_srcs =3D [] + arch_deps =3D [] + c_args =3D config_target['QEMU_CFLAGS'].split() + ['-DNEED_CPU_H', + '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(target), + '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(targe= t)] + link_args =3D config_target['QEMU_LDFLAGS'].split() =20 target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] if host_machine.system() =3D=3D 'linux' @@ -820,12 +833,15 @@ foreach target : target_dirs target_type=3D'system' t =3D target_softmmu_arch[arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() + arch_deps +=3D t.dependencies() =20 hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch hw =3D hw_arch[hw_dir].apply(config_target, strict: false) arch_srcs +=3D hw.sources() + arch_deps +=3D hw.dependencies() =20 arch_srcs +=3D config_devices_h[target] + link_args +=3D ['@block.syms', '@qemu.syms'] else abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' @@ -862,9 +878,11 @@ foreach target : target_dirs =20 t =3D target_arch[arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() + arch_deps +=3D t.dependencies() =20 target_common =3D common_ss.apply(config_target, strict: false) objects =3D common_all.extract_objects(target_common.sources()) + deps =3D target_common.dependencies() =20 # TODO: Change to generator once obj-y goes away config_target_h =3D custom_target(target + '-config-target.h', @@ -875,15 +893,60 @@ foreach target : target_dirs =20 target_specific =3D specific_ss.apply(config_target, strict: false) arch_srcs +=3D target_specific.sources() + arch_deps +=3D target_specific.dependencies() =20 - static_library('qemu-' + target, + lib =3D static_library('qemu-' + target, sources: arch_srcs + [config_target_h] + genh, objects: objects, include_directories: target_inc, - c_args: ['-DNEED_CPU_H', - '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format= (target), - '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.form= at(target)], + c_args: c_args, + build_by_default: false, name_suffix: 'fa') + + if target.endswith('-softmmu') + execs =3D [{ + 'name': 'qemu-system-' + target_name, + 'gui': false, + 'sources': files('softmmu/main.c'), + 'dependencies': [] + }] + if sdlwindows + execs +=3D [{ + 'name': 'qemu-system-' + target_name + 'w', + 'gui': true, + 'sources': files('softmmu/main.c'), + 'dependencies': [] + }] + endif + if config_host.has_key('CONFIG_FUZZ') + specific_fuzz =3D specific_fuzz_ss.apply(config_target, strict: fals= e) + execs +=3D [{ + 'name': 'qemu-fuzz-' + target_name, + 'gui': false, + 'sources': specific_fuzz.sources(), + 'dependencies': specific_fuzz.dependencies(), + 'link_depends': [files('tests/qtest/fuzz/fork_fuzz.ld')], + }] + endif + else + execs =3D [{ + 'name': 'qemu-' + target_name, + 'gui': false, + 'sources': [], + 'dependencies': [] + }] + endif + foreach exe: execs + emulators +=3D executable(exe['name'], exe['sources'], + install: true, + c_args: c_args, + dependencies: arch_deps + deps + exe['dependencies'], + objects: lib.extract_all_objects(recursive: true), + link_language: 'cpp', + link_depends: [block_syms, qemu_syms] + exe.get('link_depen= ds', []), + link_args: link_args, + gui_app: exe['gui']) + endforeach endforeach =20 # Other build targets diff --git a/os-posix.c b/os-posix.c index 3572db3..8334193 100644 --- a/os-posix.c +++ b/os-posix.c @@ -96,7 +96,7 @@ char *os_find_datadir(void) exec_dir =3D qemu_get_exec_dir(); g_return_val_if_fail(exec_dir !=3D NULL, NULL); =20 - dir =3D g_build_filename(exec_dir, "..", "pc-bios", NULL); + dir =3D g_build_filename(exec_dir, "pc-bios", NULL); if (g_file_test(dir, G_FILE_TEST_IS_DIR)) { return g_steal_pointer(&dir); } diff --git a/plugins/meson.build b/plugins/meson.build index 9608e52..e777230 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,5 +1,13 @@ +if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host + plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.build_root() / 'qem= u-plugins-ld.symbols')] +elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host + plugin_ldflags =3D ['-Wl,-exported_symbols_list,' + (meson.build_root() = / 'qemu-plugins-ld64.symbols')] +else + plugin_ldflags =3D [] +endif + specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files( 'loader.c', 'core.c', 'api.c', -)]) +), declare_dependency(link_args: plugin_ldflags)]) diff --git a/rules.mak b/rules.mak index 8285fe5..6488dc3 100644 --- a/rules.mak +++ b/rules.mak @@ -21,7 +21,6 @@ MAKEFLAGS +=3D -rR %.cpp: %.m: %.mak: -clean-target: =20 # Flags for dependency generation QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 305d042..866baf7 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -383,7 +383,7 @@ def binariesToTest(args, testcase): if args.qemu: r =3D args.qemu else: - r =3D glob.glob('./*-softmmu/qemu-system-*') + r =3D glob.glob('./qemu-system-*') return r =20 =20 diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index 52430cb..f0b7442 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -64,24 +64,26 @@ mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries = here =20 # Build once to get the list of dynamic lib paths, and copy them over ../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" --enable-fuzzing= \ + --prefix=3D"$DEST_DIR" --bindir=3D"$DEST_DIR" --datadir=3D"$DEST_DIR/d= ata/" \ --extra-cflags=3D"$EXTRA_CFLAGS" --target-list=3D"i386-softmmu" =20 -if ! make "-j$(nproc)" i386-softmmu/fuzz; then +if ! make "-j$(nproc)" qemu-fuzz-i386; then fatal "Build failed. Please specify a compiler with fuzzing support"\ "using the \$CC and \$CXX environemnt variables"\ "\nFor example: CC=3Dclang CXX=3Dclang++ $0" fi =20 -for i in $(ldd ./i386-softmmu/qemu-fuzz-i386 | cut -f3 -d' '); do +for i in $(ldd ./qemu-fuzz-i386 | cut -f3 -d' '); do cp "$i" "$DEST_DIR/lib/" done -rm ./i386-softmmu/qemu-fuzz-i386 +rm qemu-fuzz-i386 =20 # Build a second time to build the final binary with correct rpath -../configure --bindir=3D"$DEST_DIR" --datadir=3D"$DEST_DIR/data/" --disabl= e-werror \ - --cc=3D"$CC" --cxx=3D"$CXX" --extra-cflags=3D"$EXTRA_CFLAGS" \ - --extra-ldflags=3D"-Wl,-rpath,'\$\$ORIGIN/lib'" -make "-j$(nproc)" i386-softmmu/fuzz +../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" --enable-fuzzing= \ + --prefix=3D"$DEST_DIR" --bindir=3D"$DEST_DIR" --datadir=3D"$DEST_DIR/d= ata/" \ + --extra-cflags=3D"$EXTRA_CFLAGS" --extra-ldflags=3D"-Wl,-rpath,'\$\$OR= IGIN/lib'" \ + --target-list=3D"i386-softmmu" +make "-j$(nproc)" qemu-fuzz-i386 V=3D1 =20 # Copy over the datadir cp -r ../pc-bios/ "$DEST_DIR/pc-bios" @@ -90,9 +92,9 @@ cp -r ../pc-bios/ "$DEST_DIR/pc-bios" # of available fuzz-targets. Copy over the qemu-fuzz-i386, naming it accor= ding # to each available fuzz target (See 05509c8e6d fuzz: select fuzz target u= sing # executable name) -for target in $(./i386-softmmu/qemu-fuzz-i386 | awk '$1 ~ /\*/ {print $2}= '); +for target in $(./qemu-fuzz-i386 | awk '$1 ~ /\*/ {print $2}'); do - cp ./i386-softmmu/qemu-fuzz-i386 "$DEST_DIR/qemu-fuzz-i386-target-$tar= get" + cp qemu-fuzz-i386 "$DEST_DIR/qemu-fuzz-i386-target-$target" done =20 echo "Done. The fuzzers are located in $DEST_DIR" diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs deleted file mode 100644 index ebcfd15..0000000 --- a/softmmu/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -softmmu-main-y =3D softmmu/main.o -main.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) diff --git a/tests/Makefile.include b/tests/Makefile.include index b6d9661..c3874ca 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -457,7 +457,7 @@ build-tcg-tests-%: $(if $(CONFIG_PLUGIN),plugins) V=3D"$(V)" TARGET=3D"$*" guest-tests, \ "BUILD", "TCG tests for $*") =20 -run-tcg-tests-%: build-tcg-tests-% %/all +run-tcg-tests-%: build-tcg-tests-% all $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=3D$(SRC_PATH) SPEED=3D"$(SPEED)" \ @@ -485,7 +485,7 @@ QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CO= NFIG_LINUX)) =3D tests/qemu .PHONY: check-tests/check-block.sh check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ - $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) + $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) @$< =20 # Python venv for running tests diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 77d1c1d..db9c0f5 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -57,8 +57,7 @@ def pick_default_qemu_bin(arch=3DNone): # qemu binary path does not match arch for powerpc, handle it if 'ppc64le' in arch: arch =3D 'ppc64' - qemu_bin_relative_path =3D os.path.join("%s-softmmu" % arch, - "qemu-system-%s" % arch) + qemu_bin_relative_path =3D "./qemu-system-%s" % arch if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path =20 diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebu= ild-expected-aml.sh index 76cd797..fc78770 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. =20 -qemu_bins=3D"x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system= -aarch64" +qemu_bins=3D"./qemu-system-x86_64 ./qemu-system-aarch64" =20 if [ ! -e "tests/qtest/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this s= cript." diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh index 98df91e..f968bf7 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. =20 -QEMU=3D${QEMU:-"../../x86_64-softmmu/qemu-system-x86_64"} +QEMU=3D${QEMU:-"../../qemu-system-x86_64"} =20 run_qemu() { local kernel=3D$1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 0657f72..3ab859a 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -577,11 +577,11 @@ if [ -z "$QEMU_PROG" ] then if [ -x "$build_iotests/qemu" ]; then export QEMU_PROG=3D"$build_iotests/qemu" - elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" = ]; then - export QEMU_PROG=3D"$build_root/${qemu_arch}-softmmu/qemu-system-$= {qemu_arch}" + elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then + export QEMU_PROG=3D"$build_root/qemu-system-${qemu_arch}" else pushd "$build_root" > /dev/null - for binary in *-softmmu/qemu-system-* + for binary in qemu-system-* do if [ -x "$binary" ] then diff --git a/tests/qtest/fuzz/Makefile.include b/tests/qtest/fuzz/Makefile.= include deleted file mode 100644 index 5bde793..0000000 --- a/tests/qtest/fuzz/Makefile.include +++ /dev/null @@ -1,39 +0,0 @@ -QEMU_PROG_FUZZ=3Dqemu-fuzz-$(TARGET_NAME)$(EXESUF) - -fuzz-obj-y +=3D tests/qtest/libqtest.o -fuzz-obj-y +=3D $(libqos-obj-y) -fuzz-obj-y +=3D tests/qtest/fuzz/fuzz.o # Fuzzer skeleton -fuzz-obj-y +=3D tests/qtest/fuzz/fork_fuzz.o -fuzz-obj-y +=3D tests/qtest/fuzz/qos_fuzz.o -fuzz-obj-y +=3D tests/qtest/fuzz/qtest_wrappers.o - -# Targets -fuzz-obj-$(CONFIG_PCI_I440FX) +=3D tests/qtest/fuzz/i440fx_fuzz.o -fuzz-obj-$(CONFIG_VIRTIO_NET) +=3D tests/qtest/fuzz/virtio_net_fuzz.o -fuzz-obj-$(CONFIG_SCSI) +=3D tests/qtest/fuzz/virtio_scsi_fuzz.o - -FUZZ_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest - -# Linker Script to force coverage-counters into known regions which we can= mark -# shared -FUZZ_LDFLAGS +=3D -Xlinker -T$(SRC_PATH)/tests/qtest/fuzz/fork_fuzz.ld - -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inb -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inw -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inl -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outb -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outw -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outl -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readb -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readw -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readl -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readq -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writeb -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writew -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writel -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writeq -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memread -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_bufread -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memwrite -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_bufwrite -FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memset diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c index f45373f..86796bf 100644 --- a/tests/qtest/fuzz/i440fx_fuzz.c +++ b/tests/qtest/fuzz/i440fx_fuzz.c @@ -17,8 +17,8 @@ #include "tests/qtest/libqos/pci.h" #include "tests/qtest/libqos/pci-pc.h" #include "fuzz.h" -#include "fuzz/qos_fuzz.h" -#include "fuzz/fork_fuzz.h" +#include "qos_fuzz.h" +#include "fork_fuzz.h" =20 =20 #define I440FX_PCI_HOST_BRIDGE_CFG 0xcf8 diff --git a/tests/qtest/fuzz/meson.build b/tests/qtest/fuzz/meson.build new file mode 100644 index 0000000..bb0a3f2 --- /dev/null +++ b/tests/qtest/fuzz/meson.build @@ -0,0 +1,35 @@ +specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c', + 'qtest_wrappers.c'), qos) + +# Targets +specific_fuzz_ss.add(when: 'CONFIG_I440FX', if_true: files('i440fx_fuzz.c'= )) +specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio_net= _fuzz.c')) +specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio_sc= si_fuzz.c')) + +# unfortunately declare_dependency does not support link_depends, so +# this will be duplicated in meson.build +fork_fuzz =3D declare_dependency( + link_args: ['-fsanitize=3Dfuzzer', + '-Wl,-T,' + (meson.current_source_dir() / 'fork_fuzz.ld'), + '-Wl,-wrap,qtest_inb', + '-Wl,-wrap,qtest_inw', + '-Wl,-wrap,qtest_inl', + '-Wl,-wrap,qtest_outb', + '-Wl,-wrap,qtest_outw', + '-Wl,-wrap,qtest_outl', + '-Wl,-wrap,qtest_readb', + '-Wl,-wrap,qtest_readw', + '-Wl,-wrap,qtest_readl', + '-Wl,-wrap,qtest_readq', + '-Wl,-wrap,qtest_writeb', + '-Wl,-wrap,qtest_writew', + '-Wl,-wrap,qtest_writel', + '-Wl,-wrap,qtest_writeq', + '-Wl,-wrap,qtest_memread', + '-Wl,-wrap,qtest_bufread', + '-Wl,-wrap,qtest_memwrite', + '-Wl,-wrap,qtest_bufwrite', + '-Wl,-wrap,qtest_memset'] +) + +specific_fuzz_ss.add(fork_fuzz) diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wra= ppers.c index 713c830..0580f8d 100644 --- a/tests/qtest/fuzz/qtest_wrappers.c +++ b/tests/qtest/fuzz/qtest_wrappers.c @@ -12,7 +12,7 @@ */ =20 #include "qemu/osdep.h" -#include "cpu.h" +#include "hw/core/cpu.h" #include "exec/ioport.h" =20 #include "fuzz.h" diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_n= et_fuzz.c index 277a9e2..0e873ab 100644 --- a/tests/qtest/fuzz/virtio_net_fuzz.c +++ b/tests/qtest/fuzz/virtio_net_fuzz.c @@ -61,7 +61,8 @@ static void virtio_net_fuzz_multi(QTestState *s, * backend. Otherwise, always place the input on a virtqueue. */ if (vqa.rx && sockfds_initialized) { - write(sockfds[0], Data, vqa.length); + int ignored =3D write(sockfds[0], Data, vqa.length); + (void) ignored; } else { vqa.rx =3D 0; uint64_t req_addr =3D guest_alloc(t_alloc, vqa.length); diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_= scsi_fuzz.c index 3a9ea13..6ff6fab 100644 --- a/tests/qtest/fuzz/virtio_scsi_fuzz.c +++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c @@ -12,10 +12,10 @@ =20 #include "qemu/osdep.h" =20 -#include "tests/qtest/libqtest.h" -#include "libqos/virtio-scsi.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" +#include "tests/qtest/libqos/libqtest.h" +#include "tests/qtest/libqos/virtio-scsi.h" +#include "tests/qtest/libqos/virtio.h" +#include "tests/qtest/libqos/virtio-pci.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pci.h" #include "standard-headers/linux/virtio_scsi.h" diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h index 1054326..5f63d35 100644 --- a/tests/qtest/libqos/qgraph.h +++ b/tests/qtest/libqos/qgraph.h @@ -226,7 +226,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void= *arg); * my_test <--consumed_by-- my_interface <--produces--+ * * Assuming there the binary is - * QTEST_QEMU_BINARY=3Dx86_64-softmmu/qemu-system-x86_64 + * QTEST_QEMU_BINARY=3D./qemu-system-x86_64 * a valid test path will be: * "/x86_64/pc/other_node/my_driver/my_interface/my_test". * diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 30cb88d..8f8fdb1 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -234,7 +234,7 @@ foreach dir : target_dirs qtest_env =3D environment() qtest_env.set('QTEST_QEMU_IMG', './qemu-img') qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vm= state-daemon.sh') - qtest_env.set('QTEST_QEMU_BINARY', '@0@-softmmu/qemu-system-@0@'.format(= target_base)) + qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base) =20 foreach test : qtests # Executables are shared across targets, declare them only the first t= ime we diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c index a7e83e7..16751db 100644 --- a/tests/qtest/rtas-test.c +++ b/tests/qtest/rtas-test.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); =20 if (strcmp(arch, "ppc64")) { - g_printerr("RTAS requires ppc64-softmmu/qemu-system-ppc64\n"); + g_printerr("RTAS requires qemu-system-ppc64\n"); exit(EXIT_FAILURE); } qtest_add_func("rtas/get-time-of-day", test_rtas_get_time_of_day); diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 102578c..7d714f9 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -193,11 +193,11 @@ for target in $target_list; do case $target in *-linux-user | *-bsd-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D\$(BUILD_DIR)/$target/qemu-$arch" >> $config_target_mak + echo "QEMU=3D\$(BUILD_DIR)/qemu-$arch" >> $config_target_mak ;; *-softmmu) echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak - echo "QEMU=3D\$(BUILD_DIR)/$target/qemu-system-$arch" >> $config_tar= get_mak + echo "QEMU=3D\$(BUILD_DIR)/qemu-system-$arch" >> $config_target_mak ;; esac =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083212; cv=none; d=zohomail.com; s=zohoarc; b=Yyk3E6x9xW1wJDlqYcZMI/cbXciNit9JbmYsPv9cZUzCyVkWe2Mn1Kt6v89ljWZHXE5CxDw08UmZ6gvLeAZiOie63A1EocYVHb//doE56dNx+zZTX6ExENH5Dw9NgqbACW09j8Cc33ZCaK/iLKuYYQ5BLp8Z6G9sCjJptmnP1E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083212; 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=AEn8HY0hbZnigh2zF+adrqHOxONI7ngTjgI9sOI65tg=; b=T2wzcRQWZvLbdYKfdW7uODZxJuADYaNHEp2giDzVN/E7MrmA2mW9+GXZoFAbG6+pRZcn5ufqpDfwSolMnu88wyNR3ZNMijshO4qgs+Etu0NPMda0yb/mLdAnTUe1snR4iTyJuk1dg6FcRC7HdGhRIRsdy0M/XWAU042ah+WcN/Q= 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 1597083212053728.9916129240819; Mon, 10 Aug 2020 11:13:32 -0700 (PDT) Received: from localhost ([::1]:52296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CIc-0003a6-M1 for importer@patchew.org; Mon, 10 Aug 2020 14:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLx-0003Qe-0y for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:53 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:58094 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 1k5BLv-0003N2-0m for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:52 -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-58-kkegG43VPRCswZ9UeofSzQ-1; Mon, 10 Aug 2020 13:12:48 -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 9C0A757 for ; Mon, 10 Aug 2020 17:12:47 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9C045F1EA; Mon, 10 Aug 2020 17:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079570; 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=AEn8HY0hbZnigh2zF+adrqHOxONI7ngTjgI9sOI65tg=; b=iiLRcQdc6W2W4SyP6zIc1eaRX151NH7+vKSqdeOvuTEshzhoaLVHgFgxBzRMgMK9X/+9bt NJCFxRUvXmMdnm+Jcfcb6oxmEG85WgbboUdQBmrElaQ+CqoBsdGP5k7Hi4nmWc/W2dcZp3 XvpgjS5nhv/CVDmblicvGT7qIzExDPI= X-MC-Unique: kkegG43VPRCswZ9UeofSzQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 132/147] meson: convert systemtap files Date: Mon, 10 Aug 2020 19:08:50 +0200 Message-Id: <1597079345-42801-133-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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.target | 85 ++-------------------------------------------------= ---- meson.build | 26 +++++++++++++++++ rules.mak | 3 -- trace/meson.build | 14 ++++----- 4 files changed, 35 insertions(+), 93 deletions(-) diff --git a/Makefile.target b/Makefile.target index 8ee4c78..a07149c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,88 +6,7 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak =20 -$(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) - -ifdef CONFIG_USER_ONLY -# user emulator name -QEMU_PROG=3Dqemu-$(TARGET_NAME) -else -# system emulator name -QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) -endif - -STPFILES=3D - -ifdef CONFIG_TRACE_SYSTEMTAP -stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace= .stp $(QEMU_PROG)-log.stp - -ifdef CONFIG_USER_ONLY -TARGET_TYPE=3Duser -else -TARGET_TYPE=3Dsystem -endif - -tracetool-y =3D $(SRC_PATH)/scripts/tracetool.py -tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") - -$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetoo= l-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dstap \ - --backends=3D$(TRACE_BACKENDS) \ - --binary=3D$(bindir)/$(QEMU_PROG) \ - --target-name=3D$(TARGET_NAME) \ - --target-type=3D$(TARGET_TYPE) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed") - -$(QEMU_PROG).stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dstap \ - --backends=3D$(TRACE_BACKENDS) \ - --binary=3D$(realpath .)/$(QEMU_PROG) \ - --target-name=3D$(TARGET_NAME) \ - --target-type=3D$(TARGET_TYPE) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp") - -$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracet= ool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dsimpletrace-stap \ - --backends=3D$(TRACE_BACKENDS) \ - --probe-prefix=3Dqemu.$(TARGET_TYPE).$(TARGET_NAME) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp") - -$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=3Dall \ - --format=3Dlog-stap \ - --backends=3D$(TRACE_BACKENDS) \ - --probe-prefix=3Dqemu.$(TARGET_TYPE).$(TARGET_NAME) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-log.stp") - -else -stap: -endif -.PHONY: stap - -all: stap - -clean: - rm -f *.a *~ - rm -f $(shell find . -name '*.[od]') - rm -f hmp-commands.h gdbstub-xml.c - rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp -ifdef CONFIG_TRACE_SYSTEMTAP - rm -f *.stp -endif - +all: install: all -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" - $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../= systemtap/tapset/$(QEMU_PROG).stp" - $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/.= ./systemtap/tapset/$(QEMU_PROG)-simpletrace.stp" - $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../system= tap/tapset/$(QEMU_PROG)-log.stp" -endif - +=09 .PHONY: all clean install diff --git a/meson.build b/meson.build index 797e69d..c3ef9b6 100644 --- a/meson.build +++ b/meson.build @@ -811,6 +811,7 @@ common_all =3D static_library('common', name_suffix: 'fa') =20 feature_to_c =3D find_program('scripts/feature_to_c.sh') +tracetool =3D find_program('scripts/tracetool.py') =20 emulators =3D [] foreach target : target_dirs @@ -946,6 +947,31 @@ foreach target : target_dirs link_depends: [block_syms, qemu_syms] + exe.get('link_depen= ds', []), link_args: link_args, gui_app: exe['gui']) + + if 'CONFIG_TRACE_SYSTEMTAP' in config_host + foreach stp: [ + {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_di= r() / exe_name, 'install': false}, + {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_o= ption('bindir') / exe_name, 'install': true}, + {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '', = 'install': true}, + {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': true}, + ] + custom_target(exe_name + stp['ext'], + input: trace_events_all, + output: exe_name + stp['ext'], + capture: true, + install: stp['install'], + install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', + command: [ + tracetool, '--group=3Dall', '--format=3D' + stp['f= mt'], + '--backends=3D' + config_host['TRACE_BACKENDS'], + '--binary=3D' + stp['bin'], + '--target-name=3D' + target_name, + '--target-type=3D' + target_type, + '--probe-prefix=3Dqemu.' + target_type + '.' + tar= get_name, + '@INPUT@', + ]) + endforeach + endif endforeach endforeach =20 diff --git a/rules.mak b/rules.mak index 6488dc3..b983c7f 100644 --- a/rules.mak +++ b/rules.mak @@ -199,9 +199,6 @@ ne =3D $(if $(subst $2,,$1)$(subst $1,,$2),y,n) isempty =3D $(if $1,n,y) notempty =3D $(if $1,y,n) =20 -# Generate files with tracetool -TRACETOOL=3D$(PYTHON) $(SRC_PATH)/scripts/tracetool.py - .PHONY: clean-timestamp clean-timestamp: rm -f *.timestamp diff --git a/trace/meson.build b/trace/meson.build index 9c3c128..56e8708 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -49,13 +49,13 @@ foreach dir : [ '.' ] + trace_events_subdirs endif endforeach =20 -custom_target('trace-events-all', - output: 'trace-events-all', - input: trace_events_files, - command: [ 'cat', '@INPUT@' ], - capture: true, - install: true, - install_dir: config_host['qemu_datadir']) +trace_events_all =3D custom_target('trace-events-all', + output: 'trace-events-all', + input: trace_events_files, + command: [ 'cat', '@INPUT@' ], + capture: true, + install: true, + install_dir: config_host['qemu_datadir']) =20 foreach d : [ ['generated-tcg-tracers.h', 'tcg-h'], --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082842; cv=none; d=zohomail.com; s=zohoarc; b=cc59c6HuuhuIkHVduEuAnmpJ+zKsZMux3V4cjzVJyp39wibh2gR9uqw6axPWqXwaLfzBNlDgzcfMcSg9hdx2MNO1v4qWaRpNhpXPYKBixRa+rey2RZU0YFq3Q+wgrRNC8mz6BwclM+d+tgP1ul47elkwKZg3w1CWtA4WrQ3OVts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082842; 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=JCWQsqaYkXE5O2PZN9SLzgeF6lcVZ+ltbOpsodxa3rQ=; b=X8CSkQ/p7JbupDdq3JQnNusVzU025lDRWjep96PavO8zQzKfBqiW5XbbqGMIkGnFxnNhxfwVFma+vWAZ6WzmnX1SY3fMQxXt2HCKJOtca7G1DDuK5BSpncE9C4WC2g8dYUKBK1nLoJ/Zl72S5d+PrsYe7ZRQrlnUaXzPfTyGBPE= 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 1597082842292623.5867196300964; Mon, 10 Aug 2020 11:07:22 -0700 (PDT) Received: from localhost ([::1]:51646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CCf-0000PM-1F for importer@patchew.org; Mon, 10 Aug 2020 14:07:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLy-0003Tf-7o for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:54 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:50362 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 1k5BLw-0003ND-An for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:53 -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-387-aknlCe4fMOWp4WBv6et2cw-1; Mon, 10 Aug 2020 13:12:49 -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 06CC680183C for ; Mon, 10 Aug 2020 17:12:49 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 143F987D61; Mon, 10 Aug 2020 17:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079571; 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=JCWQsqaYkXE5O2PZN9SLzgeF6lcVZ+ltbOpsodxa3rQ=; b=P+6EFpv9NTvmtEVleIuo80kn+yeXr5z3MlXZ4TMZoaYlSlJAjYh5M5U1uuCv9JeBN9ALHN TNcS1VmMHw9/+dcDhlFrqgbteujezJBC3a2BDDkey9WMN6TOfr9L2x9+d2D1eSxwHQDLTN /Y32EAdmQbMPbIsUVf+BuWgmZeQepkQ= X-MC-Unique: aknlCe4fMOWp4WBv6et2cw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 133/147] rules.mak: remove version.o Date: Mon, 10 Aug 2020 19:08:51 +0200 Message-Id: <1597079345-42801-134-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 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 | 5 ----- Makefile.objs | 4 ---- rules.mak | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ebda912..2962a41 100644 --- a/Makefile +++ b/Makefile @@ -225,11 +225,6 @@ recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(RO= M_DIRS)) recurse-install: $(addsuffix /install, $(TARGET_DIRS)) $(addsuffix /install, $(TARGET_DIRS)): all =20 -$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h - $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o") - -Makefile: $(version-obj-y) - ###################################################################### =20 clean: recurse-clean diff --git a/Makefile.objs b/Makefile.objs index 5295c3a..c351b59 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -32,7 +32,3 @@ crypto-obj-y =3D crypto/libcrypto.fa io-obj-y =3D io/libio.fa =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS - -###################################################################### -# Resource file for Windows executables -version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o diff --git a/rules.mak b/rules.mak index b983c7f..6d89001 100644 --- a/rules.mak +++ b/rules.mak @@ -77,8 +77,6 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ -c -o $@ $<,"CC","$(TARGET_DIR)$@") -%.o: %.rc - $(call quiet-command,$(WINDRES) -I. -o $@ $<,"RC","$(TARGET_DIR)$@") =20 # If we have a CXX we might have some C++ objects, in which case we # must link with the C++ compiler, not the plain C compiler. @@ -86,7 +84,7 @@ LINKPROG =3D $(or $(CXX),$(CC)) =20 LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@= \ $(call process-archive-undefs, $1) \ - $(version-obj-y) $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_D= IR)$@") + $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") =20 %.o: %.S $(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082946; cv=none; d=zohomail.com; s=zohoarc; b=Ebp+UFIMuoZf+KlJX2eXAsDpu0nea6FZQGVLktevRhJ54LUTo/CpIt+i1KWKvAioxY61kfJ3rfaWKOvglPUfeXNTazWi1Bih8nCKnQt4wRRwMmGCYrWc0p2FXvwKiYvLoFJfz6BJ9eZiH6Doo/eKG+zaAwej7+eDV2uzAv4uLuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082946; 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=Pi1yBhTiJxBmEAtjHe8ER84d9T1BH/tlS2/NzYfm/KE=; b=gk/fKpADL5Jpfn1mwJPqRXeRT7l0Jk0Dj+nUzK2qamfdQkrGYW79eHA7JL/wfp7fMYH1hVh4WSH6I5NpBu5iuOifzizpOHjxIiB2sFlec4YkenGhGLMch5D9PpZimscLTISAVQ77kQnkn5vkRV6oGdg/ZbXVGjkrojCc4pcmT+Y= 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 159708294634129.309799829353437; Mon, 10 Aug 2020 11:09:06 -0700 (PDT) Received: from localhost ([::1]:60136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CEL-0003lq-71 for importer@patchew.org; Mon, 10 Aug 2020 14:09:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLz-0003Y6-Uw for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57303 helo=us-smtp-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 1k5BLx-0003NO-SH for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:55 -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-557-gP6xMOF_MMKMMgFlxzsz2Q-1; Mon, 10 Aug 2020 13:12:51 -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 64F54106B244 for ; Mon, 10 Aug 2020 17:12:50 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71C9187D64; Mon, 10 Aug 2020 17:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079573; 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=Pi1yBhTiJxBmEAtjHe8ER84d9T1BH/tlS2/NzYfm/KE=; b=JKCs2wUN0q1xYhRvofjr/oeKJPR7xTyoI8jzt5q4dvCLXV8xlWVQCyQNN7PKY9pRLPp2d2 f1JH0pGH2xQGLVA7iyA9dg1/KzkjySJRxgUAMiYUVKu8hN+5tRRHrjV0iHhamL369pwTGZ Udpa/K3WXLypY3zE2lNcufKLCM/h5VE= X-MC-Unique: gP6xMOF_MMKMMgFlxzsz2Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 134/147] remove Makefile.target Date: Mon, 10 Aug 2020 19:08:52 +0200 Message-Id: <1597079345-42801-135-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 53 ++++------------------------------------------------- Makefile.target | 12 ------------ configure | 2 -- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 Makefile.target diff --git a/Makefile b/Makefile index 2962a41..2297712 100644 --- a/Makefile +++ b/Makefile @@ -163,17 +163,6 @@ include $(SRC_PATH)/tests/Makefile.include =20 all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules =20 -config-host.h: config-host.h-timestamp -config-host.h-timestamp: config-host.mak - -TARGET_DIRS_RULES :=3D $(foreach t, all fuzz clean install, $(addsuffix /$= (t), $(TARGET_DIRS))) - -.PHONY: $(TARGET_DIRS_RULES) -# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that -# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal -$(TARGET_DIRS_RULES): $(TARGET_DEPS) - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" $(notdir $@),) - # LIBFDT_lib=3D"": avoid breaking existing trees with objects requiring -f= PIC DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_lib=3D"" DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) @@ -210,8 +199,6 @@ slirp/all: .git-submodule-status CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ CFLAGS=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)") =20 -$(filter %/all, $(TARGET_DIRS_RULES)): - ROM_DIRS =3D $(addprefix pc-bios/, $(ROMS)) ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) # Only keep -O and -g cflags @@ -219,11 +206,9 @@ ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix /= $(t), $(ROM_DIRS))) $(ROM_DIRS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))" $(notdir $@= ),) =20 -.PHONY: recurse-all recurse-clean recurse-install -recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS)) -recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS)) -recurse-install: $(addsuffix /install, $(TARGET_DIRS)) -$(addsuffix /install, $(TARGET_DIRS)): all +.PHONY: recurse-all recurse-clean +recurse-all: $(ROM_DIRS) +recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) =20 ###################################################################### =20 @@ -273,9 +258,6 @@ distclean: clean $(call clean-manual,system) $(call clean-manual,tools) $(call clean-manual,user) - for d in $(TARGET_DIRS); do \ - rm -rf $$d || exit 1 ; \ - done rm -Rf .sdk =20 KEYMAPS=3Dda en-gb et fr fr-ch is lt no pt-br sv \ @@ -379,8 +361,7 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 # Needed by "meson install" export DESTDIR install: all $(if $(BUILD_DOCS),install-doc) \ - install-datadir install-localstatedir \ - recurse-install + install-datadir install-localstatedir ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) endif @@ -410,9 +391,6 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ done - for d in $(TARGET_DIRS); do \ - $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ - done =20 # documentation MAKEINFO=3Dmakeinfo @@ -527,20 +505,6 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-re= f.html \ =20 $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl =20 -# Reports/Analysis - -%/coverage-report.html: - @mkdir -p $* - $(call quiet-command,\ - gcovr -r $(SRC_PATH) \ - $(foreach t, $(TARGET_DIRS), --object-directory $(BUILD_DIR)/$(t)) \ - --object-directory $(BUILD_DIR) \ - -p --html --html-details -o $@, \ - "GEN", "coverage-report.html") - -.PHONY: coverage-report -coverage-report: $(CURDIR)/reports/coverage/coverage-report.html - ifdef CONFIG_WIN32 =20 INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) @@ -628,15 +592,6 @@ endif $(call print-help,cscope,Generate cscope index) $(call print-help,sparse,Run sparse on the QEMU source) @echo '' - @$(if $(TARGET_DIRS), \ - echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ - $(call print-help-run,$(t)/all,Build for $(t)); \ - $(if $(CONFIG_FUZZ), \ - $(if $(findstring softmmu,$(t)), \ - $(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \ - ))) \ - echo '') @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) $(call print-help,distclean,Remove all generated files) diff --git a/Makefile.target b/Makefile.target deleted file mode 100644 index a07149c..0000000 --- a/Makefile.target +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: makefile -*- - -BUILD_DIR?=3D$(CURDIR)/.. - -include ../config-host.mak -include config-target.mak -include $(SRC_PATH)/rules.mak - -all: -install: all -=09 -.PHONY: all clean install diff --git a/configure b/configure index 23e93aa..21b9ed2 100755 --- a/configure +++ b/configure @@ -8096,8 +8096,6 @@ if [ "$TARGET_SYSTBL_ABI" !=3D "" ] && [ "$TARGET_SYS= TBL" =3D "" ]; then TARGET_SYSTBL=3Dsyscall.tbl fi =20 -symlink "$source_path/Makefile.target" "$target_dir/Makefile" - upper() { echo "$@"| LC_ALL=3DC tr '[a-z]' '[A-Z]' } --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083356; cv=none; d=zohomail.com; s=zohoarc; b=Oq0ZhaeE1uXeIfEHz4SrGM6R9xnX37qIPxPqX+2eqMVbKjD3r6ay5lIY8mSUCW+KFkJW9Ys0n3nZIgE3JmAECkWbdJG0Z5bDoW8065DOxrGtG9iV95U7bmFrG+3AOci12SxovT84BXHMZhf2MAqP0CbUIJCEtzlXWYd6roeOqx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083356; 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=6T+qQ5Af2XUz8xg/wB8G7ZdM42mw9zJzpJhLBXqYbWg=; b=j1vxJJZ3bqfx6cVN5XBvxmEWs0vr5EXGZrTA66O+G0450lwivR3Kmwf9pVlTFEXHqVURZXWBC1Wizfz4Scu1tEs0D3ZO7G0aTef4xYeEp/tNyJ7Ki+igi8SxDPYTjGLjRR6JVZUOancuDLk55wAHC00G7TC1c+5Feliq30HRIMk= 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 1597083356356558.0202246269392; Mon, 10 Aug 2020 11:15:56 -0700 (PDT) Received: from localhost ([::1]:35296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CKw-00088w-SD for importer@patchew.org; Mon, 10 Aug 2020 14:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM4-0003i7-76 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:00 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:60610 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 1k5BM1-0003Nx-BK for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:59 -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-142-Alty6mcjN7S-jBXYHEofgQ-1; Mon, 10 Aug 2020 13:12:52 -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 C3972800465 for ; Mon, 10 Aug 2020 17:12:51 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1BB15F1E9; Mon, 10 Aug 2020 17:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079576; 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=6T+qQ5Af2XUz8xg/wB8G7ZdM42mw9zJzpJhLBXqYbWg=; b=C6tqUBguV5c6NQL69W/rU24ra0j24+UpH3bOrvd5lFe2pgXZZLjNqwjTZfhbA237TjH3RW 8IMxeDRT93wEudf33qtvOsTTlL6e/Fi6QxDzKPvmp8NjMvo9WPgLtekcWI4MY3U1l+qbii baK+JLMaglr6yXHxmwwYY2HD9TqbhbU= X-MC-Unique: Alty6mcjN7S-jBXYHEofgQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 135/147] meson: sphinx-build Date: Mon, 10 Aug 2020 19:08:53 +0200 Message-Id: <1597079345-42801-136-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 142 +++----------------------------------------------= ---- configure | 1 - docs/index.html.in | 4 +- docs/meson.build | 68 +++++++++++++++++++++++++ meson.build | 2 + rules.mak | 48 ------------------ 6 files changed, 79 insertions(+), 186 deletions(-) create mode 100644 docs/meson.build diff --git a/Makefile b/Makefile index 2297712..b0207a9 100644 --- a/Makefile +++ b/Makefile @@ -119,36 +119,9 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -# Sphinx does not allow building manuals into the same directory as -# the source files, so if we're doing an in-tree QEMU build we must -# build the manuals into a subdirectory (and then install them from -# there for 'make install'). For an out-of-tree build we can just -# use the docs/ subdirectory in the build tree as normal. -ifeq ($(realpath $(SRC_PATH)),$(realpath .)) -MANUAL_BUILDDIR :=3D docs/built -else -MANUAL_BUILDDIR :=3D docs -endif - ifdef BUILD_DOCS -DOCS+=3D$(MANUAL_BUILDDIR)/system/qemu.1 -DOCS+=3D$(MANUAL_BUILDDIR)/tools/qemu-img.1 -DOCS+=3D$(MANUAL_BUILDDIR)/tools/qemu-nbd.8 -DOCS+=3D$(MANUAL_BUILDDIR)/interop/qemu-ga.8 -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) -DOCS+=3D$(MANUAL_BUILDDIR)/tools/virtiofsd.1 -endif -DOCS+=3D$(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 DOCS+=3Ddocs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/in= terop/qemu-ga-ref.7 -DOCS+=3D$(MANUAL_BUILDDIR)/system/qemu-cpu-models.7 -DOCS+=3D$(MANUAL_BUILDDIR)/index.html -ifdef CONFIG_VIRTFS -DOCS+=3D$(MANUAL_BUILDDIR)/tools/virtfs-proxy-helper.1 -endif -ifdef CONFIG_TRACE_SYSTEMTAP -DOCS+=3D$(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1 -endif else DOCS=3D endif @@ -231,11 +204,6 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2= ,%,$@)" =20 -define clean-manual =3D -rm -rf $(MANUAL_BUILDDIR)/$1/_static -rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.= js $(MANUAL_BUILDDIR)/$1/*.html -endef - distclean: clean rm -f config-host.mak config-host.h* $(DOCS) rm -f tests/tcg/config-*.mak @@ -251,13 +219,6 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html - rm -rf .doctrees - $(call clean-manual,devel) - $(call clean-manual,interop) - $(call clean-manual,specs) - $(call clean-manual,system) - $(call clean-manual,tools) - $(call clean-manual,user) rm -Rf .sdk =20 KEYMAPS=3Dda en-gb et fr fr-ch is lt no pt-br sv \ @@ -291,28 +252,8 @@ else BLOBS=3D endif =20 -# Note that we manually filter-out the non-Sphinx documentation which -# is currently built into the docs/interop directory in the build tree, -# and also any sphinx-built manpages. -define install-manual =3D -for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "= $(DESTDIR)$(qemu_docdir)/$$d"; done -for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f -a '!' '(' -name '*.[= 0-9]' -o -name 'qemu-*-qapi.*' -o -name 'qemu-*-ref.*' ')' ); do $(INSTALL_= DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done -endef - -# Note that we deliberately do not install the "devel" manual: it is -# for QEMU developers, and not interesting to our users. -.PHONY: install-sphinxdocs -install-sphinxdocs: sphinxdocs - $(call install-manual,interop) - $(call install-manual,specs) - $(call install-manual,system) - $(call install-manual,tools) - $(call install-manual,user) - -install-doc: $(DOCS) install-sphinxdocs +install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/= interop" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/i= nterop" ifdef CONFIG_POSIX @@ -320,19 +261,7 @@ ifdef CONFIG_POSIX $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man= 1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR= )$(mandir)/man7" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-cpu-models.7 "$(DESTDIR)$(= mandir)/man7" -ifeq ($(CONFIG_TOOLS),y) - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-img.1 "$(DESTDIR)$(mandir)/= man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-nbd.8 "$(DESTDIR)$(mandir)/= man8" -endif -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1 "$(DESTDIR)$(m= andir)/man1" -endif ifeq ($(CONFIG_GUEST_AGENT),y) - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)= /man8" - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop" $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/i= nterop" $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/in= terop" $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" @@ -419,69 +348,6 @@ docs/version.texi: $(SRC_PATH)/VERSION config-host.mak %.pdf: %.texi docs/version.texi $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") =20 -# Sphinx builds all its documentation at once in one invocation -# and handles "don't rebuild things unless necessary" itself. -# The '.doctrees' files are cached information to speed this up. -.PHONY: sphinxdocs -sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ - $(MANUAL_BUILDDIR)/interop/index.html \ - $(MANUAL_BUILDDIR)/specs/index.html \ - $(MANUAL_BUILDDIR)/system/index.html \ - $(MANUAL_BUILDDIR)/tools/index.html \ - $(MANUAL_BUILDDIR)/user/index.html - -# Canned command to build a single manual -# Arguments: $1 =3D manual name, $2 =3D Sphinx builder ('html' or 'man') -# Note the use of different doctree for each (manual, builder) tuple; -# this works around Sphinx not handling parallel invocation on -# a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946 -build-manual =3D $(call quiet-command,CONFDIR=3D"$(qemu_confdir)" $(SPHINX= _BUILD) $(if $(V),,-q) $(SPHINX_WERROR) -b $2 -D version=3D$(VERSION) -D re= lease=3D"$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_B= UILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1") -# We assume all RST files in the manual's directory are used in it -manual-deps =3D $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*= /*.rst) \ - $(SRC_PATH)/docs/defs.rst.inc \ - $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py \ - $(SRC_PATH)/docs/sphinx/*.py -# Macro to write out the rule and dependencies for building manpages -# Usage: $(call define-manpage-rule,manualname,manpage1 manpage2...[,extra= deps]) -# 'extradeps' is optional, and specifies extra files (eg .hx files) that -# the manual page depends on. -define define-manpage-rule -$(call atomic,$(foreach manpage,$2,$(MANUAL_BUILDDIR)/$1/$(manpage)),$(cal= l manual-deps,$1) $3) - $(call build-manual,$1,man) -endef - -$(MANUAL_BUILDDIR)/devel/index.html: $(call manual-deps,devel) - $(call build-manual,devel,html) - -$(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) - $(call build-manual,interop,html) - -$(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs) - $(call build-manual,specs,html) - -$(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system) $(SRC_PAT= H)/hmp-commands.hx $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/qemu-option= s.hx - $(call build-manual,system,html) - -$(MANUAL_BUILDDIR)/tools/index.html: $(call manual-deps,tools) $(SRC_PATH)= /qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst.inc - $(call build-manual,tools,html) - -$(MANUAL_BUILDDIR)/user/index.html: $(call manual-deps,user) - $(call build-manual,user,html) - -$(call define-manpage-rule,interop,qemu-ga.8) - -$(call define-manpage-rule,system,qemu.1 qemu-block-drivers.7 qemu-cpu-mod= els.7) - -$(call define-manpage-rule,tools,\ - qemu-img.1 qemu-nbd.8 qemu-trace-stap.1\ - virtiofsd.1 virtfs-proxy-helper.1,\ - $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst= .inc) - -$(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version= .h - @mkdir -p "$(MANUAL_BUILDDIR)" - $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \ - "GEN","$@") - docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ =20 @@ -504,6 +370,12 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-re= f.html \ docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi =20 $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl + $(call quiet-command, \ + perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod = && \ + $(POD2MAN) --section=3D$(subst .,,$(suffix $@)) --center=3D" " --releas= e=3D" " $@.pod > $@, \ + "GEN","$@") + +man: $(filter %.1 %.7 %.8,$(DOCS)) =20 ifdef CONFIG_WIN32 =20 diff --git a/configure b/configure index 21b9ed2..7e7b4d8 100755 --- a/configure +++ b/configure @@ -7768,7 +7768,6 @@ echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_= host_mak echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak -echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak diff --git a/docs/index.html.in b/docs/index.html.in index 6736fa4..ca28047 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -2,10 +2,10 @@ - QEMU @@VERSION@@ Documentation + QEMU @VERSION@ Documentation -

QEMU @@VERSION@@ Documentation

+

QEMU @VERSION@ Documentation

  • System Emulation User's Guid= e
  • User Mode Emulation User's Gui= de
    • diff --git a/docs/meson.build b/docs/meson.build new file mode 100644 index 0000000..20fc92e --- /dev/null +++ b/docs/meson.build @@ -0,0 +1,68 @@ +SPHINX_ARGS =3D [config_host['SPHINX_BUILD'], + '-Dversion=3D' + meson.project_version(), + '-Drelease=3D' + config_host['PKGVERSION']] + +if get_option('werror') + SPHINX_ARGS +=3D [ '-W' ] +endif + +if build_docs + configure_file(output: 'index.html', + input: files('index.html.in'), + configuration: {'VERSION': meson.project_version()}, + install_dir: config_host['qemu_docdir']) + manuals =3D [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ] + man_pages =3D { + 'interop' : { + 'qemu-ga.8': (have_tools ? 'man8' : ''), + }, + 'tools': { + 'qemu-img.1': (have_tools ? 'man1' : ''), + 'qemu-nbd.8': (have_tools ? 'man8' : ''), + 'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP'= ) ? 'man1' : ''), + 'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''), + 'virtiofsd.1': (have_virtiofsd ? 'man1' : ''), + }, + 'system': { + 'qemu.1': 'man1', + 'qemu-block-drivers.7': 'man7', + 'qemu-cpu-models.7': 'man7' + }, + } + + sphinxdocs =3D [] + sphinxmans =3D [] + foreach manual : manuals + private_dir =3D meson.current_build_dir() / (manual + '.p') + input_dir =3D meson.current_source_dir() / manual + sphinxdocs +=3D custom_target(manual + ' manual', + build_always_stale: true, + build_by_default: build_docs, + output: manual, + command: [SPHINX_ARGS, '-b', 'html', '-d', private_dir, + input_dir, meson.current_build_dir() / manual]) + if build_docs and manual !=3D 'devel' + install_subdir(meson.current_build_dir() / manual, + install_dir: config_host['qemu_docdir']) + endif + + these_man_pages =3D [] + install_dirs =3D [] + foreach page, section : man_pages.get(manual, {}) + these_man_pages +=3D page + install_dirs +=3D section =3D=3D '' ? false : get_option('mandir') /= section + endforeach + if these_man_pages.length() > 0 + sphinxmans +=3D custom_target(manual + ' man pages', + build_always_stale: true, + build_by_default: build_docs, + output: these_man_pages, + install: build_docs, + install_dir: install_dirs, + command: [SPHINX_ARGS, '-b', 'man', '-d', private= _dir, + input_dir, meson.current_build_dir()]) + endif + endforeach + alias_target('sphinxdocs', sphinxdocs) + alias_target('man', sphinxmans) +endif diff --git a/meson.build b/meson.build index c3ef9b6..903b860 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') enable_modules =3D 'CONFIG_MODULES' in config_host +build_docs =3D 'BUILD_DOCS' in config_host =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: ['c', 'objc']) @@ -1039,6 +1040,7 @@ endif subdir('tools') subdir('pc-bios') subdir('tests') +subdir('docs') =20 summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} diff --git a/rules.mak b/rules.mak index 6d89001..6cab0b9 100644 --- a/rules.mak +++ b/rules.mak @@ -375,53 +375,5 @@ define unnest-vars $(eval $v :=3D $(filter-out %/,$($v)))) endef =20 -TEXI2MAN =3D $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod &&= \ - $(POD2MAN) --section=3D$(subst .,,$(suffix $@)) --center=3D" " --release= =3D" " $@.pod > $@, \ - "GEN","$@") - -%.1: - $(call TEXI2MAN) -%.7: - $(call TEXI2MAN) -%.8: - $(call TEXI2MAN) - -# Support for building multiple output files by atomically executing -# a single rule which depends on several input files (so the rule -# will be executed exactly once, not once per output file, and -# not multiple times in parallel.) For more explanation see: -# https://www.cmcrossroads.com/article/atomic-rules-gnu-make - -# Given a space-separated list of filenames, create the name of -# a 'sentinel' file to use to indicate that they have been built. -# We use fixed text on the end to avoid accidentally triggering -# automatic pattern rules, and . on the start to make the file -# not show up in ls output. -sentinel =3D .$(subst $(SPACE),_,$(subst /,_,$1)).sentinel. - -# Define an atomic rule that builds multiple outputs from multiple inputs. -# To use: -# $(call atomic,out1 out2 ...,in1 in2 ...) -# rule to do the operation -# -# Make 4.3 will have native support for this, and you would be able -# to instead write: -# out1 out2 ... &: in1 in2 ... -# rule to do the operation -# -# The way this works is that it creates a make rule -# "out1 out2 ... : sentinel-file ; @:" which says that the sentinel -# depends on the dependencies, and the rule to do that is "do nothing". -# Then we have a rule -# "sentinel-file : in1 in2 ..." -# whose commands start with "touch sentinel-file" and then continue -# with the rule text provided by the user of this 'atomic' function. -# The foreach... is there to delete the sentinel file if any of the -# output files don't exist, so that we correctly rebuild in that situation. -atomic =3D $(eval $1: $(call sentinel,$1) ; @:) \ - $(call sentinel,$1) : $2 ; @touch $$@ \ - $(foreach t,$1,$(if $(wildcard $t),,$(shell rm -f $(call sentinel= ,$1)))) - print-%: @echo '$*=3D$($*)' --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083051; cv=none; d=zohomail.com; s=zohoarc; b=XIJ7bhQn+2A5Nn12Ea8dJrNm9bSs93O/cmmhYANFA/CjyrxkvUr+1Nb/7I4iPiCj0s79awl84mpd3MjPHiMlXgz/+QxysXP9I3uT8OI47x0CsjwwUIbjRPqzm5q6LCG8o5pd+hCRnLrgnlR7QhS7xuyjWdqhMUw0SuoQros5W4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083051; 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=VMfPAUK19svy+KwG9R3cauVYzC3HR/I0gH9MWcFFsWQ=; b=iB6jfpoij0wEYJv8wEM6kbtSMiFcZ5k6rAjTSCCO8++xL2pBGBxIHxler/tVyjoY/7KAKDKagptaTiXJi4AteOXHVcCnoPzA7dtPgoXytmR31hBjo4rXCLJWborYTO+C7BAaqp7cEPIzy78/nsgt3BL7vUozo0eCnL6VADsb1Ek= 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 1597083051576454.4743615356099; Mon, 10 Aug 2020 11:10:51 -0700 (PDT) Received: from localhost ([::1]:40380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CG2-000790-7v for importer@patchew.org; Mon, 10 Aug 2020 14:10:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM3-0003gS-Ge for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:59 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:26122 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 1k5BM0-0003Np-MB for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:59 -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-264-zA8BbQKAPGyEkO1Jr-ETLg-1; Mon, 10 Aug 2020 13:12:54 -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 2E5A58015FB for ; Mon, 10 Aug 2020 17:12:53 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B65E5F1E9; Mon, 10 Aug 2020 17:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079576; 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=VMfPAUK19svy+KwG9R3cauVYzC3HR/I0gH9MWcFFsWQ=; b=WqyB5+cYW/kwpaJzit7P1taGY/1eiDKtKIKsJ538VlK2TGYazJsAXeDj2dqyqQiHJSBc0C C7iUJF6JqFFAs2GukzoOVYe0Q3UavTJBiYKHqLogAK6GTkXjqXJSmU83Q+KzwZzDJWj3ok z8GnScMH9L87iBEVYxqJNm857G+LmvI= X-MC-Unique: zA8BbQKAPGyEkO1Jr-ETLg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 136/147] meson: build texi doc Date: Mon, 10 Aug 2020 19:08:54 +0200 Message-Id: <1597079345-42801-137-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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 106 +++----------------------------------= ---- docs/interop/qemu-ga-ref.texi | 2 +- docs/interop/qemu-qmp-ref.texi | 2 +- meson.build | 85 +++++++++++++++++++++++++++++++++ qga/meson.build | 12 +++-- version.texi.in | 2 + 6 files changed, 104 insertions(+), 105 deletions(-) create mode 100644 version.texi.in diff --git a/Makefile b/Makefile index b0207a9..9c97dd7 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ BUILD_DIR=3D$(CURDIR) SRC_PATH=3D. =20 UNCHECKED_GOALS :=3D %clean TAGS cscope ctags dist \ - html info pdf txt \ help check-help print-% \ docker docker-% vm-help vm-test vm-build-% =20 @@ -112,20 +111,13 @@ generated-files-y +=3D .git-submodule-status Makefile: ; configure: ; =20 -.PHONY: all clean cscope distclean html info install install-doc \ - pdf txt recurse-all dist msi FORCE +.PHONY: all clean cscope distclean install \ + recurse-all dist msi FORCE =20 $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -ifdef BUILD_DOCS -DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 -DOCS+=3Ddocs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/in= terop/qemu-ga-ref.7 -else -DOCS=3D -endif - SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) =20 ifneq ($(wildcard config-host.mak),) @@ -134,7 +126,7 @@ endif =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules +all: recurse-all modules =20 # LIBFDT_lib=3D"": avoid breaking existing trees with objects requiring -f= PIC DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_lib=3D"" @@ -205,7 +197,7 @@ qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2= ,%,$@)" =20 distclean: clean - rm -f config-host.mak config-host.h* $(DOCS) + rm -f config-host.mak config-host.h* rm -f tests/tcg/config-*.mak rm -f config-all-disas.mak config.status rm -f po/*.mo tests/qemu-iotests/common.env @@ -213,12 +205,6 @@ distclean: clean rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f config.log rm -f linux-headers/asm - rm -f docs/version.texi - rm -f docs/interop/qemu-ga-qapi.texi docs/interop/qemu-qmp-qapi.texi - rm -f docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 - rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt - rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf - rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -Rf .sdk =20 KEYMAPS=3Dda en-gb et fr fr-ch is lt no pt-br sv \ @@ -252,29 +238,6 @@ else BLOBS=3D endif =20 -install-doc: $(DOCS) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/= interop" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/i= nterop" -ifdef CONFIG_POSIX - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man= 1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" -ifeq ($(CONFIG_GUEST_AGENT),y) - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/i= nterop" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/in= terop" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" -endif -endif -ifdef CONFIG_VIRTFS - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/virtfs-proxy-helper.1 "$(DESTDIR= )$(mandir)/man1" -endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/virtiofsd.1 "$(DESTDIR)$(mandir)= /man1" -endif - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 @@ -289,8 +252,7 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 =20 # Needed by "meson install" export DESTDIR -install: all $(if $(BUILD_DOCS),install-doc) \ - install-datadir install-localstatedir +install: all install-datadir install-localstatedir ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) endif @@ -321,62 +283,6 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ done =20 -# documentation -MAKEINFO=3Dmakeinfo -MAKEINFOINCLUDES=3D -I docs -I $( $@,"GEN","$@") - -%.html: %.texi docs/version.texi - $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ - --html $< -o $@,"GEN","$@") - -%.info: %.texi docs/version.texi - $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") - -%.txt: %.texi docs/version.texi - $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ - --plaintext $< -o $@,"GEN","$@") - -%.pdf: %.texi docs/version.texi - $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") - -docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi - @cp -p $< $@ - -docs/interop/qemu-ga-qapi.texi: qga/qga-qapi-doc.texi - @cp -p $< $@ - -html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxd= ocs -info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info -pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf -txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt - -docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ - docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ - docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7: \ - docs/interop/qemu-ga-ref.texi docs/interop/qemu-ga-qapi.texi - -docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ - docs/interop/qemu-qmp-ref.info docs/interop/qemu-qmp-ref.pdf \ - docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \ - docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi - -$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl - $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod = && \ - $(POD2MAN) --section=3D$(subst .,,$(suffix $@)) --center=3D" " --releas= e=3D" " $@.pod > $@, \ - "GEN","$@") - -man: $(filter %.1 %.7 %.8,$(DOCS)) - ifdef CONFIG_WIN32 =20 INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) @@ -475,7 +381,7 @@ endif $(call print-help,vm-help,Help about targets running tests inside VM) @echo '' @echo 'Documentation targets:' - $(call print-help,html info pdf txt,Build documentation in specified form= at) + $(call print-help,html info pdf txt man,Build documentation in specified = format) @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/docs/interop/qemu-ga-ref.texi b/docs/interop/qemu-ga-ref.texi index ddb76ce..a23cc2e 100644 --- a/docs/interop/qemu-ga-ref.texi +++ b/docs/interop/qemu-ga-ref.texi @@ -65,7 +65,7 @@ along with this manual. If not, see http://www.gnu.org/l= icenses/. @c for texi2pod: @c man begin DESCRIPTION =20 -@include qemu-ga-qapi.texi +@include qga/qga-qapi-doc.texi =20 @c man end =20 diff --git a/docs/interop/qemu-qmp-ref.texi b/docs/interop/qemu-qmp-ref.texi index bb25758..ea1d7fe 100644 --- a/docs/interop/qemu-qmp-ref.texi +++ b/docs/interop/qemu-qmp-ref.texi @@ -65,7 +65,7 @@ along with this manual. If not, see http://www.gnu.org/l= icenses/. @c for texi2pod: @c man begin DESCRIPTION =20 -@include qemu-qmp-qapi.texi +@include qapi/qapi-doc.texi =20 @c man end =20 diff --git a/meson.build b/meson.build index 903b860..a858af5 100644 --- a/meson.build +++ b/meson.build @@ -1042,6 +1042,91 @@ subdir('pc-bios') subdir('tests') subdir('docs') =20 +if build_docs + makeinfo =3D find_program('makeinfo', required: build_docs) + + docs_inc =3D [ + '-I', meson.current_source_dir(), + '-I', meson.current_build_dir() / 'docs', + '-I', '@OUTDIR@', + ] + + version_texi =3D configure_file(output: 'version.texi', + input: 'version.texi.in', + configuration: {'VERSION': meson.project_ver= sion(), + 'qemu_confdir': config_host[= 'qemu_confdir']}) + + texi =3D { + 'qemu-qmp-ref': ['docs/interop/qemu-qmp-ref.texi', qapi_doc_texi, vers= ion_texi], + } + if 'CONFIG_GUEST_AGENT' in config_host + texi +=3D {'qemu-ga-ref': ['docs/interop/qemu-ga-ref.texi', qga_qapi_d= oc_texi, version_texi]} + endif + + if makeinfo.found() + cmd =3D [ + 'env', 'LC_ALL=3DC', makeinfo, '--no-split', '--number-sections', do= cs_inc, + '@INPUT0@', '-o', '@OUTPUT@', + ] + foreach ext, args: { + 'info': [], + 'html': ['--no-headers', '--html'], + 'txt': ['--no-headers', '--plaintext'], + } + t =3D [] + foreach doc, input: texi + output =3D doc + '.' + ext + t +=3D custom_target(output, + input: input, + output: output, + install: true, + install_dir: config_host['qemu_docdir'] / 'interop', + command: cmd + args) + endforeach + alias_target(ext, t) + endforeach + endif + + texi2pdf =3D find_program('texi2pdf', required: false) + + if texi2pdf.found() + pdfs =3D [] + foreach doc, input: texi + output =3D doc + '.pdf' + pdfs +=3D custom_target(output, + input: input, + output: output, + command: [texi2pdf, '-q', docs_inc, '@INPUT0@', '-o', = '@OUTPUT@'], + build_by_default: false) + endforeach + alias_target('pdf', pdfs) + endif + + texi2pod =3D find_program('scripts/texi2pod.pl') + pod2man =3D find_program('pod2man', required: build_docs) + + if pod2man.found() + foreach doc, input: texi + man =3D doc + '.7' + pod =3D custom_target(man + '.pod', + input: input, + output: man + '.pod', + command: [texi2pod, + '-DVERSION=3D"' + meson.project_versio= n() + '"', + '-DCONFDIR=3D"' + config_host['qemu_co= nfdir'] + '"', + '@INPUT0@', '@OUTPUT@']) + man =3D custom_target(man, + input: pod, + output: man, + capture: true, + install: true, + install_dir: config_host['mandir'] / 'man7', + command: [pod2man, '--utf8', '--section=3D7', '-= -center=3D" "', + '--release=3D" "', '@INPUT@']) + endforeach + endif +endif + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/qga/meson.build b/qga/meson.build index 7e7174b..6fdddd6 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -1,7 +1,6 @@ qga_qapi_outputs =3D [ 'qga-qapi-commands.c', 'qga-qapi-commands.h', - 'qga-qapi-doc.texi', 'qga-qapi-emit-events.c', 'qga-qapi-emit-events.h', 'qga-qapi-events.c', @@ -17,12 +16,19 @@ qga_qapi_outputs =3D [ ] =20 qga_qapi_files =3D custom_target('QGA QAPI files', - output: qga_qapi_outputs, + output: qga_qapi_outputs + ['qga-qapi-doc.t= exi'], input: 'qapi-schema.json', command: [ qapi_gen, '-o', 'qga', '-p', 'qg= a-', '@INPUT0@' ], depend_files: qapi_gen_depends) + qga_ss =3D ss.source_set() -qga_ss.add(qga_qapi_files) +i =3D 0 +foreach output: qga_qapi_outputs + qga_ss.add(qga_qapi_files[i]) + i =3D i + 1 +endforeach +qga_qapi_doc_texi =3D qga_qapi_files[i] + qga_ss.add(files( 'commands.c', 'guest-agent-command-state.c', diff --git a/version.texi.in b/version.texi.in new file mode 100644 index 0000000..0a723b8 --- /dev/null +++ b/version.texi.in @@ -0,0 +1,2 @@ +@set VERSION @VERSION@ +@set CONFDIR @qemu_confdir@ --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083172; cv=none; d=zohomail.com; s=zohoarc; b=Pi1HEssLmxt69dREmQEqiJaxr6APpIcrGwlzgxgi+fQEWud3DnpVMHQgifmOaiIf25xxD1qaCJw0rVmr0YgwX+bpoOEO/UYl/umbGj2sXkKGiabn7KlDVpXlkIio933rxRAXIaTnCGvM2ZitBP9X91k7rf6AiMhY4Mx8oAtZdMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083172; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=pw6jQgzJowoLxo1o6vZ+RJZ8mSIYpQphma7uRLHyF64=; b=jefZ5W/7TdT7dxTTVEK8z15STz17nG11CaIzw8lLqJVvOQIKXfRFzUzrY9WSSycyeDDooLutcR8VnQNSSyGcEHrObrlX1vUOwqxvecHx+7PD3RvZVcNkLLbotUwuW+O+/cGQxLy+8ZB5NLFZ0s3qSvM6V5s4+wP8wULFgPMJQtY= 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 1597083172207664.7732067305319; Mon, 10 Aug 2020 11:12:52 -0700 (PDT) Received: from localhost ([::1]:49286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CHz-0002Md-0T for importer@patchew.org; Mon, 10 Aug 2020 14:12:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM5-0003kg-7l for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BM2-0003O1-IV for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:00 -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-556-vszdb35CP8SIiYl3s9Mb0A-1; Mon, 10 Aug 2020 13:12:55 -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 5482E800472 for ; Mon, 10 Aug 2020 17:12:54 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A87A5F1E9 for ; Mon, 10 Aug 2020 17:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=pw6jQgzJowoLxo1o6vZ+RJZ8mSIYpQphma7uRLHyF64=; b=Gtu1jaulU5KwvsuR3lqsYxGfjJwSYnahQtpCwTFZMYizrI08yK64HT7Gma6efV4LS81Z95 MDfGAzm7K71+8oGj3AkofMQk2lLB4DWUwlh1SRbNE6eEeXhrow3t9o9BS/fMur0hNUj+pT BaqFctqMXc9SXDhxpPWqb9R8oscaNLA= X-MC-Unique: vszdb35CP8SIiYl3s9Mb0A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 137/147] meson: convert check-block Date: Mon, 10 Aug 2020 19:08:55 +0200 Message-Id: <1597079345-42801-138-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> 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 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=63.128.21.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/10 13:09:25 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ tests/Makefile.include | 16 ++-------------- tests/meson.build | 4 ++++ tests/qemu-iotests/meson.build | 10 ++++++++++ 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 tests/qemu-iotests/meson.build diff --git a/meson.build b/meson.build index a858af5..9e37814 100644 --- a/meson.build +++ b/meson.build @@ -991,9 +991,11 @@ if have_tools dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) + qemu_block_tools =3D [qemu_img, qemu_io] if host_machine.system() =3D=3D 'linux' or host_machine.system() =3D=3D = 'sunos' or host_machine.system().endswith('bsd') qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) + qemu_block_tools +=3D [qemu_nbd] endif =20 subdir('storage-daemon') diff --git a/tests/Makefile.include b/tests/Makefile.include index c3874ca..e023df8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -160,8 +160,6 @@ check-unit-y +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 -check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh - generated-files-y +=3D tests/test-qapi-types.h generated-files-y +=3D tests/include/test-qapi-types-sub-module.h generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h @@ -480,14 +478,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 =20 -QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D te= sts/qemu-iotests/socket_scm_helper$(EXESUF) - -.PHONY: check-tests/check-block.sh -check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ - qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ - $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) - @$< - # Python venv for running tests =20 .PHONY: check-venv check-acceptance @@ -541,13 +531,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get= -vm-images =20 # Consolidated targets =20 -.PHONY: check-block check-unit check check-clean get-vm-images +.PHONY: check-unit check check-clean get-vm-images ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif check-build: build-unit =20 -check: check-block check-unit +check: check-unit check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -f tests/test-qapi-gen-timestamp @@ -559,8 +549,6 @@ clean: check-clean =20 # Build the help program automatically =20 -all: $(QEMU_IOTESTS_HELPERS-y) - -include $(wildcard tests/*.d) =20 endif diff --git a/tests/meson.build b/tests/meson.build index d724402..f834c27 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,7 @@ +if have_system and 'CONFIG_POSIX' in config_host + subdir('qemu-iotests') +endif + test('decodetree', sh, args: [ files('decode/check.sh'), config_host['PYTHON'], files('../sc= ripts/decodetree.py') ], workdir: meson.current_source_dir() / 'decode', diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build new file mode 100644 index 0000000..3de09fb --- /dev/null +++ b/tests/qemu-iotests/meson.build @@ -0,0 +1,10 @@ +if 'CONFIG_LINUX' in config_host + socket_scm_helper =3D executable('socket_scm_helper', 'socket_scm_help= er.c', + build_by_default: false) +else + socket_scm_helper =3D [] +endif +test('qemu-iotests', sh, args: [files('../check-block.sh')], + depends: [qemu_block_tools, emulators, socket_scm_helper], + suite: 'block', timeout: 10000) + --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083451; cv=none; d=zohomail.com; s=zohoarc; b=nfupZXgdtduElVu54XHh3EyWxaWDyRRwnkTQDPmwXTdnuX7e53JBQJHxtMgQeXfGwMk4uNk7a/PflZxzOCFyiPJm9CGGSaMSGEPHcrcXWlEqMeDwvD5RxcsXyWOJ9XS65G9jQMcPpOAorqZ8FTYPsGUjTo0RaqlYGE4oCH1Wmv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083451; h=Content-Type:Content-Transfer-Encoding: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=KHUzMS8mJY4vfeWvIYje4z92EdXfwUsX5tWJpfHIYA8=; b=Kna3P87VPXcg/oZ/yHsw5Xdzy2Voj6PZk+Q0cLvpUsAPyAWPsmB0Ef+82kvm4lMAXDW6eBKCNFwRznVi/1zTvYOtxuUs6TprXTPwTyEkKnFsygWVaixKjDbLIShAJcyHjvfQRqyYYRsjEj4zpxfO9r/CnOD1DNw/8VgBfaAJBiY= 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 1597083451303913.0289993151538; Mon, 10 Aug 2020 11:17:31 -0700 (PDT) Received: from localhost ([::1]:43510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CMT-00035I-LB for importer@patchew.org; Mon, 10 Aug 2020 14:17:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMA-0003wO-AQ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20160 helo=us-smtp-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 1k5BM6-0003OZ-8V for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:05 -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-357-bPNRqP7BOQmSTmJc8DHCvw-1; Mon, 10 Aug 2020 13:12:56 -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 7A4861005504 for ; Mon, 10 Aug 2020 17:12:55 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C15B25F1E9 for ; Mon, 10 Aug 2020 17:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KHUzMS8mJY4vfeWvIYje4z92EdXfwUsX5tWJpfHIYA8=; b=XoEjG++Rh0os1EB8bxaupeQ/5zkICxAFjhgBSvDNBdPhbO9DV/wkVcJsXTXh7FhOjW5IRO 5+8FMJY70JQhVwC8HLScHt0xri3FINpaeo16QLoJKnxfHsZMMUSrVzZ1guDvvOUzkD+wk9 fKlMvQMK9HiNib2H/SsbZhabT5bb0kU= X-MC-Unique: bPNRqP7BOQmSTmJc8DHCvw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 138/147] rules.mak: drop unneeded macros Date: Mon, 10 Aug 2020 19:08:56 +0200 Message-Id: <1597079345-42801-139-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Paolo Bonzini --- .gitignore | 1 - Makefile | 7 +- configure | 32 +----- docs/devel/build-system.txt | 5 +- rules.mak | 231 +---------------------------------------= ---- scripts/create_config | 6 +- 6 files changed, 14 insertions(+), 268 deletions(-) diff --git a/.gitignore b/.gitignore index 2424131..6b133a6 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ *.msi *.dll *.so -*.mo *.fn *.ky *.log diff --git a/Makefile b/Makefile index 9c97dd7..cd4eeb5 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ endif =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: recurse-all modules +all: recurse-all =20 # LIBFDT_lib=3D"": avoid breaking existing trees with objects requiring -f= PIC DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_lib=3D"" @@ -180,7 +180,7 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h - find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]= ' \) -type f \ + find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ @@ -361,9 +361,6 @@ print-help =3D $(quiet-@)$(call print-help-run,$1,$2) help: @echo 'Generic targets:' $(call print-help,all,Build all) -ifdef CONFIG_MODULES - $(call print-help,modules,Build all modules) -endif $(call print-help,dir/file.o,Build specified target only) $(call print-help,install,Install QEMU, documentation and tools) $(call print-help,ctags/TAGS,Generate tags file for editors) diff --git a/configure b/configure index 7e7b4d8..a7f1e00 100755 --- a/configure +++ b/configure @@ -29,7 +29,6 @@ TMPC=3D"${TMPDIR1}/${TMPB}.c" TMPO=3D"${TMPDIR1}/${TMPB}.o" TMPCXX=3D"${TMPDIR1}/${TMPB}.cxx" TMPE=3D"${TMPDIR1}/${TMPB}.exe" -TMPMO=3D"${TMPDIR1}/${TMPB}.mo" TMPTXT=3D"${TMPDIR1}/${TMPB}.txt" =20 rm -f config.log @@ -424,7 +423,7 @@ bigendian=3D"no" mingw32=3D"no" gcov=3D"no" EXESUF=3D"" -DSOSUF=3D".so" +HOST_DSOSUF=3D".so" LDFLAGS_SHARED=3D"-shared" modules=3D"no" module_upgrades=3D"no" @@ -958,7 +957,7 @@ fi =20 if test "$mingw32" =3D "yes" ; then EXESUF=3D".exe" - DSOSUF=3D".dll" + HOST_DSOSUF=3D".dll" # MinGW needs -mthreads for TLS and macro _MT. QEMU_CFLAGS=3D"-mthreads $QEMU_CFLAGS" LIBS=3D"-lwinmm -lws2_32 $LIBS" @@ -6207,31 +6206,6 @@ EOF fi fi =20 -################################################# -# Sparc implicitly links with --relax, which is -# incompatible with -r, so --no-relax should be -# given. It does no harm to give it on other -# platforms too. - -# Note: the prototype is needed since QEMU_CFLAGS -# contains -Wmissing-prototypes -cat > $TMPC << EOF -extern int foo(void); -int foo(void) { return 0; } -EOF -if ! compile_object ""; then - error_exit "Failed to compile object file for LD_REL_FLAGS test" -fi -for i in '-Wl,-r -Wl,--no-relax' -Wl,-r -r; do - if do_cc -nostdlib $i -o $TMPMO $TMPO; then - LD_REL_FLAGS=3D$i - break - fi -done -if test "$modules" =3D "yes" && test "$LD_REL_FLAGS" =3D ""; then - feature_not_found "modules" "Cannot find how to build relocatable object= s" -fi - ########################################## # check for sysmacros.h =20 @@ -7807,7 +7781,7 @@ echo "LIBS+=3D$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=3D$libs_tools" >> $config_host_mak echo "PTHREAD_LIB=3D$PTHREAD_LIB" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak -echo "DSOSUF=3D$DSOSUF" >> $config_host_mak +echo "HOST_DSOSUF=3D$HOST_DSOSUF" >> $config_host_mak echo "LDFLAGS_SHARED=3D$LDFLAGS_SHARED" >> $config_host_mak echo "LIBS_QGA=3D$libs_qga" >> $config_host_mak echo "TASN1_LIBS=3D$tasn1_libs" >> $config_host_mak diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index 41bd08e..fea67b2 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -404,10 +404,7 @@ using Makefile.target for the build rules. - rules.mak =20 This file provides the generic helper rules for invoking build tools, in -particular the compiler and linker. This also contains the magic (hairy) -'unnest-vars' function which is used to merge the variable definitions -from all Makefile.objs in the source tree down into the main Makefile -context. +particular the compiler and linker. =20 =20 - default-configs/*.mak diff --git a/rules.mak b/rules.mak index 6cab0b9..c66c821 100644 --- a/rules.mak +++ b/rules.mak @@ -33,11 +33,6 @@ QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d # different for target-dependent ones. QEMU_LOCAL_INCLUDES =3D -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -i= quote $(@D) =20 -WL_U :=3D -Wl,-u, -find-symbols =3D $(if $1, $(sort $(shell $(NM) -P -g $1 | $2))) -defined-symbols =3D $(call find-symbols,$1,awk '$$2!=3D"U"{print $$1}') -undefined-symbols =3D $(call find-symbols,$1,awk '$$2=3D=3D"U"{print $$1}') - WL :=3D -Wl, ifdef CONFIG_DARWIN whole-archive =3D $(WL)-force_load,$1 @@ -45,32 +40,7 @@ else whole-archive =3D $(WL)--whole-archive $1 $(WL)--no-whole-archive endif =20 -# All the .mo objects in -m variables are also added into corresponding -y -# variable in unnest-vars, but filtered out here, when LINK is called. -# -# The .mo objects are supposed to be linked as a DSO, for module build. So= here -# they are only used as a placeholders to generate those "archive undefine= d" -# symbol options (-Wl,-u,$symbol_name), which are the archive functions -# referenced by the code in the DSO. -# -# Also the presence in -y variables will also guarantee they are built bef= ore -# linking executables that will load them. So we can look up symbol refere= nce -# in LINK. -# -# This is necessary because the exectuable itself may not use the function= , in -# which case the function would not be linked in. Then the DSO loading will -# fail because of the missing symbol. -process-archive-undefs =3D $(filter-out %.a %.fa %.mo %$(DSOSUF),$1) \ - $(addprefix $(WL_U), \ - $(filter $(call defined-symbols,$(filter %.a %.fa, $1= )), \ - $(call undefined-symbols,$(filter %.mo %$(DSOSUF),$1)))) \ - $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ - $(filter %.a,$1) - -extract-libs =3D $(strip $(foreach o,$(filter-out %.mo %$(DSOSUF),$1),$($o= -libs))) -expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ - $(foreach o,$(filter %.mo %$(DSOSUF),$1),$($o-objs)) \ - $(filter-out %.o %.mo %$(DSOSUF),$1)) +extract-libs =3D $(strip $(foreach o,$1,$($o-libs))) =20 %.o: %.c @mkdir -p $(dir $@) @@ -83,7 +53,9 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ LINKPROG =3D $(or $(CXX),$(CC)) =20 LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@= \ - $(call process-archive-undefs, $1) \ + $(filter-out %.a %.fa,$1) \ + $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ + $(filter %.a,$1) \ $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") =20 %.o: %.S @@ -109,25 +81,11 @@ LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $= (QEMU_LDFLAGS) -o $@ \ %.o: %.dtrace $(call quiet-command,dtrace -o $@ -G -s $<,"GEN","$(TARGET_DIR)$@") =20 -DSO_OBJ_CFLAGS :=3D -fPIC -DBUILD_DSO -module-common.o: CFLAGS +=3D $(DSO_OBJ_CFLAGS) -%$(DSOSUF): QEMU_LDFLAGS +=3D $(LDFLAGS_SHARED) -%$(DSOSUF): %.mo - $(call LINK,$^) - @# Copy to build root so modules can be loaded when program started witho= ut install - $(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@),"CP","= $(subst /,-,$@)")) - - -LD_REL :=3D $(CC) -nostdlib $(LD_REL_FLAGS) - -%.mo: - $(call quiet-command,$(LD_REL) -o $@ $^,"LD","$(TARGET_DIR)$@") - .PHONY: modules modules: =20 %$(EXESUF): %.o - $(call LINK,$(filter %.o %.a %.mo %.fa, $^)) + $(call LINK,$(filter %.o %.a %.fa, $^)) =20 %.a: $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@") @@ -160,15 +118,6 @@ define install-prog $(if $(STRIP),$(STRIP) $(foreach T,$1,"$2/$(notdir $T)"),) endef =20 -# find-in-path -# Usage: $(call find-in-path, prog) -# Looks in the PATH if the argument contains no slash, else only considers= one -# specific directory. Returns an # empty string if the program doesn't ex= ist -# there. -find-in-path =3D $(if $(findstring /, $1), \ - $(wildcard $1), \ - $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH))))) - # Logical functions (for operating on y/n values like CONFIG_FOO vars) # Inputs to these must be either "y" (true) or "n" or "" (both false) # Output is always either "y" or "n". @@ -205,175 +154,5 @@ clean: clean-timestamp # will delete the target of a rule if commands exit with a nonzero exit st= atus .DELETE_ON_ERROR: =20 -# save-vars -# Usage: $(call save-vars, vars) -# Save each variable $v in $vars as save-vars-$v, save their object's -# variables, then clear $v. saved-vars-$v contains the variables that -# where saved for the objects, in order to speedup load-vars. -define save-vars - $(foreach v,$1, - $(eval save-vars-$v :=3D $(value $v)) - $(eval saved-vars-$v :=3D $(foreach o,$($v), \ - $(if $($o-cflags), $o-cflags $(eval save-vars-$o-cflags :=3D $= ($o-cflags))$(eval $o-cflags :=3D )) \ - $(if $($o-libs), $o-libs $(eval save-vars-$o-libs :=3D $($o-li= bs))$(eval $o-libs :=3D )) \ - $(if $($o-objs), $o-objs $(eval save-vars-$o-objs :=3D $($o-ob= js))$(eval $o-objs :=3D )))) - $(eval $v :=3D )) -endef - -# load-vars -# Usage: $(call load-vars, vars, add_var) -# Load the saved value for each variable in @vars, and the per object -# variables. -# Append @add_var's current value to the loaded value. -define load-vars - $(eval $2-new-value :=3D $(value $2)) - $(foreach v,$1, - $(eval $v :=3D $(value save-vars-$v)) - $(foreach o,$(saved-vars-$v), - $(eval $o :=3D $(save-vars-$o)) $(eval save-vars-$o :=3D )) - $(eval save-vars-$v :=3D ) - $(eval saved-vars-$v :=3D )) - $(eval $2 :=3D $(value $2) $($2-new-value)) -endef - -# fix-paths -# Usage: $(call fix-paths, obj_path, src_path, vars) -# Add prefix @obj_path to all objects in @vars, and add prefix @src_path t= o all -# directories in @vars. -define fix-paths - $(foreach v,$3, - $(foreach o,$($v), - $(if $($o-libs), - $(eval $1$o-libs :=3D $($o-libs))) - $(if $($o-cflags), - $(eval $1$o-cflags :=3D $($o-cflags))) - $(if $($o-objs), - $(eval $1$o-objs :=3D $(addprefix $1,$($o-objs))))) - $(eval $v :=3D $(addprefix $1,$(filter-out %/,$($v))) \ - $(addprefix $2,$(filter %/,$($v))))) -endef - -# unnest-var-recursive -# Usage: $(call unnest-var-recursive, obj_prefix, vars, var) -# -# Unnest @var by including subdir Makefile.objs, while protect others in @= vars -# unchanged. -# -# @obj_prefix is the starting point of object path prefix. -# -define unnest-var-recursive - $(eval dirs :=3D $(sort $(filter %/,$($3)))) - $(eval $3 :=3D $(filter-out %/,$($3))) - $(foreach d,$(dirs:%/=3D%), - $(call save-vars,$2) - $(eval obj :=3D $(if $1,$1/)$d) - $(eval -include $(SRC_PATH)/$d/Makefile.objs) - $(call fix-paths,$(if $1,$1/)$d/,$d/,$2) - $(call load-vars,$2,$3) - $(call unnest-var-recursive,$1,$2,$3)) -endef - -# unnest-vars -# Usage: $(call unnest-vars, obj_prefix, vars) -# -# @obj_prefix: object path prefix, can be empty, or '..', etc. Don't inclu= de -# ending '/'. -# -# @vars: the list of variable names to unnest. -# -# This macro will scan subdirectories's Makefile.objs, include them, to bu= ild -# up each variable listed in @vars. -# -# Per object and per module cflags and libs are saved with relative path f= ixed -# as well, those variables include -libs, -cflags and -objs. Items in -obj= s are -# also fixed to relative path against SRC_PATH plus the prefix @obj_prefix. -# -# All nested variables postfixed by -m in names are treated as DSO variabl= es, -# and will be built as modules, if enabled. -# -# A simple example of the unnest: -# -# obj_prefix =3D .. -# vars =3D hot cold -# hot =3D fire.o sun.o season/ -# cold =3D snow.o water/ season/ -# -# Unnest through a faked source directory structure: -# -# SRC_PATH -# =E2=94=9C=E2=94=80=E2=94=80 water -# =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 Makefile.objs=E2=94=80=E2= =94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=90 -# =E2=94=82 =E2=94=82 hot +=3D steam.o =E2=94= =82 -# =E2=94=82 =E2=94=82 cold +=3D ice.mo =E2=94= =82 -# =E2=94=82 =E2=94=82 ice.mo-libs :=3D -licemaker =E2=94= =82 -# =E2=94=82 =E2=94=82 ice.mo-objs :=3D ice1.o ice2.o =E2=94= =82 -# =E2=94=82 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2= =94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2= =94=80=E2=94=98 -# =E2=94=82 -# =E2=94=94=E2=94=80=E2=94=80 season -# =E2=94=94=E2=94=80=E2=94=80 Makefile.objs=E2=94=80=E2=94=80= =E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=90 -# =E2=94=82 hot +=3D summer.o =E2=94=82 -# =E2=94=82 cold +=3D winter.o =E2=94=82 -# =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2= =94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=98 -# -# In the end, the result will be: -# -# hot =3D ../fire.o ../sun.o ../season/summer.o -# cold =3D ../snow.o ../water/ice.mo ../season/winter.o -# ../water/ice.mo-libs =3D -licemaker -# ../water/ice.mo-objs =3D ../water/ice1.o ../water/ice2.o -# -# Note that 'hot' didn't include 'water/' in the input, so 'steam.o' is not -# included. -# -define unnest-vars - # In the case of target build (i.e. $1 =3D=3D ..), fix path for top le= vel - # Makefile.objs objects - $(if $1,$(call fix-paths,$1/,,$2)) - - # Descend and include every subdir Makefile.objs - $(foreach v, $2, - $(call unnest-var-recursive,$1,$2,$v) - # Pass the .mo-cflags and .mo-libs along to its member objects - $(foreach o, $(filter %.mo,$($v)), - $(foreach p,$($o-objs), - $(if $($o-cflags), $(eval $p-cflags +=3D $($o-cflags))) - $(if $($o-libs), $(eval $p-libs +=3D $($o-libs)))))) - - # For all %.mo objects that are directly added into -y, just expand th= em - $(foreach v,$(filter %-y,$2), - $(eval $v :=3D $(foreach o,$($v),$(if $($o-objs),$($o-objs),$o)))) - - $(foreach v,$(filter %-m,$2), - # All .o found in *-m variables are single object modules, create = .mo - # for them - $(foreach o,$(filter %.o,$($v)), - $(eval $(o:%.o=3D%.mo)-objs :=3D $o)) - # Now unify .o in -m variable to .mo - $(eval $v :=3D $($v:%.o=3D%.mo)) - $(eval modules-m +=3D $($v)) - - # For module build, build shared libraries during "make modules" - # For non-module build, add -m to -y - $(if $(CONFIG_MODULES), - $(foreach o,$($v), - $(eval $($o-objs): CFLAGS +=3D $(DSO_OBJ_CFLAGS)) - $(eval $o: $($o-objs))) - $(eval $(patsubst %-m,%-y,$v) +=3D $($v)) - $(eval modules: $($v:%.mo=3D%$(DSOSUF))), - $(eval $(patsubst %-m,%-y,$v) +=3D $(call expand-objs, $($v))= ))) - - # Post-process all the unnested vars - $(foreach v,$2, - $(foreach o, $(filter %.mo,$($v)), - # Find all the .mo objects in variables and add dependency rul= es - # according to .mo-objs. Report error if not set - $(if $($o-objs), - $(eval $(o:%.mo=3D%$(DSOSUF)): module-common.o $($o-objs))= )) - $(shell mkdir -p ./ $(sort $(dir $($v)))) - # Include all the .d files - $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.= o,$($v))))) - $(eval $v :=3D $(filter-out %/,$($v)))) -endef - print-%: @echo '$*=3D$($*)' diff --git a/scripts/create_config b/scripts/create_config index bc82661..ec5c0b4 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -91,6 +91,9 @@ case $line in name=3D${line%=3D*} echo "#define $name 1" ;; + HOST_DSOSUF=3D*) + echo "#define HOST_DSOSUF \"${line#*=3D}\"" + ;; HOST_*=3D*) # configuration name=3D${line%=3D*} value=3D${line#*=3D} @@ -123,9 +126,6 @@ case $line in value=3D${line#*=3D} echo "#define $name $value" ;; - DSOSUF=3D*) - echo "#define HOST_DSOSUF \"${line#*=3D}\"" - ;; esac =20 done # read --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083169; cv=none; d=zohomail.com; s=zohoarc; b=PtL91/5uxXfyiEYeoUj23ole1hxCt2hpAVEOhp5JTWNGRlw8UPDjGP6kSw+N2RfmtvItDM/YV4nuxhAIYbUTXf4GBzlWcrRy904sJ/mz87yhIBIOoEkeQAo+NnxKkF50zRocFm0QH6Fs9UvWS1HhKljyGAWt7RLRkpdAxm9nNEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083169; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=SbNho+vCgH++MRH64CW0YogKLKmaN5l5ejCa0b1aPf8=; b=WS+S355JK76ELF8rQX0+DDnanxRq6ELRZcmL6kim9JebfmM4KYP8AMXPwUMDRwyZ6QGM9iPP5tAdfoZxtLBrbmJ/GwmaKnOKI2mfep5RbsFqkcpEfrkr2fyHgUoX6Vl2elkBfQLxja91d8fhT4tgaZb03HeD9Wq5O0XD9eBgQd4= 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 1597083169470844.7186067269228; Mon, 10 Aug 2020 11:12:49 -0700 (PDT) Received: from localhost ([::1]:48962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CHw-0002Ej-2t for importer@patchew.org; Mon, 10 Aug 2020 14:12:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM6-0003oI-Me for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:02 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48383 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 1k5BM3-0003OE-VR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:02 -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-135-VDAqKGsjMlOzHTBgvff7xA-1; Mon, 10 Aug 2020 13:12:57 -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 A144F1005510 for ; Mon, 10 Aug 2020 17:12:56 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6E175F1E9 for ; Mon, 10 Aug 2020 17:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=SbNho+vCgH++MRH64CW0YogKLKmaN5l5ejCa0b1aPf8=; b=D1MVMj1UWk6U+jo2txOrP1zde5suDjNGlIsI793l9EqL3KNvrkmVGoIIDyQgXa4Z8pCOmc Tb3C0VXFfoqJdgZNXFccnxxhmf/ls7B2wE54ipv4/bW33wYuVQ9y2eeZNjBdAe7wFA6XW3 ZUW3JtarZhfMfvjRK4/qpFqy+WYliQY= X-MC-Unique: VDAqKGsjMlOzHTBgvff7xA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 139/147] meson: replace create-config with meson configure_file Date: Mon, 10 Aug 2020 19:08:57 +0200 Message-Id: <1597079345-42801-140-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> 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move the create-config logic to meson.build; create a configuration_data object and let meson handle the quoting and output. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- block.c | 4 +- configure | 9 ++- meson.build | 100 ++++++++++++++++++++++--------- scripts/create_config | 131 -------------------------------------= ---- tests/qtest/bios-tables-test.c | 2 +- 6 files changed, 80 insertions(+), 168 deletions(-) delete mode 100755 scripts/create_config diff --git a/Makefile b/Makefile index cd4eeb5..1eec727 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ clean: recurse-clean rm -f fsdev/*.pod scsi/*.pod rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) =20 -VERSION ?=3D $(shell cat VERSION) +VERSION =3D $(shell cat $(SRC_PATH)/VERSION) =20 dist: qemu-$(VERSION).tar.bz2 =20 diff --git a/block.c b/block.c index 67c5028..67ca543 100644 --- a/block.c +++ b/block.c @@ -443,13 +443,13 @@ static int bdrv_format_is_whitelisted(const char *for= mat_name, bool read_only) return 1; /* no whitelist, anything goes */ } =20 - for (p =3D whitelist_rw; *p; p++) { + for (p =3D whitelist_rw; p < &whitelist_rw[ARRAY_SIZE(whitelist_rw)]; = p++) { if (!strcmp(format_name, *p)) { return 1; } } if (read_only) { - for (p =3D whitelist_ro; *p; p++) { + for (p =3D whitelist_ro; p < &whitelist_ro[ARRAY_SIZE(whitelist_ro= )]; p++) { if (!strcmp(format_name, *p)) { return 1; } diff --git a/configure b/configure index a7f1e00..5d57990 100755 --- a/configure +++ b/configure @@ -6907,7 +6907,7 @@ if test "$slirp" !=3D "no"; then echo "SLIRP_LIBS=3D$slirp_libs" >> $config_host_mak fi if [ "$slirp" =3D "git" -o "$slirp" =3D "internal" ]; then - echo "config-host.h: slirp/all" >> $config_host_mak + echo "qemu-version.h: slirp/all" >> $config_host_mak fi if test "$vde" =3D "yes" ; then echo "CONFIG_VDE=3Dy" >> $config_host_mak @@ -6985,7 +6985,6 @@ if test "$xfs" =3D "yes" ; then echo "CONFIG_XFS=3Dy" >> $config_host_mak fi qemu_version=3D$(head $source_path/VERSION) -echo "VERSION=3D$qemu_version" >>$config_host_mak echo "PKGVERSION=3D$pkgversion" >>$config_host_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak @@ -7746,7 +7745,7 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then - echo "IASL=3D$iasl" >> $config_host_mak + echo "CONFIG_IASL=3D$iasl" >> $config_host_mak fi echo "HOST_CC=3D$host_cc" >> $config_host_mak echo "CXX=3D$cxx" >> $config_host_mak @@ -8273,10 +8272,10 @@ echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_ho= st_mak echo "PIXMAN_LIBS=3D$pixman_libs" >> $config_host_mak =20 if [ "$fdt" =3D "git" ]; then - echo "config-host.h: dtc/all" >> $config_host_mak + echo "qemu-version.h: dtc/all" >> $config_host_mak fi if [ "$capstone" =3D "git" -o "$capstone" =3D "internal" ]; then - echo "config-host.h: capstone/all" >> $config_host_mak + echo "qemu-version.h: capstone/all" >> $config_host_mak fi if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=3D$LIBCAPSTONE" >> $config_host_mak diff --git a/meson.build b/meson.build index 9e37814..dc66c85 100644 --- a/meson.build +++ b/meson.build @@ -12,6 +12,8 @@ config_host =3D keyval.load(meson.current_build_dir() / '= config-host.mak') config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') enable_modules =3D 'CONFIG_MODULES' in config_host build_docs =3D 'BUILD_DOCS' in config_host +config_host_data =3D configuration_data() +genh =3D [] =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: ['c', 'objc']) @@ -347,13 +349,47 @@ if 'CONFIG_LIBPMEM' in config_host link_args: config_host['LIBPMEM_LIBS'].spli= t()) endif =20 -create_config =3D find_program('scripts/create_config') +# Create config-host.h + +config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) +config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) +config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) +config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) + +arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] +ignored =3D ['HOST_USB', 'HOST_CC'] +strings =3D ['HOST_DSOSUF', 'CONFIG_IASL'] +foreach k, v: config_host + if arrays.contains(k) + if v !=3D '' + v =3D '"' + '", "'.join(v.split()) + '", ' + endif + config_host_data.set(k, v) + elif k =3D=3D 'ARCH' + config_host_data.set('HOST_' + v.to_upper(), 1) + elif ignored.contains(k) + # do nothing + elif k.startswith('qemu') and (k.endswith('dir') or k.endswith('path')) + config_host_data.set_quoted('CONFIG_' + k.to_upper(), v) + elif strings.contains(k) + config_host_data.set_quoted(k, v) + elif k.startswith('CONFIG_') or k.startswith('HAVE_') or k.startswith('H= OST_') + if v =3D=3D 'y' or v =3D=3D 'm' + config_host_data.set(k, 1) + else + config_host_data.set(k, v) + endif + endif +endforeach +genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) + minikconf =3D find_program('scripts/minikconf.py') target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false have_system =3D false config_devices_mak_list =3D [] config_devices_h =3D {} +config_target_h =3D {} config_target_mak =3D {} kconfig_external_symbols =3D [ 'CONFIG_KVM', @@ -369,16 +405,36 @@ kconfig_external_symbols =3D [ 'CONFIG_LINUX', 'CONFIG_PVRDMA', ] +ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] foreach target : target_dirs have_user =3D have_user or target.endswith('-user') - config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') + config_host + config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') + + config_target_data =3D configuration_data() + foreach k, v: config_target + if not k.startswith('TARGET_') and not k.startswith('CONFIG_') + # do nothing + elif ignored.contains(k) + # do nothing + elif k =3D=3D 'TARGET_BASE_ARCH' + config_target_data.set('TARGET_' + v.to_upper(), 1) + elif k =3D=3D 'TARGET_NAME' + config_target_data.set_quoted(k, v) + elif v =3D=3D 'y' + config_target_data.set(k, 1) + else + config_target_data.set(k, v) + endif + endforeach + config_target_h +=3D {target: configure_file(output: target + '-config-t= arget.h', + configuration: config_targe= t_data)} =20 if target.endswith('-softmmu') have_system =3D true =20 base_kconfig =3D [] foreach sym : kconfig_external_symbols - if sym in config_target + if sym in config_target or sym in config_host base_kconfig +=3D '@0@=3Dy'.format(sym) endif endforeach @@ -392,14 +448,16 @@ foreach target : target_dirs command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], config_devices_mak, '@DEPFILE@', '@INPUT@', base_kconfig]) - config_devices_h +=3D {target: custom_target( - target + '-config-devices.h', - input: config_devices_mak, - output: target + '-config-devices.h', - capture: true, - command: [create_config, '@INPUT@'])} + + config_devices_data =3D configuration_data() + config_devices =3D keyval.load(config_devices_mak) + foreach k, v: config_devices + config_devices_data.set(k, 1) + endforeach config_devices_mak_list +=3D config_devices_mak - config_target +=3D keyval.load(config_devices_mak) + config_devices_h +=3D {target: configure_file(output: target + '-confi= g-devices.h', + configuration: config_devi= ces_data)} + config_target +=3D config_devices endif config_target_mak +=3D {target: config_target} endforeach @@ -439,7 +497,6 @@ config_all +=3D { =20 # Generators =20 -genh =3D [] hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') qapi_gen =3D find_program('scripts/qapi-gen.py') @@ -469,7 +526,7 @@ tracetool =3D [ =20 qemu_version_cmd =3D [find_program('scripts/qemu-version.sh'), meson.current_source_dir(), - config_host['PKGVERSION'], config_host['VERSION']] + config_host['PKGVERSION'], meson.project_version()] qemu_version =3D custom_target('qemu-version.h', output: 'qemu-version.h', command: qemu_version_cmd, @@ -478,13 +535,6 @@ qemu_version =3D custom_target('qemu-version.h', build_always_stale: true) genh +=3D qemu_version =20 -config_host_h =3D custom_target('config-host.h', - input: meson.current_build_dir() / 'config-h= ost.mak', - output: 'config-host.h', - capture: true, - command: [create_config, '@INPUT@']) -genh +=3D config_host_h - hxdep =3D [] hx_headers =3D [ ['qemu-options.hx', 'qemu-options.def'], @@ -819,13 +869,14 @@ foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] arch =3D config_target['TARGET_BASE_ARCH'] - arch_srcs =3D [] + arch_srcs =3D [config_target_h[target]] arch_deps =3D [] c_args =3D config_target['QEMU_CFLAGS'].split() + ['-DNEED_CPU_H', '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(targe= t)] link_args =3D config_target['QEMU_LDFLAGS'].split() =20 + config_target +=3D config_host target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] if host_machine.system() =3D=3D 'linux' target_inc +=3D include_directories('linux-headers', is_system: true) @@ -886,19 +937,12 @@ foreach target : target_dirs objects =3D common_all.extract_objects(target_common.sources()) deps =3D target_common.dependencies() =20 - # TODO: Change to generator once obj-y goes away - config_target_h =3D custom_target(target + '-config-target.h', - input: meson.current_build_dir() / target / = 'config-target.mak', - output: target + '-config-target.h', - capture: true, - command: [create_config, '@INPUT@']) - target_specific =3D specific_ss.apply(config_target, strict: false) arch_srcs +=3D target_specific.sources() arch_deps +=3D target_specific.dependencies() =20 lib =3D static_library('qemu-' + target, - sources: arch_srcs + [config_target_h] + genh, + sources: arch_srcs + genh, objects: objects, include_directories: target_inc, c_args: c_args, diff --git a/scripts/create_config b/scripts/create_config deleted file mode 100755 index ec5c0b4..0000000 --- a/scripts/create_config +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -test $# -gt 0 && exec < $1 - -echo "/* Automatically generated by create_config - do not modify */" - -while read line; do - -case $line in - VERSION=3D*) # configuration - version=3D${line#*=3D} - major=3D$(echo "$version" | cut -d. -f1) - minor=3D$(echo "$version" | cut -d. -f2) - micro=3D$(echo "$version" | cut -d. -f3) - echo "#define QEMU_VERSION \"$version\"" - echo "#define QEMU_VERSION_MAJOR $major" - echo "#define QEMU_VERSION_MINOR $minor" - echo "#define QEMU_VERSION_MICRO $micro" - ;; - qemu_*dir=3D* | qemu_*path=3D*) # qemu-specific directory configuration - name=3D${line%=3D*} - value=3D${line#*=3D} - define_name=3D$(echo $name | LC_ALL=3DC tr '[a-z]' '[A-Z]') - eval "define_value=3D\"$value\"" - echo "#define CONFIG_$define_name \"$define_value\"" - # save for the next definitions - eval "$name=3D\$define_value" - ;; - prefix=3D*) - # save for the next definitions - prefix=3D${line#*=3D} - ;; - IASL=3D*) # iasl executable - value=3D${line#*=3D} - echo "#define CONFIG_IASL $value" - ;; - CONFIG_AUDIO_DRIVERS=3D*) - drivers=3D${line#*=3D} - echo "#define CONFIG_AUDIO_DRIVERS \\" - for drv in $drivers; do - echo " \"${drv}\",\\" - done - echo "" - ;; - CONFIG_BDRV_RW_WHITELIST=3D*) - echo "#define CONFIG_BDRV_RW_WHITELIST\\" - for drv in ${line#*=3D}; do - echo " \"${drv}\",\\" - done - echo " NULL" - ;; - CONFIG_BDRV_RO_WHITELIST=3D*) - echo "#define CONFIG_BDRV_RO_WHITELIST\\" - for drv in ${line#*=3D}; do - echo " \"${drv}\",\\" - done - echo " NULL" - ;; - CONFIG_*=3Dy) # configuration - name=3D${line%=3D*} - echo "#define $name 1" - ;; - CONFIG_*=3Dn) # configuration - ;; - CONFIG_*=3D*) # configuration - name=3D${line%=3D*} - value=3D${line#*=3D} - echo "#define $name $value" - ;; - HAVE_*=3Dy) # configuration - name=3D${line%=3D*} - echo "#define $name 1" - ;; - HAVE_*=3D*) # configuration - name=3D${line%=3D*} - value=3D${line#*=3D} - echo "#define $name $value" - ;; - ARCH=3D*) # configuration - arch=3D${line#*=3D} - arch_name=3D$(echo $arch | LC_ALL=3DC tr '[a-z]' '[A-Z]') - echo "#define HOST_$arch_name 1" - ;; - HOST_USB=3D*) - # do nothing - ;; - HOST_CC=3D*) - # do nothing - ;; - HOST_*=3Dy) # configuration - name=3D${line%=3D*} - echo "#define $name 1" - ;; - HOST_DSOSUF=3D*) - echo "#define HOST_DSOSUF \"${line#*=3D}\"" - ;; - HOST_*=3D*) # configuration - name=3D${line%=3D*} - value=3D${line#*=3D} - echo "#define $name $value" - ;; - TARGET_BASE_ARCH=3D*) # configuration - target_base_arch=3D${line#*=3D} - base_arch_name=3D$(echo $target_base_arch | LC_ALL=3DC tr '[a-z]' '[A-= Z]') - echo "#define TARGET_$base_arch_name 1" - ;; - TARGET_XML_FILES=3D*) - # do nothing - ;; - TARGET_ABI_DIR=3D*) - # do nothing - ;; - TARGET_NAME=3D*) - target_name=3D${line#*=3D} - echo "#define TARGET_NAME \"$target_name\"" - ;; - TARGET_DIRS=3D*) - # do nothing - ;; - TARGET_*=3Dy) # configuration - name=3D${line%=3D*} - echo "#define $name 1" - ;; - TARGET_*=3D*) # configuration - name=3D${line%=3D*} - value=3D${line#*=3D} - echo "#define $name $value" - ;; -esac - -done # read diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index d49b398..d25ff35 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -88,7 +88,7 @@ typedef struct { static char disk[] =3D "tests/acpi-test-disk-XXXXXX"; static const char *data_dir =3D "tests/data/acpi"; #ifdef CONFIG_IASL -static const char *iasl =3D stringify(CONFIG_IASL); +static const char *iasl =3D CONFIG_IASL; #else static const char *iasl; #endif --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597082932; cv=none; d=zohomail.com; s=zohoarc; b=ImHTF3UFbpxH0soFAbj/vRH3pNVJZtoRegG6QpZrD3OIskYmw3ZqniZRiYYsdzBBDWET4Fcx0/pcd8Dtx7k4+DacNuOj7R7Kwhy4Zn35jSd7rO6/XjNo8mohZHssdb5ysAt9qZMD0p27wQM7nAIDLi5rV2wIuG1JXaLNBlakm4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082932; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=s31xm4JAuFhjhN3htnKViDYE1BgESjhYQhCECa8DNG0=; b=NmtHkso+6NQSS7XwJOhlfULVXG50qMg+jBZPo6FAFhgIlx4AmKPiBEowEFDyCB3eOkYthi3IMhs2cLYVIGDN/+ORUDB0Uytjl1pImFAdUi2BmQqraXL1aB66lowBDAc7oyB9WJmkWR86pPbtGswO21PkmneIsDzXbTOPk4YSMXA= 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 1597082932053825.3365669534645; Mon, 10 Aug 2020 11:08:52 -0700 (PDT) Received: from localhost ([::1]:58600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CE6-0003Ab-Rt for importer@patchew.org; Mon, 10 Aug 2020 14:08:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM7-0003pG-4k for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BM5-0003OP-1K for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:02 -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-124-2MZYqA0hOOanrTdXZRR7Zw-1; Mon, 10 Aug 2020 13:12:58 -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 C72EC80183C for ; Mon, 10 Aug 2020 17:12:57 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 197CB5F1E9 for ; Mon, 10 Aug 2020 17:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=s31xm4JAuFhjhN3htnKViDYE1BgESjhYQhCECa8DNG0=; b=VnjpwvNesLwuFtnF0fVczumD315YK+zZ4IoflH4Reo8qwoY8AGEKbnaHhJx9zdE//432x7 TVvSLGKHaITMaGmbxSjMIulgTfA+cQKXTcKzJXE50p4Hw+XcVD2ifEqpN4qTZlivLrEAqO ufQwHboP4At6ctecrtAiLFaojvFsE/g= X-MC-Unique: 2MZYqA0hOOanrTdXZRR7Zw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 140/147] meson: convert sample plugins Date: Mon, 10 Aug 2020 19:08:58 +0200 Message-Id: <1597079345-42801-141-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> 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 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=63.128.21.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/10 13:09:25 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 4 ---- tests/Makefile.include | 9 --------- tests/meson.build | 3 +++ tests/plugin/Makefile | 46 --------------------------------------------= -- tests/plugin/meson.build | 7 +++++++ 5 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 tests/plugin/Makefile create mode 100644 tests/plugin/meson.build diff --git a/configure b/configure index 5d57990..ee32003 100755 --- a/configure +++ b/configure @@ -6825,9 +6825,6 @@ echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 -echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak -echo "GLIB_LDFLAGS=3D$glib_ldflags" >> $config_host_mak - if test "$default_devices" =3D "yes" ; then echo "CONFIG_MINIKCONF_MODE=3D--defconfig" >> $config_host_mak else @@ -8312,7 +8309,6 @@ DIRS=3D"$DIRS roms/seabios" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/lm32/Makefile po/Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" -LINKS=3D"$LINKS tests/plugin/Makefile" LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile" diff --git a/tests/Makefile.include b/tests/Makefile.include index e023df8..aec293b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -429,15 +429,6 @@ check-speed: $(check-speed-y) check-report-unit.tap: $(check-unit-y) $(call do_test_tap,$^) =20 -# Plugins -ifeq ($(CONFIG_PLUGIN),y) -.PHONY: plugins -plugins: - $(call quiet-command,\ - $(MAKE) $(SUBDIR_MAKEFLAGS) -C tests/plugin V=3D"$(V)", \ - "BUILD", "plugins") -endif - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) diff --git a/tests/meson.build b/tests/meson.build index f834c27..fe2c6d8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -9,6 +9,9 @@ test('decodetree', sh, =20 if 'CONFIG_TCG' in config_host subdir('fp') + if 'CONFIG_PLUGIN' in config_host + subdir('plugin') + endif endif =20 subdir('qapi-schema') diff --git a/tests/plugin/Makefile b/tests/plugin/Makefile deleted file mode 100644 index e9348fd..0000000 --- a/tests/plugin/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -*- Mode: makefile -*- -# -# This Makefile example is fairly independent from the main makefile -# so users can take and adapt it for their build. We only really -# include config-host.mak so we don't have to repeat probing for -# cflags that the main configure has already done for us. -# - -BUILD_DIR :=3D $(CURDIR)/../.. - -include $(BUILD_DIR)/config-host.mak - -VPATH +=3D $(SRC_PATH)/tests/plugin - -NAMES :=3D -NAMES +=3D bb -NAMES +=3D empty -NAMES +=3D insn -NAMES +=3D mem -NAMES +=3D hotblocks -NAMES +=3D howvec -NAMES +=3D hotpages -NAMES +=3D lockstep - -SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) - -# The main QEMU uses Glib extensively so it's perfectly fine to use it -# in plugins (which many example do). -CFLAGS =3D $(GLIB_CFLAGS) -CFLAGS +=3D -fPIC -CFLAGS +=3D $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) -CFLAGS +=3D -I$(SRC_PATH)/include/qemu - -all: $(SONAMES) - -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -lib%.so: %.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS) - -clean: - rm -f *.o *.so *.d - rm -Rf .libs - -.PHONY: all clean diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build new file mode 100644 index 0000000..dbbdcba --- /dev/null +++ b/tests/plugin/meson.build @@ -0,0 +1,7 @@ +t =3D [] +foreach i : ['bb', 'empty', 'insn', 'mem', 'hotblocks', 'howvec', 'hotpage= s', 'lockstep'] + t +=3D shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) +endforeach +alias_target('plugins', t) --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083277; cv=none; d=zohomail.com; s=zohoarc; b=H85A5DOWv0F3mJsUtZnZQ/Q//7hEdwgpblmS1eWEaTNM2xGpeK+nccr7bb1gA+F0mb5eMA7uJPaMQxriHvpi4rmXK7X934IYSmLGwp+qrAZ3aIc3WyBC9rSkZeu9dzgkDmv5Gx79qHQySpZaqYDXJtrQTvo/x422TWZEVru47dc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083277; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=KFxgSgnVSss4T1nPYNPGkAyZxpOvyKgWwF98fzZ5/ro=; b=ATDrAizHyLQ2efkg4DryUBfowIlFxrMB6uKNQ0E/SoRmYSpPQEIlpGgzTpGfkFgKz0i4luedVdnpR0Y18o4E5pXwYdkrD1g6OjINRro7SKmZUZupmknqASvteWtPz9HwA5nOghInf+5JnB0KbZft1sGvO0/LxImfbO1lqttyl5s= 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 1597083277489574.9284418367548; Mon, 10 Aug 2020 11:14:37 -0700 (PDT) Received: from localhost ([::1]:57158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CJg-0005Vw-0R for importer@patchew.org; Mon, 10 Aug 2020 14:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM9-0003tq-3a for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43258 helo=us-smtp-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 1k5BM6-0003Ob-GM for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:04 -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-392--0YvtXkJNZ-BwMin3_AYTg-1; Mon, 10 Aug 2020 13:12:59 -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 ED497106B242 for ; Mon, 10 Aug 2020 17:12:58 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FB015F1EA for ; Mon, 10 Aug 2020 17:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=KFxgSgnVSss4T1nPYNPGkAyZxpOvyKgWwF98fzZ5/ro=; b=U6Z53NsfsZ5aCrM/W73fYouOJylo1qGXesSZkWjFrLSr+QJCVhhDyEZByzIS+1VVUwiJ5P 1JxlZIJQWYxxO90/eANgOjmvCc188lba1miGf4qmgnIW3lNfzOAtTJ9dwcTwHfg1KBCJro F3DJ9LCH0oO41Eb1EunlnxJNOJhKrEs= X-MC-Unique: -0YvtXkJNZ-BwMin3_AYTg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 141/147] meson: move SDL and SDL-image detection to meson Date: Mon, 10 Aug 2020 19:08:59 +0200 Message-Id: <1597079345-42801-142-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- chardev/meson.build | 2 +- configure | 142 +++---------------------------------------------= ---- meson.build | 27 +++++++--- meson_options.txt | 2 + ui/meson.build | 4 +- 5 files changed, 33 insertions(+), 144 deletions(-) create mode 100644 meson_options.txt diff --git a/chardev/meson.build b/chardev/meson.build index 2122505..a0aaafa 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -36,7 +36,7 @@ softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: fi= les('spice.c')) =20 chardev_modules =3D [] =20 -if config_host.has_key('CONFIG_BRLAPI') and config_host.has_key('CONFIG_SD= L') +if config_host.has_key('CONFIG_BRLAPI') and sdl.found() chardev_modules +=3D [['baum', files('baum.c'), [sdl, brlapi]]] endif =20 diff --git a/configure b/configure index ee32003..9f8ae94 100755 --- a/configure +++ b/configure @@ -377,8 +377,8 @@ curses=3D"" docs=3D"" fdt=3D"" netmap=3D"no" -sdl=3D"" -sdl_image=3D"" +sdl=3D"auto" +sdl_image=3D"auto" virtfs=3D"" mpath=3D"" vnc=3D"yes" @@ -1092,13 +1092,13 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --disable-sdl) sdl=3D"no" + --disable-sdl) sdl=3D"disabled" ;; - --enable-sdl) sdl=3D"yes" + --enable-sdl) sdl=3D"enabled" ;; - --disable-sdl-image) sdl_image=3D"no" + --disable-sdl-image) sdl_image=3D"disabled" ;; - --enable-sdl-image) sdl_image=3D"yes" + --enable-sdl-image) sdl_image=3D"enabled" ;; --disable-qom-cast-debug) qom_cast_debug=3D"no" ;; @@ -2373,7 +2373,7 @@ if test "$cocoa" =3D "yes"; then error_exit "Cocoa and GTK UIs cannot both be enabled at once" fi gtk=3Dno - sdl=3Dno + sdl=3Ddisabled fi =20 # Some versions of Mac OS X incorrectly define SIZE_MAX @@ -3276,125 +3276,6 @@ if test "$vte" !=3D "no"; then fi =20 ########################################## -# SDL probe - -# Look for sdl configuration program (pkg-config or sdl2-config). Try -# sdl2-config even without cross prefix, and favour pkg-config over sdl2-c= onfig. - -sdl_probe () -{ - if $pkg_config sdl2 --exists; then - sdlconfig=3D"$pkg_config sdl2" - sdlversion=3D$($sdlconfig --modversion 2>/dev/null) - elif has "$sdl2_config"; then - sdlconfig=3D"$sdl2_config" - sdlversion=3D$($sdlconfig --version) - else - if test "$sdl" =3D "yes" ; then - feature_not_found "sdl" "Install SDL2-devel" - fi - sdl=3Dno - # no need to do the rest - return - fi - if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" =3D sdl2-c= onfig; then - echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2 - fi - - cat > $TMPC << EOF -#include -#undef main /* We don't want SDL to override our main() */ -int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } -EOF - sdl_cflags=3D$($sdlconfig --cflags 2>/dev/null) - sdl_cflags=3D"$sdl_cflags -Wno-undef" # workaround 2.0.8 bug - if test "$static" =3D "yes" ; then - if $pkg_config sdl2 --exists; then - sdl_libs=3D$($pkg_config sdl2 --static --libs 2>/dev/null) - else - sdl_libs=3D$($sdlconfig --static-libs 2>/dev/null) - fi - else - sdl_libs=3D$($sdlconfig --libs 2>/dev/null) - fi - if compile_prog "$sdl_cflags" "$sdl_libs" ; then - sdl=3Dyes - - # static link with sdl ? (note: sdl.pc's --static --libs is broken) - if test "$sdl" =3D "yes" && test "$static" =3D "yes" ; then - if test $? =3D 0 && echo $sdl_libs | grep -- -laa > /dev/null; then - sdl_libs=3D"$sdl_libs $(aalib-config --static-libs 2>/dev/null)" - sdl_cflags=3D"$sdl_cflags $(aalib-config --cflags 2>/dev/null)" - fi - if compile_prog "$sdl_cflags" "$sdl_libs" ; then - : - else - sdl=3Dno - fi - fi # static link - else # sdl not found - if test "$sdl" =3D "yes" ; then - feature_not_found "sdl" "Install SDL2 devel" - fi - sdl=3Dno - fi # sdl compile test -} - -sdl_image_probe () -{ - if test "$sdl_image" !=3D "no" ; then - if $pkg_config SDL2_image --exists; then - if test "$static" =3D "yes"; then - sdl_image_libs=3D$($pkg_config SDL2_image --libs --static = 2>/dev/null) - else - sdl_image_libs=3D$($pkg_config SDL2_image --libs 2>/dev/nu= ll) - fi - sdl_image_cflags=3D$($pkg_config SDL2_image --cflags 2>/dev/nu= ll) - sdl_image=3Dyes - - sdl_cflags=3D"$sdl_cflags $sdl_image_cflags" - sdl_libs=3D"$sdl_libs $sdl_image_libs" - else - if test "$sdl_image" =3D "yes" ; then - feature_not_found "sdl_image" "Install SDL Image devel" - else - sdl_image=3Dno - fi - fi - fi -} - -if test "$sdl" !=3D "no" ; then - sdl_probe -fi - -if test "$sdl" =3D "yes" ; then - sdl_image_probe -else - if test "$sdl_image" =3D "yes"; then - echo "warning: SDL Image requested, but SDL is not available, disablin= g" - fi - sdl_image=3Dno -fi - -if test "$sdl" =3D "yes" ; then - cat > $TMPC < -#if defined(SDL_VIDEO_DRIVER_X11) -#include -#else -#error No x11 support -#endif -int main(void) { return 0; } -EOF - if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then - need_x11=3Dyes - sdl_cflags=3D"$sdl_cflags $x11_cflags" - sdl_libs=3D"$sdl_libs $x11_libs" - fi -fi - -########################################## # RDMA needs OpenFabrics libraries if test "$rdma" !=3D "no" ; then cat > $TMPC <> $config_host_mak echo "X11_LIBS=3D$x11_libs" >> $config_host_mak fi -if test "$sdl" =3D "yes" ; then - echo "CONFIG_SDL=3Dm" >> $config_host_mak - echo "SDL_CFLAGS=3D$sdl_cflags" >> $config_host_mak - echo "SDL_LIBS=3D$sdl_libs" >> $config_host_mak - if test "$sdl_image" =3D "yes" ; then - echo "CONFIG_SDL_IMAGE=3Dy" >> $config_host_mak - fi -fi if test "$cocoa" =3D "yes" ; then echo "CONFIG_COCOA=3Dy" >> $config_host_mak fi @@ -8426,6 +8299,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ + -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index dc66c85..3e7ff68 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') enable_modules =3D 'CONFIG_MODULES' in config_host +enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host config_host_data =3D configuration_data() genh =3D [] @@ -206,13 +207,23 @@ brlapi =3D not_found if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) endif + +sdl =3D dependency('sdl2', method: 'config-tool', required: get_option('sd= l'), + static: enable_static) +sdl_image =3D not_found sdlwindows =3D false -sdl =3D not_found -if 'CONFIG_SDL' in config_host - sdl =3D declare_dependency(compile_args: config_host['SDL_CFLAGS'].split= (), - link_args: config_host['SDL_LIBS'].split()) - sdlwindows =3D config_host['SDL_LIBS'].contains('-mwindows') +if sdl.found() + sdlwindows =3D sdl.get_configtool_variable('libs').split().contains('-mw= indows') + sdl_image =3D dependency('sdl-image', required: get_option('sdl_image'), + static: enable_static) +else + if get_option('sdl_image').enabled() + error('sdl-image required, but SDL was @0@', + get_option('sdl').disabled() ? 'disabled' : 'not found') + endif + sdl_image =3D not_found endif + rbd =3D not_found if 'CONFIG_RBD' in config_host rbd =3D declare_dependency(link_args: config_host['RBD_LIBS'].split()) @@ -351,6 +362,8 @@ endif =20 # Create config-host.h =20 +config_host_data.set('CONFIG_SDL', sdl.found()) +config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) @@ -1229,8 +1242,8 @@ if targetos =3D=3D 'darwin' summary_info +=3D {'Cocoa support': config_host.has_key('CONFIG_COCOA')} endif # TODO: add back version -summary_info +=3D {'SDL support': config_host.has_key('CONFIG_SDL')} -summary_info +=3D {'SDL image support': config_host.has_key('CONFIG_SDL_IM= AGE')} +summary_info +=3D {'SDL support': sdl.found()} +summary_info +=3D {'SDL image support': sdl_image.found()} # TODO: add back version summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} summary_info +=3D {'GTK GL support': config_host.has_key('CONFIG_GTK_GL= ')} diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..e548211 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +option('sdl', type : 'feature', value : 'auto') +option('sdl_image', type : 'feature', value : 'auto') diff --git a/ui/meson.build b/ui/meson.build index 246e518..57160b3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -54,11 +54,11 @@ if config_host.has_key('CONFIG_GTK') and config_host.ha= s_key('CONFIG_VTE') ui_modules +=3D [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]] endif =20 -if config_host.has_key('CONFIG_SDL') +if sdl.found() softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) =20 sdl_ss =3D ss.source_set() - sdl_ss.add(pixman, glib, files( + sdl_ss.add(sdl, sdl_image, pixman, glib, files( 'sdl2-2d.c', 'sdl2-input.c', 'sdl2.c', --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083025; cv=none; d=zohomail.com; s=zohoarc; b=PVGuf/r1lysrCVpZvRKpXPlJ+jQRvcUvlONbj1JpRSZRxQZ9sJ61DdhbqE5dN/IJxBNph0+ra9jAD6d+WVRSx0PJiW4ep3jr+k+qRfTO0M3oboT/aaonWgrxbyih05kCPrbJ8d/OyC2PLMPU6YtGxm22x/PUzbUu/liG0o/3jTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083025; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ldF5vktZKv/6sjUYMRCr3Ec+GwjStLwYCly0+awW5fA=; b=Zczlk769AqfgmMisXYWGsqozK1P0NNSyVxK0QzMH75g0p5d5MYsjSmy9uCe9tjgb6525eowfJpF/Nu+6FLWE89QMRsxsBnKfuSX526vhLq4b0s5bgu5ihT7s8QCwumAPPiRwKipnbqsrcVHv6Ufll+szfJPXN0TLzpmZvJ6+9pI= 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 159708302534591.9311510622498; Mon, 10 Aug 2020 11:10:25 -0700 (PDT) Received: from localhost ([::1]:38972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CFb-0006ap-Sg for importer@patchew.org; Mon, 10 Aug 2020 14:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMB-0003zn-Na for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:07 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23830 helo=us-smtp-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 1k5BM7-0003Or-UD for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:07 -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-43-KCECoNFlNuOny2ozDakHsQ-1; Mon, 10 Aug 2020 13:13:01 -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 1F79D1005504 for ; Mon, 10 Aug 2020 17:13:00 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6562C5F1EA for ; Mon, 10 Aug 2020 17:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ldF5vktZKv/6sjUYMRCr3Ec+GwjStLwYCly0+awW5fA=; b=CsMNwAQAJTRcTUX3D+lAGbVKVYU+iLbDnXxxuosdNVJskHdj0VfrhdevdpG1unck3Q1vFS YoVDNoE9w3lYzsMcJGliMo9/Is55fgMDNx1PfA1H0ON5cob2H14utUAjvgTT6k52Ou986w 3W2VIbhJRu98jcUgS9x+EBC8nv6wvfw= X-MC-Unique: KCECoNFlNuOny2ozDakHsQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 142/147] meson: convert VNC and dependent libraries to meson Date: Mon, 10 Aug 2020 19:09:00 +0200 Message-Id: <1597079345-42801-143-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> 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 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 122 ++++++--------------------------------------------= ---- meson.build | 40 +++++++++++------- meson_options.txt | 4 ++ ui/meson.build | 10 ++--- 4 files changed, 45 insertions(+), 131 deletions(-) diff --git a/configure b/configure index 9f8ae94..ce9669e 100755 --- a/configure +++ b/configure @@ -381,12 +381,12 @@ sdl=3D"auto" sdl_image=3D"auto" virtfs=3D"" mpath=3D"" -vnc=3D"yes" +vnc=3D"enabled" sparse=3D"no" vde=3D"" -vnc_sasl=3D"" -vnc_jpeg=3D"" -vnc_png=3D"" +vnc_sasl=3D"auto" +vnc_jpeg=3D"auto" +vnc_png=3D"auto" xkbcommon=3D"" xen=3D"" xen_ctrl_version=3D"" @@ -1112,9 +1112,9 @@ for opt do ;; --enable-mpath) mpath=3D"yes" ;; - --disable-vnc) vnc=3D"no" + --disable-vnc) vnc=3D"disabled" ;; - --enable-vnc) vnc=3D"yes" + --enable-vnc) vnc=3D"enabled" ;; --oss-lib=3D*) oss_lib=3D"$optarg" ;; @@ -1150,17 +1150,17 @@ for opt do ;; --disable-strip) strip_opt=3D"no" ;; - --disable-vnc-sasl) vnc_sasl=3D"no" + --disable-vnc-sasl) vnc_sasl=3D"disabled" ;; - --enable-vnc-sasl) vnc_sasl=3D"yes" + --enable-vnc-sasl) vnc_sasl=3D"enabled" ;; - --disable-vnc-jpeg) vnc_jpeg=3D"no" + --disable-vnc-jpeg) vnc_jpeg=3D"disabled" ;; - --enable-vnc-jpeg) vnc_jpeg=3D"yes" + --enable-vnc-jpeg) vnc_jpeg=3D"enabled" ;; - --disable-vnc-png) vnc_png=3D"no" + --disable-vnc-png) vnc_png=3D"disabled" ;; - --enable-vnc-png) vnc_png=3D"yes" + --enable-vnc-png) vnc_png=3D"enabled" ;; --disable-slirp) slirp=3D"no" ;; @@ -3371,85 +3371,6 @@ EOF fi =20 ########################################## -# VNC SASL detection -if test "$vnc" =3D "yes" && test "$vnc_sasl" !=3D "no" ; then - cat > $TMPC < -#include -int main(void) { sasl_server_init(NULL, "qemu"); return 0; } -EOF - # Assuming Cyrus-SASL installed in /usr prefix - # QEMU defines struct iovec in "qemu/osdep.h", - # we don't want libsasl to redefine it in . - vnc_sasl_cflags=3D"-DSTRUCT_IOVEC_DEFINED" - vnc_sasl_libs=3D"-lsasl2" - if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then - vnc_sasl=3Dyes - libs_softmmu=3D"$vnc_sasl_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_sasl_cflags" - else - if test "$vnc_sasl" =3D "yes" ; then - feature_not_found "vnc-sasl" "Install Cyrus SASL devel" - fi - vnc_sasl=3Dno - fi -fi - -########################################## -# VNC JPEG detection -if test "$vnc" =3D "yes" && test "$vnc_jpeg" !=3D "no" ; then -cat > $TMPC < -#include -int main(void) { struct jpeg_compress_struct s; jpeg_create_compress(&s); = return 0; } -EOF - vnc_jpeg_cflags=3D"" - vnc_jpeg_libs=3D"-ljpeg" - if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then - vnc_jpeg=3Dyes - libs_softmmu=3D"$vnc_jpeg_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_jpeg_cflags" - else - if test "$vnc_jpeg" =3D "yes" ; then - feature_not_found "vnc-jpeg" "Install libjpeg-turbo devel" - fi - vnc_jpeg=3Dno - fi -fi - -########################################## -# VNC PNG detection -if test "$vnc" =3D "yes" && test "$vnc_png" !=3D "no" ; then -cat > $TMPC < -#include -#include -int main(void) { - png_structp png_ptr; - png_ptr =3D png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL,= NULL); - return png_ptr !=3D 0; -} -EOF - if $pkg_config libpng --exists; then - vnc_png_cflags=3D$($pkg_config libpng --cflags) - vnc_png_libs=3D$($pkg_config libpng --libs) - else - vnc_png_cflags=3D"" - vnc_png_libs=3D"-lpng" - fi - if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then - vnc_png=3Dyes - libs_softmmu=3D"$vnc_png_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_png_cflags" - else - if test "$vnc_png" =3D "yes" ; then - feature_not_found "vnc-png" "Install libpng devel" - fi - vnc_png=3Dno - fi -fi - -########################################## # xkbcommon probe if test "$xkbcommon" !=3D "no" ; then if $pkg_config xkbcommon --exists; then @@ -6836,24 +6757,6 @@ if test "$audio_win_int" =3D "yes" ; then fi echo "CONFIG_BDRV_RW_WHITELIST=3D$block_drv_rw_whitelist" >> $config_host_= mak echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitelist" >> $config_host_= mak -if test "$vnc" =3D "yes" ; then - echo "CONFIG_VNC=3Dy" >> $config_host_mak -fi -if test "$vnc_sasl" =3D "yes" ; then - echo "CONFIG_VNC_SASL=3Dy" >> $config_host_mak -fi -echo "SASL_CFLAGS=3D$vnc_sasl_cflags" >> $config_host_mak -echo "SASL_LIBS=3D$vnc_sasl_libs" >> $config_host_mak -if test "$vnc_jpeg" =3D "yes" ; then - echo "CONFIG_VNC_JPEG=3Dy" >> $config_host_mak -fi -echo "JPEG_CFLAGS=3D$vnc_jpeg_cflags" >> $config_host_mak -echo "JPEG_LIBS=3D$vnc_jpeg_libs" >> $config_host_mak -if test "$vnc_png" =3D "yes" ; then - echo "CONFIG_VNC_PNG=3Dy" >> $config_host_mak -fi -echo "PNG_CFLAGS=3D$vnc_png_cflags" >> $config_host_mak -echo "PNG_LIBS=3D$vnc_png_libs" >> $config_host_mak if test "$xkbcommon" =3D "yes" ; then echo "CONFIG_XKBCOMMON=3Dy" >> $config_host_mak echo "XKBCOMMON_CFLAGS=3D$xkbcommon_cflags" >> $config_host_mak @@ -8300,6 +8203,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ + -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index 3e7ff68..426f9d8 100644 --- a/meson.build +++ b/meson.build @@ -293,20 +293,24 @@ if 'CONFIG_GIO' in config_host gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), link_args: config_host['GIO_LIBS'].split()) endif +vnc =3D not_found png =3D not_found -if 'CONFIG_VNC_PNG' in config_host - png =3D declare_dependency(compile_args: config_host['PNG_CFLAGS'].split= (), - link_args: config_host['PNG_LIBS'].split()) -endif jpeg =3D not_found -if 'CONFIG_VNC_JPEG' in config_host - jpeg =3D declare_dependency(compile_args: config_host['JPEG_CFLAGS'].spl= it(), - link_args: config_host['JPEG_LIBS'].split()) -endif sasl =3D not_found -if 'CONFIG_VNC_SASL' in config_host - sasl =3D declare_dependency(compile_args: config_host['SASL_CFLAGS'].spl= it(), - link_args: config_host['SASL_LIBS'].split()) +if get_option('vnc').enabled() + vnc =3D declare_dependency() # dummy dependency + png =3D dependency('libpng', required: get_option('vnc_png'), + static: enable_static) + jpeg =3D cc.find_library('jpeg', has_headers: ['jpeglib.h'], + required: get_option('vnc_jpeg'), + static: enable_static) + sasl =3D cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], + required: get_option('vnc_sasl'), + static: enable_static) + if sasl.found() + sasl =3D declare_dependency(dependencies: sasl, + compile_args: '-DSTRUCT_IOVEC_DEFINED') + endif endif fdt =3D not_found if 'CONFIG_FDT' in config_host @@ -364,6 +368,10 @@ endif =20 config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) +config_host_data.set('CONFIG_VNC', vnc.found()) +config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) +config_host_data.set('CONFIG_VNC_PNG', png.found()) +config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) @@ -1275,11 +1283,11 @@ summary_info +=3D {'Block whitelist (rw)': config_h= ost['CONFIG_BDRV_RW_WHITELIST'] summary_info +=3D {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHI= TELIST']} summary_info +=3D {'VirtFS support': config_host.has_key('CONFIG_VIRTFS= ')} summary_info +=3D {'Multipath support': config_host.has_key('CONFIG_MPATH'= )} -summary_info +=3D {'VNC support': config_host.has_key('CONFIG_VNC')} -if config_host.has_key('CONFIG_VNC') - summary_info +=3D {'VNC SASL support': config_host.has_key('CONFIG_VNC_= SASL')} - summary_info +=3D {'VNC JPEG support': config_host.has_key('CONFIG_VNC_= JPEG')} - summary_info +=3D {'VNC PNG support': config_host.has_key('CONFIG_VNC_= PNG')} +summary_info +=3D {'VNC support': vnc.found()} +if vnc.found() + summary_info +=3D {'VNC SASL support': sasl.found()} + summary_info +=3D {'VNC JPEG support': jpeg.found()} + summary_info +=3D {'VNC PNG support': png.found()} endif summary_info +=3D {'xen support': config_host.has_key('CONFIG_XEN_BA= CKEND')} if config_host.has_key('CONFIG_XEN_BACKEND') diff --git a/meson_options.txt b/meson_options.txt index e548211..67455c5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,6 @@ option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') +option('vnc', type : 'feature', value : 'enabled') +option('vnc_jpeg', type : 'feature', value : 'auto') +option('vnc_png', type : 'feature', value : 'auto') +option('vnc_sasl', type : 'feature', value : 'auto') diff --git a/ui/meson.build b/ui/meson.build index 57160b3..3632455 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -27,14 +27,12 @@ vnc_ss.add(files( 'vnc-ws.c', 'vnc-jobs.c', )) -vnc_ss.add(zlib) -vnc_ss.add(when: 'CONFIG_VNC_SASL', if_true: [files('vnc-auth-sasl.c'), sa= sl]) -softmmu_ss.add_all(when: 'CONFIG_VNC', if_true: vnc_ss) -softmmu_ss.add(when: 'CONFIG_VNC', if_false: files('vnc-stubs.c')) +vnc_ss.add(zlib, png, jpeg) +vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) +softmmu_ss.add_all(when: vnc, if_true: vnc_ss) +softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c')) softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c',= 'console-gl.c', 'egl-helpers.c', 'egl-context.c')) softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL_DMABUF'], if_true: files('egl= -headless.c')) -softmmu_ss.add(when: 'CONFIG_VNC_PNG', if_true: png) -softmmu_ss.add(when: 'CONFIG_VNC_JPEG', if_true: jpeg) =20 ui_modules =3D [] =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083538; cv=none; d=zohomail.com; s=zohoarc; b=VdA4ootTLVpSrNfZ30O4urkgAHlaf/nZwCHwpuOJlXvRMDGBXYDs8uCATT9wniYAB1cPqXjcd4V7owT4NFQCNATRl4aAf0GisIteF7dX2LIZW6f2m9wI7GLSmXMkp1IRuqObubnwSiIrBG/3imqK01OY70nMN+q2GyeRTmI+tk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083538; 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=iCRGuFsItJm1p9/SqoSGCnUWdo5I0PNjTpt8wDKhwPI=; b=M56zd5y3bjQ3dunkwCVUuPBIMcTBmmQKq2DcfW9/OftNUG7iW4wEmNhswcxD2vOmubFQjUPV8v9lGgxkaB+8wgmDFcW9PwCg1xiYSWbnDCgfPQ4rY6WVSyev6lJN9YUK3wWZNnyao3EZuxjeWw1QUna6viBwoTx0TxpWUSxn2go= 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 1597083538725311.45682717934824; Mon, 10 Aug 2020 11:18:58 -0700 (PDT) Received: from localhost ([::1]:51234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CNt-0006Co-C6 for importer@patchew.org; Mon, 10 Aug 2020 14:18:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BME-00046E-FT for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54541 helo=us-smtp-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 1k5BMC-0003PN-2c for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:10 -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-232-Cvhye9DsPvao7mi3m56T7w-1; Mon, 10 Aug 2020 13:13:05 -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 66211106B249 for ; Mon, 10 Aug 2020 17:13:04 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BDD25F1EA; Mon, 10 Aug 2020 17:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079587; 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=iCRGuFsItJm1p9/SqoSGCnUWdo5I0PNjTpt8wDKhwPI=; b=Rb/EYCEZMRg+TT4m46e4QkL8aMDf1dEM/jO4C5tlAVAMQqxYhFs0BZk9otXB2e/F8SEVkx GKjMr567tYvh85Sy0CgYOJOjkbnW8atq4yJeAiGp5GdX5VnwzCpecw3D4yZ4sD3NSW5Ug2 zKC9+sAw3jaCCUfLe80CDZEgolnWYN4= X-MC-Unique: Cvhye9DsPvao7mi3m56T7w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 143/147] meson: convert po/ Date: Mon, 10 Aug 2020 19:09:01 +0200 Message-Id: <1597079345-42801-144-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, 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 | 5 +--- configure | 2 +- meson.build | 3 +++ po/LINGUAS | 7 ++++++ po/Makefile | 52 ----------------------------------------- po/POTFILES | 1 + po/meson.build | 5 ++++ po/messages.po | 74 ------------------------------------------------------= ---- 8 files changed, 18 insertions(+), 131 deletions(-) create mode 100644 po/LINGUAS delete mode 100644 po/Makefile create mode 100644 po/POTFILES create mode 100644 po/meson.build delete mode 100644 po/messages.po diff --git a/Makefile b/Makefile index 1eec727..f0970ea 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ distclean: clean rm -f config-host.mak config-host.h* rm -f tests/tcg/config-*.mak rm -f config-all-disas.mak config.status - rm -f po/*.mo tests/qemu-iotests/common.env + rm -f tests/qemu-iotests/common.env rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f config.log @@ -275,9 +275,6 @@ endif mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" -ifdef CONFIG_GTK - $(MAKE) -C po $@ -endif $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ diff --git a/configure b/configure index ce9669e..5d64337 100755 --- a/configure +++ b/configure @@ -8083,7 +8083,7 @@ DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios" LINKS=3D"Makefile" -LINKS=3D"$LINKS tests/tcg/lm32/Makefile po/Makefile" +LINKS=3D"$LINKS tests/tcg/lm32/Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" diff --git a/meson.build b/meson.build index 426f9d8..6556a48 100644 --- a/meson.build +++ b/meson.build @@ -1108,6 +1108,9 @@ subdir('tools') subdir('pc-bios') subdir('tests') subdir('docs') +if 'CONFIG_GTK' in config_host + subdir('po') +endif =20 if build_docs makeinfo =3D find_program('makeinfo', required: build_docs) diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..054930d --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,7 @@ +bg +de_DE +fr_FR +hu +it +tr +zh_CN diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index c041f4c..0000000 --- a/po/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# This makefile is very special as it's meant to build as part of the build -# process and also within the source tree to update the translation files. - -# Set SRC_PATH for in-tree builds without configuration. -SRC_PATH=3D.. - -# The default target must come before any include statements. -all: - -.PHONY: all build clean install update - -%.mo: %.po - $(call quiet-command, msgfmt -o $@ $<,"GEN","$@") - --include ../config-host.mak -include $(SRC_PATH)/rules.mak - -PO_PATH=3D$(SRC_PATH)/po - -VERSION=3D$(shell cat $(SRC_PATH)/VERSION) -SRCS=3D$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po)) -OBJS=3D$(patsubst $(PO_PATH)/%.po,%.mo,$(SRCS)) - -vpath %.po $(PO_PATH) - -all: - @echo "Use 'make update' to update translation files or use 'make build'" - @echo "or 'make install' to build and install the translation files." - -update: $(SRCS) - -build: $(OBJS) - -clean: - rm -f $(OBJS) - -install: $(OBJS) - for obj in $(OBJS); do \ - base=3D$$(basename $$obj .mo); \ - $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ - $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MES= SAGES/qemu.mo; \ - done - -$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c - $(call quiet-command, ( cd $(SRC_PATH) && \ - xgettext -o - --from-code=3DUTF-8 --foreign-user --no-location \ - --package-name=3DQEMU --package-version=3D$(VERSION) \ - --msgid-bugs-address=3Dqemu-devel@nongnu.org -k_ -C ui/gtk.c | \ - sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@") - -$(PO_PATH)/%.po: $(PO_PATH)/messages.po - $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$= @") diff --git a/po/POTFILES b/po/POTFILES new file mode 100644 index 0000000..d34d5ed --- /dev/null +++ b/po/POTFILES @@ -0,0 +1 @@ +ui/gtk.c diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..b99d8e2 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,5 @@ +i18n =3D import('i18n') + +i18n.gettext(meson.project_name(), + args: '--msgid-bugs-address=3Dqemu-devel@nongnu.org', + preset: 'glib') diff --git a/po/messages.po b/po/messages.po deleted file mode 100644 index 065bd45..0000000 --- a/po/messages.po +++ /dev/null @@ -1,74 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: QEMU 2.12.91\n" -"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n" -"POT-Creation-Date: 2018-07-18 07:56+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=3DUTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid " - Press Ctrl+Alt+G to release grab" -msgstr "" - -msgid " [Paused]" -msgstr "" - -msgid "_Pause" -msgstr "" - -msgid "_Reset" -msgstr "" - -msgid "Power _Down" -msgstr "" - -msgid "_Quit" -msgstr "" - -msgid "_Fullscreen" -msgstr "" - -msgid "_Copy" -msgstr "" - -msgid "Zoom _In" -msgstr "" - -msgid "Zoom _Out" -msgstr "" - -msgid "Best _Fit" -msgstr "" - -msgid "Zoom To _Fit" -msgstr "" - -msgid "Grab On _Hover" -msgstr "" - -msgid "_Grab Input" -msgstr "" - -msgid "Show _Tabs" -msgstr "" - -msgid "Detach Tab" -msgstr "" - -msgid "Show Menubar" -msgstr "" - -msgid "_Machine" -msgstr "" - -msgid "_View" -msgstr "" --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083410; cv=none; d=zohomail.com; s=zohoarc; b=bxU+SWuPyImw+qbNuAaHBqrgLlYMUOOjwfKFRguFCxNNl31UX7KuhD+FfvbnhBvRbYXTZXzKsRQ+HLwsnadPXWvV/NoaQ4r2ZT8IDGQyAMb+nPZzsT50NtR6PXw3onqZl5XETdcM+2+ffv1SEz3Bjg9CGfKxSLTV5KsEGjxWrZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083410; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=QjyFNw4rKPSNWrRnQlRfHA8F4ftGlLIzb8OnZ7OowYM=; b=dy08dTiJqY7ZUcJNhts9OkIW0XOihffiFLKQzlc/UgAmhj8FHkHim8ANtsh/XptGRGMV997pIg4JYPIFgL1kAp/Vo2bjTzyTKu7VxaZlFhIhMuFGlc1UF3clq2o/LkyAhWr045zc/TVQFg1jVWx30Bz68afYwvbcJ9yOnLIfUtA= 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 1597083410147440.80025953263; Mon, 10 Aug 2020 11:16:50 -0700 (PDT) Received: from localhost ([::1]:40112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CLo-0001hF-QI for importer@patchew.org; Mon, 10 Aug 2020 14:16:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMJ-0004I3-Nr for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BMG-0003Q1-8K for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:15 -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-299-ohl3cItFPqa0JxwoSZ65gQ-1; Mon, 10 Aug 2020 13:13:07 -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 8A83557 for ; Mon, 10 Aug 2020 17:13:05 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2D375F1E9 for ; Mon, 10 Aug 2020 17:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=QjyFNw4rKPSNWrRnQlRfHA8F4ftGlLIzb8OnZ7OowYM=; b=cPYA0HW3vO5wq19CYs72l/Y+tERTRMBUeDoHVe+aYzI7X1eKNwpV2k3mtdA93tTsk55vds QhUHF5XDMXdRp18wQSdWgnRRiS7Q3NuPxovX+adY6yb/ulnat6+lyKS/u9cY4oizySGLW/ X5lVtB+fhWUBQjZ9oZOJp8AsE2A5psM= X-MC-Unique: ohl3cItFPqa0JxwoSZ65gQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 144/147] meson: update build-system documentation Date: Mon, 10 Aug 2020 19:09:02 +0200 Message-Id: <1597079345-42801-145-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> 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 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/10 11:11:16 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/devel/build-system.txt | 401 +++++++++++++++++++++++-----------------= ---- 1 file changed, 213 insertions(+), 188 deletions(-) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index fea67b2..df5b949 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -22,6 +22,30 @@ silent while it is checking for features. It will only d= isplay output when an error occurs, or to show the final feature enablement summary on completion. =20 +Because QEMU uses the Meson build system under the hood, only VPATH +builds are supported. There are two general ways to invoke configure & +perform a build: + + - VPATH, build artifacts outside of QEMU source tree entirely + + cd ../ + mkdir build + cd build + ../qemu/configure + make + + - VPATH, build artifacts in a subdir of QEMU source tree + + mkdir build + cd build + ../configure + make + +For now, checks on the compilation environment are found in configure +rather than meson.build, though this is expected to change. The command +line is parsed in the configure script and, whenever needed, converted +into the appropriate options to Meson. + Adding new checks to the configure script usually comprises the following tasks: =20 @@ -164,145 +188,189 @@ developers in checking for system features: then --static will be automatically added to $ARGS =20 =20 -Stage 2: makefiles -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -The use of GNU make is required with the QEMU build system. - -Although the source code is spread across multiple subdirectories, the -build system should be considered largely non-recursive in nature, in -contrast to common practices seen with automake. There is some recursive -invocation of make, but this is related to the things being built, -rather than the source directory structure. +Stage 2: Meson +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -QEMU currently supports both VPATH and non-VPATH builds, so there are -three general ways to invoke configure & perform a build. +The Meson build system is currently used to describe the build +process for: =20 - - VPATH, build artifacts outside of QEMU source tree entirely +1) executables, which include: + - Tools - qemu-img, qemu-nbd, qga (guest agent), etc + - System emulators - qemu-system-$ARCH + - Userspace emulators - qemu-$ARCH + - Some (but not all) unit tests =20 - cd ../ - mkdir build - cd build - ../qemu/configure - make +2) documentation =20 - - VPATH, build artifacts in a subdir of QEMU source tree +3) ROMs, which can be either installed as binary blobs or compiled =20 - mkdir build - cd build - ../configure - make +4) other data files, such as icons or desktop files =20 - - non-VPATH, build artifacts everywhere - - ./configure - make - -The QEMU maintainers generally recommend that a VPATH build is used by -developers. Patches to QEMU are expected to ensure VPATH build still -works. +The source code is highly modularized, split across many files to +facilitate building of all of these components with as little duplicated +compilation as possible. The Meson "sourceset" functionality is used +to list the files and their dependency on various configuration =20 +symbols. =20 +Various subsystems that are common to both tools and emulators have +their own sourceset, for example block_ss for the block device subsystem, +chardev_ss for the character device subsystem, etc. These sourcesets +are then turned into static libraries as follows: =20 -Module structure ----------------- + libchardev =3D static_library('chardev', chardev_ss.sources(), + name_suffix: 'fa', + build_by_default: false) =20 -There are a number of key outputs of the QEMU build system: + chardev =3D declare_dependency(link_whole: libchardev) =20 - - Tools - qemu-img, qemu-nbd, qga (guest agent), etc - - System emulators - qemu-system-$ARCH - - Userspace emulators - qemu-$ARCH - - Unit tests +The special ".fa" suffix is needed as long as unit tests are built with +the older Makefile infrastructure, and will go away later. =20 -The source code is highly modularized, split across many files to -facilitate building of all of these components with as little duplicated -compilation as possible. There can be considered to be two distinct -groups of files, those which are independent of the QEMU emulation -target and those which are dependent on the QEMU emulation target. +Files linked into emulator targets there can be split into two distinct gr= oups +of files, those which are independent of the QEMU emulation target and +those which are dependent on the QEMU emulation target. =20 In the target-independent set lives various general purpose helper code, such as error handling infrastructure, standard data structures, platform portability wrapper functions, etc. This code can be compiled once only and the .o files linked into all output binaries. +Target-independent code lives in the common_ss, softmmu_ss and user_ss +sourcesets. common_ss is linked into all emulators, softmmu_ss only +in system emulators, user_ss only in user-mode emulators. =20 In the target-dependent set lives CPU emulation, device emulation and much glue code. This sometimes also has to be compiled multiple times, once for each target being built. =20 -The utility code that is used by all binaries is built into a -static archive called libqemuutil.a, which is then linked to all the -binaries. In order to provide hooks that are only needed by some of the -binaries, code in libqemuutil.a may depend on other functions that are -not fully implemented by all QEMU binaries. Dummy stubs for all these -functions are also provided by this library, and will only be linked +All binaries link with a static library libqemuutil.a, which is then +linked to all the binaries. libqemuutil.a is built from several +sourcesets; most of them however host generated code, and the only two +of general interest are util_ss and stub_ss. + +The separation between these two is purely for documentation purposes. +util_ss contains generic utility files. Even though this code is only +linked in some binaries, sometimes it requires hooks only in some of +these and depend on other functions that are not fully implemented by +all QEMU binaries. stub_ss links dummy stubs that will only be linked into the binary if the real implementation is not present. In a way, the stubs can be thought of as a portable implementation of the weak symbols concept. =20 -All binaries should link to libqemuutil.a, e.g.: +The following files concur in the definition of which files are linked +into each emulator: =20 - qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a +- default-configs/*.mak =20 +The files under default-configs/ control what emulated hardware is built +into each QEMU system and userspace emulator targets. They merely contain +a list of config variable definitions like the machines that should be +included. For example, default-configs/aarch64-softmmu.mak has: =20 -Windows platform portability ----------------------------- + include arm-softmmu.mak + CONFIG_XLNX_ZYNQMP_ARM=3Dy + CONFIG_XLNX_VERSAL=3Dy =20 -On Windows, all binaries have the suffix '.exe', so all Makefile rules -which create binaries must include the $(EXESUF) variable on the binary -name. e.g. +These files rarely need changing unless new devices / hardware need to +be enabled for a particular system/userspace emulation target =20 - qemu-img$(EXESUF): qemu-img.o ..snip.. +- */Kconfig =20 -This expands to '.exe' on Windows, or '' on other platforms. +These files are processed together with default-configs/*.mak and +describe the dependencies between various features, subsystems and +device models. They are described in kconfig.rst. + + +Support scripts +--------------- + +Meson has a special convention for invoking Python scripts: if their +first line is "#! /usr/bin/env python3" and the file is *not* executable, +find_program() arranges to invoke the script under the same Python +interpreter that was used to invoke Meson. This is the most common +and preferred way to invoke support scripts from Meson build files, +because it automatically uses the value of configure's --python=3D option. + +In case the script is not written in Python, use a "#! /usr/bin/env ..." +line and make the script executable. + +Scripts written in Python, where it is desirable to make the script +executable (for example for test scripts that developers may want to +invoke from the command line, such as tests/qapi-schema/test-qapi.py), +should be invoked through the "python" variable in meson.build. For +example: + + test('QAPI schema regression tests', python, + args: files('test-qapi.py'), + env: test_env, suite: ['qapi-schema', 'qapi-frontend']) + +This is needed to obey the --python=3D option passed to the configure +script, which may point to something other than the first python3 +binary on the path. =20 -A further complication for the system emulator binaries is that -two separate binaries need to be generated. =20 -The main binary (e.g. qemu-system-x86_64.exe) is linked against the -Windows console runtime subsystem. These are expected to be run from a -command prompt window, and so will print stderr to the console that -launched them. +Stage 3: makefiles +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The use of GNU make is required with the QEMU build system. + +The output of Meson is a build.ninja file, which is used with the Ninja +build system. QEMU uses a different approach, where Makefile rules are +synthesized from the build.ninja file. The main Makefile includes these +rules and wraps them so that e.g. submodules are built before QEMU. +The resulting build system is largely non-recursive in nature, in +contrast to common practices seen with automake. + +Tests are also ran by the Makefile with the traditional "make check" +phony target. Meson test suites such as "unit" can be ran with "make +check-unit" too. It is also possible to run tests defined in meson.build +with "meson test". + +The following text is only relevant for unit tests which still have to +be converted to Meson. + +All binaries should link to libqemuutil.a, e.g.: =20 -The second binary generated has a 'w' on the end of its name (e.g. -qemu-system-x86_64w.exe) and is linked against the Windows graphical -runtime subsystem. These are expected to be run directly from the -desktop and will open up a dedicated console window for stderr output. + qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a =20 -The Makefile.target will generate the binary for the graphical subsystem -first, and then use objcopy to relink it against the console subsystem -to generate the second binary. +On Windows, all binaries have the suffix '.exe', so all Makefile rules +which create binaries must include the $(EXESUF) variable on the binary +name. e.g. + + qemu-img$(EXESUF): qemu-img.o ..snip.. =20 +This expands to '.exe' on Windows, or '' on other platforms. =20 -Object variable naming ----------------------- +Variable naming +--------------- =20 The QEMU convention is to define variables to list different groups of -object files. These are named with the convention $PREFIX-obj-y. For -example the libqemuutil.a file will be linked with all objects listed -in a variable 'util-obj-y'. So, for example, util/Makefile.obj will -contain a set of definitions looking like +object files. These are named with the convention $PREFIX-obj-y. The +Meson "chardev" variable in the previous example corresponds to a +variable 'chardev-obj-y'. + +Likewise, tests that are executed by "make check-unit" are grouped into +a variable check-unit-y, like this: =20 - util-obj-y +=3D bitmap.o bitops.o hbitmap.o - util-obj-y +=3D fifo8.o - util-obj-y +=3D acl.o - util-obj-y +=3D error.o qemu-error.o + check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) + check-unit-y +=3D tests/test-iov$(EXESUF) + check-unit-y +=3D tests/test-bitmap$(EXESUF) =20 -When there is an object file which needs to be conditionally built based +When a test or object file which needs to be conditionally built based on some characteristic of the host system, the configure script will define a variable for the conditional. For example, on Windows it will define $(CONFIG_POSIX) with a value of 'n' and $(CONFIG_WIN32) with a value of 'y'. It is now possible to use the config variables when listing object files. For example, =20 - util-obj-$(CONFIG_WIN32) +=3D oslib-win32.o qemu-thread-win32.o - util-obj-$(CONFIG_POSIX) +=3D oslib-posix.o qemu-thread-posix.o + check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF) =20 On Windows this expands to =20 - util-obj-y +=3D oslib-win32.o qemu-thread-win32.o - util-obj-n +=3D oslib-posix.o qemu-thread-posix.o + check-unit-n +=3D tests/vmstate.exe =20 -Since libqemutil.a links in $(util-obj-y), the POSIX specific files -listed against $(util-obj-n) are ignored on the Windows platform builds. +Since the "check-unit" target only runs tests included in "$(check-unit-y)= ", +POSIX specific tests listed in $(util-obj-n) are ignored on the Windows +platform builds. =20 =20 CFLAGS / LDFLAGS / LIBS handling @@ -316,27 +384,25 @@ avoided in QEMU, since it would apply to too many bui= ld targets. Flags that are needed by any QEMU code (i.e. everything *except* GIT submodule projects) are put in $(QEMU_CFLAGS) variable. For linker flags the $(LIBS) variable is sometimes used, but a couple of more -targeted variables are preferred. $(libs_softmmu) is used for -libraries that must be linked to system emulator targets, $(LIBS_TOOLS) -is used for tools like qemu-img, qemu-nbd, etc and $(LIBS_QGA) is used -for the QEMU guest agent. There is currently no specific variable for -the userspace emulator targets as the global $(LIBS), or more targeted -variables shown below, are sufficient. +targeted variables are preferred. =20 In addition to these variables, it is possible to provide cflags and libs against individual source code files, by defining variables of the -form $FILENAME-cflags and $FILENAME-libs. For example, the curl block -driver needs to link to the libcurl library, so block/Makefile defines -some variables: +form $FILENAME-cflags and $FILENAME-libs. For example, the test +test-crypto-tlscredsx509 needs to link to the libtasn1 library, +so tests/Makefile.include defines some variables: =20 - curl.o-cflags :=3D $(CURL_CFLAGS) - curl.o-libs :=3D $(CURL_LIBS) + tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) + tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) =20 The scope is a little different between the two variables. The libs get used when linking any target binary that includes the curl.o object file, while the cflags get used when compiling the curl.c file only. =20 =20 +Important files for the build system +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + Statically defined files ------------------------ =20 @@ -348,81 +414,26 @@ number of dynamically created files listed later. =20 The main entry point used when invoking make to build all the components of QEMU. The default 'all' target will naturally result in the build of -every component. The various tools and helper binaries are built +every component. Makefile takes care of recursively building submodules directly via a non-recursive set of rules. =20 -Each system/userspace emulation target needs to have a slightly -different set of make rules / variables. Thus, make will be recursively -invoked for each of the emulation targets. - -The recursive invocation will end up processing the toplevel -Makefile.target file (more on that later). +- Makefile.objs =20 +Defines *-obj-y files corresponding to=20 =20 -- */Makefile.objs - -Since the source code is spread across multiple directories, the rules -for each file are similarly modularized. Thus each subdirectory -containing .c files will usually also contain a Makefile.objs file. -These files are not directly invoked by a recursive make, but instead -they are imported by the top level Makefile and/or Makefile.target - -Each Makefile.objs usually just declares a set of variables listing the -.o files that need building from the source files in the directory. They -will also define any custom linker or compiler flags. For example in -block/Makefile.objs - - block-obj-$(CONFIG_LIBISCSI) +=3D iscsi.o - block-obj-$(CONFIG_CURL) +=3D curl.o - - ..snip... - - iscsi.o-cflags :=3D $(LIBISCSI_CFLAGS) - iscsi.o-libs :=3D $(LIBISCSI_LIBS) - curl.o-cflags :=3D $(CURL_CFLAGS) - curl.o-libs :=3D $(CURL_LIBS) - -If there are any rules defined in the Makefile.objs file, they should -all use $(obj) as a prefix to the target, e.g. - - $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp - - -- Makefile.target - -This file provides the entry point used to build each individual system -or userspace emulator target. Each enabled target has its own -subdirectory. For example if configure is run with the argument -'--target-list=3Dx86_64-softmmu', then a sub-directory 'x86_64-softmmu' -will be created, containing a 'Makefile' which symlinks back to -Makefile.target - -So when the recursive '$(MAKE) -C x86_64-softmmu' is invoked, it ends up -using Makefile.target for the build rules. +- */meson.build =20 +The meson.build file in the root directory is the main entry point for the +Meson build system, and it coordinates the configuration and build of all +executables. Build rules for various subdirectories are included in +other meson.build files spread throughout the QEMU source tree. =20 - rules.mak =20 This file provides the generic helper rules for invoking build tools, in particular the compiler and linker. =20 - -- default-configs/*.mak - -The files under default-configs/ control what emulated hardware is built -into each QEMU system and userspace emulator targets. They merely contain -a list of config variable definitions like the machines that should be -included. For example, default-configs/aarch64-softmmu.mak has: - - include arm-softmmu.mak - CONFIG_XLNX_ZYNQMP_ARM=3Dy - CONFIG_XLNX_VERSAL=3Dy - -These files rarely need changing unless new devices / hardware need to -be enabled for a particular system/userspace emulation target - - -- tests/Makefile +- tests/Makefile.include =20 Rules for building the unit tests. This file is included directly by the top level Makefile, so anything defined in this file will influence the @@ -435,11 +446,11 @@ Rules for Docker tests. Like tests/Makefile, this fil= e is included directly by the top level Makefile, anything defined in this file will influence the entire build system. =20 -- po/Makefile - -Rules for building and installing the binary message catalogs from the -text .po file sources. This almost never needs changing for any reason. +- tests/vm/Makefile.include =20 +Rules for VM-based tests. Like tests/Makefile, this file is included +directly by the top level Makefile, anything defined in this file will +influence the entire build system. =20 Dynamically created files ------------------------- @@ -450,6 +461,7 @@ the need for QEMU makefiles to go through any pre-proce= ssing as seen with autotools, where Makefile.am generates Makefile.in which generates Makefile. =20 +Built by configure: =20 - config-host.mak =20 @@ -457,27 +469,17 @@ When configure has determined the characteristics of = the build host it will write a long list of variables to config-host.mak file. This provides the various install directories, compiler / linker flags and a variety of CONFIG_* variables related to optionally enabled features. -This is imported by the top level Makefile in order to tailor the build -output. +This is imported by the top level Makefile and meson.build in order to +tailor the build output. + +config-host.mak is also used as a dependency checking mechanism. If make +sees that the modification timestamp on configure is newer than that on +config-host.mak, then configure will be re-run. =20 The variables defined here are those which are applicable to all QEMU build outputs. Variables which are potentially different for each emulator target are defined by the next file... =20 -It is also used as a dependency checking mechanism. If make sees that -the modification timestamp on configure is newer than that on -config-host.mak, then configure will be re-run. - - -- config-host.h - -The config-host.h file is used by source code to determine what features -are enabled. It is generated from the contents of config-host.mak using -the scripts/create_config program. This extracts all the CONFIG_* variable= s, -most of the HOST_* variables and a few other misc variables from -config-host.mak, formatting them as C preprocessor macros. - - - $TARGET-NAME/config-target.mak =20 TARGET-NAME is the name of a system or userspace emulator, for example, @@ -488,19 +490,42 @@ the target and any other potential custom libraries n= eeded for linking the target. =20 =20 -- $TARGET-NAME/config-devices.mak +Built by Meson: + +- ${TARGET-NAME}-config-devices.mak =20 TARGET-NAME is again the name of a system or userspace emulator. The config-devices.mak file is automatically generated by make using the scripts/make_device_config.sh program, feeding it the default-configs/$TARGET-NAME file as input. =20 +- config-host.h +- $TARGET-NAME/config-target.h +- $TARGET-NAME/config-devices.h + +These files are used by source code to determine what features +are enabled. They are generated from the contents of the corresponding +*.h files using the scripts/create_config program. This extracts +relevant variables and formats them as C preprocessor macros. + +- build.ninja + + +Built by Makefile: + +- Makefile.ninja: + +A Makefile conversion of the build rules in build.ninja. The conversion +is straightforward and, were it necessary to debug the rules produced +by Meson, it should be enough to look at build.ninja. The conversion +is performed by scripts/ninjatool.py. =20 -- $TARGET-NAME/Makefile +- Makefile.mtest: =20 -This is the entrypoint used when make recurses to build a single system -or userspace emulator target. It is merely a symlink back to the -Makefile.target in the top level. +The Makefile definitions that let "make check" run tests defined in +meson.build. The rules are produced from Meson's JSON description of +tests (obtained with "meson introspect --tests") through the script +scripts/mtest2make.py. =20 =20 Useful make targets --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083630; cv=none; d=zohomail.com; s=zohoarc; b=JqKiqUUacVWcXiHQMzjfHPHyqB3JGwBwdozB80qTpMgZebYwVppwODbUrvFfUpIJh5fEmPN8ipl1ZHWKTeArdffmsW7qFUuE/KT4Qyy8SabWfkt+2lLsdKXcAsexsb1w9AC7AyYt+bhe6O2f+u3f2VoiKQQHFBucQufVpIPlOF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083630; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dYdKiCkdStqxDQTQYURdCoB9Apg77KU1oTgN49LYhQ0=; b=JYemho2m3zPWQp9dVCG5/xVsspRYxbT/oP+0GtTjSTCPpYVbeLhLc2/d3NOvlQnz8vZBsnL0d8JxMukM2KedkTpTHTc2NS5Yqg/DBIUz47C/zyUu5DOPonwfCCDYl/eKyOp/eydkX+XlwAaTpE69unVIQUTKPuZudjOVB3nxjLs= 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 1597083630805380.30637555618137; Mon, 10 Aug 2020 11:20:30 -0700 (PDT) Received: from localhost ([::1]:57498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CPN-0000K6-HT for importer@patchew.org; Mon, 10 Aug 2020 14:20:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMI-0004G3-UV for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29889 helo=us-smtp-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 1k5BMG-0003Pw-7t for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:14 -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-286-g12LH0hSPFe1XhiQn8Rcog-1; Mon, 10 Aug 2020 13:13:07 -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 A3A19800473 for ; Mon, 10 Aug 2020 17:13:06 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8F2F5F1E9 for ; Mon, 10 Aug 2020 17:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=dYdKiCkdStqxDQTQYURdCoB9Apg77KU1oTgN49LYhQ0=; b=iAyGmUzHrkYWBV0spLecB58VYDrTxWdKZ6WrLex+ysZlJB5HvWK5xzzRNBtJV9JxCzLLwo 0FjDlYiC4gkokUJQ8Bo0u/tAdxBANr+AlcnQShMVQ6G7LoVY/CXDhrnp3jN7VlYoXuYLRS jko6Y+HwIfKa5fO18Uwtl50szK0LeKo= X-MC-Unique: g12LH0hSPFe1XhiQn8Rcog-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 145/147] acceptance: use stable URLs for the Debian and Ubuntu installer Date: Mon, 10 Aug 2020 19:09:03 +0200 Message-Id: <1597079345-42801-146-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00: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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The kernel and initrd hashes seem to have changed for the Bionic aarch64 installer, causing BootLinuxConsole.test_aarch64_xlnx_versal_virt to fail. Correct the paths to use the previous binaries instead of the latest. Do the same for the Lenny alpha installer for consistency, even though those are unlikely to change. Signed-off-by: Paolo Bonzini --- tests/acceptance/boot_linux_console.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 73cc69c..57ba632 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -336,13 +336,13 @@ class BootLinuxConsole(LinuxKernelTest): :avocado: tags=3Ddevice:arm_gicv3 """ kernel_url =3D ('http://ports.ubuntu.com/ubuntu-ports/dists/' - 'bionic-updates/main/installer-arm64/current/images/' + 'bionic-updates/main/installer-arm64/20101020ubuntu5= 43.15/images/' 'netboot/ubuntu-installer/arm64/linux') kernel_hash =3D '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 initrd_url =3D ('http://ports.ubuntu.com/ubuntu-ports/dists/' - 'bionic-updates/main/installer-arm64/current/images/' + 'bionic-updates/main/installer-arm64/20101020ubuntu5= 43.15/images/' 'netboot/ubuntu-installer/arm64/initrd.gz') initrd_hash =3D 'd385d3e88d53e2004c5d43cbe668b458a094f772' initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dinitrd_h= ash) @@ -822,7 +822,7 @@ class BootLinuxConsole(LinuxKernelTest): :avocado: tags=3Dmachine:clipper """ kernel_url =3D ('http://archive.debian.org/debian/dists/lenny/main= /' - 'installer-alpha/current/images/cdrom/vmlinuz') + 'installer-alpha/20090123lenny10/images/cdrom/vmlinu= z') kernel_hash =3D '3a943149335529e2ed3e74d0d787b85fb5671ba3' kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083278; cv=none; d=zohomail.com; s=zohoarc; b=e0tYHFARGFj5CgK0xeZ0nz36iq+yw/W1jctNAvI2BmXPKFXvpH0wpp0AP2P0Z7K/X972+Ar90PcOBTcFd6kgTz762JDexFKWG3fFLLUc0pbUtZOrrqzEKHAXAfpVy2IhbBqYYrLbrEpdJMkwjazuUnbHWP55GqeWXkEm2YkE/LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083278; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=yDml1jliThzfzu1mQfJjS219TcGUyUrVsLyE18WnGco=; b=RzVziXbgxzhlkEAyHv/1hq5ZLLIQDx9uH/btJ6AhzH8rAniYwb4+asdsKsZV2N7MAFDnmYItwX2kSqS5+OEVhYsMBDnEot5V03B2etjm9RgBwPFpx+IyVo8e2t33jh0y5QOMYDOfD30JZ3rXFj8rVEPqfEdQhD2CG2yvJxkzKnk= 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 1597083278074518.864785776621; Mon, 10 Aug 2020 11:14:38 -0700 (PDT) Received: from localhost ([::1]:57354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CJg-0005ad-Ur for importer@patchew.org; Mon, 10 Aug 2020 14:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMG-0004BI-TZ for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BMF-0003Pq-5u for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:12 -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-430-RnEvcvZnPfqMIom-CCqLFQ-1; Mon, 10 Aug 2020 13:13:08 -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 B8AB519067E3 for ; Mon, 10 Aug 2020 17:13:07 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B5BD5F1E9 for ; Mon, 10 Aug 2020 17:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=yDml1jliThzfzu1mQfJjS219TcGUyUrVsLyE18WnGco=; b=JrHrvJzc/szcHh56UJTKx+4kh9cuTa0a836g82nTL2tD0iQwNzT1dP/59so7MzP7fcvx2b D2gBsMVKl7h8uNNBmJFCFqF1ssCsVFkHMHvwBu+8oFeD8fa/5opshYrSL0livMvJALdWb+ rT1EFIclbityXPiKsJEL5j8fXvBC/AI= X-MC-Unique: RnEvcvZnPfqMIom-CCqLFQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 146/147] cflags Signed-off-by: Paolo Bonzini Date: Mon, 10 Aug 2020 19:09:04 +0200 Message-Id: <1597079345-42801-147-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> 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 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=63.128.21.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/10 13:09:25 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 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 5d64337..82877f1 100755 --- a/configure +++ b/configure @@ -6569,7 +6569,7 @@ EOF =20 update_cxxflags =20 - if do_cxx $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $QEMU_LDFLAGS; then + if do_cxx $CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $QEMU_LDFLAG= S; then # C++ compiler $cxx works ok with C compiler $cc : else --=20 1.8.3.1 From nobody Mon May 6 10:16:42 2024 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=1597083373; cv=none; d=zohomail.com; s=zohoarc; b=gDJTuEkrgsQEb1iTAyT75Mh6SIF5hDXBVnU31tzZiwB0l+YbIQkYcWNwPtdRbDGC+TK9aiOWOAP0d0NM5EasFrU+BWGKN1FtyjF/vK9u2scs4btyZFZU+9uti7IsO5/DqxRk0DisVyRoH3GVfwdybVG8vsLQRFgN6weo4J/JbZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597083373; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=AYSjFqQursWhOKANXbeBTB5KlJKZDt83RzJAWS7IRm8=; b=hwPYYLkhJvndqP4HRAm30Rd7kASAoOOD0RosZCx1Vkt/F+BBS9zw/yHbVMbJ1vD7bmx3/kyreZM5Pt6IB6RcrXq4peobEjWhZcJw3t5q9s7YS2XEZvfgeCK2hY/NW9tQyq5wNUna64hC1uRkVEeMYWUJWhxWx51LjwAZxzqaP2Q= 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 1597083373531716.9023779788531; Mon, 10 Aug 2020 11:16:13 -0700 (PDT) Received: from localhost ([::1]:36830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CLD-0000Kx-UX for importer@patchew.org; Mon, 10 Aug 2020 14:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BMI-0004Ea-CI for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:14 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57855 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 1k5BMG-0003Q4-DX for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:14 -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-536-49tzb8C7NoWehsbfMZF5Lg-1; Mon, 10 Aug 2020 13:13:09 -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 CCF38107ACCA for ; Mon, 10 Aug 2020 17:13:08 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 303005F1E9 for ; Mon, 10 Aug 2020 17:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=AYSjFqQursWhOKANXbeBTB5KlJKZDt83RzJAWS7IRm8=; b=ETIjlW9sNUKsIZ8OR7s+si+yExZZZ4QWI9c9aS+cRUOR6iOMYjgcrzGCCryB94TeaCYrl7 khRIqxlX/ILc26THBqpKr90lHVWehDmI+lvbv2+Q3xw0XQ7t57WKVQXpFBLjTu7J8yAqql 2zW/bcGWCBekvBhucJpOQjZ0g8jblnM= X-MC-Unique: 49tzb8C7NoWehsbfMZF5Lg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 147/147] meson: avoid unstable module warning with Meson 0.56.0 or newer Date: Mon, 10 Aug 2020 19:09:05 +0200 Message-Id: <1597079345-42801-148-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> 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 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=205.139.110.61; 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 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6556a48..8551ed5 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,11 @@ project('qemu', ['c', 'cpp'], meson_version: '>=3D0.55.0', version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) =20 not_found =3D dependency('', required: false) -keyval =3D import('unstable-keyval') +if meson.version().version_compare('>=3D0.56.0') + keyval =3D import('keyval') +else + keyval =3D import('unstable-keyval') +endif ss =3D import('sourceset') =20 sh =3D find_program('sh') --=20 1.8.3.1