From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684968; cv=none; d=zohomail.com; s=zohoarc; b=Y2WM42lDlWTiR0EAtWdUajBdwT5hel8Ro4XoZ20umeExqTQuEZQmCDjXpZjMM1bGVJW1C1YeBUkyPlwQiNS9PUu+562oO0VNd8q3LHUfSobhZQ4odwK+ccZa9HpHkdbI2NQyU7TekyV+1W/bh0/UF7yH+3qqbMA3rqNknWArzP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684968; h=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=I9hKuV+4GxIHdg4f78rZx+b5318hCEMxJMS+IR9ty5w=; b=KJDN/hO2V92lMp4CY+OHrMj2b1xMC8qFVgbn0cNzQ8r5T7ICztu84kS96Zfm9nZicQNEi3WfJka/iw5l5iwsbRML/WmhFHW6//YIYlT1GZOMYa5M0bB23VLr/6iqQCB9j88KrINny4QtsK7v4qsQ8/UdxOcpfOB0i0Hbaw/F95o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 15976849682742.477493646592279; Mon, 17 Aug 2020 10:22:48 -0700 (PDT) Received: from localhost ([::1]:55728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gIi-0007dD-0A for importer@patchew.org; Mon, 17 Aug 2020 10:39:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGQ-0002ss-Rb for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:30 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGP-00060M-7H for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:30 -0400 Received: by mail-wr1-x443.google.com with SMTP id r4so15221890wrx.9 for ; Mon, 17 Aug 2020 07:37:28 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I9hKuV+4GxIHdg4f78rZx+b5318hCEMxJMS+IR9ty5w=; b=qfgAoNR9qrlEA0cZUTQAWbQt+Zh6MCVgGi9ZUMB1yFzcqRUa2RJ/pVgO42Y9Jd/FRE QfbvZov6uuLJ4z13SOdD4RTwVwID4E64RvG10SOK7KvS9cK8bdwbltdIJI+b5bTmmm5x FLfHUyJq64uZqO8BFnkP35cS4xhu12HmQKB1NRnMA9/XbvxlSyewZ3RMzZSp7jvlh2N7 Hwwi5hrm7zPpnr/jAvJgyR3+KWta/5w0vZaCFt02lbEMR06MFReTKrgIydf7nDvhegpK ZmA8LEO+KEF2ZE/ifl1wJjYVuTX/1Aa5MmyVOv8kQBjUBci9MojO3YEbdrDrT+DRwcap sf4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I9hKuV+4GxIHdg4f78rZx+b5318hCEMxJMS+IR9ty5w=; b=ej8O/0UrdL7TkYOAvLo6rxUkEM77zA9tkWMhZzrKrU71TOmMFw9hncddKo4qofB/Mg OSocwAvaqMh6Hvx4JDUy1wHWAHPUXthmDWiRwolkFSMpLUgmaoIq68nDbBjhmksAArqe T7/gfpcQrLZ5WKJDNGQMtMh9G7OW3tmMJrb20NwuXgUkJ+48Jo6DyY1PV4kWKy9cifJX HjrA58d6GiTTA5s1MHRUDmMvWLuJxiiDefM2YfmOpO6qpdwmyL4lBKjzL1+A1RzN6+Wh 5jiNTgo+YhbLcQwrl7VAWM95pRHoGzLnQFX5JHQne8R1VmVLr2vDvSLE5IDUi9xeoaqi 1ryQ== X-Gm-Message-State: AOAM532yJL+huWHBEUa7mCDQkY3RYz+SEhmt49n3nU9qVNX30YL0ZrcD oYPz5uCQyvj60jrlOlv6OrqY/ttReIk= X-Google-Smtp-Source: ABdhPJwH1pa+jFAWIQiAGIDBAi2e6Iz/MukJOCvV24dJEgPpFK0ryYAJ5jSd6y2AGvGZwZkjAc+SWA== X-Received: by 2002:adf:fb87:: with SMTP id a7mr16895120wrr.390.1597675046933; Mon, 17 Aug 2020 07:37:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 001/150] oss-fuzz/build: remove LIB_FUZZING_ENGINE Date: Mon, 17 Aug 2020 16:34:54 +0200 Message-Id: <20200817143723.343284-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 a07b3022e8..52430cb620 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682875; cv=none; d=zohomail.com; s=zohoarc; b=ccjarWtHLgSQ5XlQpCxHVwW9sWOjflB+SpzLrOC1uzhEEBjVQW8Zuf2/BuctyIVGSMpiUePb/tMMxe1hcjX7KH33Byt/SnwM8EHRa0FVpKXlZ0jdg9jBwsNdNIv2H8ZpDmO0Enf43NYSN1XQY2s0powUiR1EiIUTzLhvYXKpjIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682875; 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=EMlbhp5fTK8J6EyIxi+TH4Gxywk6oqtzcXV/xxOWG0c=; b=e5aISZgfRtXQ3Ck+IQJujA970vvVM9BOjRZQSmm+vqsmAS1HWWPTJgmMMP9llnwG0tkpl/GY4dpM7L6kPVY9RIPlpg/RgaH42xj/cG+C0J3Oj7llz4LP/dcWsxplC9C3RRVqSEW/r2kyvi56eExuzS0YbC7Mc7avXsNdosh1xcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768287597517.532218843664396; Mon, 17 Aug 2020 09:47:55 -0700 (PDT) Received: from localhost ([::1]:48986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gHf-0004eQ-Fp for importer@patchew.org; Mon, 17 Aug 2020 10:38:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGR-0002t6-2f for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:31 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGP-00060R-F4 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:30 -0400 Received: by mail-wr1-x443.google.com with SMTP id a5so15255907wrm.6 for ; Mon, 17 Aug 2020 07:37:29 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EMlbhp5fTK8J6EyIxi+TH4Gxywk6oqtzcXV/xxOWG0c=; b=A5q0tbZBeikfBcYtV05iUT7ohDVjteiSf4kgSn1ivrnlIT2Mluikxvb9VT3n8FOpXL kNX4PSwjMKt73u/88wGwi+OS8xR9jMpWHrbOLEcr9jUr2Xg9M6bit3HI0mmoNw8DBRPw C+JpqMdO2UbW7f3bfLNAqFAmqK1EtxUlsvX3iowN0+Z98BqUvrjPshpgSGnwYBh/5Wh/ JYfGUhIqWhBvVXGbcR+yTv9i6yu8R2b23MPo+WZ7OFjo/Bv/CoKQsB/Z5rlxtsIZ4pfw h6ol5E1vUjCQxIiO6ioWpgS2M/S53Ts5PdBpE5ODuZ0uegfBkYgX3+YmC+Uxkj+Eegru FeWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EMlbhp5fTK8J6EyIxi+TH4Gxywk6oqtzcXV/xxOWG0c=; b=Y/LXKbXi1XsB2h6+czOMB4Bmswa/QQzrN8nlhYsR+7vvj6CGAoyM5QRg7YAUe4X0Pg io8wTIiMk4FmY1IdySd/RnfC4AElpB1J6nyPveTt+ieCBFr3h/CG8Ayms3xUeb2LTMko qq+cTIVAQePCrYi7iu22jtxyhdJIP1bwieQreYpTOfKl7fgYHL6sDkcjQ8vEXLKUy9Se /cwDcP6GKRoNtAL5A0+zmaZxT+zX6ddIDYYQRbEH/3K3TNRr3PxEJKu0qGAdHSWfIe/+ Yyt/Jnn92xahMP7jpEkPI9tDOPI/+Wn6wHqIZjVawLzTQH/gQw7Zofb2ssKKKLF3B8Nh Eong== X-Gm-Message-State: AOAM532MN5wuOj666Ob3yIfuiEq3yzqrZTzNoZduxdt8PtERJOZx3y/W 7R4KHQvKPtbeAUCR0xJBy59XQtgUQn4= X-Google-Smtp-Source: ABdhPJwjo6C1bbK+i6ktqCJ+OdXx070Io7sqRpteNXdRx66jmFnyvyWo7K7tWK2ws9BXOc8mRecOQQ== X-Received: by 2002:a5d:4d8f:: with SMTP id b15mr11217178wru.341.1597675047941; Mon, 17 Aug 2020 07:37:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 002/150] optionrom: simplify Makefile Date: Mon, 17 Aug 2020 16:34:55 +0200 Message-Id: <20200817143723.343284-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 e33a24da0d..51cb6ca9d8 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686758; cv=none; d=zohomail.com; s=zohoarc; b=hheEie69jvuFjymZ2d+yGpuF2ceGFBt4qEc4B/M1aclCQPH+QLP9t9K0qJk4fycHioXehgYVUPFd6H8Kxj4fjsL93AxqweApmGb7Kk2JRNkliuEm/ib4Y0cYL6TaFJ8SIJKZVuVOHk/93Xutlt3lr4HGby66JKXcCVya4gWnj1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686758; h=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=dVGF3E7lJx6P6MKIaUk/hhZTTCuLXFQFlFFNyp8bJj4=; b=dFLAvVF3tAPOpipUvoJ2Ids/HgdrNI/drgaOBq7NGxQ85hKxhvxEjLDvs1PlMpldpr7KImuzmXGrKuK6D9u5Up/2yxz3lA9RXtRsWsDJMmU+CUH5MRi72CQpibwtsgWDlUQ4bcCZIXwOYcW+cptMxQuTpnTR7EXIVCt2ZJBWzgE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686758596455.8342195424473; Mon, 17 Aug 2020 10:52:38 -0700 (PDT) Received: from localhost ([::1]:49178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gHh-0004kE-9X for importer@patchew.org; Mon, 17 Aug 2020 10:38:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGS-0002un-Cn for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:32 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGQ-00060Z-OZ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:32 -0400 Received: by mail-wr1-x42b.google.com with SMTP id a5so15255979wrm.6 for ; Mon, 17 Aug 2020 07:37:30 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dVGF3E7lJx6P6MKIaUk/hhZTTCuLXFQFlFFNyp8bJj4=; b=qHPnimvq85RowYWbDfcE1SVljOvwEyzRMdvvkIG6FRdXW6xNjzng6y4l3Yohi4oiG0 8nUnrifIZPFLpO0d6cld56JD3SGDwQV1d+WOkjQSPKKfxeLnoubV6DXwbl78MFbHasYR EmMHSVBjtKfQsANDAepRoGsRiH0DJVzEhyM5S31KiLCml0DurvhORL69/bJkQy7Q5/cm ER3JO3m7d1wXnN11GCdVvPaYG9nejKU423adFemYW6oagf2KD5Dn+X6e36rtHHWI/XY8 o77fPil0L5vIz9Q7MuHapy39t5Jnqi2wJshR1F+YBaIi+ecOYwZ8guOwxDeJN86vpLaX xT6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dVGF3E7lJx6P6MKIaUk/hhZTTCuLXFQFlFFNyp8bJj4=; b=UtQMzmWwkUqfka3cphekxH7IuqQXvIzI3mMBEWJbR/5o01+Z2rw/k8l5oWkEDvRXdB zDh2WuNvemNo4rzc2OR5Pp7pZ1G1qZdmsqMqWJVOwfKkdV0hkHUXzLod1zEewKyb72GJ lIImWQnAbW1Ec5CjTrzrAMWRwW4sIttKVd7jPa7ERJOeV9s22ZRqbHh/ZQD0SP/EPEf5 ten2S7qGN4F3e7Iako/KD8COvKwKVWu0MGDrdBb0TG3muJ9nzgBGNZlAVfQsHatZpq4W rr9m5RYi9OVzIvGGFimklGlrjnMXO/404aQRB56oWVBu+VQXRNoZGUQLbRUCXeYLAeZT hqPA== X-Gm-Message-State: AOAM532RxWgRjyF64Z6xQkKkVNZvItnB9d8yA9baQWJl8OkNDU7BeCnz Eof4869azMAUI0EFABxHZ/EYfVXOdQM= X-Google-Smtp-Source: ABdhPJy+c+Ksv+5WJXERkJt3m8YJqJwJk7N2Rpci+BGRM2YLj0Pd7ccxKSD4wxqmYGV8tsZVhkYlew== X-Received: by 2002:adf:dfd0:: with SMTP id q16mr17182548wrn.60.1597675049219; Mon, 17 Aug 2020 07:37:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 003/150] pc-bios/s390-ccw: do not use rules.mak Date: Mon, 17 Aug 2020 16:34:56 +0200 Message-Id: <20200817143723.343284-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Thomas Huth Signed-off-by: Paolo Bonzini --- 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 50bc880272..cc0f77baa6 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686726; cv=none; d=zohomail.com; s=zohoarc; b=lnGpP/oVWz3psDZi73Gt0nKGHdN01fZqTvLzB0ciqZMb5/HuvUlpv46uLr5moT1hge1yaX+2AzR9U5QwkKzPuYqOCAHtZFIdVwXNFDaSWQgl69ZXmJd1MI35/XvecfRkIZ99XB0eJj4Nys8i5lOJ7wvWoWVEGtCWRvUNCC9hvDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686726; h=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=/WcAi4gDTnnpB9k3+3M1VGeqqwg6I9+HGcTeOqjklrg=; b=lxp04uxgXqHx+bUYwBGu37GWru6+wBRYSwfM/z0vVjkgFyk4fb41tWmmWZy4St0L3zGTGgVgHNQkqPAPAaOnuFlaqFrELlruobMYFpJaKTUfhaZSFE8jJvNF7YAQJXoEwYUhQRdzPbCsm+fO87K/E1awE1Jw/leRR1DllybUP7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686726558342.9204989602965; Mon, 17 Aug 2020 10:52:06 -0700 (PDT) Received: from localhost ([::1]:57634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gJE-0008OI-OD for importer@patchew.org; Mon, 17 Aug 2020 10:40:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGV-000320-Jq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:35 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGS-00060u-P9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:35 -0400 Received: by mail-wr1-x435.google.com with SMTP id l2so15247849wrc.7 for ; Mon, 17 Aug 2020 07:37:32 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/WcAi4gDTnnpB9k3+3M1VGeqqwg6I9+HGcTeOqjklrg=; b=GSEkW8STij2+LqjVn+8T5Yi5YNhbLW2y1yzwDq280qOvTjfYOMULIXAbk9aaprAOfK yBYMID8tGrfW+Exwai2gDj5BJ3DsKz4Ipaw+foltkvQHbtQFad8SsPNOOPbiIApwuz9y KZ/8xXUhHTMT2ybfEYyr/R4C8VxiaKDCzAbPOW7f4NPZ15VLGnKOB5HyJ+5v7INOvC0O yH4XA3HyiMTkkfiVtUHlsuN4AL6BBSNvdU0MwWyMQddIlc8r06N/ZdFqqXVarY0ahh3k LtsZlfmhLhYTXag0mVjysPfkmPFHhz9EuINJzrxpXIKa9/mxegTQTKjF4ovPMOEfA79S 599g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/WcAi4gDTnnpB9k3+3M1VGeqqwg6I9+HGcTeOqjklrg=; b=iE1Won5gQ7ZaujZ95R3d5sJ86pML/6LY3xmlTM6yky04WiWjXyl3Y07fin2PbeWx0h f8WQRA8aQ6YgpUKkFVoZa5GBuTCbmQgZ+TkLKWlYHL0D9+uQTqVz8vZEzBN1xgCVXgsg KD2urhv1GYq0xB5cKrfqZ3TTvVv0x4HJ8d+ek3emnhsm4izBkteL8QHUn1pp38HUp10L xKdAVsIDCpY2anxVK7ejHQL7ZE4L7c1wNwRTftxHAoBU7uSmbMpuFvzbK42k58voL9u7 Xq4yGgl5y3r3TY6Rcp1MiKlpeQFwtQG/oc6uvGjW8MzUKifG5GRM5Dz930aQy0u/vPMd lhBw== X-Gm-Message-State: AOAM531BsXYD9mGL9B7Ta+06ZX6LfwCStuEGz9IOPtsSnMStfHciZ8ju uZijZSpP//vtTtzylGZtltL2c8C4/yU= X-Google-Smtp-Source: ABdhPJzPyeMTFOTPzoU/8Y7Ux0uTLeIifZhz4vJoDwcy1evcs5O4jJQG5m77FRZnwTsJeu3xUlBGMQ== X-Received: by 2002:adf:f606:: with SMTP id t6mr16715701wrp.182.1597675050109; Mon, 17 Aug 2020 07:37:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 004/150] trace: switch position of headers to what Meson requires Date: Mon, 17 Aug 2020 16:34:57 +0200 Message-Id: <20200817143723.343284-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 2992d15931..656e39050b 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 13dd708c4a..00cadebf99 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 d22b3b45d7..3823463c23 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 0000000000..67c935a6f7 --- /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 5698292749..5349ee6b0e 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 0000000000..db61fad3c6 --- /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 d8b027f8c1..1d34c57ff5 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 0000000000..4072a11b0f --- /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 0000000000..3176c127f7 --- /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 0000000000..40c4729884 --- /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 0000000000..77fe57f36c --- /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 0000000000..3a436e6c7f --- /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 0000000000..eb4f9027a1 --- /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 0000000000..a9af0f315c --- /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 2a77b5a9cb..41ef24a63b 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 6f381f98e2..8047bf2ff9 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 f3a318cd7f..9dfb6e4142 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 0000000000..6104fe2a77 --- /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 0000000000..a7f7da7009 --- /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 0000000000..20fe698191 --- /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 0000000000..91337aa6b0 --- /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 0000000000..5c7516a4d1 --- /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 0000000000..240cc59834 --- /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 0000000000..cde210ae69 --- /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 0000000000..c2df66af2e --- /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 594441a150..22bc3f974a 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 0000000000..23dfd61c49 --- /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 0000000000..4ed0e9165b --- /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 0000000000..4bcb28b47c --- /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 0000000000..8b139071bc --- /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 0000000000..4e8b52dc28 --- /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 0000000000..7f2a88881b --- /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 0000000000..4843a8d544 --- /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 0000000000..37a9f67e5d --- /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 0000000000..a02bf755dc --- /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 0000000000..e060e0aef1 --- /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 0000000000..d1cc5d924c --- /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 0000000000..02394aea20 --- /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 0000000000..501205cfc1 --- /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 0000000000..2f2c945407 --- /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 0000000000..8d1fd7c9e2 --- /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 0000000000..34a3cf1b42 --- /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 0000000000..1ab6923d11 --- /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 0000000000..93249af0ac --- /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 0000000000..88fa900ad3 --- /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 0000000000..93ec814a73 --- /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 0000000000..3dd773e22a --- /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 0000000000..87c4198e61 --- /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 0000000000..b3fa8ebc51 --- /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 0000000000..3ebc9fb7ad --- /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 0000000000..8c0e3ca1f3 --- /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 0000000000..cfd5d6ee62 --- /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 0000000000..d6568b3648 --- /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 0000000000..4ce2673582 --- /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 0000000000..f3d0c58563 --- /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 0000000000..625d60ca70 --- /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 0000000000..b6ef6e611d --- /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 0000000000..0c1de2679e --- /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 0000000000..5f72c441b0 --- /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 0000000000..9827c128aa --- /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 0000000000..f3962f2baf --- /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 0000000000..5a343aa59c --- /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 0000000000..5d7097061b --- /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 0000000000..5d8495752b --- /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 0000000000..adba31a136 --- /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 79fd3e5aa9..42e3b48b03 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 0000000000..92d63a5bfc --- /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 f9a58832e1..645601b2cc 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 53be57a3a0..8fecf38960 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 0000000000..05518e4694 --- /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 0000000000..e1a0f4fb74 --- /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 0000000000..f216e31be5 --- /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 0000000000..233d08fdd1 --- /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 0000000000..18d42c29b6 --- /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 0000000000..5c3fb674d8 --- /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 0000000000..f2895e699b --- /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 23d82ea861..c390c1844a 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 33cf6a31b3..4d84440aff 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 2db6317f3c..72576e67d1 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 0000000000..3e4d89a3a5 --- /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 354408c6ea..b89646f85d 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 04e360e79a..a799697c5d 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 af25987518..70b93104e8 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 4eb9d1f7fd..0cc86b0766 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 0000000000..60372d8e26 --- /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 0000000000..810cc09692 --- /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 0000000000..781e8ec55c --- /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 0000000000..f25b88ca6f --- /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 0000000000..a9e8962828 --- /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 0000000000..03a89fcd9b --- /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 0000000000..d7d59d4aba --- /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 0000000000..3b2f5a8e29 --- /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 ceb55c70ce..e293eeed7c 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 6558b5c906..c63a4de732 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 0000000000..a89d769623 --- /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 0000000000..86ff7a390c --- /dev/null +++ b/util/trace.h @@ -0,0 +1 @@ +#include "trace/trace-util.h" --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597681635; cv=none; d=zohomail.com; s=zohoarc; b=GTbPc36rMEyv+9sBCEn2bBbm4nEMNLBpFfgDOUZTgpE7BQhov1s6wSiLS6mICwZpmtZzHcajYn/wBCdK/TECl++C4CUSfWpb9YAMkmQFp+ub0PEKlXgrO5ry9zxwHl5ntBMetmKNK5L6ujjsj5v9jE3ERsecQB5ZRz67cTmE2Ag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597681635; h=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=qoRCGKzSh4d2/smpmVDlZsZITxNoE/1z6MyY3lVTkb4=; b=gTo33muws+rxzwz+XCFQRugRshg41aANL9n9q/V+qH4W3/E6YBrRdzQEem7DXe8o9CkMyJwVF5oc9YHB4IJqevPQUVrZsWJVXTcUgfS1AnG+lkNqxrQ2Y7+cI9d5fY09D8sEBoB0J7ogqhI0ucE+Q8n7T3Y37nwBT9g3m0qWEKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597681635713995.6456071753527; Mon, 17 Aug 2020 09:27:15 -0700 (PDT) Received: from localhost ([::1]:41544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gMP-0005IB-SN for importer@patchew.org; Mon, 17 Aug 2020 10:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGY-0003A8-Pc for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:38 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGU-00061B-MG for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:38 -0400 Received: by mail-wr1-x430.google.com with SMTP id a15so15232034wrh.10 for ; Mon, 17 Aug 2020 07:37:34 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qoRCGKzSh4d2/smpmVDlZsZITxNoE/1z6MyY3lVTkb4=; b=kXkBkhcPIniqdAscYr8GLaTdPQOAIAHyN09GY0+vLy/afOXRLWyIoYZO06GOoqGzt7 rIuXWbqzcVVR9JahhDKQ0cj3W1PKs3cyo8c4FANnypjPWI+BgHfE5FeUHtiFFzszQ779 2PuDwNHvj3B6h3J8RJIgyh1hOr1pkLPxU+aFmEM7JZbsLizIzDIW6B67jB4WBDXOmK3Z eedEczM8JpzXrzkX7dSRx5wtQgf3gppr7i+nwYx4xEKh0d0CzozEZKxPcwB92vxX4eVb 9ilyevwqchpp7iCnKn2uGNo6qmwKKVgbXXNuk3e+rvRsSis3Mfvz4m2Ew+f7iEbUxaIk uQ0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qoRCGKzSh4d2/smpmVDlZsZITxNoE/1z6MyY3lVTkb4=; b=ZzbqvdhXODdH1keV7LPHZX4ZTP3kcccHPSCWHrAJ6YWMXEYriFJwe52p8aQbm0uxkH ZvskDVnoimCNRlrflfoQq9vHRIPX2LxLWNaUp1+KDAvSFdv3NqlP1BPf36PGULkWzjEN +E8J+WGHKy7rKzG6JCNUzyx6QAsO5e/o/usp8ni+wVctMijKtJjMdqpcS0rHDp0m+EHy g4nLb6XPs9P3ptKAlG9bnBVFVp/4v/a9hwFI4/2p4yh5SPJ/AAi+KrWyWszHWsiVEVGR Qks4OPyCc5wPnvMBRxWnZKp096nEtaMHY5fboy05GxaUcIoHNvUzGfldUKfkWQGq/InQ BWVQ== X-Gm-Message-State: AOAM5327f78As8urqf6QCUJRcFq9hh0MJrP/wIoX+IWciqdDM6URvCjK ztgGL85//Wez5A6/tJhTehC46Gdbn6E= X-Google-Smtp-Source: ABdhPJxz5Co+gNh96Gkujb2kSBcUiXYPb1bmHvYDDKAkXJb2mpcdI5QUwgfPXSV8icdpHFP670ENSQ== X-Received: by 2002:a5d:5272:: with SMTP id l18mr14148142wrc.89.1597675051401; Mon, 17 Aug 2020 07:37:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 005/150] meson: rename .inc.c files to .inc Date: Mon, 17 Aug 2020 16:34:58 +0200 Message-Id: <20200817143723.343284-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- .gitignore | 4 +- Makefile | 36 ++++++++--------- ...{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 +- ...cialize.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 +++++++++---------- ...ranslate-neon.inc.c =3D> translate-neon.inc} | 6 +-- target/arm/translate-sve.c | 2 +- ...{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 +- ...ranslate_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 +- .../{mfrom_table.inc.c =3D> mfrom_table.inc} | 0 target/ppc/translate.c | 22 +++++----- .../{dfp-impl.inc.c =3D> dfp-impl.inc} | 0 .../translate/{dfp-ops.inc.c =3D> dfp-ops.inc} | 0 .../translate/{fp-impl.inc.c =3D> fp-impl.inc} | 0 .../translate/{fp-ops.inc.c =3D> fp-ops.inc} | 0 .../{spe-impl.inc.c =3D> spe-impl.inc} | 0 .../translate/{spe-ops.inc.c =3D> spe-ops.inc} | 0 .../{vmx-impl.inc.c =3D> vmx-impl.inc} | 0 .../translate/{vmx-ops.inc.c =3D> vmx-ops.inc} | 0 .../{vsx-impl.inc.c =3D> vsx-impl.inc} | 0 .../translate/{vsx-ops.inc.c =3D> vsx-ops.inc} | 0 ...ranslate_init.inc.c =3D> translate_init.inc} | 0 target/riscv/Makefile.objs | 8 ++-- ..._privileged.inc.c =3D> trans_privileged.inc} | 0 .../{trans_rva.inc.c =3D> trans_rva.inc} | 0 .../{trans_rvd.inc.c =3D> trans_rvd.inc} | 0 .../{trans_rvf.inc.c =3D> trans_rvf.inc} | 0 .../{trans_rvh.inc.c =3D> trans_rvh.inc} | 0 .../{trans_rvi.inc.c =3D> trans_rvi.inc} | 0 .../{trans_rvm.inc.c =3D> trans_rvm.inc} | 0 .../{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 +- .../{translate_vx.inc.c =3D> translate_vx.inc} | 0 target/xtensa/core-dc232b.c | 4 +- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 ...tensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-dc233c.c | 4 +- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 ...tensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-de212.c | 4 +- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 ...tensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-fsf.c | 2 +- ...tensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/core-sample_controller.c | 4 +- .../{gdb-config.inc.c =3D> gdb-config.inc} | 0 ...tensa-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 ...tensa-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 ...tensa-modules.inc.c =3D> xtensa-modules.inc} | 0 target/xtensa/import_core.sh | 8 ++-- tcg/README | 2 +- .../{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-target.inc.c =3D> tcg-target.inc} | 4 +- tcg/s390/{tcg-target.inc.c =3D> tcg-target.inc} | 4 +- .../{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 656e39050b..2424131c65 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 00cadebf99..f237ff899d 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 5349ee6b0e..ca4c98224d 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 1d34c57ff5..e219ecc916 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 2d5002fea0..e8e2628a36 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 8047bf2ff9..f5915ce24c 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 79be4f5840..7fb1f3b9bf 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 e63450a893..89fa9cffe9 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 795b3bea31..ff2dbe8525 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 fa39fd7c83..4a177ad914 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 f6cb921573..ac0ddcc2d0 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 88a2fb271d..60c0716389 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 afa8a5f888..1f518b45e3 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 c39a929b93..3128fa6fcf 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 6e35ba2c5c..81d9bcd1ba 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 8e1bac4d76..c45ab2cb14 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 648dcd5c3e..8deb126be5 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 aaa46b5bca..a0d4b1ccdf 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 174f50a96c..40dcb86ad0 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 4bd22d4820..31e292630c 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 9fad58ea2c..221a42e828 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 b5432f4684..0f2fcff6af 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 ce112640b9..3f753164ed 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 52323a16df..a119be2fc7 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 d8bd3c234a..eff3c0d33a 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 4ce3d664b5..95d90808c0 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 ff38df6219..1a66d8a859 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 9632e79cf3..aa7f56d77b 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 a0018d5bc5..eddc62a61b 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 6dee7a0342..6450892051 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 61e86653a4..272619cced 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 4f6f1e31cd..4c6452f363 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 7851bcb636..bc4c866ff0 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 f8204f7045..83419258a0 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 a061158f6e..eda095d14e 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 1221a296fa..3398f3b480 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 a1d220bb9a..1523ef5dba 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 ab73c3885f..60e9a7d7fc 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 089ed7da5d..0a297f5071 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 8f844cf9e2..a2e422b147 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 a64f67809b..fdf6ee551e 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 760b0e742d..000f7e6b08 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 6aa7757aac..42c2601280 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 ae0228238b..c8d5ff7945 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 4d32ebc1df..5459818a92 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 c8d1e765d9..7f13849bb3 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 3c11ab8b7a..d666c792e7 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 b07e9ff7d6..c313a088ff 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 65fddb310d..e6aecd9ab4 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 4eaa84b631..7390173f10 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 1362bc6101..5af2ce475c 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 386c3c7507..63ce297738 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 43ef9628c4..6fe2402e9c 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 c4301851bd..cfe2c44d28 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 b4f71e32cf..98d500278a 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684958; cv=none; d=zohomail.com; s=zohoarc; b=boECxTuFU7f1uMc6gYw4llOpxzEtkT6Q/im/LyEl6Y9uhQdX/WN0LCRJVeHo3NrDdJIQbKejtljz2Gcjojk2UFUq0lz0jw9i+Q3r/o2xc/wa1r+kC5QtjB9ox/7/iUkarU37L142Lh7mIQQvI+YGzee9qYCuzqUTcjYLlzpr14o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684958; 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=9Mp8BiBSVdEYc0+9oVuuotBn7iphkJ1Zxzn3sgGCr1c=; b=Vz7YHgpdICDod5lhcNw0RurOp+POwRAZlMRTf0r5d4Odwg5Zp/TMLAF3+m+dZ7HUZ0BmxIhHtNloaJg/SOPZMpM5n3NXEL/6M7hCznAsBxScBrmkennK71uV3+zGfigrfsef3PIr96xBnZpZd4iyOunCBa6I171DgfduBATbd7I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684958557621.9177232914467; Mon, 17 Aug 2020 10:22:38 -0700 (PDT) Received: from localhost ([::1]:38332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gLi-0003wh-SV for importer@patchew.org; Mon, 17 Aug 2020 10:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGV-00031c-FK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:35 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGU-000614-0j for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:35 -0400 Received: by mail-wr1-x430.google.com with SMTP id a5so15256162wrm.6 for ; Mon, 17 Aug 2020 07:37:33 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Mp8BiBSVdEYc0+9oVuuotBn7iphkJ1Zxzn3sgGCr1c=; b=kkv/Q3zOKVQQbtNrfctFlEG4IwDtKtJWjOAW6vL1uwwyvYw0TPOEiw/QP3ULzOtiQk DAWE/WiXLRft8TyKdhjlzbMNTMr2CYtRqWQyw/uicSwGLr0qBnOu2RJ585adAFM7nrqj fRfLTJb/B16dNAOo7WTqLxwDlur5g84IGgyTAsYyjME4j47jmeNOCM38oG1Z0SyZI4bn hv4qQ0sY4sTxfaMeYPdjkU2D2oPu1LoqLBfNq1hEJjhrKu8rBGLE8+SO4Bzt6ZzBEUr+ y5LpLmc1t8QGgHh76OOMHR/xZiQgPQTzvqOuaWZj0Nw3VD7f8C0fuKL/wP5gQz2dxs+8 7a1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9Mp8BiBSVdEYc0+9oVuuotBn7iphkJ1Zxzn3sgGCr1c=; b=YX5WtPibfUc/ymY7KOdKiIk2mG18ayF08sbI3G0tqKE2M8EZ5eOcIIT7a7qsaXy1Cr x2A8s4V967HJxtK+tA31JR2gfNstUqL3LT7thnPlOxj8RoMOep32T1ME2gIBCyp5GI5y sHGEpmuUnCPOv7tta9F6fyKc9tQv/mM1/7fGo4gviMfVh3+q2/lXYULjAin5LlyrYLNU g9lroPp7Efwi58iXgOINlBrChjJlYyFlvx4MX5kbKAxrt9b472yUt13mjehHasj3DXEq S76BlwDzxVR60ksYbwqutS+AklYFizZEZHZo43zPQfGrUIEBwKPTywQCGEr45EJ3DgAj rAaw== X-Gm-Message-State: AOAM531V1AVkAbF7FmzurriWa66V8YQ24B/U2z3259nH0uK2Y8hm+Xab ENEfWYIgiWNTwDPJsTSaeQHCp6nhxlo= X-Google-Smtp-Source: ABdhPJwKaWus3GCD2XWrO4nKe0g1GXcfpqH1voAtRQnLUz6mL7G8YH7JQxSWC/PPyMq1IZ24Z0haXA== X-Received: by 2002:adf:bc54:: with SMTP id a20mr15634006wrh.227.1597675052444; Mon, 17 Aug 2020 07:37:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 006/150] build-sys hack: ensure target directory is there Date: Mon, 17 Aug 2020 16:34:59 +0200 Message-Id: <20200817143723.343284-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 694865b63e..56ba540a32 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597681821; cv=none; d=zohomail.com; s=zohoarc; b=NaMaEnRdmQ5mGXschzF0rcPbj7DokKl3MdwxTb9ATIXnjI/mq0dH1i0OJwQ6m/s2wKrsWpgIcZuAdAXt9oxY3n9a3XjmgKDNgusLq54+U1VrEYG5msvrYSvBl73C1j1s13TC0opeFVoSBlyA+m4+kGPfzeNGxap/MJzON9To19g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597681821; 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=tjOVdeZdU8flg52xFPrCav0JQnR66QHJMCvoKZaLbqI=; b=SFqztkmj/ifceB8X//ahidW0bymAcDEfRPMaiSs2Hf3foI0mOWb4EnE3uMmZKi4zSMUtfDxGDaEqNMRPO8tYq9j2VyYMy0VEJnzXHE3jmk21ey2WC186gUQEN5Wi0k88UeHC7/AzU/yReais3rhqnMeU4YwxR71qbKR2ZJHtyyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597681821935101.70002623401763; Mon, 17 Aug 2020 09:30:21 -0700 (PDT) Received: from localhost ([::1]:49840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gHp-00052s-K4 for importer@patchew.org; Mon, 17 Aug 2020 10:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGX-00036S-BF for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:37 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGV-00061b-OK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:36 -0400 Received: by mail-wr1-x433.google.com with SMTP id a5so15256260wrm.6 for ; Mon, 17 Aug 2020 07:37:35 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tjOVdeZdU8flg52xFPrCav0JQnR66QHJMCvoKZaLbqI=; b=lkJLWYgU1ziHjtffDr7WqDFe+CbNvJwvVOoAlvSid9EKhip3MBGzV6+NAD23z0zbvm diR1DzRke97tFpHZQSg1yQPx5L8cdp0HOT8aLX6Cq35zT5B4ze+C9uInvR/7VCaRapJg AU7zB4MLI990FxTk4Uo7ijsmTmIWpPMGTCiLgVtt7DCwviC1+H1LX6CwCA0V7iBT1rT0 ARtg9UIU2x7lwS5qgPA3qzrMShiiO4LNpiRjNtfjoeYeMu361FFQZX+PENrJMNsUuIxX Ue3uUw/+6RQQbuQk55lBKjZUewgv1CaK9g4DX87NASsRuuJc/FRadzxTViVY4H5Q/BRL TvUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tjOVdeZdU8flg52xFPrCav0JQnR66QHJMCvoKZaLbqI=; b=Va63tZobA2T2/HI9rLm6zjTSOBGY0JGZ1FM2YleF5MpElSei5h9ipKWBSfLH8Jg+px Osg3j9FQqPC32Uqq7sKXPWbojrk+vhE6mn8rLKzSCfBftSI2ANY7NFRap8GVBEw4G9dj qazoULiDN4pkJ760qktNl/TKmJUYalqN5pgMZRzL/6X3cJAbe5yHcZ718CCigUjIKci+ lTajj80525EjlLTBig7FzKTSFF0r5EIgUwDLWtIG8KklHkD9TTcp2EzIeTogLAsZTuw2 ENJvy97aPeQgEuAcgxrErmnJ7PwjjvG3aQ7uVtHBbMLiO01lfIVnVxXq/I+XFVdTgqL2 weBg== X-Gm-Message-State: AOAM5307m3gvHaJSx6yGT6UyTNYsoBuiIG0jX1Xe1BKMwdUvjgIhLrz+ QTJ+3i6mFMZ4elP3Q2kBU9Jmsib8Cf4= X-Google-Smtp-Source: ABdhPJyxaMvDjLfC4LOMZ6wSyX0n8gnJmxs9OASdbvngYxHZlWYFTRGxIHeI80FfqtgbhvdZpDSQFQ== X-Received: by 2002:adf:b34a:: with SMTP id k10mr15515332wrd.402.1597675054057; Mon, 17 Aug 2020 07:37:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 007/150] tests/vm: do not pollute configure with --efi-aarch64 Date: Mon, 17 Aug 2020 16:35:00 +0200 Message-Id: <20200817143723.343284-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 19 ------------------- tests/vm/Makefile.include | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 2acc4d1465..1c17a0f27f 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 f21948c46a..a599d1994d 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684076; cv=none; d=zohomail.com; s=zohoarc; b=kfGoGD912qN8nvcWUWYu3Y3qrNgQbt4DeUw71P8YE/AwvGF2ZCzRDZhG9AnuGhq0fBJHmXQDAxCApoASo6y6U9bw/vD57P9nvcOjmf6N4VE+OKaNVxH/nmdNXwPgkyUgl+R/BiCdc7h+/fzJ4egq9Dg9Otu/ufuAt1ggCsQyDfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684076; 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=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=kn875T8c/HM1RQWSqbfGiQXQq8eYI4wdUjqoChGyd8QmoQVMqXTVMl46UJ2fbXIJCd/Bi2Viu8HrwEN7grqDoqxOXjPWpQ1sATpRW3oUhS6B5kaY6A2pS78rtc7PO9QZRmwYGBCYG3n3EF95szxLL2fnv7U7cIGMU4IonJ6H8HE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684076056162.7154451088029; Mon, 17 Aug 2020 10:07:56 -0700 (PDT) Received: from localhost ([::1]:58046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gJH-00007P-95 for importer@patchew.org; Mon, 17 Aug 2020 10:40:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGY-00038Y-7p for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:38 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGW-000624-Pi for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:37 -0400 Received: by mail-wr1-x443.google.com with SMTP id a15so15232147wrh.10 for ; Mon, 17 Aug 2020 07:37:36 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=GHwJzBhLxvN6UcWH4Z8oI1fTPJYlHL9yj8yKmbOUmxdVPmaRI0y/9CeX3cP5b5eYaR ZdOFCsYe+6NFs9xlK7Js49B2wDN90OKmurqQpNdLOnJDOYN+6lvOvRzpVrqgGb89kKHJ FEndBsK3ZNf2A3SHIMc9rf3A/ERmMzYznX02MufEM2+b3Xkj0i/ZbFJpRN+5Kes4p2U4 Yj8nmH9+JdqRuZ27YjAxUdTnSnPAy/RYvQpS5XF25hXFViPIoHRnbd2XuiGbOWZbbved 7TgO7iZhCWzLyWPyeBE+6y5G8sdxZvV+DDQkMChmFezYRHZ+sSSZAj+1AxMV7BFwzMIi nUHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=i56p+z+RCCht2K6HyOaJRi6xlDQSSZBJB73velTAIETfkBD8fRYTwhc6X/GEaTgHOL Cal2neGTFv0qs7YIX1GaLA/wPTvdppT3BTD5Rfwdg7jnt9MI67wH7cC/ie+WGo5ib3fT VCugmk8I8Bn6J4mpfag8S5zO+7xJLc40aGALHxNg9MFrsQubgXJuMmOkjCPzNjlW2zg3 i1UrFwAjawTs/ct+yUBpWutTrk+6vfTBmVkgyTEPLYl+X6P8/ysBXZJ0Un+xRZ1+9m33 jEd6KMncjZJ+2P+f9X+tODWhwvUhQ+1e1Jny/nHOa+uSj5P0ErlDzk0jF7daGlCjRZTV vsCA== X-Gm-Message-State: AOAM530PbXzY4lqGQIKwdViViSlaShv0yiuxIoOoYctwTdVNodXLZfyE ZxpWyGTsnTpDeynKTpUk1u7adbv0Vgk= X-Google-Smtp-Source: ABdhPJxPip/B2KuRuh3proc42ILhNhX0/nMSkFfT4RMnIkN1xKw5RPayaBWnyfTvKlZpGkZMEWLZhg== X-Received: by 2002:adf:fb87:: with SMTP id a7mr16895687wrr.390.1597675055246; Mon, 17 Aug 2020 07:37:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 008/150] tests/vm: check for Python YAML parser in the Makefile Date: Mon, 17 Aug 2020 16:35:01 +0200 Message-Id: <20200817143723.343284-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 1c17a0f27f..625c14c500 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 a599d1994d..257e2edbb3 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684152; cv=none; d=zohomail.com; s=zohoarc; b=aoUDnsbFLXFuFuCjXF0haIc30NNlbZBSJJRUoxeMCRFYvKeVLVwOooDacdGMFHoC9vHRfBliFE9T+Sp7T3c49xECOSu3cO4XMqhLFVyvDeZ85HQJ7TjlmMCKyJ8fuZBvVBmRInlUWWpGDNXs6XxRTT9fjd2thDVzXL/ie+AL+rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684152; h=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=wCwinYbY8KogL6MVGmLHlxl2ZdviDPrAvyQ0cEAXXVE=; b=WYoTEexP0KmAtd7CCcUAsvip7W6Pjps3uPo7g1EqpoDNxnJnu7Zr28J+srbJAL7SU26XmeFzlnrnuYhSTUJtRPoQIErJ9SbTnq2iRtqiMe4IWT+go6Ut6f2l0bVYF9swkLbL3UDNWdV/p9YIOIo4I6nk0Z7LCBXblNlxE1+MqIY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684152710129.45923063612054; Mon, 17 Aug 2020 10:09:12 -0700 (PDT) Received: from localhost ([::1]:35490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gL3-0002cL-9y for importer@patchew.org; Mon, 17 Aug 2020 10:42:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGZ-0003Au-3e for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:39 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41606) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGX-00062A-JD for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:38 -0400 Received: by mail-wr1-x441.google.com with SMTP id r2so15265574wrs.8 for ; Mon, 17 Aug 2020 07:37:37 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wCwinYbY8KogL6MVGmLHlxl2ZdviDPrAvyQ0cEAXXVE=; b=SnM2WhZCF7UbZWerxNmXCHsmOIUGopXrFz4dEFHx8gOubTmFx/O8Y7ReK0lKwqr2tI WGP/09NTZ3qFYWhbCZSlMlBflwb6AlmFiAHCjYYXl6SEpyTJiZgD+YFvi48A7lAYzseY 0lSBVSInKfN/DWvRhFGnSm4oOH8iim11AOKXSxArAj2SBtLOYQxV2y3vdhMPXiEX4aKx xTFhmw6gW9VMZauswrL+YvIE7HzJMqYBHQL7OWhIO8ltPDPjIQ9TI4SG8SN2hJQ1hJOu 9wS1WpYzb+WbS2fLIPapJBEf/Rr9la7nOtXSOOdNa5hqU2ijfShfqsNpON9nzndQboYf 0Ngg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wCwinYbY8KogL6MVGmLHlxl2ZdviDPrAvyQ0cEAXXVE=; b=d9xwaES8GJd+oN8nfUimhp2/U8U1Lu0Gf9nnvNe5kJ9jxvy7aWoSvNh8qGQ9bHKrF3 Qiu89MBP8MEDFJ9iI8cfKImDkn8Cl29HTnCBeIFbl0fKU5mR0PJmDu8laSGYRj5Ng7pb QZaFoEQN38e9yyngEmgLpRTQ4R4ocnWv5TWme8rjECOdRsKjU8oKO8SMjpTDGKjyW+q2 t5xar2tLYD3PydNNCkVtZ/XHHQHIM6zZ5nnzgjlEyuSVp21CgkavNfYJm8Xb6uVTEuMk 41FLIY1MREQy64Em3OY0/GMLwucug3+QdfbThC91XNb8o4JjB72eoaCHu0Zk3wI+Io4Y LhOg== X-Gm-Message-State: AOAM531+1rfzgO0BzRR205+RE8y916iQ71pcAAfKLYkX6/Hus2siVL6f E3kImDUwCDHTD7/1iPAVFP4yFOfNcPE= X-Google-Smtp-Source: ABdhPJxqEK14PqrZNthfoSXC8Awvr4ocMKkHEsmY48ptp27ytKxVNY727/ROYIDvo6INghTh1brLRw== X-Received: by 2002:a5d:544a:: with SMTP id w10mr16075543wrv.317.1597675056008; Mon, 17 Aug 2020 07:37:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 009/150] tests/docker: add test script for static linux-user builds Date: Mon, 17 Aug 2020 16:35:02 +0200 Message-Id: <20200817143723.343284-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 0000000000..372ef6fac7 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682960; cv=none; d=zohomail.com; s=zohoarc; b=eOlcgalGBjiKkk2TqChjY1fAlhxHnQ3vXLDUeQr+9GXrg2/vxanp67keAfDWGM30J3yZ1A/rrKvb4QmqLMYapqECSQsXQiUiUwCddORl3kLgdsoGt52dzeUjS8q9PQe2OdLCx+Q+4EuDv/NuVkGpgl2/a1/IwuAoCr/oK51UoyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682960; h=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=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=PZdorL7NHjTT34JllxEPeMmpka2X1NdkViXO3au04tBhflIhcxL1GY0G/jbasxiG2b1ZO50N+J+4ZBKnrfPZyZGh5n+aM37VSfcmjeEnLTK7uY34QU15Fz4tMrhhmGRiIHLH2Ob3ME9OX6Y5l7HB6dO5Z2DNvVMbM5K+1Mf10Q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682960925415.9988685546749; Mon, 17 Aug 2020 09:49:20 -0700 (PDT) Received: from localhost ([::1]:37980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gLY-0003n1-RB for importer@patchew.org; Mon, 17 Aug 2020 10:42:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGa-0003DF-1S for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:40 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGY-00062L-Fq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:39 -0400 Received: by mail-wm1-x343.google.com with SMTP id t14so14085328wmi.3 for ; Mon, 17 Aug 2020 07:37:38 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=lQZfoWPjHU4Pjkx4oZ6oS78TUARb4S8WhEQBh+bEPzB88gP+rlXUGn7IFL5TsYXW8+ uIYqtZoeZmbJ50So+/jdCPitt5qX+mRLA8kBGo1KnN15sOHFCiKtApKPbyILfdS3jwMl J55wY3Jvzo62YZzddpMe8LltqCi+Hg9INQQTZKAdaMRxgkLFzvvIXvLHjvhJCwv9GHsX eqJd+9GsNViwwsT18KSFqA3jeDBOPDxiNauDo5dNE7W8yunCpKCo9lGd1xKjfwAMB20N zGZD88d3/16MqyAz0HR7BNtRExfdgorprk0WIe6rmPEbwAXq7pI+ZfuPI2rzHom8JEJ8 a+OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=T86s+L18HuyRhErHMBnbQ6dVZxdlWJJ2pknV9IAgHTU2V8TOslet6UUSyEZkoyZrIL 3nxSCqkvsn73J+7PwkLxrLG21tfmFsdFu6zlIRGJSEQUyGn0ggroAXXrba4pxyliXIr/ bfNhZOZYrWQvYVFfSmEDEn9PBLdyy9ZrxocB6YQ81/xTfw4W6cGsQeakBFaKJ8+fd+OK TCQSYg459ZzvSGjCIykOUPh36ToK5f6mduXx06vEj+ngyBpb6HAcp4zaStWoLV/ZE05F QYucBtBBsmHJt+/jaCeWCXdiqjh3qHWsxVPh6R07yIKdoZVlVwsi4hHQfNEU+Txe72Uj K/4w== X-Gm-Message-State: AOAM530Y+me/vHqG7rhk8Cy+0ZCLzas5Z7t1X4x83npCWgVK7uCZLWto R+WjE+fUJS1bf7Ljf5phJwvPq/8d0NI= X-Google-Smtp-Source: ABdhPJwsZxR3X4qAX6yMpe+ZrUqaryN81A5Oq9RyhsVStuCn7Lo7CoPuwHXE4H4RNZlvEHNOOWaD7g== X-Received: by 2002:a1c:a553:: with SMTP id o80mr14677459wme.50.1597675056907; Mon, 17 Aug 2020 07:37:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 010/150] nsis: use "make DESTDIR=" instead of "make prefix=" Date: Mon, 17 Aug 2020 16:35:03 +0200 Message-Id: <20200817143723.343284-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 f237ff899d..9d9478205c 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597675484; cv=none; d=zohomail.com; s=zohoarc; b=MfeLmSOfFLaaH6XuDPY6CjzVb+p67fV9Md0Ok10kNL04I/2Hct63cyln/NzXfRbnvrC6LBn/wGdxV2K/6OLTnGkkd7D0iYLL+9AedGKZDWnUfKp8RWU1ELxG5C8+rhkKFEfamLwDSfuzH1OIqpgjRAM++LgxT+RHkH6eNiSHCNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597675484; 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=pyogagIogekxmBEBJdMiIgfbzL4q1hqCl4ySl4yEPBY=; b=h/IeaA+rFNCW+ai15r/Odba32CBQ5AXQ3ub7TAs5IB+pz+shL5clv1Cf45GV9Cht+Snt1YAdXs2vRwzEsfo7fxmw5XO4gvrejoQ3N8ZSALt4LcNup29VScXSEtpI3iEBlw7VpRriGcDDCgt4l7PoykcdERWFj3bNU/oDCB5kIGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597675484759897.5701363790405; Mon, 17 Aug 2020 07:44:44 -0700 (PDT) Received: from localhost ([::1]:46562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gNP-0007O8-3R for importer@patchew.org; Mon, 17 Aug 2020 10:44:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGb-0003HI-AX for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:41 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42834) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGZ-00062Z-Pc for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:41 -0400 Received: by mail-wr1-x443.google.com with SMTP id r4so15222529wrx.9 for ; Mon, 17 Aug 2020 07:37:39 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pyogagIogekxmBEBJdMiIgfbzL4q1hqCl4ySl4yEPBY=; b=nFwYzU8pw35+LOD7sRVbNUWZ/Ll+FdoHmfZoUf3e/xzgJ3gY/8SKJ4UMHKlfphG9OH Bg9WOcOwPu9iPf9ZXNQx1DtYHAk56jFjvwHXNTIN3A+HfKxIq/HGogcvrJhIwW09WpDJ YJ6O+8T6kh8N0FzHdK+onRSDV629LoqKqi9508qKKzYCF4pqX2+T+LwAeU7Zqz0V2gwz tliwI7IhjYnbnah0TPeK2+TXW8XR8ZxKhU113doyrHHiDZaaPfPaaffMgwebWqw0FVH5 kR/b6IS0z5j7eqD9Q9qITBqA70q9ZoBOwQySWOXHWiO+dRizW5XG3yJDwNpypvCDGZZ7 CZRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pyogagIogekxmBEBJdMiIgfbzL4q1hqCl4ySl4yEPBY=; b=SKYiHl1EfY5BIRRKJiwGu9bfyBmUFQ6EuXYyupP+lig6IbwypbLCYa/XQu3d4g+RaR JjswSddv/5Zp6eeG4x+hWVvm63WSAwOB7lj1XITJdbulRkVCGAzFZPl6rRlRVhtnhz5L enCDj6TiYRpIErDFy0NNeMWwbESGuDguvgwbuBof91K9j0ZTALFhEcdeOiQrLsgAdQvU tGoyKWlmKngviQNZzTTTZJN4fMCVT6+CgKsF+cPHz+cpUjq2k6clrieKlhjKAFPZy6J3 zkiR9iAGdJ1ircdgBKPdOGg+OdV5k/lzUYFgwiEIdaOF3Ai2mKt/z/vl4Y//RzUBIHY9 0vOw== X-Gm-Message-State: AOAM531fpjHNPMw6+aK4NvHQ5HVqpZVOaP7mRS7SDzOoQSTJMqBpG2kG 2KX1jdUb0azRk2ta/UN3P2kcR47iNwc= X-Google-Smtp-Source: ABdhPJwXnWTOIB1ifU2gcR/t08c16QNwWSqgxhNYmhy9auCxEr4N5UZrtfcDDSVRan+8CKhh4gDFiQ== X-Received: by 2002:adf:dfd0:: with SMTP id q16mr17183139wrn.60.1597675057950; Mon, 17 Aug 2020 07:37:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 011/150] configure: do not include $(...) variables in config-host.mak Date: Mon, 17 Aug 2020 16:35:04 +0200 Message-Id: <20200817143723.343284-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 625c14c500..606c327cca 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684048; cv=none; d=zohomail.com; s=zohoarc; b=ApIafXTakL70xvgb+90QA35hcqG2fNjy3DSVJv9tWlObke1EkP7/YLFr0GA+ZLWzHCcXQOXDjvsrNoeuIIqS9c1BATaAnkzo8UWpeYLg+BL+fM5V2ycFTYoHb1aKxRSm+C4qS1NyHcPNUAVLktqsapBNNRA1m8WTxbFfsDG/I1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684048; 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=mQFyJVdpVjaE0U+2hL8BlOmtacuv/C9XnPeWiNd02zw=; b=gt8N8OqPIJgnHeDl+xJoEAGijGXGor21/KKjRn9ICnJkxAlHq77yue/x0jMt0tuz8bVf7Vk6DIy+TK3meCAnh9qMNtKKTeqjPcGIP/9WsCT9v/0c7QDDFEFFi5lQ2LMUo5x7nHWJAu2qbtN2W38RWSGv0q400xIr2BUWtZYwKgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684048297770.2037313013242; Mon, 17 Aug 2020 10:07:28 -0700 (PDT) Received: from localhost ([::1]:50274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gOH-0000Sb-KL for importer@patchew.org; Mon, 17 Aug 2020 10:45:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGc-0003KZ-BR for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:42 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:36391) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGa-00062k-RZ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:42 -0400 Received: by mail-wr1-x42f.google.com with SMTP id 88so15280672wrh.3 for ; Mon, 17 Aug 2020 07:37:40 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mQFyJVdpVjaE0U+2hL8BlOmtacuv/C9XnPeWiNd02zw=; b=s21N8Ng71iQSh2RJwjvDHgkUUQHFOlS+j4pw+826LodvnUGoDnNYAl7dutEZhjmDQQ u8kFvhwlMMHpl2cR/QOD3Vu356IQrql1/EmtFaLNZLzKwe8SnTto6h52qX47wsUY0lyc fgDW3F2+Krz7tPfWl8Mmf81Ddu/yR/OhuLnspx0BIiHxO90rLdlxIZQXq6fQjUrWyI/a dkobRooohz3Y4LNETaqh9MBAFFsq63l2t3Z5bOT3nVa82z2zCIZqZX4jR3sB7gO/WmK8 bg21H9wCR0DVa7czrfxpv9acXaYIWM7Q/D53Q4d3yjmSPza/IHQ12mbSQ7pJKzivUN0s 4U2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mQFyJVdpVjaE0U+2hL8BlOmtacuv/C9XnPeWiNd02zw=; b=m2Wb8sAszY5ftlbxAR23k1yQPYRbimI86DEIkbEclEu/273xcOxXHh6SzY5GRrEGZ9 b4Valgg2lbrgV7ws96x89rZNssZaxPJHKpnfMVDj6OL00CSPNY74v8+AMC+4awjisx3H McMNprXvRQUt2d9ivSvh1JOgzlz6SRQYgsi+fEbH4AMc3qYUyi/vWTk5F5ZRBz8Qcdjb xbU525r8ZI59Cj3OdB3ORLDr8FmS0Y33j6nrgqAkcfNmevns2FNA/n6XDcUfxU1jzII0 PLwyeDPL34K5FZ9gQGXFYqfN5arAn+oQ6gEJncZdFZlQR3rxzmhrD+IDgLIO4av2NLpm sFHg== X-Gm-Message-State: AOAM532c/bJOP2kMGVAacYxUUsCNq9LRaEvv+WxhfjN1Bfs8TwOuVXge 0hgTTI94W6VGUxG1XGvXo7kWaf9XHKw= X-Google-Smtp-Source: ABdhPJxzfK3Oe6i/7d2iiB1y91jdJr+vGrUIa+wSUP96msVx/qg90/gDAQ1nE43VjJ9rueYfWh9D/A== X-Received: by 2002:adf:92a1:: with SMTP id 30mr17126918wrn.56.1597675059100; Mon, 17 Aug 2020 07:37:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 012/150] configure: expand path variables for meson configure Date: Mon, 17 Aug 2020 16:35:05 +0200 Message-Id: <20200817143723.343284-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 606c327cca..373bb22287 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686776; cv=none; d=zohomail.com; s=zohoarc; b=kxsUDq5EM/iPaRn5E0NQrpjuZ3UmZ2roAKZv5u0QbarO/tf7w+dDH4ess+Cuefe9o4SkyzH8+AOXL7lbtYzHDs+yY6Bj+kZ3AKwHXwsx61AVUezM13yjANQyTVy13jmUND1a3GlTzXznnF7Ck411JF9rjrhJX5sCe9K7Pb2EZZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686776; h=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=/9cnuSUY7R8bNQaayK9fc2xPxyOR/SLBtuCwfgtQfHE=; b=dCVci5pAbpA0Y0wjXBOFApW/qsquHAIN3lT30uNSgVX1iKDFUIf8SdMYwYoONoLqKyOwEjg8M/EltDjowlkjE3jtcN1k9i7CGKT+2AtFLuwNr7XCki4YPNUBM/2UaeuTdrSHI8DoNu40LmnQGdP9Q+/ujHw6KaRz6f3OxrvP3II= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686776535924.7438603320979; Mon, 17 Aug 2020 10:52:56 -0700 (PDT) Received: from localhost ([::1]:46176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gNL-0007DW-To for importer@patchew.org; Mon, 17 Aug 2020 10:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGe-0003Pq-3d for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:44 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGc-00062z-8B for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:43 -0400 Received: by mail-wm1-x342.google.com with SMTP id c19so13336431wmd.1 for ; Mon, 17 Aug 2020 07:37:41 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/9cnuSUY7R8bNQaayK9fc2xPxyOR/SLBtuCwfgtQfHE=; b=QOVXyLfKuib9NWz2UcsaljMUxvne7kMB3ZlBVD1YN4vMXhhHOMWmElV39n+iLdUCUl VyQlt4Kmtz80cC36M3AdnTyLPAfMoz5Py2SxiJgjYEwtt2bkaRzuZ949dBGQZvMFBmPF UNILR5ElOWPCbffAE6/XGi4XLvcPya5KoW2vL8W1Q/1RixO2pmKqt2NHnrtuZ8B29xj6 QSJb9eYTcpzKoF999PeSroDPFQHatyNiVbk9SteXVICkYxRxGVHGctb00p3ye+Kry0qx c2WU67TJ/Tq8tliJU0ubrB/nQhlw5QEiBhpGZ67KqANFQifB3xNd3bl1WgeAEKOEI/mZ +bng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/9cnuSUY7R8bNQaayK9fc2xPxyOR/SLBtuCwfgtQfHE=; b=HZQU3AtPDfDoPqX2JyMHOhTivX0YdmJCib/Y8rREQ4/GJ5evEadTAKM26ewXo/DeRS IGVbEVAeODulDojWo/vy9L3H1eO7vZuq4isasuKA1dP1URgrc3fKPTP8RFKP5hhcPMbG EKRB3aT7Va3muUEPS1l1aQue63vk0tFr+40EAGCTCE5v8K8rj54vBJ2etzHnPnmGPAiY RatVKYX18FbHZGw7yYnAAnRK6G56OKD/HwCpYqRtibNmnjzRf7rKHgPeNnzCnnqlXMFL JLLqvu4FaRD+21KTBNATBNBIQhA1+sBXnfFezEekMIFAFKVgpzFQRBJLeA6lpVemDXc0 HsFA== X-Gm-Message-State: AOAM532HnAOKxP38+OsWpbegfrBLB7Oob0BFTwuZ/eN+fL1KgbRK7ASS OIIf9Bayz0GS9zdZ01COWzpPEULoLCM= X-Google-Smtp-Source: ABdhPJzJ0/KHh28M51v0YGElJLKRlje9x1XcMoyPl6aBBIwr4CRLGF7zplGXtC5nLaAOyO7xOW3Uxw== X-Received: by 2002:a1c:1d91:: with SMTP id d139mr15365508wmd.144.1597675060345; Mon, 17 Aug 2020 07:37:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 013/150] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson Date: Mon, 17 Aug 2020 16:35:06 +0200 Message-Id: <20200817143723.343284-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::342; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 78 ++++++++++++++++++++----------------------- rules.mak | 4 +-- softmmu/Makefile.objs | 2 +- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/configure b/configure index 373bb22287..42f0c1c20b 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,28 @@ 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 + +case "$ARCH" in +alpha) + # Ensure there's only a single GP + QEMU_CFLAGS=3D"-msmall-data $QEMU_CFLAGS" +;; +esac + +if test "$gprof" =3D "yes" ; then + QEMU_CFLAGS=3D"-p $QEMU_CFLAGS" + QEMU_LDFLAGS=3D"-p $QEMU_LDFLAGS" +fi =20 if test "$have_asan" =3D "yes"; then QEMU_CFLAGS=3D"-fsanitize=3Daddress $QEMU_CFLAGS" @@ -6782,7 +6795,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 @@ -7874,7 +7887,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 +7974,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 @@ -8430,24 +8444,6 @@ if test "$tcg_interpreter" =3D "yes" ; then disas_config "TCI" fi =20 -case "$ARCH" in -alpha) - # Ensure there's only a single GP - cflags=3D"-msmall-data $cflags" -;; -esac - -if test "$gprof" =3D "yes" ; then - if test "$target_linux_user" =3D "yes" ; then - cflags=3D"-p $cflags" - ldflags=3D"-p $ldflags" - fi - if test "$target_softmmu" =3D "yes" ; then - ldflags=3D"-p $ldflags" - echo "GPROF_CFLAGS=3D-p" >> $config_target_mak - fi -fi - # Newer kernels on s390 check for an S390_PGSTE program header and # enable the pgste page table extensions in that case. This makes # the vm.allocate_pgste sysctl unnecessary. We enable this program diff --git a/rules.mak b/rules.mak index 56ba540a32..e79a4005a7 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 diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs index a414a74c50..c036887500 100644 --- a/softmmu/Makefile.objs +++ b/softmmu/Makefile.objs @@ -11,4 +11,4 @@ obj-y +=3D memory_mapping.o obj-y +=3D qtest.o =20 obj-y +=3D vl.o -vl.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) +vl.o-cflags :=3D $(SDL_CFLAGS) --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597685708; cv=none; d=zohomail.com; s=zohoarc; b=neJQxFDadFaMX8oVDZf42ibR4lkyu2UUP8cKtzPIWHjWtBJ+lzFuLpRmBnAa38rZGv4hBtiuKCxnZkpwagaTwI6DiPhvx5x9T00RDq0UrYm55K9+QNUEuzclBRe26++v0z2c5xFi2DXbQafSeJ23lvEmBGj0YsQ0BnskD+l5XL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685708; h=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=rgLa8OOgysOf7Sl9OK2QDbGQukQVDXrVrkDaQKpgc84=; b=ByNkhsAsfxr/wnSarBTp5ICULRqUCZdjtGdQS59LOS8WcBSIbWzV7wglCkN59w67llWgc5NpiB3er9xCgxegixXVtAgc02kM2NdW8VGjx7TkiAl3xKEIjq2dRqr58lvDJbMRnOwYzUeOLipPkFQEakNQ1/lqzFVcbERj5Hrw1Cc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597685708686318.1552260186471; Mon, 17 Aug 2020 10:35:08 -0700 (PDT) Received: from localhost ([::1]:54962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gPc-0002V0-Sx for importer@patchew.org; Mon, 17 Aug 2020 10:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGe-0003QE-7d for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:44 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGc-000632-NY for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:43 -0400 Received: by mail-wr1-x42c.google.com with SMTP id r2so15265803wrs.8 for ; Mon, 17 Aug 2020 07:37:42 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rgLa8OOgysOf7Sl9OK2QDbGQukQVDXrVrkDaQKpgc84=; b=WDdu53j1/HqGCSmA24j6T2i6BO10XlWivf8LT0NGawMq1hj2RDeAUQXEdHuzJVLzTc Fe+Hp7UAQ9J1dymtnH1V7ALC3RbZ2QIF6ogMPYcQhKWhhBBEz/m+rfwkZa1eNKyK34A1 nAApt+HUCQY83FttnmFwWaK6xm3ZeeS0Ij9ZaMEMsgfpUxZskC3X/4PaWtt2D8UQdWlZ v8919NHp/+DyjXEIm8u1Hj36Q/Zb75MNBebmxj2b4aD2NvmuQYBLMuhoIEggrktXNv9l E1fDqpoG0AOYwl2R9xuyPWKryb1ZsKJLrneQ1JHc6ZWL8Ays/4bP2IdTJBGXio+fxlkM YEwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rgLa8OOgysOf7Sl9OK2QDbGQukQVDXrVrkDaQKpgc84=; b=UURCEV7bs34h5/d0d11p2XWJJ/p8V7wy7AI4ohTZzwFtpF75LSBuhKFJDT+82Y+7QD a/FKslpHuzsviFPJOUiPVgofppH+2XUT5j2UWOps3X+K4xT9Qqbufeb+DOVwUfvOe+oM JTH2ZZhka9HNZq6vtGVHWAxTQa0eOlZOTz9xX+kEzz0cbfgGZsYkIctNcr92XiWeXVIK C989y8LZ4y9F6WpIgtRPhghQi4QXENtzGqTgETYsuOUjyqF9vXjdh1ib4mq1xcxiJA9H QBpPMqsEAuRZytJ3H67AP3p7cAOZiPxwN5q3ydRFd2T5xO9iyk4cJYNNvg4nSB7cEWr/ MITA== X-Gm-Message-State: AOAM5328yFW7+fwlufqdPyOaVqbin0HJ1k+mM8H6ZdGupbtYgHKZXZb2 eb+QHuHiwURnhJv8mv3cn+ZRLoJqZrE= X-Google-Smtp-Source: ABdhPJxqQdGi6zhP66UvnblEr48QUQKDlhgpmIrAp+PAdmdp9Te3pWF/kqh4zXtJ5fWhpFVG2xJXpQ== X-Received: by 2002:adf:e704:: with SMTP id c4mr16990308wrm.81.1597675061038; Mon, 17 Aug 2020 07:37:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 014/150] tests/vm: include setuptools Date: Mon, 17 Aug 2020 16:35:07 +0200 Message-Id: <20200817143723.343284-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 29252fa4a6..b34b14fc53 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 2e87199211..93d48b6fdd 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 dfe633e453..7e27fda642 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686775; cv=none; d=zohomail.com; s=zohoarc; b=KltMkM3hwVK5yEx5H5Bw5HeKLDiuTrSqD/2KhYo2d3Bxe85aMEoDAloorOz/mZUB9WXIN8UPKXG5kHLtJj9q47F67L95I6kdpNGFI3WnN3USq1BoyxTr7rp6dcRCe8DD8nBAgdWlDP2xv9evcWmOb1BEU0R5kpYs5vhv332YnS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686775; h=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=Qavq21WbbuBMO3afAWf+vyPAAax7TKE6cLfGUEDN2HA=; b=Ltup4SACT09ttezYiQlMA7whZPGmLJ5KmTuHx7dBehg8gUbQOh/ZqFItDVsOxK9oTBAnKFHpekiV3bgj54BWc6598i2uK2Rh7o1lkcLl8WZoy2CmlUB3E2CjbKBXBbVGQyeLEhd6vaJHEpXGWPadfSWh0KYz2cKm6bpD/QKrXKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686775252686.0524880314654; Mon, 17 Aug 2020 10:52:55 -0700 (PDT) Received: from localhost ([::1]:35070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gRL-0005sJ-Vh for importer@patchew.org; Mon, 17 Aug 2020 10:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGi-0003c4-Gm for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:48 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGe-00063E-Pp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id t14so14085665wmi.3 for ; Mon, 17 Aug 2020 07:37:44 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qavq21WbbuBMO3afAWf+vyPAAax7TKE6cLfGUEDN2HA=; b=ClsYTp3QOeuRRjwtkXRgx+GuiJ8hr+cCQrAwo1oCCMS8uYB7ofE7fYifnbv6sCmE1r SwlZ00bPPl5OylETTpoJdpP8zrrnlwJ6VnmiuKumyPYsfpP6gkFCzUZo+PDfur0lk8wo X+OU0iXzIfSJVFs/h42mUH93BegpXK2DrsN+SwdaIDl+KSdTtZNH7lE3xwUVNcnLoOxO c6QJMyjkDBAYMaolnUdcnroLOqCokG5imamlBRixJ6u7a6RDi2aHjFx846MhNPYyqCiU Qdbk29oVr0XI3Y3gZFFoXIiMo7XTuVUbYkWVvi3O3/EBtYSvX+sGGinafCiYGpeWEmEE EKjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qavq21WbbuBMO3afAWf+vyPAAax7TKE6cLfGUEDN2HA=; b=QFgLJNjW1g3ce/O/se/PSm9OMIYOiTtazeH33kqpvfQue3YJYC/J5HhWxFajMxd/2I /Uex1Z2YmHdkcXsN4K7AJBbIDaY6eGTywDQgB1pI20CPwM1XllNg+3lOzYRyv0XN2C+s fF3IM1s9nUnWEiw106mHW8WSoa8mBhj+QfcTr5fBk/tEVAo/jDi/hn5/7r4ILYHjc9+/ Eg6IaYlKGKMJKthbB2rKi9NbPS/MJeLnjvr//nScm6AL8stPlInM2kTUnYqG2myAYNFJ TEy1BVh1Q54+T2xv9xiMLIEL1T8mn+cYhH6s8/ykx5yk+nJ0M76EtYqTyMt9ALXpuaZn EN/w== X-Gm-Message-State: AOAM530hqA4MDnf6OQ7CoFQwQjCqBytTo46b7bG7J8ddqPBFOhLsYceS 0odOgvKDIs1MEHQ/jVjgphBEgsf8pKE= X-Google-Smtp-Source: ABdhPJwKICYxgWvBD2H+n6LtQTZaZ066OZNafqonrdjyNQn18A2koOphSpLK4x9Zj1Kj7NpK4JCW9w== X-Received: by 2002:a1c:2742:: with SMTP id n63mr14566745wmn.24.1597675062311; Mon, 17 Aug 2020 07:37:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 015/150] configure: integrate Meson in the build system Date: Mon, 17 Aug 2020 16:35:08 +0200 Message-Id: <20200817143723.343284-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, PDS_OTHER_BAD_TLD=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 41 +- configure | 43 +- meson.build | 24 + scripts/ninjatool.py | 1013 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1101 insertions(+), 20 deletions(-) create mode 100644 meson.build create mode 100755 scripts/ninjatool.py diff --git a/Makefile b/Makefile index 9d9478205c..bf66df5893 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,20 @@ git-submodule-update: endif endif =20 +export NINJA=3D./ninjatool +Makefile.ninja: build.ninja ninjatool + ./ninjatool -t ninja2make --omit clean dist uninstall < $< > $@ +-include Makefile.ninja + +ninjatool: ninjatool.stamp +ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak + $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@ + +.PHONY: ninja-clean ninja-distclean clean-ctlist +clean-ctlist: +ninja-clean:: +ninja-distclean:: + .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 +82,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 @@ -762,7 +778,8 @@ clean-coverage: "CLEAN", "coverage files") endif =20 -clean: recurse-clean +clean: recurse-clean ninja-clean clean-ctlist + -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t 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 @@ -799,7 +816,8 @@ rm -rf $(MANUAL_BUILDDIR)/$1/_static rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.= js $(MANUAL_BUILDDIR)/$1/*.html endef =20 -distclean: clean +distclean: clean ninja-distclean + -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean -g 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 @@ -807,6 +825,8 @@ distclean: clean 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 + rm -rf meson-private meson-logs meson-info compile_commands.json + rm -f Makefile.ninja ninjatool ninjatool.stamp rm -f config.log rm -f linux-headers/asm rm -f docs/version.texi @@ -933,6 +953,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 +1028,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 42f0c1c20b..f99baba99e 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,16 @@ 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) + +if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then + error_exit "Python setuptools not found" +fi + # 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 +6518,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 case "$ARCH" in alpha) @@ -7955,6 +7969,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 @@ -8565,6 +8580,28 @@ 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 +touch ninjatool.stamp + # 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 0000000000..598b32d18c --- /dev/null +++ b/meson.build @@ -0,0 +1,24 @@ +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']) + +if host_machine.system() =3D=3D 'darwin' + add_languages('objc', required: false, native: false) +endif + +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 0000000000..16496406c6 --- /dev/null +++ b/scripts/ninjatool.py @@ -0,0 +1,1013 @@ +#! /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.stamp_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 ninja-clean ninja-distclean') + 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-start') + 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]))) + self.print('ninja-stamp-%s :=3D %s' % (rule, ' '.join(self.sta= mp_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] + depfile =3D scope.expand('${depfile}') + + if restat and not depfile: + 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.stamp_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 + if depfile: + self.depfiles.append(depfile) + + def end_rule(self, scope, name): + # Note that the generator pseudo-variable could also be attached + # to a build block rather than a rule. This is not handled here + # in order to reduce the number of "rm" invocations. However, + # "ninjatool.py -t clean" does that correctly. + target =3D 'distclean' if scope.generator else 'clean' + self.print('ninja-%s:: ; $(if $V,,@)rm -f ${ninja-stamp-%s}' % (ta= rget, name)) + if self.emit_clean: + self.print('ninja-%s:: ; $(if $V,,@)rm -rf ${ninja-targets-%s}= ' % (target, 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682879; cv=none; d=zohomail.com; s=zohoarc; b=Vv7/k9wCXvre0A9kTZ9n9++OPXoQEyKZJp6dqU29aLjuQn7+xoee+2EjgBvjgn+T9AvUhh3o7YF49OOWnbBxoFi76bfXuNrQJ1Slb4l921FhjxVb2D+n5y3X80EqaCd5hKn9tZ1Wt/iyfORBB+OGAuLZJCN4DG3EEJGTqepM0Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682879; 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=v1AguchhlgmoLPXUlF2TKI6VdFVr+arnC+mhG7/d0Ac=; b=EOEe87zJ/uzfS/cvBL/P/faO3zENUqAHke7xTPZ3iRs2BS61t2LiY/powgb7wZStGjVAoSYmiN86YvFuGzAohBa1oqVSj0PAr9bgGFC+JnqP+6u7jJr7jfjuE9FiyL1owVVRm0c5WBUbkIHTDg8erOPC1/HvabpTfLKZ/ZUPk28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682879421708.9559889999325; Mon, 17 Aug 2020 09:47:59 -0700 (PDT) Received: from localhost ([::1]:58724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gQF-00042U-5z for importer@patchew.org; Mon, 17 Aug 2020 10:47:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGg-0003WH-Cz for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:46 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:33571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGe-00063J-RN for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:46 -0400 Received: by mail-wr1-x42c.google.com with SMTP id p20so15282098wrf.0 for ; Mon, 17 Aug 2020 07:37:44 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v1AguchhlgmoLPXUlF2TKI6VdFVr+arnC+mhG7/d0Ac=; b=Jb8+JRaGdLvthom2BJLr2o2bNmokGtmKSPmLPW9xiVq6uh6X25gDccPpYleJrDxyyj UEZna2ynDW5WhwmTcHs0jUE1fdt5Nj07NyIHolAIIC8R/dPa53bFrU0aosx4QkfzjpyG +ai+DxOGX9yelvpy9WHvsT1WuGWg5z3TSV4Xd9afgfdOwIVvTvtdlveZW97uKzwkyzTq X995OSx0Qu2hC13gmekRAyr2Zr84rH7m1EydbTwnFXFauLM4f2Pqll1e9npZD/XUSig4 nnWmIAyRWHbGlVUGL7jKesYspeL/lL8wGV+BAobNOPg4J6ninyKrzw+iAt1Cu1JD3gop 4y5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v1AguchhlgmoLPXUlF2TKI6VdFVr+arnC+mhG7/d0Ac=; b=mr3wOreMkwygdNGTnVe56Z0xL4xivh2hH+qopqLntZ9zQD68Hn6peO6bEDjS044Q9h 3nmGhiXTEjClXi22ZSM9NnX0wzMYWsvDAvHoq1kaL6E9qIXL4EezkKj0wWjEDkdgsklE CDGp7xd02uBqmLvLGoDCaSWzdE+qjZBiyRefUiRPUe2uP7UopUD73DctyHLKMCqeJG4B W5xYWyoWkHTtGUOkAh2VLInCqUXjnn89SCAJiOJ23Z2XLI6C28M7er5ZDM6feV7Cwxr1 sdRGTUYPPmwpJ9I6ugwAuXiHsQtQW+JQ/ZXsgh3K4BcuSvbxRZKo08L4FH48MB4fcvTz wChA== X-Gm-Message-State: AOAM532KxS26krQ2a1GAKKnpWVj9Ke9k4/3hkdKz3l4dvVo3Qh/J2FFz iUWl58LtaZxh6du7NhPhHvxUuGNYFC0= X-Google-Smtp-Source: ABdhPJwrFUh5hV+S/fiKU4I+CKicW3beEM8xbtuNaxv7uhXMHDyydxSuqoP7x9KkpOyl4jJhm1XtNg== X-Received: by 2002:adf:b353:: with SMTP id k19mr15503324wrd.159.1597675063261; Mon, 17 Aug 2020 07:37:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 016/150] configure: generate Meson cross file Date: Mon, 17 Aug 2020 16:35:09 +0200 Message-Id: <20200817143723.343284-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 68 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/configure b/configure index f99baba99e..994e9844aa 100755 --- a/configure +++ b/configure @@ -8580,21 +8580,71 @@ echo "# Automatically generated by configure - do n= ot 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 "[host_machine]" >> $cross + + # Hack: Meson expects an absolute path for the *build* machine + # for the prefix, so add a slash in front of a Windows path that + # includes a drive letter. + # + # See https://github.com/mesonbuild/meson/issues/7577. + if test "$mingw32" =3D "yes" ; then + echo "system =3D 'windows'" >> $cross + case $prefix in + ?:*) pre_prefix=3D/ ;; + esac + 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" \ - --libdir "$libdir" \ - --libexecdir "$libexecdir" \ - --bindir "$bindir" \ - --includedir "$includedir" \ - --datadir "$datadir" \ - --mandir "$mandir" \ - --sysconfdir "$sysconfdir" \ - --localstatedir "$local_statedir" \ + --prefix "${pre_prefix}$prefix" \ + --libdir "${pre_prefix}$libdir" \ + --libexecdir "${pre_prefix}$libexecdir" \ + --bindir "${pre_prefix}$bindir" \ + --includedir "${pre_prefix}$includedir" \ + --datadir "${pre_prefix}$datadir" \ + --mandir "${pre_prefix}$mandir" \ + --sysconfdir "${pre_prefix}$sysconfdir" \ + --localstatedir "${pre_prefix}$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) \ + $cross_arg \ "$PWD" "$source_path" =20 if test "$?" -ne 0 ; then --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682919; cv=none; d=zohomail.com; s=zohoarc; b=DovWrH5vDyGwFNSGcZ40wLs28dVreHLpBM1IIQQEDWdbLFAeCVC+5uLME6VLEGQrEW0orq6KHr+4Npm3XPbi9bGn9rvD5zTDdE8vmCejk8+hAfujAb0aaTyR2kotLQ25kIoQ5de0QE2gzG3uvSaquhF+16Fa2QSMGGUzrjlfpec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682919; 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=dspYanX3zf7a9yxolnnruaw1M3atSamdkc1hvEVqzGE=; b=X5PlwlWPydwf7TpXotGZQt5xBDBEqeMjumCN2v9c78aZlHhkbJMGoaEb4mflJNH2N/hgxpQCKwYnS9ebwWdFnLu5sVerWnzQvA+6pDZsd3i9oTL8RB9bX5OfFBskOthxzZrUS/aZ6lL6qPL2BvtTbeVPvRQ+cB7FUD23vyXbVXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682919571996.3538483508892; Mon, 17 Aug 2020 09:48:39 -0700 (PDT) Received: from localhost ([::1]:54588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gPZ-0002LR-Du for importer@patchew.org; Mon, 17 Aug 2020 10:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGh-0003Zq-PV for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:47 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:45580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGf-00063U-PU for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:47 -0400 Received: by mail-wr1-x42a.google.com with SMTP id z18so15240511wrm.12 for ; Mon, 17 Aug 2020 07:37:45 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dspYanX3zf7a9yxolnnruaw1M3atSamdkc1hvEVqzGE=; b=bVS4MP7OD0Kk3M6bl9iuuY6LTLaC1GxovV8fQcQrNNUOcjQrWdf/TW9FLIG8uMCRIz vwBHSGcdXRuvK0VKMKf7+C6iryNR5ysVY9Vx3X3hKfyBr3VZDovLq8oL/YVRM4V+BhOd nQNYTVYnq67KAedV3eH1+mGvtZ1TxOY8aG/bRob2OblUmonunBeJK2azHkhbL/PSuFBt qpqkajgNXzRF2oDVjbOcqY7LeCwec9a7qobxQPhRKF9uXdqD4nwXl8MzEyO1NmDR5N1k CVkQmGEQ9pBYyejfoFKGLNqeIsfHCC3SXq+pLLfgcHfaojLN6tUB59WEoVcNae0kXGkk 7YNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dspYanX3zf7a9yxolnnruaw1M3atSamdkc1hvEVqzGE=; b=oJtzsiK2IyW2Gt09LO8l9hGimvZk+cr6NB2VXCso0zHQCT5+tXNJNWpofT8+dMks0G FtNkTyAjBIRVdBmRAMfgy4T+FoM+u/812WNxJMFoe2Y3KZIPNMw/7Q6ZLqh2fOtBQJo2 XYp9x2AtCVpFfYyiGMlYT8208eZ6sYyhqBgZRr23lIbkqtRzVU+IMB0SOvQ7aY0z6Ax0 9wIngiNuQrLBKD4pxDZ8O5HEjG2FuT0vodLhg6nD18yFYFGU+jVvuV+TRrPrImZMqiPl 6jTwgz67ripdQ/VIeT2ZBiTTVh3CGyfC1pZIDs6yPk9y5OMWnqych08Q/3b5MEZM1P1S EluQ== X-Gm-Message-State: AOAM531d78I+rzIuxW6nuxwqgBzSCexspN+GsnTn+9pt0CQzvN8quJq5 9vBm6PWSVpV8ZvhKairx+9PUzk5wlzc= X-Google-Smtp-Source: ABdhPJxm18IhDgtyUK3NJHGPa/63dgzgkJSxxgTCMOQB849PF+zBOfwO3bGZmrUBuHOLo4l7hHh3CA== X-Received: by 2002:adf:fb87:: with SMTP id a7mr16896296wrr.390.1597675064179; Mon, 17 Aug 2020 07:37:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 017/150] build-sys hack: link with whole .fa archives Date: Mon, 17 Aug 2020 16:35:10 +0200 Message-Id: <20200817143723.343284-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 e79a4005a7..5ab42def82 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597675488; cv=none; d=zohomail.com; s=zohoarc; b=SHXfJYc/jTwe5SwTonNlgxwjYhZBQavqx9AFEf433LGErGHLBA2QUaPvj43UB8wDfANUvQZrewOacZ3ilB1x8e6oZYR6lre84Iw1WvJGO6+5IQhfzg53GDp/GmyGrpwz92CLNTCHvgTVbhUdBRDuqVOqPlY/BHW6dpH2X8ouG4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597675488; 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=A7aT8Lsvyvguxpc7XKTthGOqaaTVf42GL2XpGYgV4Bc=; b=nKrLcqciXMBSlGcQYNEUP4R5RsnpVKc3G3Aa8YMDlshl37boheCAZOkdggCPbHmGRrN6JN/FDxSkzSn7fuRnwxhWk2CIMieu39j6avf4DjMnK03gVjr1vWHSELwAYae3VCgPogbDF+NZpI47lKXiHJb9tX0OFH0eAdFn7eKinds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597675488175105.41139040064809; Mon, 17 Aug 2020 07:44:48 -0700 (PDT) Received: from localhost ([::1]:46888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gNS-0007WL-Ky for importer@patchew.org; Mon, 17 Aug 2020 10:44:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGj-0003f9-HZ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:49 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGh-00063h-Fx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:49 -0400 Received: by mail-wr1-x441.google.com with SMTP id a5so15256919wrm.6 for ; Mon, 17 Aug 2020 07:37:46 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A7aT8Lsvyvguxpc7XKTthGOqaaTVf42GL2XpGYgV4Bc=; b=LLOaVJQn96NjmAzOMVxfB7eXeARoiwoZ/q/JdKXl0RNx1ThXgVTCYV49/JLrsIQo9P j2GNHkN/zlXBYrxMDU6MHenXoOiwdL+O1tY4A+KW7KTqFKN8eX5eFaTg8xbI17fv4XhJ 1ygsnQ/T4ZKjPlLYodfCoobnah8gbIQyOL5akgkbU/BDtbTXcJH94ZaQcBh3RHLOSGdM szCgt9PZnQ0xGbu0WHTk9k92Nrl/Hckivuiqhh5ncX6YuPvnZrLQYiIwB3F/8uGOM1FQ I+9+m5D+zQQwfVqPZfJ5K5JoIPuszqlU4U9eg09ojjt+RG4kTpVFHQ5nSTafB5FgZBuP YKbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A7aT8Lsvyvguxpc7XKTthGOqaaTVf42GL2XpGYgV4Bc=; b=lZYiginnBX6HnC268DyyhykfTKUYd9py4s7sNCHrTZ2kD5OPs5FKplUJwwD/2/oZa/ 094LJIAIUKpJCYf+Df8ZcE9gVMjNzno7DKUeTTF77xfcFMx80daJkB3legAbyb7ekN5s VT4JuZv6bVqakbVgAY0N+2B8ES7uamU4f6MGkT0dykpSq11z30OutaHqbBss5faOBzVL R9RpGdgOdtkBizA5aS7APByqGFSlzz09KWKa8EbiF2jrOUhmp5g3VOiGCKcuJnFmIKQs WzE9XZdYx5vif6jq8ODHGqw6dbfpS5d49kUviJ5SMoqeNSoQodWBY9PV92ySXJoPJP8Q LOeA== X-Gm-Message-State: AOAM532HvFAy7Q88GvV1GHtAk8EQI2tKqIbYrvmgNKqISKbnst1WKmlu qDm5X6OiHljDLZKwYhHZM12TNxRtUsI= X-Google-Smtp-Source: ABdhPJy4RdemsMDT4TtB3Dq1coeHJoDQPPN4KIjQYmMo9kuC2teB9QLXJ8/0eE0bz1ldDW4EuMsjAQ== X-Received: by 2002:adf:efd2:: with SMTP id i18mr15254882wrp.32.1597675065663; Mon, 17 Aug 2020 07:37:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 018/150] build-sys: add meson submodule Date: Mon, 17 Aug 2020 16:35:11 +0200 Message-Id: <20200817143723.343284-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- .gitmodules | 3 ++ configure | 73 ++++++++++++++++++++++++++++++++++----- meson | 1 + scripts/archive-source.sh | 3 +- 4 files changed, 71 insertions(+), 9 deletions(-) create mode 160000 meson diff --git a/.gitmodules b/.gitmodules index 9c0501a4d4..ce979398a8 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 994e9844aa..45111a619d 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" @@ -916,6 +935,7 @@ fi # python 2.x, but some distros have it as python 3.x, so # we check that too python=3D +explicit_python=3Dno for binary in "${PYTHON-python3}" python do if has "$binary" @@ -999,7 +1019,7 @@ for opt do ;; --install=3D*) install=3D"$optarg" ;; - --python=3D*) python=3D"$optarg" + --python=3D*) python=3D"$optarg" ; explicit_python=3Dyes ;; --sphinx-build=3D*) sphinx_build=3D"$optarg" ;; @@ -1978,15 +1998,52 @@ 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 test "$explicit_python" =3D no && 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 + else + if test "$explicit_python" =3D yes; then + error_exit "--python requires using QEMU's embedded Meson dist= ribution, but it was not found." + else + error_exit "Meson not found. Use --meson=3D/path/to/meson" + fi + fi +else + # Meson uses its own Python interpreter to invoke other Python scripts, + # but the user wants to use the one they specified with --python. + # + # We do not want to override the distro Python interpreter (and someti= mes + # cannot: for example in Homebrew /usr/bin/meson is a bash script), so + # just require --meson=3Dgit|internal together with --python. + if test "$explicit_python" =3D yes; then + case "$meson" in + git | internal) ;; + *) error_exit "--python requires using QEMU's embedded Meson d= istribution." ;; + esac + fi fi -meson=3D$(command -v $meson) =20 -if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then - error_exit "Python setuptools not found" +if test "$meson" =3D git; then + git_submodules=3D"${git_submodules} meson" fi +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) + if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then + error_exit "Python setuptools not found" + fi + meson=3D"$python ${source_path}/meson/meson.py" + ;; + *) meson=3D$(command -v meson) ;; +esac + =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 0000000000..d0c68dc115 --- /dev/null +++ b/meson @@ -0,0 +1 @@ +Subproject commit d0c68dc11507a47b9b85de508e023d9590d60565 diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index fb5d6b3918..c6169db69f 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686281; cv=none; d=zohomail.com; s=zohoarc; b=DCBajuwCgHUmftDw+dw2T3pAMEw+m5bo0sI65jM6BEDXxq2S+kcxS3kCFFcjD6jZ0kASAM7yAwe9KabAzReIPLTdvmtqi1/atZR/wYQQG3saFinTkgXJb4JRHhRh3GWTMFqO9/9/snvvrzIt67Tlhg93zxiplH4msa5ZahZfuSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686281; h=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=kSCt/GneYlTLyTTFTzoZhd7T9PYsCWYFxNxdM95qa08=; b=RR3lv8AXnQnysyYGiyXV6yy8+MINUbmV2vrwbKZHeiv0cI4Mi5DfmjI/KqSA9rJbSnPy80akHs2Qos5cOF9BAah3M9xA6F1Cyi9REuciGAQ8qIyovAoG0hwHA6Aw86XFHG5FgcIctRlLbFFUrkUMGtP0YanLDkWn4dPV48WgA8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686281399306.62308676570615; Mon, 17 Aug 2020 10:44:41 -0700 (PDT) Received: from localhost ([::1]:38944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gRy-0007Ut-JL for importer@patchew.org; Mon, 17 Aug 2020 10:49:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGl-0003l8-Kp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:51 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGi-00063t-Ri for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:51 -0400 Received: by mail-wr1-x441.google.com with SMTP id a15so15232841wrh.10 for ; Mon, 17 Aug 2020 07:37:48 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kSCt/GneYlTLyTTFTzoZhd7T9PYsCWYFxNxdM95qa08=; b=FLdFuiqChMioVUF6/ZxqxG9xyB5cGvLt99HSqHzUJwktbh4EinlhRG1dwVlEjwaGBE IjRIWu9kyTfOq+7QAekqn0shCw+4daaNw+bgqZ9t2jKcK+K0OAAAFS8FoaP0TKeuJmx8 Izg1GoLWQ6Il4TFOZggEo6Gi+qa3UZSlGJz82m2l1vTcxtFfTNpABda9pgo0aKgJ0Ftw pcj9YV328KwgieMNsyBCSPgkDckFtrmewpzO9+I0KzcGLgx2DOKky3sTvTefX9ZErIIi NIjvHWv2I296IFDhQeYTtN5XyKsNQxhjZjNVDD4H4wxX59/A6HBzqCWrLp0iMvEVqdX3 xn4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kSCt/GneYlTLyTTFTzoZhd7T9PYsCWYFxNxdM95qa08=; b=pTg+1tgZjsjW3U+p6Tqi7mDzPeZDKyprH+w02kvE4QSCRQaTnfdKHAzCAMz8VQKHEm a2GsPHiQJ+xvlwb/kjuGOTt9/PaunGF5ccYJ8VXVfrpDo5uSMWeGTdoBIuKeKvdQRXEm Jr7/dd/XBJVNEh4iIel8mZ9F1D9qW6dgTVS1gu+ISHTArwByZbKA1l9oOie7vb9oh9RQ 7lRkXXqSsr3l1p3b5+1aEsB7Oj3BeYpKuV6V1iL9DaQurrS3JntK7Rfdz7/hJIMlkFxY exSKxrwtPQKl9GO4gU1wyCxM927AyAOuwzlK88hVwJlAis6frSawCgNgUVjOl4MqOdH4 Hw3w== X-Gm-Message-State: AOAM531tI0OeBGDpjJIGoSwA1AKMWSh9O6Yy2TnEb9No4fLD9WOsE9Y2 MSfNKygtV9szyqxmfVaQsBuBXqVM7Og= X-Google-Smtp-Source: ABdhPJybaDuWEadt7nHDOd8PrpeLd57Qe626xPutiTFp9PqRsDHBv8yiUAVrVq6PYSMqkXivwfTdcA== X-Received: by 2002:adf:92a1:: with SMTP id 30mr17127458wrn.56.1597675066633; Mon, 17 Aug 2020 07:37:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 019/150] meson: move summary to meson.build Date: Mon, 17 Aug 2020 16:35:12 +0200 Message-Id: <20200817143723.343284-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 237 -------------------------------------------------- meson.build | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+), 237 deletions(-) diff --git a/configure b/configure index 45111a619d..7bcc9704d8 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 @@ -5272,8 +5256,6 @@ EOF spice=3D"yes" libs_softmmu=3D"$libs_softmmu $spice_libs" QEMU_CFLAGS=3D"$QEMU_CFLAGS $spice_cflags" - spice_protocol_version=3D$($pkg_config --modversion spice-protocol) - spice_server_version=3D$($pkg_config --modversion spice-server) else if test "$spice" =3D "yes" ; then feature_not_found "spice" \ @@ -6890,225 +6872,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 598b32d18c..d3b1f4b503 100644 --- a/meson.build +++ b/meson.build @@ -15,6 +15,8 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].sp= lit(), add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: ['c', 'cpp', 'objc']) =20 +python =3D import('python').find_installation() + if host_machine.system() =3D=3D 'darwin' add_languages('objc', required: false, native: false) endif @@ -22,3 +24,244 @@ 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').cmd_arra= y()[0]} +if host_machine.system() =3D=3D 'darwin' + summary_info +=3D {'Objective-C compiler': meson.get_compiler('objc').cm= d_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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684765; cv=none; d=zohomail.com; s=zohoarc; b=HXFQh5LhjvOy2qcljmPzkXIJVhiYvKxxlj/I49Ox+YqkuP+prASSnJeY1gdYDcFSpC09bOSore6t0icASaWaQi2AwB2Iy2FMNmlmREtnIpFJOxTgvhNW+ZUTgRT4njO6tc03WyFJyJMb1ucouUFGFtWcSzjiPCXhIO2i6WfXtE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684765; 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=z41Kpgt+yU4SOPCuSOOqqnFemAYvfNxaLEX2fcjYGAc=; b=Y28oVA7X0v9Cv+ZmIrQHT6luGpWCd6Jc29TiHcIgRdELUzXq7TLiffCkkH88SXOMhDSJw2u7xq4O+kMPls8a/CxzajraLlboz1yTl4CG4yibkDYN2BvMED6XNZbxq2TN08bQ/QZFjWl91xdvtD0fA85e5TFNv/ykWD+PeKFkPr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684765899108.34093320687464; Mon, 17 Aug 2020 10:19:25 -0700 (PDT) Received: from localhost ([::1]:34872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gRI-0005nT-5D for importer@patchew.org; Mon, 17 Aug 2020 10:48:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGk-0003ig-QN for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:50 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGj-000640-8Q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:50 -0400 Received: by mail-wr1-x42d.google.com with SMTP id a5so15257010wrm.6 for ; Mon, 17 Aug 2020 07:37:48 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z41Kpgt+yU4SOPCuSOOqqnFemAYvfNxaLEX2fcjYGAc=; b=IT7t/oMVNHUp260IHFCt0kgpddtSDPEyfcqdiZskhcuBFyEVLJtd+BJptsFjfI27gD wGdITdda0LUUqq6DZfPeR7V/fIvpNDsVWmLQ/NCppIpZeSrtyibwAcOjJpWZw8v9Ha/E 2rSLmoW3smRUVO5WZHEg+9U5aOsDbVBfIGb7IFzoDUO0ck7hOPBQvoynJBoGRMHXjSEk ksprmxATFcPRL0UHLC+zVftGxMiAzrvB/hPFrG83z2bKPbtP6f/tuOhKmAN5+BBghXHL xm8O12ayYcHzR513bomh7U/Z8gikDd4fFZ7aHY9EYwoBoZaxcj83tvrQX5/c6pRz7gdr 7E/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z41Kpgt+yU4SOPCuSOOqqnFemAYvfNxaLEX2fcjYGAc=; b=LK3GTW43AAj/YYZQdfA3/4ZM6/Z68osSrR6asdvwdH6Qt75nU+j2YO70FpmAdkixQ8 iA1h/pA+VMMwsjrcD5Y+D3mmY7687rQx+EP7oezA3LF3OJG/htht2EAzUylpX0A+QhPi H/YtmeKt8+Bju2dtHceYEQi5pSKeF427K6WZ//KBlDs7zTqlmrU6IS7pcDi5gEIvbmx+ Gm2uydR9IA2aUQuGsHwpz6yEb65YX0tPXza4obJVaau2uLFIcHDmytAsRQIH4+SFBDm/ +31d9qGJ0g4FNLRY5iFFtWvjxOgPqzMTE98MexKI8LztFUe0VC8LD5DbFpAafIveFYbN uOCg== X-Gm-Message-State: AOAM530Fy59Q1e2qm1g/sMwzh/kmYCWD+CFMTaXa2j1J+aGjHnFYsBs/ XSD/FGam6oDww9pF2RjFJO5/oVx3/ZM= X-Google-Smtp-Source: ABdhPJzqQ3ZVvyegasg01Nk1sUapLtcIpTCEWAwr1k0YymnY2fYU7qfp12xt4iGJVtgdv0rlUs5PyA== X-Received: by 2002:adf:e647:: with SMTP id b7mr16942384wrn.220.1597675067740; Mon, 17 Aug 2020 07:37:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 020/150] meson: enable pie Date: Mon, 17 Aug 2020 16:35:13 +0200 Message-Id: <20200817143723.343284-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 7bcc9704d8..dcdf7312c8 100755 --- a/configure +++ b/configure @@ -8464,6 +8464,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597681655; cv=none; d=zohomail.com; s=zohoarc; b=lTXy9HOlmx+eNgzp7qfFXThBPot2ah4+X47HwTvVev85n596/oQtTdl22BOXi8yDgJ3UhvEdB7uKiHeWpMMmV/r65aDYqKrpTBDf3msipYHSjFLGJhEL8d/7gyqlapDGlpCVHwT1afmLSm8QC0DYSGTmfL2iXWYhmwTOdudGHtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597681655; 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=F/wQ36U34280qL2K1OxdmvgUNjncr7As1uiWfdy1L4U=; b=g18yRcsD4g//XBkC1jTK7vXBVq1jtwi3GhveYxmILNYbqdkVsIwhfqdy0NcXRi2ZoLGfJxoIw85AnqQJe92A0VkZp0axP/oX1bmr9lIlqW8UBh+OBC6oEjSiOokqsDdSylhevgq3b3xHe2O9lWv9jCCLZK22RQOni+OhXJV+P+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597681655407500.13762053360665; Mon, 17 Aug 2020 09:27:35 -0700 (PDT) Received: from localhost ([::1]:47486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gTP-0002eL-LS for importer@patchew.org; Mon, 17 Aug 2020 10:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGm-0003nL-I6 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:52 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGk-00064H-Fe for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:52 -0400 Received: by mail-wr1-x42a.google.com with SMTP id 88so15281188wrh.3 for ; Mon, 17 Aug 2020 07:37:50 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F/wQ36U34280qL2K1OxdmvgUNjncr7As1uiWfdy1L4U=; b=Gmr3CWaCajvl/MJxDhzDGSpqMbyXJ3s/rzTuZVNYtXfoRNVq20VLCDkCcc9e1IgzHq /Kod41a6ap3s05n1k/2HowGn0UciP0UdrxGrtYNYFTpDFUvhKEloQhhHpvhOvekdGY3Z QSroYDCFtKrVQNZCB/3rHE8voCJoiY5O48eyEcGyhvAgMN8M9Tq5rWt0qGkzPfvyxzfw P4iLdPHToibOuDeIP7PMUSL00mve3+f5iY9y2b/QRlyjKcTvWdVUPZn4CJnB+QaAM8c9 cakkk8TLnmaX9dzmij2n9dqTRBpjfHipddlTX41NZx4vUtx5CgnP7+F3dnThAvomtSvp NQrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=F/wQ36U34280qL2K1OxdmvgUNjncr7As1uiWfdy1L4U=; b=DyvOaBtKmqOXGat4OOR1CWRrsaWy3LU1nFRfmXDirsa3OX6lP6cPbVfrppDlS4QUrY Po1c93whHWOhI+YTjf3EeWSiMH25vIqp4SMsXADTcoYRRRKhE6u1NvK8lyF9OAVOfLlK A7V3j0qzbKwGTA/UV/GBodwM9wo2dtOMakggvRlPU9y9dykKBxSsXPOu8OmU8UW85PVJ 0Q6m3oRTWAT8cA9pbsRfDsJLytVFPI1g0HfORP+qvCdvvDvz0iFF9ARJBqle1xjnfi/T E0YADXB92hkJx0+8oPowzI3psqx7GF4mzxcdDHi/3y/FLHtmAB+zSiLyKZJ9BahlLXhf zzew== X-Gm-Message-State: AOAM531/0BwfG8+3QzqB4g0AEMX5jHhtG5WceqXnFiypgB9FvLkb3WrV Ukdy1dTcF6RN3DyNE0vuPuWjbByHwbg= X-Google-Smtp-Source: ABdhPJx/iZPJe66KkJud8vRgLlrZWoZbGAza6Djmu5RihCaMEWYjL9w8CCfYuaPaHqx7Za7bfb+mLw== X-Received: by 2002:adf:e704:: with SMTP id c4mr16990880wrm.81.1597675068733; Mon, 17 Aug 2020 07:37:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 021/150] meson: use coverage option Date: Mon, 17 Aug 2020 16:35:14 +0200 Message-Id: <20200817143723.343284-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 bf66df5893..578aa99942 100644 --- a/Makefile +++ b/Makefile @@ -770,14 +770,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 ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files @@ -1284,9 +1276,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 '' @@ -1297,9 +1286,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 ffa2657269..d61a6a978b 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 dcdf7312c8..9f20bf1d36 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" @@ -1009,8 +1008,6 @@ for opt do ;; --meson=3D*) meson=3D"$optarg" ;; - --gcov=3D*) gcov_tool=3D"$optarg" - ;; --smbd=3D*) smbd=3D"$optarg" ;; --extra-cflags=3D*) @@ -1817,7 +1814,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) @@ -6551,8 +6547,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 @@ -7837,7 +7832,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 @@ -8465,6 +8459,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 c1ff24370b..a4264691be 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 d3b1f4b503..e6f9dfb070 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684998; cv=none; d=zohomail.com; s=zohoarc; b=lam6IWmM8leTEJOzfBHjlOnhCkdaXI34qd6TdIoK20YEdDCneASJtawx2D5n2OAPOVd87/3pLsZM+U4kzDg3n77rsZTBOJ8u+ah2IW4WPE0r358ZMltEN+OS5aevRGy4s4Q7Ebd5ZbuuytoPt86tVq9FzyM4im1H8WsCQOY93Bc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684998; h=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=pjHPdTSEtllDij+zXCCOkgSX4mQ0mNOLN2bMHomzYEY=; b=H3guxyB9q7ZfqCr03fGahJOZxNCwBz9HeUwhnqxp6h7pJY5GAiujRC8WN5IN/J7suQ4SSOFe1+4k8hNkB6qaTLcvgVUsr3LnUmPA0l0SjXBBlhX2rjVuZFy3roxo0xtgbIKMYl5jb+F69l61an24CgbKbI/m2QEqTZAiXo/rCxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684998802120.58234423412625; Mon, 17 Aug 2020 10:23:18 -0700 (PDT) Received: from localhost ([::1]:55694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gUn-0005ya-6e for importer@patchew.org; Mon, 17 Aug 2020 10:52:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGm-0003ns-Nx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:52 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGl-00064K-0Q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:52 -0400 Received: by mail-wr1-x435.google.com with SMTP id r2so15266270wrs.8 for ; Mon, 17 Aug 2020 07:37:50 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pjHPdTSEtllDij+zXCCOkgSX4mQ0mNOLN2bMHomzYEY=; b=L167BocW5B37/ru9Q8OW8GKUCYY6FBFTccRI8lyDI2+teCrIuLo37TqSNTi1OD0mzV ZwMWZkhM/89pa9yTPlzpUnP6UhpHK7XhNNSl4j9jxKQsYlTWuSW1fhQ54T/3t4ZrwbyA HKha10FNROB6m2mee/xwrc7+e71JuoG/6V7fjGoKI07z07phv4Ek2KEa5OCyWSTrcxd3 wJuz8blNbOqAzQGBhoTlGg7Qjtzw8BxMB3wcR8DXxS07Nx35EUX0+JZUJMlF2ufLDP44 FHYpxi3hrArlTLi65c+9N9S1Bm6SwJVX5NAwL4rJpDV2Qcx/3yu40S23WWiMl1um17W5 bgzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pjHPdTSEtllDij+zXCCOkgSX4mQ0mNOLN2bMHomzYEY=; b=GGZToI88abptZPe1gdFGmFxVVVu7affexYNNecHyXOKZiQeNMbnwge89sg9XT2zJW2 25RKNEa8zSgN8u5Sc/2CicYgz3JjIsufSx6HDNBtrzTz1/8koUo7h63sBslWhNxM7vTZ JQZvF6W/Bx4mK2eUG1wvUlktDEWUXDYnURvUxFPSdbxNgXBcGK1d05o50mKfF9pw7Hyd F7u7EsjNG0GcAf/HUqxg+Z3Ck02asFXF8Me3noWWw7R/0Vie2YritLrUEsSxl2x31CDZ FrkIX06gIgI3SKEchQ/tOG9wUen8cVquoAIuQpNA/0PWGHH+ku2bkpFAghHwOT2IyGSA a6jA== X-Gm-Message-State: AOAM5339xEjhmQcCIuCRTu4w4QY/UX4CgjMYa8xaX4F3FuhAvhlzjPUC N48kwWBcMICUj0BI6+/GIu2FjI60Tlg= X-Google-Smtp-Source: ABdhPJzMXPtmypvOd2d543sVK0swn9DW1dxRBx2vTDWNPDbcdzStk7t7zGlgzncRP65UuyqSawww6A== X-Received: by 2002:a5d:5272:: with SMTP id l18mr14149269wrc.89.1597675069360; Mon, 17 Aug 2020 07:37:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 022/150] meson: add sparse support Date: Mon, 17 Aug 2020 16:35:15 +0200 Message-Id: <20200817143723.343284-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 578aa99942..8288e2fbd2 100644 --- a/Makefile +++ b/Makefile @@ -1254,6 +1254,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 9f20bf1d36..d4172b06a7 100755 --- a/configure +++ b/configure @@ -3009,7 +3009,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 @@ -7810,11 +7810,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 e6f9dfb070..e15e072a8c 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() =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, native: false) endif diff --git a/scripts/check_sparse.py b/scripts/check_sparse.py new file mode 100644 index 0000000000..0de7aa55d9 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684907; cv=none; d=zohomail.com; s=zohoarc; b=fkM5Dm2aSm9NjEC5JptDyhVMly96dPzTIK3p8x4lhmhA67yZig4shB/tJdLXETFaIhvdBZti5JR8x6XH5XnEUUDSd8fnYTGTroJz5nw8bpS7p0BkfmlCmPB54o0iDNHTqVCuqxef24jfHDaN+khY1nfIGkNWMUdEcPMOm8Oa1Ck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684907; h=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=2fWHmrkva6tvROSN57DBDe2O0fpTnZMaLKw/ALz8PEs=; b=Z6BIGL3rETsr2qHUey86PUaTAXH8WJiLqmHQckjGneljjKnL4pdt2zaI0YoM8IGBqdFKC5BWKrLyghSea225zye2/2HGjcDeDkhlxPLlioIw781YalP42NoInGmyaUczNM81ZTwG3SCBvfZdO8bByowaR1jJwpF8ZkHX0eMb9Us= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684907715590.1347720544608; Mon, 17 Aug 2020 10:21:47 -0700 (PDT) Received: from localhost ([::1]:35898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gWT-00012o-Pc for importer@patchew.org; Mon, 17 Aug 2020 10:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGn-0003rP-Sp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:53 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGm-00064Y-2o for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:53 -0400 Received: by mail-wm1-x342.google.com with SMTP id t14so14086099wmi.3 for ; Mon, 17 Aug 2020 07:37:51 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2fWHmrkva6tvROSN57DBDe2O0fpTnZMaLKw/ALz8PEs=; b=FVtlytvaAve3GcMDhQdxr5X9toHXT1xvY7A2ZrsL9I3rxDL1pkGjRalXo8+mkP1AOd v2gEmQd07oZLnj4M/9LJZLbAgz+A8bVOAfbhEXqHZ//F9KhY29zmyEBVIP+Vi6N+HFd8 DW2z9YrZyXXGkdrTdAu5qQlLzLKDhb1YohYuADeU47MSHIeG8Vz+DuRjQBgJ0nuu6D7K nsKR6qc3+6VytGdvy9wnjlw8GKuBYksnpNInDpfNkEaz0/4AB9bsb5RVsncGkb3k3yTd sANS16jIGxx6ZhY1jDGlqelIwjXFO3yY1nRIb5Z+gSfZYfq+3T5wZs5b3v2y6786NejY x0LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2fWHmrkva6tvROSN57DBDe2O0fpTnZMaLKw/ALz8PEs=; b=FLhrVB/lymvSfWIirygwO2jyNZ1/FTBvQRy/6Dxp8kb3NoXjhGTJIAKo0RqdfKHCYW CkplnBrsLlaQ/Vt80NPrpSsl8777dAI8MgfPBC1BcEgaknummX0cS5oaOpLdnZ+q3zvM Rljuu9Do/gMVR5CgFqYUCzSLvdlRUNovRdD/9dWtiI9FnpYaQhvkpHBMZ52YpOQZU9GS RSDJTrky/EBlG2FX6oVRX2qX6SBEUUaRRG+4fgZRsCA+8m8+pZHlhjR1+BZQJWj8TrCL Eh9Qk66DGiNgv6j3eiQZF341myTdLHRQzfWCGGYkCNM/XFIX1XvkEZQobJyj41zcGE7V 1Pmg== X-Gm-Message-State: AOAM531ju8t4Zdk/gZaxEZqeeaWr8jbFK3BCCjOK/RE+LPOTHf5adBn7 VdQFMPSsjjue3Uqkxf7aRH8smUHc8ec= X-Google-Smtp-Source: ABdhPJzUkt1qUSPF9/ziSduy3dmFwjfTA+ovErqwarlsYvhXrLA3NeoUnNyDaCCgpiVYv29+ZsS15w== X-Received: by 2002:a1c:a1c7:: with SMTP id k190mr14167969wme.1.1597675070373; Mon, 17 Aug 2020 07:37:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 023/150] meson: add testsuite Makefile generator Date: Mon, 17 Aug 2020 16:35:16 +0200 Message-Id: <20200817143723.343284-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::342; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 6 ++- scripts/mtest2make.py | 102 +++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 1 - 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 scripts/mtest2make.py diff --git a/Makefile b/Makefile index 8288e2fbd2..b4dff89204 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,10 @@ clean-ctlist: ninja-clean:: ninja-distclean:: =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 @@ -818,7 +822,7 @@ distclean: clean ninja-distclean rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -rf meson-private meson-logs meson-info compile_commands.json - rm -f Makefile.ninja ninjatool ninjatool.stamp + rm -f Makefile.ninja ninjatool ninjatool.stamp Makefile.mtest rm -f config.log rm -f linux-headers/asm rm -f docs/version.texi diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py new file mode 100644 index 0000000000..bdb257bbd9 --- /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 +.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 c7e4646ded..ad54100369 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684399; cv=none; d=zohomail.com; s=zohoarc; b=GbthcFtbeQZQGxoeGjA+wMdayGZfAYDKz9ECVDKP/+iZwRbewQUQ9cjQ/aehZPpK4dpu5ATGkvywBGQQxw2F4rpHRbgVd0jgK+Rr1b+cnuE/rmwbyOaKW+FUId5UCzZMlh6Id1A6vpCKWXjLfs0/U+oDP/a6NeOsdJ+IOt3tDPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684399; h=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=A8PInox6g02sR2/AHxDKx9ShlBZlMXO4KPJmCFCaHig=; b=Ya4UjBlMmw4oA5jK8TFrNiHuvSzK3lKog1Jlj2NTvppMaIESKTHMsReQg3mGSsbb8GI+tWYabVePXQF9gK72QzHimh9XI03spzHS9Chskm2i6TC+z8eDr/f6o4vSxJb/+14Nw0+erQnU3cMhsBQPba2HLc+eN+oV/ma7TfNS4ms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684399819905.6810508874228; Mon, 17 Aug 2020 10:13:19 -0700 (PDT) Received: from localhost ([::1]:52568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gUG-0004ip-8D for importer@patchew.org; Mon, 17 Aug 2020 10:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGs-00044X-KW for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:37365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGo-000652-KL for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: by mail-wr1-x42e.google.com with SMTP id y3so15279735wrl.4 for ; Mon, 17 Aug 2020 07:37:54 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A8PInox6g02sR2/AHxDKx9ShlBZlMXO4KPJmCFCaHig=; b=dEE57XoyLx0WUQ8BtzmaeWIaRJaozbuQkHBjUyssNv63HB1LMbDsaZSeIPaw+AIc7E AwktK06bje9rbOSoiFEammPRCpzxaHS1DODpkFvRjA8x83Aav4eqPYeLmji1gyMpqFSc Zx6ZR7fkwxPKJCLy6iWWQh5cN1pXN9PzUieykZZWAG/r3ZHVko1U6C8b+nfSzWSUk1pl z2LN7v1WDdEmoblpChOE+vRD10f7Vv75yejAai1RL92ppTsN2MeZKhOw5imdpFWa/s8S zLbsvCjJ1GXuiqjFaTzGCftee3pOIehgQKAS5t8PtU8M5fxKVEbFJ5uQpG/NABkFSrbj 6pzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A8PInox6g02sR2/AHxDKx9ShlBZlMXO4KPJmCFCaHig=; b=sHTzmCmUfbuihLjteSwpzaO+AW/QBFj63ofpPOkwaZGxEb8hg8BCRU8pp6LOe0p4AW v0o5fNRuDxkCeW3tZRN78zSfRFUBGWIRiajYalXFEOAIcebi/ZDRkKbHAykbiy4m2xxc b5dvZ6UA/fKJgeFAAbZLsR3XVe0itaP68ZjhwH7sJsFFF4yWVNihy9GJKSK48HgVRLl/ ZO8b6JklriG916hgnIfPhX3yxfrgNAb2Y2FKHFu1JTYncjzOhmNU9teXtsRvOJCAyctE L1nIQ7jGeq0/rZIi7n6/XWZnozDNHXNjYk55iujkmw+lV+DCEJdyrdHbCSFz/Qb3/AoA Rv3Q== X-Gm-Message-State: AOAM532cPGunqJgBEzrbqXYowNFZfC2x5wevEDnpwL4G3KeKb5Ac0Sx/ EoDOYsoal8H3HkzevFCo/17hHa6VO5I= X-Google-Smtp-Source: ABdhPJxRiHSQbeN3E+YW7exBQMEwGvK0bP0KGVMmqzPohUKH7Q3G6td2mYE3Hra7GmPEerOJ7bHJCw== X-Received: by 2002:adf:b353:: with SMTP id k19mr15503879wrd.159.1597675071473; Mon, 17 Aug 2020 07:37:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 024/150] libqemuutil, qapi, trace: convert to meson Date: Mon, 17 Aug 2020 16:35:17 +0200 Message-Id: <20200817143723.343284-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 121 +++++++++++++++ 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 | 69 +++++++++ 27 files changed, 588 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 b4dff89204..777d9f8e13 100644 --- a/Makefile +++ b/Makefile @@ -126,184 +126,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 @@ -474,10 +350,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 \ @@ -498,14 +372,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 @@ -619,8 +486,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 @@ -683,27 +549,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 @@ -741,9 +586,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" @@ -756,12 +601,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 @@ -790,9 +635,6 @@ clean: recurse-clean ninja-clean clean-ctlist 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 @@ -1022,7 +864,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 @@ -1233,10 +1077,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 3823463c23..e5c9077517 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 ####################################################################### @@ -94,10 +92,6 @@ common-obj-y +=3D disas/ # Resource file for Windows executables version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o =20 -###################################################################### -# tracing -util-obj-y +=3D trace/ - ###################################################################### # guest agent =20 @@ -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 d61a6a978b..0b323641bb 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 d4172b06a7..ca87955a65 100755 --- a/configure +++ b/configure @@ -7198,6 +7198,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 @@ -7208,6 +7210,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 @@ -7584,6 +7588,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 @@ -7809,6 +7815,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 f1965b1a68..a9885919f2 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 0000000000..1b244315b9 --- /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 cb5f685de9..6144d9921b 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 e15e072a8c..16f92c4c60 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 4673ab7490..c0a31be1a1 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 0000000000..f45b80bbfa --- /dev/null +++ b/qapi/meson.build @@ -0,0 +1,121 @@ +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', + 'qapi-emit-events.c', 'qapi-emit-events.h', +] + +# First build all sources +qapi_util_outputs =3D [ + 'qapi-builtin-types.c', 'qapi-builtin-visit.c', + 'qapi-builtin-types.h', 'qapi-builtin-visit.h', +] + +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 7b12c9cacf..0000000000 --- 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 0000000000..bb63c06b63 --- /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 5ab42def82..7aefd37b5d 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 fc0c8fc52f..e17edc9b9d 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 6c0a5f8d68..c857516f21 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 cfe6beee52..41c0d02178 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 0000000000..35f8949924 --- /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 8a4b220c96..0000000000 --- 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 0000000000..7a2b041247 --- /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 + ['qapi-doc= .texi'], + 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 d42046afe4..0000000000 --- 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 0000000000..019bd79c7a --- /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 c544509adf..a429474618 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 0000000000..f0a8d1c2e2 --- /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 cc5e37177a..0000000000 --- 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 0000000000..5fe1156503 --- /dev/null +++ b/util/meson.build @@ -0,0 +1,69 @@ +util_ss.add(dependency('threads')) +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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687100; cv=none; d=zohomail.com; s=zohoarc; b=N4L4knvuo/dlatGReiu8KAIUSIUV7R6LqbBK6YF7xCFMKJGDDaZaBfgqbi0jOUmRTLQfsqrwzTeJ1PoJZ5qI1EnQoUF/Pr4VyNNX0/02BYeAFUXmEbfvg+zgGEJ6vwsejgD2R0O2vpuYl7NFKBUS28l7ts5Q3l0aWo11oDtSTk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687100; 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=0br65Kmn5xpB8GRXasSxYgnYWTwyOEOqVF8R8HtK98c=; b=NYT60HvuNgTOswnDazHiQjLBYwKAsciqzE7gOoGymTBwPKmd3ThEPp22XIpGzH//6tr6MCUPYBhxt1F5qS15GXrNgXalcLi0lSURIWqsG0NskbcKlGrLjqOjmhxtNtfUhK7qgfazRtgAqkxU+tSiGXnBQMJ71ej7lOgUUilS9nw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687100267497.2310617587017; Mon, 17 Aug 2020 10:58:20 -0700 (PDT) Received: from localhost ([::1]:43186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gSe-0000oz-5R for importer@patchew.org; Mon, 17 Aug 2020 10:50:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGp-0003wI-Lq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:55 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:56085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGn-00064x-V7 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:55 -0400 Received: by mail-wm1-x336.google.com with SMTP id 9so13413446wmj.5 for ; Mon, 17 Aug 2020 07:37:53 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0br65Kmn5xpB8GRXasSxYgnYWTwyOEOqVF8R8HtK98c=; b=LbCx2HLR0BYds77O0AViDe85vyUxkpoKveStiZKaTJ3ekKxt7bNdzvDr3zKIvP78pn liDFPo8Y/pd3ppgB3n/1u8VfVgaAwwkbSR1QSBO0M/c38JN3+IOgOqabxCJKtlfOGjbB Oks7IWGfnZyANtms2HSdBfrXGY0hEzqzLrRSr83JFhwCYngZpBCHaSh58MKZayJl0jDu wY84fDbrajwXj2CWfmF+gLbZs926khLEnWm3gONNguAxYUNx7Ut2iLobBk4B0byxur5y Gb1cToVjPOBnSRnnBG779Yento+KXIOlVDkVL/ICQa+NrsNrBy/cYLNrHWPnPEAoIQgH kd6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0br65Kmn5xpB8GRXasSxYgnYWTwyOEOqVF8R8HtK98c=; b=EBdE7IY4jnIS0NLPGevOMoXg5qAOKeInC8iaav+x4n3qhwlMfofopxUB4JQdJOoYRl bkGKTQtHnkXuThhtA9v8lwQYhqOs41i2i39eREgGiURpSqQZy51BpOsTBMKhpUu73Ilk ojVBUIFhaVdoPmSDvI/FYVmr06c77mb+8oAn70W1/bJKP/jSIVEuKF1leKnpL3AlxWvf yQYWy4Ie508LqzOEHgXkdFSDvdSLGKJSeOUmvmrID2SQq8S/4JNeyeDAUfL8LmiaD2Ya qug/Y2cDa1cgcTwIiOA+w2Au51NL2arvqZ1MeNcnzt69UGREqzD5PH6tdsfwcJCSXTEA 95KQ== X-Gm-Message-State: AOAM531IHxr9FZoAxQQLYTUto0jaHlSRdg+op7CwAhMCHJUyfhKR35OI Ba59ycrcjXMY7PRFQJ99lftB1QI/h1s= X-Google-Smtp-Source: ABdhPJwIUOXyOOgGOnHtGJL9fp0hs8AdAVA5nHznfE4ygO9uXr+s3ic9UWJTCWlNPEMf7aQFCxZpjg== X-Received: by 2002:a05:600c:258e:: with SMTP id 14mr14508968wmh.141.1597675072273; Mon, 17 Aug 2020 07:37:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 025/150] meson: add remaining generated tcg trace helpers Date: Mon, 17 Aug 2020 16:35:18 +0200 Message-Id: <20200817143723.343284-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 777d9f8e13..973e932869 100644 --- a/Makefile +++ b/Makefile @@ -126,61 +126,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 f0a8d1c2e2..cab36a248b 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684330; cv=none; d=zohomail.com; s=zohoarc; b=OTM566JgE3EKyxmB4wJAYDupa21jRxHjNJZNFnGvdnE/LIvftMQuuWrNzfIPBn0gBZz2m+AIRoxDwyJIXRMtPDmbIo0jfdaez3iRXFTrGLXPHQXUksFr5tT7eQIcuG5GaaQavmXA2l08Ht31e4d5OBq1kpaVnm0y2zYSOCSUrm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684330; 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=QVZIG0mdwsjMiMofc5+oO2XHExj/PcaxRAVhdIUfPEM=; b=nvQ0lcG9Yvl+jd1wE99Rga8ijg/bocdEcShMSHBKJy4H9GZTmNiT0BBav052+fItF8z9B3Cjl2FC3LsBDdq2rB5M1k1kM+OzRro0j7oO4FdvCn5nWx/QDQAsmKviadfZ7A2tRcvk4X8Ng8/Ak8bXfInywrm0KPEnPt0/cjhcvjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 15976843302141022.9326733107317; Mon, 17 Aug 2020 10:12:10 -0700 (PDT) Received: from localhost ([::1]:58356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gQB-0003tD-Ny for importer@patchew.org; Mon, 17 Aug 2020 10:47:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGs-000459-St for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51536) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGr-00065Q-3d for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id p14so13423663wmg.1 for ; Mon, 17 Aug 2020 07:37:56 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QVZIG0mdwsjMiMofc5+oO2XHExj/PcaxRAVhdIUfPEM=; b=lqlad71IfRVmKkFnWGwli0kMNIgMqnnIuc5LzLF4JdAt9frvLeqY2oRjFKBk+CgRa6 uzSr4QIZrMuBo9WdwNN2QWoUNTtl49IlpvOB8BwY4nAXjnEhd4vOKltZoBmy6B7QnPXT Q1sgCEuBG7oVLCLHtDexjHMPgSxdS6kpBVVBI2GTmvNZzZ6l/JhOhrflcXf0dGyJRg0w bzFdUaX11lFgVqBd1wzjNHAbSAiAX67U4rRK1PmfnL22z6IDll/lWg+q+r+TzTb2I64L JC1+6Lj75jo6D6kJVbZGPHM2efPIiG/nNHHEggsfjpoZ7sX1KOTVWBfCw5SB8PrbFBzW yoCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QVZIG0mdwsjMiMofc5+oO2XHExj/PcaxRAVhdIUfPEM=; b=ZfqYoaThCyNFLfNr4JHup+yKXA52UR5g7j0OMuBoSrch0EmRkFd3dZyJFfhRV3zPXg nWVKAe0TFH2zrt1Nl5kNfEMbOVt/tEuDfprpd0jYiQgFpXCRpdGHg4UJwTyy7RCpxp0A vW4C27HRaDZGJSlPrxKSpL5ognpMRbyaRB/rJ3a0HnsyoSu0vvQfsNfhx+DTAvIGwAxf AVaqpaex2TjkwGZo5PwabllaPqR3TCSzVDEnG3PGIUE2LB/+cxBhDQQuzJQD6Ks/BaPr oDbN5ANvf5IeEHuwUvL28tceGpPDt1hjnSWw/r2L93m0DTf9bkihc1r/DcK9BzZB7hCR 7DTA== X-Gm-Message-State: AOAM531xDdh8z+sheCkd7PG3HOmgCYplq18Q8NhVnxEicsyt0piCIbmL MCs4G3BvoDY7xEtk69oDhHXuY43oTF8= X-Google-Smtp-Source: ABdhPJzwtGwVBVqdnBa0lZXjkq3h5v2hMSQOYoT3eXitibBXqc21ieag0yUTsHSNDW5LyBXxaJVK2w== X-Received: by 2002:a1c:1b41:: with SMTP id b62mr14972683wmb.89.1597675073357; Mon, 17 Aug 2020 07:37:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 026/150] meson: add version.o Date: Mon, 17 Aug 2020 16:35:19 +0200 Message-Id: <20200817143723.343284-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 16f92c4c60..d70c98bd9c 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597683039; cv=none; d=zohomail.com; s=zohoarc; b=MSI1WrTi80iRKsTO1CR3bSlkcFLQsTTAjt00PEfbKZQ8MwhjXalv6qqEeB3EHBqiVcmFLTzJeMEqC8wGSj8u7y/UJcENaIfR860d9oT4unolPlqLg8pCTA2TMiEnNpLzIH42Hzt9eDJftEdf/NlGdNpWLrqXEch75hxDbA0zPKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683039; h=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=8dZzY9VXvh43Ekdfsl0mj5O/wna2bcmAq+4iHeKQ4jE=; b=cHr5O1R0IPkpjES7zfQdAeJHtIliHVmBtdVEiDUEzqdWSXE9McGKAEREjN7Nz+u3+uPBK4IF0ipvi8poBN9/oq1UoxT1NqA9c51FuzkRD/I529qMMx2548hXyNClSjCEmJY9xDaAivd1tZIP7GH+Os2KPUPFVZ1mx0w+yrlSPjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597683039796290.57430611534676; Mon, 17 Aug 2020 09:50:39 -0700 (PDT) Received: from localhost ([::1]:44378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gY8-0004ZK-W6 for importer@patchew.org; Mon, 17 Aug 2020 10:55:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGr-00041N-F8 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:57 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGp-00065C-O9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:57 -0400 Received: by mail-wr1-x442.google.com with SMTP id c15so15227738wrs.11 for ; Mon, 17 Aug 2020 07:37:55 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8dZzY9VXvh43Ekdfsl0mj5O/wna2bcmAq+4iHeKQ4jE=; b=rWx4D72OhKLEVEyLgYhGFrkfb+SDOyWy8DmiTrg16YhfhFaMvAYah5rJNJ+HY+d4pA ahips8+VSzZR++hyaCDd/zHFICrzxVhvb8U4jmD6d57C22P7fJHAEu9GF2vFAvMsr98m FU3QdHvuEiW2emv6KS8QXi04ynHeAv6C34Q2+3g52p1pFExrmv4Qa0hXhhr5euu1gcBs KT+Apnb3Ozb+mHfUQxZ4BIAeoA3VnB5NN8Aebi9z4CVQAvVrEmB7lySL6JsQna7C3eNa 4/M0ha7lKv423sMhJSANRjTIZSb1rE0iHXbyN30nSGJ0TycwQ3vpDb3dVX1mzMiZ1EFZ NG2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8dZzY9VXvh43Ekdfsl0mj5O/wna2bcmAq+4iHeKQ4jE=; b=ZM0Wnl+6jjf2gb2puYkTmbTS2jeuUHg+t8Ogi5yXf6YJwWdMwEsgm9zqks/hLuKPmT S1mzyYSRzQPhJI6aOZ75QCyKgTrru2lO30jYUjnCQ8rXLTRcwMcNEsPDe+Zfgu7S6sgb /FuYY+y8UvlFiGnKaIYRwbPTVH/SYCFGh7gfw8yN8jAqD4CYg6BIjctbVeuvU7Eb7TMv xbQqYrrDqQu+V0nC8aSGbMKXN0rSvwm7OM+ufkeJyYisa/igzOWRyGx2D+U/c7aN8kpW 6lClsceSPzezAQBzaK7YlbDB9pArDtavZQGm2SW2FdaED4Hwd9gttjUHdTkKXeU2A9Iz pxww== X-Gm-Message-State: AOAM532fULCGH8Z5T6kCr4T/YrtByJMkGoNhXl6O4GRv5jbNScCum8bJ S+n+t7YmX6yvCuUN+HOG8l1Lt3H0QdI= X-Google-Smtp-Source: ABdhPJyqOwvPlp/vfHXFPulMx8A2+IIFNwT25L2NEJrq8EBcbpJWZcXvlDxG3fgdwPuwBgaFsd1yQg== X-Received: by 2002:a5d:544a:: with SMTP id w10mr16076702wrv.317.1597675074088; Mon, 17 Aug 2020 07:37:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 027/150] contrib/libvhost-user: convert to Meson Date: Mon, 17 Aug 2020 16:35:20 +0200 Message-Id: <20200817143723.343284-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::442; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 973e932869..2dee3e89a4 100644 --- a/Makefile +++ b/Makefile @@ -307,7 +307,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 \ @@ -432,11 +431,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-= host.h =20 Makefile: $(version-obj-y) =20 -###################################################################### -# Build libraries - -libvhost-user.a: $(libvhost-user-obj-y) - ###################################################################### =20 COMMON_LDADDS =3D libqemuutil.a @@ -535,9 +529,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" @@ -546,16 +540,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 e5c9077517..9489864967 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 ef3778edd4..0000000000 --- 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 0000000000..e68dd1a581 --- /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 d70c98bd9c..00a519edc6 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597685814; cv=none; d=zohomail.com; s=zohoarc; b=loSEWEoSs4P8sAaI9GnWmrBiI+Un3hSbspiNYjoSGJZMp8ASWLQ0O0kBmUALUkTMIBKY3duogGvI3x72boBi5OFZw2BerUMA+s7mC5Kxrm/TsgftndS1N7hIw6+CqtvG44v1X5nEbK/KZiCFEpb4zYyUyegE/7AIQRUCrpRCDq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685814; h=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=sX3v+t9MCcWKD8VmZAcSmOKmtyBCwIHz9lD/cY7kqX4=; b=QYJAJseITUPFQHJdtNxVAdjpkQjZX35Y7MCsY0zm959wdXapF2ABoOJIQb+THhZpIU3M2kK0x06mgaxxxAEjjo+w9tamBl0iWjBXV1AmnHCEn96tFoF4rbg03KZntDpc8LmV7CLl5wcHQezPX0f7lQpxCqLvu2LFpONpjXRLwzU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597685814828702.2663350489577; Mon, 17 Aug 2020 10:36:54 -0700 (PDT) Received: from localhost ([::1]:43778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gSk-00013g-86 for importer@patchew.org; Mon, 17 Aug 2020 10:50:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGs-00043Y-Ac for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGq-00065M-GN for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:57 -0400 Received: by mail-wr1-x441.google.com with SMTP id a15so15233286wrh.10 for ; Mon, 17 Aug 2020 07:37:56 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sX3v+t9MCcWKD8VmZAcSmOKmtyBCwIHz9lD/cY7kqX4=; b=iPzrHESnFFC+w2IOEPiWZcOVBdHA7zkVCCAppkB5zLvZflLISIEYavg9o32YTvUdrA DVxo/iSCVByFvtwUDR/w2XiNAeqtxSRpLE9PDtXRMFhM/hEjHEB8pjl3JBstK0qVk8jd 6KJJkMNpWucEqF/DtUUkBrDutHFCkUkY69Fxp1M/Fh2y/DMVtXXi/v9IzI9dIgeb7Y8N GDHoRfT5BOyKHO2SsZXl9tak5SrISFitVvhD1lyAG6EePYbU92XnDIA6VG47Rx6PcWlb Qv3T9MYrdJOJVd09JTA9KwTRds2SEOybZZ+/c+qMQTCIr5y7WoGxqfsWs9k81pvZZ+8p v1Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sX3v+t9MCcWKD8VmZAcSmOKmtyBCwIHz9lD/cY7kqX4=; b=TR5f25ZRK+t21J4bav0YQkQOlHk8+9mgHH0SDB8+tTYHc6zHr5p8bYZwePQXoQ/75s 4Bv6KkDC19sFj0VqfcUgTanQYrR3efsRD4V0J6W1dtMm8opaEZoAsggRwMH6Gf4eNoxf 9P7/CUOpviutjCYG9qiR5VXIp7Ujbge/8+nF8KvlkSdAwoiCfCDS09LL2I8+K0UTlK2Q WR2eBEtmFke/bX1FxmmFONLxGvts8nBLrybU0WME9uu1rwPOsm95JS017NkWgnaqPAgQ +tjm0zNvv9tlo9WhBIn82BSD9RaDgZjhjYTGTrBejNsD2nlTFnCLKZZiFsGzQ6PLKcvD CYxw== X-Gm-Message-State: AOAM532/svhO5xIWLhrZRKdDZzLhKFEftw47lTTqeYt99hEMeTDIXaRI 218fubn08FPXB4n7EF72WgJ48Q4fMVA= X-Google-Smtp-Source: ABdhPJzRRPK9y2FFOhXLvbGRiXTvMA/KStXdMWbaGyKdk7c6ycuiPcDxO6eAyV+tv8E65fMm6AXRYQ== X-Received: by 2002:a5d:6a4a:: with SMTP id t10mr16624228wrw.360.1597675074881; Mon, 17 Aug 2020 07:37:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 028/150] tools/virtiofsd: convert to Meson Date: Mon, 17 Aug 2020 16:35:21 +0200 Message-Id: <20200817143723.343284-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 +- .../{seccomp.c =3D> passthrough_seccomp.c} | 2 +- .../{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 2dee3e89a4..3bb2cd7c73 100644 --- a/Makefile +++ b/Makefile @@ -194,11 +194,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 @@ -305,7 +300,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 \ @@ -538,12 +532,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 9489864967..fee0f71372 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 ca87955a65..9582ecdf02 100755 --- a/configure +++ b/configure @@ -6998,6 +6998,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 00a519edc6..d56cd0dd27 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 0000000000..513bd2ff4f --- /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 076f667e46..0000000000 --- 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 0000000000..d1e23c5760 --- /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 94e0de2d2b..63d1d00565 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 3b1522acdd..19fee60011 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597681699; cv=none; d=zohomail.com; s=zohoarc; b=Bo0rrfkBGkY2joXjmHTL+8QpYMK1u+/2i54XpKIl2LM5B5CjFfUWrhVcxiBX6lUncvFlWuxzc/5t8y82+HD5DHZ362VybyGmmUQ07Y5xkvX7EnZ7coRnDVeuEvjMu77exOlny650i0O04CpA5jikwo793HC6oMi3y5KVGNekJrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597681699; h=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=3/A25iqRX1oTupID8UYDeviy1ajt4ku4RSauqaDT1hc=; b=E3HOe7YeimHnN89nHPL+rY82UJV1MrDYJQGZHBtIg+qR2TtfQRZ/eWjj+5Tb5JA4DPuN6+UxlM/DVnc1TxkzvjsJznJEgoNgF2H8jVTaYIxlvgM4gT/kZy34gJVIqw1+/M0P1xmGTD7yd1GJpIWqVm/LUz0jK1L/eoPieztggVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597681699443551.6973733061972; Mon, 17 Aug 2020 09:28:19 -0700 (PDT) Received: from localhost ([::1]:38306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gRr-0007E2-JJ for importer@patchew.org; Mon, 17 Aug 2020 10:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGt-00046E-AM for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:59 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGr-00065Y-FG for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:58 -0400 Received: by mail-wr1-x441.google.com with SMTP id a5so15257484wrm.6 for ; Mon, 17 Aug 2020 07:37:57 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3/A25iqRX1oTupID8UYDeviy1ajt4ku4RSauqaDT1hc=; b=i4ghMj+UrispXtZnQStHGlQJL4ZffzlEQ0wTwiHrHmMO6inlp7xHKs8k1VZz7VBy1o 1H0k28YbDdCuGIcDY1CWdJJLjztM6V8BlhAmQsBEN5mOTHQybVSP7T0DhYV+ly4TXRKb 5HTLwimwlnPDfHf4b/9Ch0ST+Zv9Gt23mHYZ1M9Dwz+V+ECyqC0i72xWQ3wVaXEHk3OM NdGBNkugiI06NUDDusvYTNm8Qg7S7Tm7f3k4cTbkvsffvna3t5UWgHFdNnwAmDEyMhbd yOYsR2SiKNIKJ5lLaIRNxO3rTiUbhZ/I+ogWasPOrhZFP4KxRHPFeze11hRS/jhYMqK8 yDrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3/A25iqRX1oTupID8UYDeviy1ajt4ku4RSauqaDT1hc=; b=NISXysUd29wFc8C3KG1WEhYtWaPs6MW3Fr4Bex4FfPKa89WzzSlzrzeQ2tfwcLUBcD LLnD24bxKtp1DDyVWsOX/kJaZGx9uDN60MFTrfAsAua6nqFXV7NxynbOETTsLoLJ4R4L 2yceCPHCxgtC8ONh+gNG67gFrYfao7QDizmfV0LuqBh3DfZWH1EE6AjeAtxGU48F16Kw Ch80Qb/pkjnzj3tKSn23PQTELDjpKavI0KEPtt8ow1r2pSq3IVmxCBLcvZrwY4f29LGN Y/5VfRNtqGvBCcIWazcGAGQTLKQTSnnyun1RZwTbPKymqJyz6BRY3Debbxj//BckCPcy 4nUA== X-Gm-Message-State: AOAM533mZ9t5WN1u4boIbWOm+e6RDXxGvnzpdGVSuUF7nUDllsJX+Tnx PcjTKRveRHtVm6OK05zwZEQ1GpM3wb8= X-Google-Smtp-Source: ABdhPJzdDto2HhT8UE8WOoxOa9thaHvXAlbEeO3mEZVD29Il3rHY5nTyn1h+bt0i6N3Zdan7/nORWw== X-Received: by 2002:adf:f606:: with SMTP id t6mr16717452wrp.182.1597675075901; Mon, 17 Aug 2020 07:37:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 029/150] contrib/vhost-user-blk: convert to Meson Date: Mon, 17 Aug 2020 16:35:22 +0200 Message-Id: <20200817143723.343284-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 3bb2cd7c73..f09d8ff553 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,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 \ @@ -525,8 +524,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 fee0f71372..f69736c10c 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 72e2cdc3ad..0000000000 --- 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 0000000000..05cbf816d2 --- /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 d56cd0dd27..90c20d8f35 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684404; cv=none; d=zohomail.com; s=zohoarc; b=hfIJLLXUKIvImUTwDeEzYhQpn9uId0ZUOPxiRNvipOL5kSF79SPc3K6dYsf1D9lMk1fJ9MpNt331EoG68ptHKNpmHyFInlzYjWFgvnwkm5ARyMHTYymAR5vARLIXlo1Q5xqaX1n4F8qlIBiAz3ThbKSmxdM+UJd0VdX4A7G0gTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684404; h=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=+r6q9fJAOZFBMvVsJ4cL4RUbvyuHLisZKU9ps+vESG8=; b=dyqc3k1usHzGgIIXwBEF2iXuayZ927zCwrpGM1IhQz9uc4FOw7NdGOCdHhHB7Siod7n+OGQz+gCqB7bGKoVw1C6MOx+o6Bsxy/jt6ZXdHtqxwxlNPIGhAFv0p6UpXUezUUXxYvWMjlfAlNW9LzI3jSqxkXWSUUL70vF0HMrA3rU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684404675879.326274057478; Mon, 17 Aug 2020 10:13:24 -0700 (PDT) Received: from localhost ([::1]:46662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gTG-0002JO-Pu for importer@patchew.org; Mon, 17 Aug 2020 10:50:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGt-00048B-VQ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:59 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGs-00065m-BX for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:59 -0400 Received: by mail-wr1-x444.google.com with SMTP id f7so15275154wrw.1 for ; Mon, 17 Aug 2020 07:37:57 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+r6q9fJAOZFBMvVsJ4cL4RUbvyuHLisZKU9ps+vESG8=; b=UKO2nWzVjB0n8C9RMWBpI88enFHuLCILQUZh8tPzvLG7AL83DtlEIggXXRKh6J1DC7 qGnc6iUPLMbHeGZKtQLCIugBrsspkTTzb/5Knn0uSkCAryYSwIZ82u/4rN0eh+yIENEw Me674FYP4CuCPooQfNu1veGnf5jWSKslCJoWkU+6Osz0tZPW/UAuWfVDlWz+V9EV9qXd TR9IMMzhB4tWoOPG8dlwrNwoqHst1xOCLKgf/UMOTx8vJyO39MOERu3xDWt9czfAetuy 4xzzjKDEZtuvNdX9xroxeIGbKK+WCw+HeWHvv8crdbD348cW1zHLt8X8YRp0mvr3xCYf hvcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+r6q9fJAOZFBMvVsJ4cL4RUbvyuHLisZKU9ps+vESG8=; b=Ji2/DyT26tDgcRb9as98cgR0uK/wWMoUEhsONxgO9i0ZDemtNqlRAzrNoEBThMos2M CLj4Z4mK8+B53ffOzFjCUn1sT8/cGCj/QhHsGK8qNp6LJL68Ynx1j7NoILE64NHrUwZb iu1vZfC1SltAs5WupPtzqystpocSJ7bD/MeL/ZBEbnAIAyDOdpDF8UNDGBMkHxa6dQ3m +xv6RBPJmXpFvOrCIwxqTfvCX7yzpPfv3TpQagwBc39bZBITFFgCx9hXfgu4Ycg4EKoc ij7Yya2hqoaJfR0Ck+lUg8JGhZClOEZUVrKn84uToh1zj59NPLeHc4UDuIdx+BBpSnPH ieyg== X-Gm-Message-State: AOAM530V+mBIrAywoFG32nE/PZ2pjkRkdAbcfacOBuzE55nVTUJkbUoX mq70XJMtBotfAJ9Lb8K7KgX4YTqmznY= X-Google-Smtp-Source: ABdhPJzYMGUDwzkzrvi185goth5P2sADxJa3WCsWZAj/SAo2NJgEY0aZCjyI0ufbFWnE1lJ6hp4lQQ== X-Received: by 2002:adf:fd41:: with SMTP id h1mr16840874wrs.124.1597675076741; Mon, 17 Aug 2020 07:37:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 030/150] vhost-user-scsi: add compatibility for libiscsi 1.9.0 Date: Mon, 17 Aug 2020 16:35:23 +0200 Message-Id: <20200817143723.343284-31-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::444; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- contrib/vhost-user-scsi/vhost-user-scsi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user= -scsi/vhost-user-scsi.c index 7a1db164c8..3c912384e9 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -12,7 +12,9 @@ =20 #include "qemu/osdep.h" #include +#define inline __attribute__((gnu_inline)) /* required for libiscsi v1.9.= 0 */ #include +#undef inline #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_scsi.h" =20 --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684151; cv=none; d=zohomail.com; s=zohoarc; b=YdHLIOUBkO/lWf0aN5nI1HNGoyLy1dDr3UNbdkCGxc43b3j7vfyvO+vZqo+EYhejb3VE1RecNEwHPOC+c09RgiQvC9HiNOiajryDjGqNJmAdV9VyutO+kWooLkO70EG0ZkjNLaTAsb7ApfG2T5VP3F0k7vMe8N87pm4IC2bH5D8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684151; h=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=CvKA3HtioVGa1k7QaD2L6j9DSHq1BRktE8vRVlGtT4E=; b=YBgmdKEBH+BKy1J97e7qF01IfLOSscb7XV9pMueciDvo+f4nvzY5knfZplLIxF9AWzUgSbDq/yirB6jsVUDgHrQB0Bl1q6sg7gbvtOhwRGTKD3A8iET5FXiHPNih32Kz4AQHNgA91eAzETDEV9+dxucMfnb4ZYmxUEL/ZTTyylc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684151464532.4570073591243; Mon, 17 Aug 2020 10:09:11 -0700 (PDT) Received: from localhost ([::1]:51472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gU3-0004HX-Mz for importer@patchew.org; Mon, 17 Aug 2020 10:51:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGw-0004Av-Jm for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:02 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39307) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGt-000669-Dx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:01 -0400 Received: by mail-wr1-x443.google.com with SMTP id a5so15257577wrm.6 for ; Mon, 17 Aug 2020 07:37:58 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CvKA3HtioVGa1k7QaD2L6j9DSHq1BRktE8vRVlGtT4E=; b=qbPesc+A6piraQrsaprq1Ij0nf32LPETPsULJkjh3EM6zYa8pebHJjAWM4g248DhoW tiMgZwGVvTGyNP8UiUEyRfqLBNeCzy9H7+wOC7P41qfYp+4Mucj/53iyUPL8uG6GUHjm 10mr0InBT0/eCI7Tg6QAEkzJqnCZ4Swaa1USlA83cZ29nRPCVM9QANlwLd5XK1Qgl2Ei a0GCIcurlxIwK1orY1zd3o+I/b6rEvVylzHFL92uwmTVH70U1SciCs5Z4OmvLCkYYBt9 5dvKJzj3GLSEqp2N3zLyMaF4hxi0CSaNKHavuRPR8dxLa0Kr4jg0QIRJAOnklNagiSzh c6kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CvKA3HtioVGa1k7QaD2L6j9DSHq1BRktE8vRVlGtT4E=; b=dziDX3Sv5cIQJ5ET9sZSUWPbkVwpujma424i63mWmLnv8O2MvLTmTGuPD5ojEDNVMj 69weDV4/s4xrSIl/h4coqNlBhaoxMfpa2sLxVwQ8j8EKzM/BObpEpVbyYGOCZNgDSlPo WGErx5xz8tmeZoqQ9hmlX1YUcc3lsAf3ryUXjrkMjD2WltspUzJaphDE3vRBWAodA1EC xNc1dPMfGmMdRquLe5lMJNsV9s3o6Edg9YWh/Pq1MceZn0vRpGgB/IOaGEjyvDQdH06D qvwehN3+B/NfuFfNukUyiF29hnErGBNkYwhhhOacpogEGdWh4VYlQJR9hiaxqYVMStJb MZnw== X-Gm-Message-State: AOAM532LZcXE+V9Af6CXmfCKyOFDWcvgvUk7p8/raKUdDOllFN037b4j upJv3uYsin+YjPSgLvDJIhmn8nmW5cA= X-Google-Smtp-Source: ABdhPJwP2cInHQiW2Wu9lyysPiKRKRTlYsZPaWkivW8XIcz85w8nm9UwmRQB7kq9Crkt4t3nUHkRMQ== X-Received: by 2002:adf:e647:: with SMTP id b7mr16943063wrn.220.1597675077754; Mon, 17 Aug 2020 07:37:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 031/150] contrib/vhost-user-scsi: convert to Meson Date: Mon, 17 Aug 2020 16:35:24 +0200 Message-Id: <20200817143723.343284-32-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 f09d8ff553..da1eefd827 100644 --- a/Makefile +++ b/Makefile @@ -301,7 +301,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 \ @@ -522,8 +521,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 f69736c10c..ab798b08a7 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 e83a38a85b..0000000000 --- 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 0000000000..257cbffc8e --- /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 90c20d8f35..48ac6c3da3 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684955; cv=none; d=zohomail.com; s=zohoarc; b=mQqdCyj9wd/uapMlGtx89ecl7LtBpemVjiDryVASnzY6Zl2dd2cL41YijI9/JfZyeUnIIKNOG/f4zmzqn9ueGoTR5/hA4wPqWMuJLffNpgujMlp9faVD3V5CrIIiaTJObN/EaaPH0oVUHr5CYE18ZuBSVgWNf8AMiCFkf/U0jE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684955; h=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=/2v2cBSvlqgwOfQ4NBBtOTdfUDnNSdQUL7TF+4lOREY=; b=g/JLW/v23PRRJs7WsYQV8jjtXoadO3dDjrPGwwNNS8jhe7oQYwIkzjo+3+QHBXzgMtW6jL6y3cT5o2U+fSeW8HwCVgGDszw1r+HP84N8+4AeSBldKFV+iPPrbkA6SAiQobT/Uk+TNFzXEhnn4sOLLQdiNUIZiUGFM9bYJjodpEg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684955612452.79080729425186; Mon, 17 Aug 2020 10:22:35 -0700 (PDT) Received: from localhost ([::1]:59722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gVi-0007eO-Pu for importer@patchew.org; Mon, 17 Aug 2020 10:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGw-0004Ax-Kr for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:02 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGu-00066t-32 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:01 -0400 Received: by mail-wr1-x442.google.com with SMTP id c15so15227959wrs.11 for ; Mon, 17 Aug 2020 07:37:59 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/2v2cBSvlqgwOfQ4NBBtOTdfUDnNSdQUL7TF+4lOREY=; b=u3FaDbyrr4ESPRp6/l/0nvG/0MQqRwHINYhPGV650nyBlqqSAxYUFpFBRoSIGqqeKM E8zUJBGn5RGh8S+SlDqKXmrzrfTz85ebryNDOMolI5dS9LybbqpYNOQyiAOcSXhQbRdo SgT8uvhODaPBdwyJzFFGYxEhqH5wS/X/CG4p75sW/CWogc7m9Me76ovG4v0pUngXbRwu BsCEpL7WS3RJ/nSZX9M/dld6H/9h8Hd0clrN8KGpA+O4ztlodB7QsMvAc3RnlJOOYShU TRTmotRfbusRsHAvQOygX9xMuXbzJ1vkf0uqQXNtrwiFbepO41uMNQXFdROZMCfCWJZz yrFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/2v2cBSvlqgwOfQ4NBBtOTdfUDnNSdQUL7TF+4lOREY=; b=dRn6bMOZOYndS+9LOS3l7eQifdQPdRkuS/NUS1Tm44fAcTYAZvdvjzjPD1AOy4ColN 395GQkvY2d2q8YegNMgrF10UycsYbjiuoExL5ELDCbWPcTY0wmuJOLROAnhm7hTNVReW eynSUPX6FMw92HCjfKrsyV8A34BezdAroQqvhnIzSzPPRla6Ssk7Rh4bDRsgT43pElrY eoLR9JjxYdG70xG60mgAkSM2Gvwr8kOPqMwgqRJP1ynXoq/kZX86ZgSU0mRNMI3p74y6 J7Nr/NucnTum60K4XJyk9L8dsDkPOOZsT6k8t9vxaRI7fYUg0B5rj29NlMqwxarQUsOD PGpQ== X-Gm-Message-State: AOAM530OMqago4S6wee79vSQ5WrrgtabRNrA8O8PQpov0Ds4SoEmuVqQ 3rJLoO+qtJhQcKkc+upYBCBcfeKUtE0= X-Google-Smtp-Source: ABdhPJyKDJmADqXwgjl4/KL16ndKsb9QvfpTM89OKBZqzm0ywBpL01MEa22jh3FlfeLjpRigEaHSTQ== X-Received: by 2002:adf:e704:: with SMTP id c4mr16991541wrm.81.1597675078556; Mon, 17 Aug 2020 07:37:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 032/150] contrib/rdmacm-mux: convert to Meson Date: Mon, 17 Aug 2020 16:35:25 +0200 Message-Id: <20200817143723.343284-33-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::442; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 da1eefd827..78f2cb12c7 100644 --- a/Makefile +++ b/Makefile @@ -300,7 +300,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 \ @@ -522,10 +521,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 ab798b08a7..0f80b63554 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 3df744af89..0000000000 --- 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 0000000000..1a01bb9262 --- /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 48ac6c3da3..730442de1d 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684896; cv=none; d=zohomail.com; s=zohoarc; b=lMa4PPhmFKEU/LRn1SIVZLDYyqF8e/RPrvKkQGP0pQdk7MWMKDdKvM3pclw/VTH4ohF0InBMaUJrz8/KZNquqlOqIcnL2CmFQl8TGNooVshJzsqWQa/tAqTs3fvf54vYOG7oi8P2KLrBctLxYkCPnrRxbJGZ6Ju3aUAn4N24JhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684896; 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=eZ40KHdt5g1CPMsiLXKPeY2vOcqMNZVd2dgkLPBu8Lg=; b=L6/6xeMS1yb5rRfcjQ0BzO7vvA34DVZNdWV99nNFQZ9kdoNzgle2D3iVobRSvy9PWWe0PjQTTti45p6Lonqrp3syCHTWP0C13wD20Ldl+a34Z4FalTgbjUeDWxxQYfIGB995rY9yZSO95TPnvZ+9GZcpZOT+f+Ovdh9P3fTrJV4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684896872779.1095527353259; Mon, 17 Aug 2020 10:21:36 -0700 (PDT) Received: from localhost ([::1]:52844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gZT-00082d-3V for importer@patchew.org; Mon, 17 Aug 2020 10:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGw-0004B9-NB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:02 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:42250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGv-00067s-2n for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:02 -0400 Received: by mail-wr1-x42f.google.com with SMTP id r4so15223775wrx.9 for ; Mon, 17 Aug 2020 07:38:00 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eZ40KHdt5g1CPMsiLXKPeY2vOcqMNZVd2dgkLPBu8Lg=; b=ZL8YwdGDTashcH95TuQn8NItysNz3Ov3RRcoFKuR4ZQQVuMhwvJGz/JkasRxhi8KVQ NBUS1i1kqBUhauzXlVopOlewDUA8ltn7lbbNdTseVHqAJcIZy9eZoGM0f2mhiYVY8QET Fs8hhaixtO0GsZGcIojWFFgFZFYwhTawlop0Da5Arq94e0UU2rJd7zn0UVAhWn6Rvwi0 fdJRCba1Dub+UdwNItKyOZ6F5M47R1d8MuMUL0fDlV/1ElgWVjxMt+KjY5iaCaZJY7SZ ArcFXtPPTlDarNTW6AcCn2pzNBPifb4pT2g/WxgD/C2Hj6xQ2wT7ursoiHxpDwASqhDW Cojg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eZ40KHdt5g1CPMsiLXKPeY2vOcqMNZVd2dgkLPBu8Lg=; b=M3YKfNhDKyWtd2F8+K8PnX5+AdG+4mVqebPcxRA8DQCtOMXtnNETpzwFn+Fg4mFCw8 J4pURDN1TbP/EIJuPMs6Cunl33hSOOHIts3vKwWW5R3AbKIP3oM32f9oJ54V6TO6RpbA Lj7fhUweD355muOH56fo4Y82m5DDG1VEYgDYQAvU5bghqUIKi/g9QS74cznBabBweU4m qnrnM6H9Rsj1hFCVpwxkoKjJjRIeOXSf0eylp15XAfOJlva/SL1pQRAolhTjLViGm8yb 17vb5xguYDuaJpkdQA+HS1h+s/Af8NM6Q5UisyzEn4ADuQ1FPylqpWPZYDuTcH4fNHRz Ncag== X-Gm-Message-State: AOAM530P918/K6Et6ViOjhxrcsPEFjJc2YVbliLb6HkEB57Bb5hc+J4o HRHCKc9QC5GGTd3cm02mud6oovJYNc8= X-Google-Smtp-Source: ABdhPJyeahjxH9B4Ce+h4B5kodGYBndYAfxDfJAVpjwXj4EUzy4HlDIkUGuYzL2Ng9Q+RU3dpoALhw== X-Received: by 2002:adf:812a:: with SMTP id 39mr15319292wrm.137.1597675079464; Mon, 17 Aug 2020 07:37:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 033/150] contrib/vhost-user-input: convert to meson Date: Mon, 17 Aug 2020 16:35:26 +0200 Message-Id: <20200817143723.343284-34-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 78f2cb12c7..d02910b073 100644 --- a/Makefile +++ b/Makefile @@ -300,7 +300,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 \ @@ -524,16 +523,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 0f80b63554..0922c3ed00 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 b1fad90d51..0000000000 --- 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 0000000000..1eeb1329d9 --- /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 730442de1d..a8c22b20e5 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686674; cv=none; d=zohomail.com; s=zohoarc; b=D7fMZwyexvwhphT1XBf6fw3wj9EtCOxiRSQtTfVJIn/vjKLwrvVgY37rc+qD5fbo1UAffFx50XONFAmAo48YV+fGpge5sCWMyFcdRFSw+sasg2z/jXL90HgDFB3tAPlnGpKe9fmQvcjtzZxKMSqPIB8qPLxKnPtcniNOvmaBvM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686674; 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=dZwHbdO9HxehKFQePTOuC1KMP4DvkmrbQ/M7cw7Pcco=; b=nn6ieT8EH/6UyiNCDJwjIaDo/hXpZ+mNMVFXqXHfOJ4DTJhI5hUCTAoMf6fzSII1/zsZAFA/3/nESNjqHO7mm6U1KVnY9c98H6gfH8PsI/5BVUNbHRajWHqCl5baPs0cHzQz9Ea+V4MKznHo4W8HOoBDrpPP4mZuGsWj69jZaqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686674896273.1296624908549; Mon, 17 Aug 2020 10:51:14 -0700 (PDT) Received: from localhost ([::1]:54944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gUb-0005fz-Dq for importer@patchew.org; Mon, 17 Aug 2020 10:52:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGy-0004Fb-8Q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:05 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:39412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGw-000680-E5 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:03 -0400 Received: by mail-wm1-x335.google.com with SMTP id g75so14082096wme.4 for ; Mon, 17 Aug 2020 07:38:01 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dZwHbdO9HxehKFQePTOuC1KMP4DvkmrbQ/M7cw7Pcco=; b=Lid5JGJCu1pzO9Wxc4Vks3zGW6bw0qa+DikxWx8d4RoCRLrX3lZM3f1FRdxR6D5uKG Nk2Dn6ascuvSj/e6R7+f2cGOoPDAGPFpQIblXmO13X1xfFmaxBlSuqmfeVQ/Wa8H69Pw Y0uNqLULSEM+qIjQlF0dgYk88P4rG69oplEpg2875oeLsI+Joy2ApfmPXb2C09nku9kH CfTmzAVoqdqH3jJm/U0Y6QLj611DkO2qMqHj5lvBDhq3K3w6ELb8U/peN+d0lPFYKqI/ Z50CZeSK4mIje5th6ZTirkE0dDhZEVY298nYUG4zBs5N09bZgBT3jQzp7/Ar687h4S98 7oxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dZwHbdO9HxehKFQePTOuC1KMP4DvkmrbQ/M7cw7Pcco=; b=ZVmXx7HKZDIw2DDQpnB3qBovjUd1Ex3ak0cJL4g9zds2Lv1Z9a43PRr2DgrMRN3e4T /jj6CepnvfnzkEmVsDOJkuFef3Pyl2SUay98QgWRyi0j+DVpdQxYSFJ0S34cqpu9Pqm3 RFC5YGClmQen5AlsRqMjTi0Q3s2MtqgFifdrQkGPqCocQHobS57VYqLRD32K86iz8SK5 cs0m47UyRHlMPB0y0sOklaEvQTHsOYrFTCqIr4nPYIhiXd9Nwu7A6paDd5DpcKa7g9zz FJ+D8+LoNtGiTWNiRPgeOuX/6ZZVuiiYG3XOy2PqSqFFvScw08GUGb5b6qJA0nihfzE0 XKcQ== X-Gm-Message-State: AOAM533YdM5+CM66RjFDe6gmqk12cPvazDe2pUz0HPfNcQIihYln8kUr mwYqVIH5zq4y+Kwx7l5llGKcNT3GWBg= X-Google-Smtp-Source: ABdhPJxp1iJhjqOPd9x39Ntcfz+R/dOKnh0qwQfZoLhl0ncqByOUC7NU2KTVMViuJknI7DXQN/sHJw== X-Received: by 2002:a1c:f30f:: with SMTP id q15mr14686124wmq.60.1597675080295; Mon, 17 Aug 2020 07:38:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 034/150] contrib/vhost-user-gpu: convert to meson Date: Mon, 17 Aug 2020 16:35:27 +0200 Message-Id: <20200817143723.343284-35-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 d02910b073..44626d6a80 100644 --- a/Makefile +++ b/Makefile @@ -184,16 +184,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 @@ -300,7 +294,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 \ @@ -314,7 +307,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, \ @@ -520,9 +513,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))), \ @@ -720,12 +710,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 0922c3ed00..2f2d4b2066 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 09296091be..0000000000 --- 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 0000000000..6c1459f54a --- /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 a8c22b20e5..6f17032e95 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 7aefd37b5d..1aa6394079 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682970; cv=none; d=zohomail.com; s=zohoarc; b=NKM98nLwOzUmBkvvlvhE6pqNFdhPvoS4ErTQC5ekEI5iLvRrFksXBYye9aX1bkY3xqZ1eZSWoi0ZhRE880lOSKVJ3ntKiYjqO+jSFZRAhtqaJMLlkTsP6h5y41wHj6xEzFdpbFRoT3DiRsAzO0JIbFS0xkBoMMibVClho1NxGWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682970; 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=X2aYUPZOuivizIkGDiyJMkoYliOGwJAaeVDJ2ojEhe8=; b=nlGF7ONDpYNSyN3sXUAmUdcQK9edxkfB5ZtyOlvaV97pegrClWE0/E9hcTYELLQ0SLsDVQBzzluhokqaoNF5KGaL6FpRHdzMl9t3YlO+88dGgMgm8DQq/Vw3y1X99aeZO/RXFDIqN62lVHTprj5d1A0XXZ2+75Y9B8YufWjUNE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682970019739.7037156548381; Mon, 17 Aug 2020 09:49:30 -0700 (PDT) Received: from localhost ([::1]:43278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gXx-000431-Dv for importer@patchew.org; Mon, 17 Aug 2020 10:55:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGz-0004Fq-Iy for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:05 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:44463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGw-00068G-QU for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:04 -0400 Received: by mail-wr1-x430.google.com with SMTP id c15so15228119wrs.11 for ; Mon, 17 Aug 2020 07:38:02 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X2aYUPZOuivizIkGDiyJMkoYliOGwJAaeVDJ2ojEhe8=; b=bVswz6wKcE4YAIFF6Yc81IWwlfAlG4eyV+9n/nUk7SODNAynyrJk9dFQ86rwH0lfFV HUbgj9ePXUzUAl+ruys306SarCPHav+6hL4GwNNoV1DN/NuPo/IuxelWIC5q9RXequv+ 13j0XQlItpRytvgjlkZILkcOR0JwAXJguDtFVYRz3yjqGos8EXTGWzjvx/S2mEervkvv KX4sNAlEpPbhSZ6E2igST2OADxz6Y5henF89y+6PB/iOK1QC54x5SWoUd8NSFgNOafqx uvyryh5ho0ELPwemlnh2duq3BGPxcjl06xteu87h/+6a8LBDbIDDCcue5YbO7rEKxdlX eh/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=X2aYUPZOuivizIkGDiyJMkoYliOGwJAaeVDJ2ojEhe8=; b=PWxo45Rj7OgLTD6IH7l8C1yyo0RgwSVRwroH+bsRKIy6UVXtsjRa0AG7FM1faAqZa8 SlqbjMSW/q1Djtu7W8j8Ak5Sel1N8S4qPVJE0OySXUogswJoFfR3vUxmmGlza61aB+P8 Ed6Uelcbg1hSUViISEIwUl/KznxcwaL6/BOMG6nGUTF1il7x+qL1tR7rzz+5VNv99Eq6 sU2iGhFFW+sus0eS8XWEE3SdL4pfrQQuv5U+DTgH+j2v0v/i9EEhgfq8xhAKYA32LirI zQjqW78CA2bR4l5qlRc4I7GPr+aOLIg7XAVblZ2BkVq40n/LXS7gilD43BoSn/yfYa6i 2iHQ== X-Gm-Message-State: AOAM531MFE9IAxtD0HPqXxD1Pgp433HClpDqz1GTiKRT7dIQ+7Ggwysd x52jJvznazO4658n4A3vMyNc7qUqd5c= X-Google-Smtp-Source: ABdhPJw4LiTQTybu+v1rpkFKUhILFk9bDBWoHmLsLxRlWynvwHJpaOJ2asGpdwBhFHt2ieUUtXbeGA== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15502213wrq.422.1597675081258; Mon, 17 Aug 2020 07:38:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 035/150] contrib/ivshmem: convert to meson Date: Mon, 17 Aug 2020 16:35:28 +0200 Message-Id: <20200817143723.343284-36-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 44626d6a80..0cc478b2f1 100644 --- a/Makefile +++ b/Makefile @@ -292,8 +292,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 \ @@ -506,13 +504,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 2f2d4b2066..336a684ff3 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 9582ecdf02..b6237f8102 100755 --- a/configure +++ b/configure @@ -6680,9 +6680,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 bfab2d20dd..0000000000 --- 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 0000000000..1b171efb4f --- /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 c060dd3698..0000000000 --- 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 0000000000..3a53942201 --- /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 6f17032e95..0814ec3e62 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686826; cv=none; d=zohomail.com; s=zohoarc; b=g44AgbUcZ46jJIP2BtzsX2P+8BlKpI+bOYUCHTw3blt82dhgC36xONGgQs+ZsAN8JcYoZ0AAlO5VIFa1znlD3Euf6Irgf9WBDA9SteFoRb+E4g+7bfny+A7gBVa/+eXK0IryOeA+WU8uRQuRJslC9sT+QpwqmNb39bFXnDCkmQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686826; 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=f4qt9FKyFSeN8BJ56T9zt2ILCTqUpRYsJA1sb+QqLwo=; b=YJKW4xKIBJ33jB8FAQBxj9h7JRtmdKnpOk7nn5fSyFapUf9oaA/YZPabOkR1EVvfkWFo7CHgl9mnRg7dyqfc+QOc29D8e+2BfE4YIwzvpvHfZtzfhSEqB7pR0+d/RkA6jL5/0Pu2T9hDPDlCHaQrlXTs2HogsEXvgNAKyYNLVjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686826428583.0616956241147; Mon, 17 Aug 2020 10:53:46 -0700 (PDT) Received: from localhost ([::1]:35054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gWL-0000hq-IV for importer@patchew.org; Mon, 17 Aug 2020 10:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGz-0004Fr-JT for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:05 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGx-00068V-NJ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:05 -0400 Received: by mail-wr1-x441.google.com with SMTP id f7so15275447wrw.1 for ; Mon, 17 Aug 2020 07:38:03 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f4qt9FKyFSeN8BJ56T9zt2ILCTqUpRYsJA1sb+QqLwo=; b=Z0pZIEBEDHdtjk6lRkw66nGR9BpFdYVfp4DzjNHrZZq7RuFhGdPAEz3cAWIBki7A6S yMbH0Xacvz5A4unJ9aI/lvfEHAzyCZ8IwBxY3fuqUl6fciIvjSbY/Kc+cxtca4bgXaqn GD8Qxf4W6qRTt5eN+MQ/yFPXRPaNK0E/rmjTj8MVppkrI+W/Ln53+QbdGIJSVabcXSgN D6EqDxVMR5EkPPaNClKwmyoc4Gzri+NzDFFrFcZXdj0arXhMmPTNPKagqwh4P9Y0xnPc ogPEf8fS2XL5cB+KHs8UmiIGYKiie/JhzVrnYqkfYz/EkDwtPalwNxGjk3+lyTBjXofV VWtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f4qt9FKyFSeN8BJ56T9zt2ILCTqUpRYsJA1sb+QqLwo=; b=FDz9XXz6AALi+fQKJOVMBvelk7uos1ROxGNYOhokGRyKO/eAnkqtg2Tth5/wUGzBcE XhzPCWwLIT2+3P/q6XpSSU97z+KJ8rI4/Xz5jQ/1UXaUdg1oe9nRSugYu6Zz3bcB647p 8Bm1GIf0tqf8eba5tMv3VzQpZPCYXk8Br5mjNu23FXDuklK7ha4dEZqOX0Y9ltb/TEt0 v7sKyENP5nkV0FO9Nt/va51pRrOVsQoTWjXxv2uilDK0Zsupo1k/EphMk5XOESMenKk6 OxfS6e/wEE53VyT9yx/bLhSMygK+yJ6WgZzOleXohU24EX2acnzq4wF/B5EhqGEkHB2n ytiw== X-Gm-Message-State: AOAM531kKqK73Wwh5ro56cT0+LOlH4Q5WOF+bKmRJjX6rp8ZmB0iV5jz KqC0xPNRh4wnTyDpDv1RabbOKhTICPA= X-Google-Smtp-Source: ABdhPJyjA8E2nBx5p0o3HHo1X2SV6mnGezH53Ta1vDnsRj4otxURC7lvAhfF3Wawcdttxib3yfQ1Vg== X-Received: by 2002:adf:e98c:: with SMTP id h12mr15621288wrm.3.1597675082221; Mon, 17 Aug 2020 07:38:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 036/150] contrib/elf2dmp: convert to meson Date: Mon, 17 Aug 2020 16:35:29 +0200 Message-Id: <20200817143723.343284-37-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 0cc478b2f1..b97a3d0eeb 100644 --- a/Makefile +++ b/Makefile @@ -291,7 +291,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 \ @@ -501,9 +500,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 336a684ff3..1486254a2c 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 b6237f8102..0eb9f8aefd 100755 --- a/configure +++ b/configure @@ -6680,9 +6680,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 1505716916..0000000000 --- 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 0000000000..b3de173316 --- /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 0814ec3e62..661f1bb4f5 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684388; cv=none; d=zohomail.com; s=zohoarc; b=H/SAN7KPDBkLNEMhg93P2Z+T3mjUg/iU7mW/KH27dnLr9xaF4hIxtmkvjsPw3y62GFP+ESUrZoMmBjFHkGKkClru6TkhoUr87FpGmUpmJ5andKxsVko9+IW7Et5hBnD5X1ZXG6+TgVRMwse747d4eLMeXYnRZl7hDfzuRfcQEVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684388; 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=RxTPKve4UPMsuDPCMcd7u6d232jLsll/CSW6mGhHCo4=; b=m8Mluj4nLM2jey/r9fIHKScjrcztK+HVAqjRfPrlzkTVggRIOz+up8sKnrrrczWBESAzrUf0dvjIXQWRDSZfZVr8beKlEvJHDdBueeKicXoXLOvDsXPXTwTnN4FL71P8FGtGt1zum1IdRU+iEzExEStXx9azlVKbGKiP5yw0zMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684388889323.1508799104249; Mon, 17 Aug 2020 10:13:08 -0700 (PDT) Received: from localhost ([::1]:51648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gZG-0007Z2-KK for importer@patchew.org; Mon, 17 Aug 2020 10:56:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH0-0004Gs-QF for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:07 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGz-00068a-Ah for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:06 -0400 Received: by mail-wr1-x429.google.com with SMTP id r15so5341860wrp.13 for ; Mon, 17 Aug 2020 07:38:04 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RxTPKve4UPMsuDPCMcd7u6d232jLsll/CSW6mGhHCo4=; b=pQj1Jb8yqzSgjL6xMy2tKKojwBC118RWk9l13GX/dz79252Jd8uOIT1KguHp4QKPyT FTQ+R7W2k+mQP7jmgz7ZVukGguIVSpI5t+6UhgPNKTwGlNsZBzx/n36TDg0+Au7b/JLg kRaXHL6qpW6hHTjfDnjcxIxZKke8c9zVsY/+1eKlmKZDhBfh8hCWDrA2utOolY7VoYGy 49D9d1pvAyB05Ilzsb16q7INi0PCD9vYXIwckso/pY2pXqwKPki/9TwYAmA5B9WKuHBT N0pcBkxNHD38GgiEU4jQJBpdAkDAiatFXoJvfPwXBxt7qTOeDkkz3dTwUKcdJNNYDnWe uH0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RxTPKve4UPMsuDPCMcd7u6d232jLsll/CSW6mGhHCo4=; b=dAmDf3sCnMBJsPY1qHDobxhPOQTg1H0VfGw7bEtOmNx73j8yAqcRYhEl8jdI0t0oIT YamvWRWB+ht17rdaldRD0KJMLHJGuRO5RtmfEK5Fvgu5IhBYV3u+cGEbBRep/5/J2oX1 /VcI39srFsebBKj4ukJfFvmfmalqycynuHZSZE8pQnOET/79uIQrBS+h/DvV34/Odeo0 ini3CzMV2BM3pCuqJuy+qZoIGZNYexw1+oh4cKcsm2j4lSzk8lgRhuE86o5SuWPxqwDF dI8fYp62mzmk+gOYt7NuzPQr9OZRfc87c8YfOyOSd4t0+1rJijnnee80WyMDIQVtDU2I nTkg== X-Gm-Message-State: AOAM532rmL8AiKyA7UcDHcEo8AgW86WV8N5tl01vwG2Qc1WDZZCRxlLX F7Y/ZsoZgNNjUdA7EhXT1Q+Xf0U9z04= X-Google-Smtp-Source: ABdhPJxtkA7tdQ1s5fOUb5kcqLH4b8W6IaDcstBXHFQc7Lq+NxawupdISt7dD7QloWr2gr/l2NmWZw== X-Received: by 2002:adf:fdce:: with SMTP id i14mr15559661wrs.273.1597675083080; Mon, 17 Aug 2020 07:38:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 037/150] meson: add macos dependencies Date: Mon, 17 Aug 2020 16:35:30 +0200 Message-Id: <20200817143723.343284-38-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 661f1bb4f5..34e2a7a3f5 100644 --- a/meson.build +++ b/meson.build @@ -46,6 +46,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 @@ -53,6 +57,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684278; cv=none; d=zohomail.com; s=zohoarc; b=P0gxIOOV08qtZqxNnjvgH9R+6+dEkyxMeK9/zOQyzk16mxkddGs+CYDnk0JFLK/XXliYUErZleW3Exf98hoMHyjlljoS+DcQRJGaJ7Dzq9oncUr70SJX1Bg9Rwls+z1wQNLZDJnnWojl5lAC2RKEvgBG5V/ry78/k4KwXdCi0wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684278; h=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=jyMNUDYyORpdvrQXMR4LxpvvMPAAn/lulO8jr9STstU=; b=knit593h3NUkUoUjmlU8DdxR72B1M88lQOpQjduxKxfJGFVAjVS/35p2PdXhXTCBErB5Dk1F3ihzNO5y5UxUbylgCTHROoYXy67zethpq6NU6UW1vmcAgxn2vW5v28I2qQD1CggiTNUvLOjRs3IP/wJ22x2jrZqSa5xl65dkF7M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684278116249.75411825832737; Mon, 17 Aug 2020 10:11:18 -0700 (PDT) Received: from localhost ([::1]:33168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gVz-0008Kf-1z for importer@patchew.org; Mon, 17 Aug 2020 10:53:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH0-0004Gr-OJ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:07 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGz-00068m-Bg for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:06 -0400 Received: by mail-wr1-x444.google.com with SMTP id f7so15275587wrw.1 for ; Mon, 17 Aug 2020 07:38:04 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jyMNUDYyORpdvrQXMR4LxpvvMPAAn/lulO8jr9STstU=; b=Odeq9dSiSL/hZ0XnXXrheUP+Jeg6xvKk8LwKBzEiPrPHzLn6tpZYZw6gmv2hwBEo3K 5Uak3+b5yjGp3521e1I9VLvYJn9RuLnRcujJT5VeKZgizAzN2dDA8IMh8Qpdbu1jeVJO RQWxQgruGZLRQt0lH8qyV2u+gsOFCgL5VCHQ6v3ApxGgkpuXDdZRDGpVd/Q83bBS4Ep4 g1/rh/sCKMXWSA21O6jN6PLcifzLy9cO3lMwHqrkWDfkjRuLW6KAH2+79qlhTupHuhqK H5FJV6ApAtkK6aAcxtJULDoIicOsNAPIgyRaVITbWCdOiSBRiN6LqvKym2ugAZA5uHDd zbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jyMNUDYyORpdvrQXMR4LxpvvMPAAn/lulO8jr9STstU=; b=Rnk/LTchmdlwdCQxcQPeCNCC06zcn5D9uG0ENviI5mZPk/w65rdD8AnPb6FRtWvfoX OhNn/AL1BdllthcnKIz4T7rwTQ6JI7Hh7eUJ0HmSOXq5aaveVxG6o2vzJc9ZuiTD9rKR 2QCXx6iaaEXSDDVRLs+P/MZn46sY1zXFMsqXtQE7zGyTEV7lgEH/uOl0oTJPpySu53jd 5Edig1ihkSU9nqR+9GG1oErIkpUm2ZwSochT4QXswNYo1O0yiB8YgBVVvQCrGdtWJwrM dzjOMORyEal5QFRqBb9EX+vp/ty8AJ/8HPzkWK5iZvVAU/lWsmzFYF3hMuR3ml2KsD4L MWxQ== X-Gm-Message-State: AOAM530xe2lAqc4MvDNxVP3EVHcnExCkkGQ8Wha1xz6/EK1PLqeVP2c1 I3N+3sKXZ0ZeQ3x74weQl1bqRHD43I8= X-Google-Smtp-Source: ABdhPJxW0sHrDch5nJ6B8FPnfqEyvRXvjxpjmrDcBrOjpvPGZ0LlYwzgP/icjK49PZbagdp/v+TX5Q== X-Received: by 2002:adf:b353:: with SMTP id k19mr15504667wrd.159.1597675083891; Mon, 17 Aug 2020 07:38:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 038/150] meson: add solaris and Haiku libraries Date: Mon, 17 Aug 2020 16:35:31 +0200 Message-Id: <20200817143723.343284-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::444; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There is no probing in configure, so no need to pass them as variables to meson. Signed-off-by: Paolo Bonzini --- meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meson.build b/meson.build index 34e2a7a3f5..08bda49778 100644 --- a/meson.build +++ b/meson.build @@ -62,6 +62,14 @@ elif host_machine.system() =3D=3D 'darwin' iokit =3D dependency('appleframeworks', modules: 'IOKit') cocoa =3D dependency('appleframeworks', modules: 'Cocoa') hvf =3D dependency('appleframeworks', modules: 'Hypervisor') +elif host_machine.system() =3D=3D 'sunos' + socket =3D [cc.find_library('socket'), + cc.find_library('nsl'), + cc.find_library('resolv')] +elif host_machine.system() =3D=3D 'haiku' + socket =3D [cc.find_library('posix_error_mapper'), + cc.find_library('network'), + cc.find_library('bsd')] endif glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), link_args: config_host['GLIB_LIBS'].split()) --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686911; cv=none; d=zohomail.com; s=zohoarc; b=esVxmyj+npiXD1zNdw/82/wEAAN3PfzTNQK3NB1mTnbW/RoxM7/DF9LLnBWeIH+tsdwCYhbVBV50hSB3qlrNqOA9CABCR2S6ekftnu66eQgpTAAHEztFv5c6uCa7NwNBqU+M+cw9ZW8lIlz1r1HVeEtrJlhKT+lM62jLbdPVRSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686911; 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=oNBGFH2Y+HiqoM85hNYRvTjlzhO6SEyWeacg/l0Rijc=; b=eFWgWZtU2u5Y9r1vTwCE2BNka2xT7NvDiY3i12FLYGzasUnC/q1gB0chPMcY1qILrUMFU2qxnGlwjnAM2zaMbm7r7kMjSPppk2lH+AOWN0bLhX8BXMfB4dY8Nq3X1+VSbtdgi7rHy42SGFdQGG7bxlLbzMH4RmmyubLBYIaFO44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686911804428.1903174586796; Mon, 17 Aug 2020 10:55:11 -0700 (PDT) Received: from localhost ([::1]:33140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gal-00035m-7A for importer@patchew.org; Mon, 17 Aug 2020 10:58:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH3-0004IG-73 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:39410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH0-000698-Q9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:08 -0400 Received: by mail-wm1-x332.google.com with SMTP id g75so14082449wme.4 for ; Mon, 17 Aug 2020 07:38:06 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oNBGFH2Y+HiqoM85hNYRvTjlzhO6SEyWeacg/l0Rijc=; b=qaRiCd/PFFIzoV5VpRE/Pnmn/6Xg31o/9K5hUIoXP5OmQpD5XDm2DwRBP6kQz+R3HU LGjcc6wNFaTFvmz0jpoYg379hKkD3VUuWwmScD2qtN0IkA1ZkxipXFlWuV50QhjHlCM3 LKIR4sfMpdcBE2rKZGt5Ro2rVDCCTssutTTYx1XCImIMnUSBHSqneUwQqJPuwkN2OU90 hOOkc4lOehhgvnEEdDg76R1R4zd2jog9u537kmn8NZjp8YG5mp7FRXO4TywRRn+ItAdj iXx6QEFesca5YR4liQtw+UfMImXe31tJBQEdZGSc2+P8CKROVFNy34eweGdNCvzy2SA1 RFKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oNBGFH2Y+HiqoM85hNYRvTjlzhO6SEyWeacg/l0Rijc=; b=MHM57T2uiQiIASRWKBreMhO4Dr6XmbUcMalOvraZvMYcjbEmfidAPIJgDvyMvHxYjx iuDsrMmdGkjEamjKFc3GqYTMdSGYzxBEiHBeLIoV/UIDZNJ5Ry5mllA3xvyoCXxdya/A cgX/GJ0q5YCUXO2FuzO8tL8wANnKTY4xs3KqbfPJrg+GXXwDhbRELONsraW5qrtLMV5l AsaSfxSdlcU7kDNC/0mwFo9U2uUn/SIheVm1EkIEHv6Lgh0bEAc58dI4FxWcG3jDgfm4 MpkxMtK/JpD/QII8XySEMI7og1jXtf0eFlo5RZqZ5ST+y6hFGQRXBSsFoeuMH6aErWK9 Zm8g== X-Gm-Message-State: AOAM5331/KQmh2CvI6/0zapoXNp/se4AcuKv47Svpi4eU1dYwN7yFtth ye6FgXNWkv3behz1Ekl8tHdg9RE88Wo= X-Google-Smtp-Source: ABdhPJwG2h6PJMfQVmFPVkF/5RrZOX/5fvZC+YEcw0ppt0LxKLitq4Zc8RvfJld+g/FsWH2DxCr53Q== X-Received: by 2002:a1c:2041:: with SMTP id g62mr14768382wmg.172.1597675084841; Mon, 17 Aug 2020 07:38:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 039/150] meson: convert qemu-ga Date: Mon, 17 Aug 2020 16:35:32 +0200 Message-Id: <20200817143723.343284-40-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 53 +++++---------------------------------- Makefile.objs | 1 - configure | 14 +++-------- 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(+), 74 deletions(-) create mode 100644 qga/meson.build diff --git a/Makefile b/Makefile index b97a3d0eeb..174d1ecc4f 100644 --- a/Makefile +++ b/Makefile @@ -290,7 +290,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 \ @@ -438,52 +437,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 @@ -496,8 +458,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 @@ -522,9 +484,6 @@ clean: recurse-clean ninja-clean clean-ctlist 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 @@ -646,7 +605,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" @@ -667,7 +626,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 @@ -859,7 +818,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 1486254a2c..259f9936ac 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 0eb9f8aefd..a58d049d13 100755 --- a/configure +++ b/configure @@ -825,8 +825,6 @@ FreeBSD) audio_possible_drivers=3D"oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h LIBS=3D"-lutil $LIBS" - # needed for kinfo_getproc - libs_qga=3D"-lutil $libs_qga" netmap=3D"" # enable netmap autodetect HOST_VARIANT_DIR=3D"freebsd" ;; @@ -888,7 +886,6 @@ SunOS) QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" solarisnetlibs=3D"-lsocket -lnsl -lresolv" LIBS=3D"$solarisnetlibs $LIBS" - libs_qga=3D"$solarisnetlibs $libs_qga" ;; Haiku) haiku=3D"yes" @@ -3972,7 +3969,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 @@ -4183,7 +4179,6 @@ else done if test "$found" =3D "no"; then LIBS=3D"$pthread_lib $LIBS" - libs_qga=3D"$pthread_lib $libs_qga" fi PTHREAD_LIB=3D"$pthread_lib" break @@ -5192,7 +5187,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 @@ -5217,7 +5211,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() @@ -5596,7 +5589,6 @@ EOF fi =20 LIBS=3D"$lttng_ust_libs $urcu_bp_libs $LIBS" - libs_qga=3D"$lttng_ust_libs $urcu_bp_libs $libs_qga" else error_exit "Trace backend 'ust' missing lttng-ust header files" fi @@ -6722,7 +6714,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 @@ -6968,6 +6959,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 @@ -7825,7 +7819,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 08bda49778..67a26314fa 100644 --- a/meson.build +++ b/meson.build @@ -128,6 +128,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 @@ -290,6 +294,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 9c558ae51c..9ecf2496da 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 f6781752e6..9cb4c3d733 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684945; cv=none; d=zohomail.com; s=zohoarc; b=AgKcb5iZUBQb1Q0appfooHSr7TOFr2giCCLKJ35OXuy/uuzuKxce5mm/WVfwTv506u+UPp7unC9aHbd3robxOvi8U/Ue1D/mibuHQBLNFR+YwVjnluEt1MtGjiZISMPqcHe5RkeEeARIKwkqQajA5q/2SORi3+ycKz/TNMrczRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684945; 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=alq3qkQflAS1MVNIYnc6+tQ6ioRrHZq26cXio83N7sg=; b=XDO75Y91/Ey2hmP95VlXejO6aXn8xCRMKIWwXtmTdAAQqoLW2HH5BCDPJvEMKOakSnshNiGD5B637fcjM3JLsyrO0wuVj1ucMZ5AbDVkaRcO6ycCojhg1DCllExqUgdsL572NzOB23tofq+O2gp8h86JxJNH1lpsu7TOEJumI5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684945223219.4636459601063; Mon, 17 Aug 2020 10:22:25 -0700 (PDT) Received: from localhost ([::1]:44620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gYA-0004gK-M3 for importer@patchew.org; Mon, 17 Aug 2020 10:55:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH3-0004IH-6m for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:09 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH1-00069D-B9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:08 -0400 Received: by mail-wr1-x434.google.com with SMTP id f7so15275713wrw.1 for ; Mon, 17 Aug 2020 07:38:06 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=alq3qkQflAS1MVNIYnc6+tQ6ioRrHZq26cXio83N7sg=; b=chYGDpdcH1xVDpbdj8P6Sbt56tA++Fz1lqsoLZD7fuN+uS7H6qqFgDexlY5Lds5pI6 haFQCQGh5w0Np4KfFrcFiKcK3vGnWeQjJ6ehtTU7ZyACMn7dfpXJPN9C7IjINjfw6hGd 0G1zrch53mgR0Bs5OdFN+76V7d70d/LVwZy/gePRl4JGvYiai8laPXs4c8gwrSIv+9IG Xvgy8jK+8CXW9QxP6KN3AFYBkOvPlf3zejSmmkdwO01G1GdhVk3/2tKRgQQzjO29tTf6 k70Tvd2E6sWrZxAYQbNhwPq0ky3CJ8wpareg2IvpoGXmB+cnRVTdO6v1b3pNFAL2vhYI uVOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=alq3qkQflAS1MVNIYnc6+tQ6ioRrHZq26cXio83N7sg=; b=niiKpNOJTTN1zXeKgUD9t3uRo+zVzqzQlHMNqB9IRoLxhPSd4Vez1GwmsmTOFTLfPs JbcRf9t87wH3YRrRNiLoiKoAbqY1/3hOWfLO3ClWnmy15OUStJ2qIeFe24epseUqLR8E WiutL/svEABFVC/D9VdNc/quAZ4+yOBX8giLWntofzPEs2qg03GH2lMM3yl0JnFPn/W/ WMBQmSFFgWCTxgqegQrl9ZTgyUw+8lylY5WkXpOzKnKVrwMd4UrdhVpyWgc5ojVQrBJX NjpmOFjfRWpbolGjwSTHaGbpyxlLMIpU0WJSWG8piBSpiWH1NgQUMx4qX3Rf0C0GUprZ 7TDQ== X-Gm-Message-State: AOAM5311B7RH+50OwDLdO02oDsrMpnbUC7/omp3iDqOTF+d/cbAo49HX P5HAPMfyM7dGmpvKW8jOmqZ3+3QyE9M= X-Google-Smtp-Source: ABdhPJz5w94neA0VwO3r4+iMbe3TbPZznURWvI5g0DU98W+dWq7QjbuugEoUCrd6/N/7ZsbKiYA6lQ== X-Received: by 2002:adf:c401:: with SMTP id v1mr15100517wrf.379.1597675085720; Mon, 17 Aug 2020 07:38:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 040/150] meson: convert vss-win32 Date: Mon, 17 Aug 2020 16:35:33 +0200 Message-Id: <20200817143723.343284-41-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::434; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 174d1ecc4f..9b35c0d00a 100644 --- a/Makefile +++ b/Makefile @@ -290,7 +290,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 259f9936ac..baf15656e8 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 9ecf2496da..0000000000 --- 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 3513a90f5d..948302e06d 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 c82676aeb8..0000000000 --- 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 0000000000..42c8d31a3d --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597683062; cv=none; d=zohomail.com; s=zohoarc; b=hNh44WLG0iDiepirWmmPrA4cRdJwr86lWHMAaZOf7pOSxY01LZJ11ccXVGQCK/B8PPoRuTV7cJKK9TaLlBInTbtq1K+828iG5El0S2B/ns3uQtQ8Q62w/gnvf2qBuPV/TRTEdeIkeNxgPdgsloXajZRR5VPy4ALkqobbBDqrZSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683062; 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=qOKJ+Ver4XgMvPbsJwwjCcehhxtmfHeXcEultQ+LU6o=; b=FNjzaNUJWtaESyyc/MvaArdUhXvPwDNe3RlY7aRbLeFfOD+mds5/dnpvc2kZqhtdY0bmmvNpgK97OvHS123UTQoZ3Xtl53FJn5AR1MqehGvPQ2W3c6HGLKivPcJmCvyR0CFWQt2d9Bd/1uUIZDHSciM5PTRe7rlgQ3rU4C4x9HU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597683062197995.7820967736751; Mon, 17 Aug 2020 09:51:02 -0700 (PDT) Received: from localhost ([::1]:41586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gc8-0006Wu-F7 for importer@patchew.org; Mon, 17 Aug 2020 10:59:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH4-0004JJ-QF for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:10 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH2-00069R-Ur for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:10 -0400 Received: by mail-wr1-x432.google.com with SMTP id z18so15241761wrm.12 for ; Mon, 17 Aug 2020 07:38:07 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qOKJ+Ver4XgMvPbsJwwjCcehhxtmfHeXcEultQ+LU6o=; b=lT+wSmKGQtylt7hUnexQEIWXYMHF7+hW5f0UPSYXJCnLtEVtr307t4xjhXpRUQ3yoj 3oYpZKGG2Wp9TyPz7FCDdBTZA7LVF14rQ6pYqDeqVa8JtPMKGamDKT1Ul7aishUQZsTQ /ER6814dovQsDNGRTeDEsuxfr6XuSptZ0xWfnSarK+b4vJOlzuZ5DpFx3NCeSsqwxjgy gN//3oEzGU6IaKClu/ZrBUPSLDD4kdKA6NhL+8GTkym+fQcL5pKFavwa1k6HLkjxCTrx +cnqpmCplW4Qp2uApMxuFEaRVFiVMbVY29GjT7ObBx3DdX4jWumpZLuJX0I8aLBNv31/ 5RJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qOKJ+Ver4XgMvPbsJwwjCcehhxtmfHeXcEultQ+LU6o=; b=KGSpjZYnrSdPn4TlssUgYYzLPLpsZTXPONTadbMl46Z8CscwnOOjz7rAkdeJHu1QPH RNFiaYVLFM+66YOy2VUef3iZ30U4Ecpa9JkmjBjt/pr47PKHSS/Dzk4oK+Cb8FskRg/H Kd9Z7bQcZez90UWR0mO5/Bpk6xKqn6fq58x+zouIGX0EgzDno2whYbf1WW8aq6FKS7HF czIH/GpqA2BpzJ+YbavQ0XceM7Gu0Se+nStSmOHDmTZvCDfS46tTTQS0DN6EnsmcCnr4 N47t6hCIOYGSw3paAKXwXulFz9ENSwBlBsOLCy0kSEvPJMnNt++0WE24cW4BLifMm4E8 BSOQ== X-Gm-Message-State: AOAM531TW2ek/C+VSBREE/IgpBb18gF/PMo+tT127PwsI6B6Hy7LQX5r 8byQRqusEkOu56V3brYwmWeolh0SNd4= X-Google-Smtp-Source: ABdhPJxTGc1xCE/WybpERzW3frl0AAD0SeMQ4930w57KKhJ3Dn8FzvX35gSFSzaW2CsLfKHN5n0bJQ== X-Received: by 2002:a5d:544a:: with SMTP id w10mr16077523wrv.317.1597675086539; Mon, 17 Aug 2020 07:38:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 041/150] meson: add msi generation Date: Mon, 17 Aug 2020 16:35:34 +0200 Message-Id: <20200817143723.343284-42-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 9b35c0d00a..a46b31b907 100644 --- a/Makefile +++ b/Makefile @@ -439,23 +439,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) @@ -471,7 +454,6 @@ clean: recurse-clean ninja-clean clean-ctlist # 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 948302e06d..2d33c09fe6 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 42c8d31a3d..1f39e05335 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682821; cv=none; d=zohomail.com; s=zohoarc; b=Y96QoYLBjU00T0uo582qo+aJ7FM41B6G2DaZ5/q77oO+9jN8X9TvaPDSLEAlkbJkJxxPYxA0VjCmE2c1Io1bxGwqIivrYs2bvPoJtw4E4WJ/t2yqW4VvxJccL/CTNBvfAGPCMJs/Op3zLI6LqYArdMO4zPP8Lr/y51UF9sQ8oLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682821; h=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=BWm4RLl9igLq5d2pFobzxBFb20HeIXdydgT8Jvp0JXU=; b=inbx8cI4BmSxWvEoPsMoXSl2i6CohQcSe59Tt67UQOWwIWMq/hIM9gsqyYc+T92nGId8ZwE0Ggd5B6WqKHkb281mbzsonCNd5YJ5K67EYy9aB9AY0pWl1TtpVRSr6SlaUJC61fNMFmHwgHMXowNJfdN0v1aawob3Btb1s/ovP9s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682821558441.28082394085413; Mon, 17 Aug 2020 09:47:01 -0700 (PDT) Received: from localhost ([::1]:40010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gXK-0002j0-2i for importer@patchew.org; Mon, 17 Aug 2020 10:54:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH4-0004JL-Qz for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:10 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH3-00069V-Ak for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:10 -0400 Received: by mail-wr1-x431.google.com with SMTP id y3so15280562wrl.4 for ; Mon, 17 Aug 2020 07:38:08 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BWm4RLl9igLq5d2pFobzxBFb20HeIXdydgT8Jvp0JXU=; b=aVn7IDAI2mr+nV7f6jwaVMs42lRP7u8ELTT809lZVAVJNZBa7dWkHYPSWT3YOVNcfn 7qOijsSimcfzvbnBK8jUCmh8PvgR1fXHh/cwpDSs6nzmqP7jg7huFytBqJBY+da15vdF JRusiqb66M9sAp6N4hHAsTP7YkNwOWaWDIpVPqM5l3seVGfN1JR6arBHNFVrIhf8JOPd uaA2jQpe75IMHC6ZV5dFAb1Y77I+ziL4zILYH0KH5731xUsJOIBhLBtFcfeZC39bcBcn BNmP6lmCG/H01uX+xM2fkNNV0rlAS75EFRYw/+PSxpdzdFnN75X0ThLtGrt0y3eeFAeT OPQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BWm4RLl9igLq5d2pFobzxBFb20HeIXdydgT8Jvp0JXU=; b=lkPPcjoR6ucrzbXeqM9wr6IesJJu2jYhegfYH0RM7QUGHS91vv+3W2f06BPcplE+6l p2TC8JkFgQZpPX/HrDexlybHevX0X+EjWPtEDElkhSZicGbLho83nP37qSLKZ+/HXo4h FqPKorDKRb8dShG96alfuQ09Jtwtj4bt2vVJWHGs+HZ/LMgQELtnCo7GFmwSd+AM+4vW 31XtdstSQuUDerh39QFmGX0/T+zePpzhWG0O7ElYdBSPKN2+iWuF6iAxrvf8ry6whx0e dOIYAGvf5FVOHUqC0aixbmDIeKEES5uOxJDp75hKqDrgHIgPRaJBh9Qx5LTe7/YLvnv7 Nomw== X-Gm-Message-State: AOAM533nwqq1t+XM6Tqwrvx1D0Q3/vpY7qLEN7FbjXGpK9zmPneFuqUa kO5jMrnQWtlAmUBjg7x5fwUSK5tUYWA= X-Google-Smtp-Source: ABdhPJx1L57YnDx5gapbbDQIzRUYX5FoxW1Xd6l8rnSqv2dYuQntZ2bO7Lp5wSTPf3+uAmd0gO2i5Q== X-Received: by 2002:adf:dfd0:: with SMTP id q16mr17185226wrn.60.1597675087466; Mon, 17 Aug 2020 07:38:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 042/150] meson: convert dummy Windows qga/qemu-ga target Date: Mon, 17 Aug 2020 16:35:35 +0200 Message-Id: <20200817143723.343284-43-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 a46b31b907..06c73b8d09 100644 --- a/Makefile +++ b/Makefile @@ -439,11 +439,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 2d33c09fe6..7e7174b0a3 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 1f39e05335..780c461432 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597676553; cv=none; d=zohomail.com; s=zohoarc; b=YwlKUOpRY34WI2mrM5wABi2F82XhDSukZPSl1KFvG+WhlljBur/BtBcAgJXH9L701PAU5mB6TACJKfDdkdmLr9b0vVuG5RqG1mAnSm8Y54sy7eA5XobS7JbICg9rOHQdg1cUrLVOtcADC7MxIBNOkEImA2xUMZKv7ZjeGKQrhJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597676553; 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=kf7BeJ8yweifSglyftbXaX9ZKpT7856D3iotyv/TdHg=; b=RCGdNCMDKqbn07HmY5FOl0om220/Bx2XGO8iNjRihdteghg5xYomERXZE6aLP0etsB8p2WgkbkxCZWpyEN22/ZdTG57GFyTZBKig45z7mGgdN20Gzq0a6qN1+osEriYPRGiz85bzfYge916CYT7bXVbK7YlnK71U7EcxXbM/Sg4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597676553918884.0329382519321; Mon, 17 Aug 2020 08:02:33 -0700 (PDT) Received: from localhost ([::1]:50072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gee-0001yB-ML for importer@patchew.org; Mon, 17 Aug 2020 11:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH6-0004Lz-3I for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:12 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37275) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH4-00069g-H2 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:11 -0400 Received: by mail-wr1-x443.google.com with SMTP id y3so15280611wrl.4 for ; Mon, 17 Aug 2020 07:38:09 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kf7BeJ8yweifSglyftbXaX9ZKpT7856D3iotyv/TdHg=; b=OUWTEKq8JGP84pCVQBEGzXPXGedcUT/8VL2T6a1vV/meg2tR5boh0LLbt3NX2Y6uq1 NUlJ51cdnHyjSSXkZcqFErLprYO8MidpC8GWQOK1ReNOXQ0IgD+GftigENm8UVRsxFWT zjeO/7IlM27yOY0zUqGNXVJ/U3Fz/bUKjoKqJNgcTcO9Ik7GB+dn/eYBD/aI5zs77/z7 3wHQW9IFBmXkcI4wQ+4xkAOv42W0g+JxYt/6a7TM1yDN+xYkHSfBOYwFhXMWBlgwWcL8 NgQ7vGhj34eC6e6xJ4yS6HruyfIVmTPfptPTVlx3u4B85FWv6VRVLf97rxvUf+sC7La/ I0Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kf7BeJ8yweifSglyftbXaX9ZKpT7856D3iotyv/TdHg=; b=FKiGAQ3VnT6EU1UCO3I5OGGpqJwDMJD29G8apmA0YDEqC7ZVQcDkjr/te/d1Ksf1gz YNhxivu/k99k/Jmc/oVbmNpLSuUdtx6CGba5G/oXj+oFph22OUW48d82bVfZvoofODNn s77psUzEO9m3FWs4P/GWMF/ctLi80RwU6PZosOzHm8w6Cdr+hGWVV8+azKFVKNWI9fSv Z706tlsqk9ZWAt8hK6ujw7TQXUR6+dXjf/BO+s0a8zcWJotrf1O1x6vHqWaFYvoPffqR zwA1cxPEByezM8mW6Sd1S0P+OjD96X/I5dPd2IOjM8qWPDvB0FzUPksJPinkMxShfMEy HmUQ== X-Gm-Message-State: AOAM531aJRtQI2FflKDj7y/oyff2sYi+cJLkHChXFnwPyXu2kH9E+WnV 3BLbUCTEdw6gcDZDhUpqDKACioUiEo4= X-Google-Smtp-Source: ABdhPJzoe12wELTCpjV6BXOr9KUVWGugQx8pGOtCxqgnTfBWx0TmKeu13nHTDUCpK+JKhlrQdZcHUw== X-Received: by 2002:adf:92a1:: with SMTP id 30mr17128981wrn.56.1597675088323; Mon, 17 Aug 2020 07:38:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 043/150] meson: add qemu-bridge-helper Date: Mon, 17 Aug 2020 16:35:36 +0200 Message-Id: <20200817143723.343284-44-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 06c73b8d09..cbd5bd1a87 100644 --- a/Makefile +++ b/Makefile @@ -186,8 +186,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 @@ -420,8 +418,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 67a26314fa..8c05db2cb6 100644 --- a/meson.build +++ b/meson.build @@ -293,7 +293,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 @@ -311,6 +310,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682953; cv=none; d=zohomail.com; s=zohoarc; b=nsk1IUZi94MYUXSwc9E2cgzki719Jmwzq97e9+fhcd0A07FHczb9gF5DSOO/1AKkiAg9vnwRjZgNVbQ7xFCdJlD084XBr7AFXzxRlzikqtyMZfpuKzquPgd7HIm9NfCBiPiupM7Nk4DgxI8fgE8jm8Ul/A2qXevBnQxNeFolbBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682953; 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=WQv+f2f0fRtkp8SsmttK9Yb+gdx5W6ZpefDYJCwcG00=; b=PJJGIze9ZMEviMqIl7OmMFfRXbwIEDkFm9IkidYfzgRJQv780mIv0Hd8e9XoqT+F8rZgx955oasCd2JSgG9KC5Am8DToTJaLuBecIybGA2sy3xQKCBCWVyAMGlL8RHa9A7DC71JBNTIkupOjRmPCZxYeSXvD4VMYBT4WXZjicoI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682953163962.9056488063048; Mon, 17 Aug 2020 09:49:13 -0700 (PDT) Received: from localhost ([::1]:59952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gaY-0002Vk-0T for importer@patchew.org; Mon, 17 Aug 2020 10:58:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH6-0004MT-7w for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:12 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH4-00069p-Mq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:11 -0400 Received: by mail-wr1-x42b.google.com with SMTP id z18so15241906wrm.12 for ; Mon, 17 Aug 2020 07:38:10 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQv+f2f0fRtkp8SsmttK9Yb+gdx5W6ZpefDYJCwcG00=; b=tZ4p5EGbheOTF5TCOVqXXl/jID1l1hqzMQJ133aRDc+n4TOC9DKp4aE8FQX8wFYJy4 g9mRuuNbdMEKqRtke2Rbv1pGMQyPt1vPmUqYLX2jSVvyr/EMBm+7ojd5nS7JFQu771Ys prYyBfzW9wLpKzQq8zKcMUx5XPHpKJaOGKIJAWHrPqRnj7HCv5Rzsx5FosKbgSS9ql4n egTUqbJK5nn1FJjFLqJBPUZxj8K2tcccZiOzu67KeTvFl5KkYREuR3+LaN8rP3GvZZex F7cqJTo24vNSDjxz6m10mhSrJId/lYUS0BiTPae+vjJ9C2eqCynm090311pZfX1oSaCg /Cdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WQv+f2f0fRtkp8SsmttK9Yb+gdx5W6ZpefDYJCwcG00=; b=uDacXGaDBQrSH40cOzlNcP1ZOxWxFdplVcC+oRFzosY1S0prBRU8uja+mfu/UuTBSL P4cir50WWzbcJWNWmuA/quRnFxLClIn1hxN82t55vixm9QiM24u0kOW/m5YrSg8Hs5Yt UXxvZLqJKsVX7dQvifG41PMghmpYOGrnPkJlVYdN5GWIq57Z596fda8HaIiI2+vPBjdf NF3mgJ2uIcFcz59qrvebFkSYSFl9OQMvyJFXjx/4ECh1DGKYAzyoSFccaU4F9qRhUhxA Dr12MfYkgBh/b0mGZulbBNmJ36MUq58Gs2bgZCdQfLToyEI4fx4knZsldnNtt5asmK0v SxzA== X-Gm-Message-State: AOAM5322LZTLQI6BdyGuKWF6yAD37Xxb8ayq7xrRsjei2qQnm1YiijvV 05yPc89bL/CfW3AXMfOkO/etZoEXhVg= X-Google-Smtp-Source: ABdhPJzblm9nqdOH4C7NxgrIySNpesrVAFZm5LvfKipaX5gp750rKJi/3W4gi7dIYhjpsuQSDA/wcg== X-Received: by 2002:adf:e647:: with SMTP id b7mr16943865wrn.220.1597675089228; Mon, 17 Aug 2020 07:38:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 044/150] meson: add qemu-keymap Date: Mon, 17 Aug 2020 16:35:37 +0200 Message-Id: <20200817143723.343284-45-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 cbd5bd1a87..60dec5d0ff 100644 --- a/Makefile +++ b/Makefile @@ -418,8 +418,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) @@ -432,9 +430,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 a58d049d13..919f0413fa 100755 --- a/configure +++ b/configure @@ -6703,9 +6703,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 @@ -7022,6 +7019,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 8c05db2cb6..fc65f01b6f 100644 --- a/meson.build +++ b/meson.build @@ -107,6 +107,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 @@ -301,6 +306,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684903; cv=none; d=zohomail.com; s=zohoarc; b=D71mQphpiO/ycTVTpZV7KbBZwH0aTaNkF2oMuVXr9dMZ3HG/chd30/2+SjwxDMX85YxEungT0Fogs3v8gyf124Wbr6yd+Ip1hxucoiTr3ns4vP0IXJ2wc/3XpxY6sNFnAi2QVjzRORRLTLVNKpVyeCbGajEs3UsCM2xVx3Mm8T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684903; 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=Ser9XLljIbOuFxuhLFNRibnCpNpEfksvUVVck7gs7/c=; b=bvII26tzLIHiRz2REsbqo/1DeFX38mHG+aaPubZewVL9LclgRE31Gg4pkb1ysiF6LzHYigk7SUEYEkwNpvXelKt+aorIcPdicNFHPns6Kawlhgsu0/Lvot4ZaZp1lkRld3pHXRyd6jz8WhndscACy3v13XMqOFFzkvryxwo+BeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684903144552.0903954969967; Mon, 17 Aug 2020 10:21:43 -0700 (PDT) Received: from localhost ([::1]:53020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gZU-00086u-4Q for importer@patchew.org; Mon, 17 Aug 2020 10:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH7-0004Pp-Ap for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:13 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH5-0006A1-PC for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:12 -0400 Received: by mail-wr1-x441.google.com with SMTP id f7so15275966wrw.1 for ; Mon, 17 Aug 2020 07:38:11 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ser9XLljIbOuFxuhLFNRibnCpNpEfksvUVVck7gs7/c=; b=D6QlqBL5a//rMSEI29QrPsZdZ+Mp+Xl06etYhL5O0knxgsI0N7GD0H+x7NBYtJeTe/ O7y4UARP7fab4rOblsLg5/vlgrJpCqjrezKAPKj9A3fztenpqc1Tx1NcWsLur7laaKZu Ihb502GVcMwbeGUt6uXasXgPxmuyZd8KwZkUn1Bp8FxyN6ixyiiwqcrMS3EXSSt3HoGj 4VXPa9gsYwtBqIyCNO5OKGuwpIN80ttgrxagqb/VpywjmrPBdthKgsAEXJXt5oPc2S5X ufkSQIkxlOQLGES5ZmngdLknHjv/dYGJRVvu9Ea/gGsKAq5eMxcjrgsh0P492ZBrB3Ko 5FMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ser9XLljIbOuFxuhLFNRibnCpNpEfksvUVVck7gs7/c=; b=dgqt2Z0N0FUXPUuut5q3uKiKD8AlgtzHLvlNgX72knQgGgN9aIUV2zKvL5JO8Qhq3e IZo5Ews5qygkJCrkcu3nIeEMv1h9imcXjIxKPqI4sbWGNNwUBbRd34xlJHyURd6EsATB nRlyT6mZZd5BDxUw8fCcqmt82a1yTq152UqqzTUaLp0D9QfP8Exaki/uGQPP0PffyEaU Xeebtn4nhFNCPGddnfmEOE1VIkOZwU4FyWZreYrxA6exgcCn/lIbp73KFGWl7g1KXa8q uK8fpEfHhsgIKWpjgNglDfKTuj8ek0A2JPXy762SI2a2OYy6oNn/6x5ZdjsAOTnEfyZW XVJg== X-Gm-Message-State: AOAM533JGP3UHsVOakWS5Oh9meHlYSowt4w7qZXyc63nX49KfSeOlgYi ifiicDYq00QEpxUVyOrBdc6mEWSQ6c0= X-Google-Smtp-Source: ABdhPJxXtRucoMer8HPOq5oA/CYvBYhToAepkzx15sUmsQpGPpfuuOzMZ45DaIWuLEFo0B729pZgsA== X-Received: by 2002:adf:bc54:: with SMTP id a20mr15636564wrh.227.1597675090249; Mon, 17 Aug 2020 07:38:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 045/150] meson: add qemu-edid Date: Mon, 17 Aug 2020 16:35:38 +0200 Message-Id: <20200817143723.343284-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 60dec5d0ff..35ea574503 100644 --- a/Makefile +++ b/Makefile @@ -418,8 +418,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 919f0413fa..2b55fba922 100755 --- a/configure +++ b/configure @@ -6668,7 +6668,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 fc65f01b6f..d336812c2a 100644 --- a/meson.build +++ b/meson.build @@ -311,6 +311,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686886; cv=none; d=zohomail.com; s=zohoarc; b=A2oiyEI0zWQ7MGPpY1+v+iFDrIyhod9CVZwe448K7eukElpLnAvBywqbiahv11gFgPH4R6ICmOjpgbL6kslheK1qFJBxIF0MOdpuK0b5t8hvikUzXdSko4lor7eVag7QV9HdSdsHiAU3yoEDjFYieOyycDKc4os1VD7mFUP/0eA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686886; 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=i6Q1BtQ7dt7i4vV9/lhWTeE6ygoU1bX5vJNmganoOBk=; b=AUNUp5Uky/WR3/KmsWKFRFOinHDaHgnCS9byckW497sOGy2vcJf5jtmcW1g+fVqXcoscCvpXxuKq73TCZSUJ6gvJR6PouJeE6ljIbtlecULNSsw6d2nkxKaOCNDPbzoFTm50jmy/2E/kHVCJS0ehOrEgYVI1OrATyj4CRNNeSOE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768688662669.19225205764883; Mon, 17 Aug 2020 10:54:46 -0700 (PDT) Received: from localhost ([::1]:33164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gal-00036L-1D for importer@patchew.org; Mon, 17 Aug 2020 10:58:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH8-0004SK-9X for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:14 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH6-0006AC-JP for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:13 -0400 Received: by mail-wr1-x430.google.com with SMTP id z18so15242015wrm.12 for ; Mon, 17 Aug 2020 07:38:12 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i6Q1BtQ7dt7i4vV9/lhWTeE6ygoU1bX5vJNmganoOBk=; b=f0d6Jrk7Xjv8TqV88uvjOGvaZbR+82AfdBMMABrf4KcIAKGcVw3y5BJdjsgaPfz7zB XNfas1gYDcQpYYbmRfxJR8WkNewjRvJhkhHbhkVYJjzf0sWkSyJA1mWXVm7hw+bcnWAZ snvtAEJMWVhBsE9NE1cvtWk5m1Ahiacb6kyvUtoPpvhbpitSoaFUBNQAFIbe166NLgVS yDYwMPTUv/SMOYSzx5lAbB/iQUErTAKNsSebpeALLg4WrGQykshbVrXSWiV64KeYdA9W 9yDPidREYap3LVRaFY6ORw78Y30uKILVL8zXpXl/IyJr/8QPaPORujTtPADBVx0ngojR so7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=i6Q1BtQ7dt7i4vV9/lhWTeE6ygoU1bX5vJNmganoOBk=; b=icBQEkhhxwErFnNlOeQhGWS7WqrYuvYM96j884cZcZvJIH3w4C+MchtqEDihzM4p2h w5Z2PsIcJFSYOrJjipKtmk8Y+gdoREnd25X4ANqK9ggdnTaFvqXsEgKWm7jX0FJl3R/X cS1fdSzv21PgcPMqFYl+GVxc0egFWO6niuQsnADY38EwhGdXeuMSuvUmGXe963TuJeWx ediWzAtv/d6l2oR9WDFOdCKhl569/Rjff2rKhwF37MJj4nACGSxC1Ss6XPm+bcq0wLqe Xrvzuylym6i4uNaDZtsd+vsSe3MRtvJlaAmLnTDqyBx6pW7W1QPxTchuD2APJDxvpCj9 qB0Q== X-Gm-Message-State: AOAM533xdJbw2WIrqMu7dhFK9GU7+cJdpjypcEOcn3/YpNYPKDcVODZl ahjzZBWWzmoQKceE9p+g5rd8gCI62Bs= X-Google-Smtp-Source: ABdhPJx6J0dHXpQ9cZKq6xiJLkeNlU4J8LAAJNzhFffaDurn16llkHKiApHEenpgy8Lu7OaDQ+Rf8w== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15502873wrq.422.1597675091004; Mon, 17 Aug 2020 07:38:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 046/150] meson: add virtfs-proxy-helper Date: Mon, 17 Aug 2020 16:35:39 +0200 Message-Id: <20200817143723.343284-47-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 35ea574503..2cd3f5862d 100644 --- a/Makefile +++ b/Makefile @@ -418,8 +418,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 2b55fba922..642f2a8f88 100755 --- a/configure +++ b/configure @@ -4339,6 +4339,7 @@ fi ########################################## # attr probe =20 +libattr_libs=3D if test "$attr" !=3D "no" ; then cat > $TMPC < @@ -4355,7 +4356,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 @@ -6667,6 +6669,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 @@ -6677,7 +6680,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" @@ -7259,6 +7261,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 0000000000..30e2319960 --- /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 d336812c2a..8319d03730 100644 --- a/meson.build +++ b/meson.build @@ -98,6 +98,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(), @@ -297,6 +301,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686178; cv=none; d=zohomail.com; s=zohoarc; b=jsdILvBeM6gDX4MZEVKTOpBP3+5h0W6lbqfqy6zTdhOyPO4/+Nkv7crbWxJ1i4o0qqCIEXeMWTfZOB8vCtYJmrzWHvIYdIDbLOFv9bpQldSjr/ZUk8ypi8mpMAXkLF/gstZ6FBpX8p3r0E42c50bd6du9JlUW6CoEELJta2FO2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686178; 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=TTpH/Amkk5QWW5qv7DGlz5zG9WnvhyPmO7FqAWwRULk=; b=SEdOnbjbdf2JXZ2ibQRszM9h2NyxHzZ1Fifr6a5m5BRcN0oCZV92gtWNH8Tttob+K7R4JYzKbcO751LZMwevsgTCcT4p0C3m45zeeeV/agqNGm/eat4jwMO+fM5syHUzRbueqaZtTYjRzwGjsGe65TUoA9zn2GxYr/dBDuCnaTk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768617879155.51336385229615; Mon, 17 Aug 2020 10:42:58 -0700 (PDT) Received: from localhost ([::1]:41520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gc7-0006VA-SI for importer@patchew.org; Mon, 17 Aug 2020 10:59:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gH9-0004Vs-Ex for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:15 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH7-0006AS-Jh for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:15 -0400 Received: by mail-wr1-x432.google.com with SMTP id a15so15234388wrh.10 for ; Mon, 17 Aug 2020 07:38:13 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TTpH/Amkk5QWW5qv7DGlz5zG9WnvhyPmO7FqAWwRULk=; b=bv68M6230nt5T4jVtif3PvbuH7t0inWvCD/bbyQ84N0UEluHgRJdFF6QS/gpGBHfpD zNIKczWu5T1HdEGdYu7Yzh6YFIQUnCvL5haAB3+TYY0ihEq73RjG0RBZ40suqMAX7iEm 6BM6XAgkL4LUsQmCX3/JnaZhOq/MWBBgx/j1jYnVpZbcO1cJW86lXr8kNc+lKUFDbFCv 8wrJn+X7sTy4f+S4HCGUmFgd+IxK0TkrXSF/ha+5LxQfUHqCESPSb4yRsHSr5r2ZVddw 9eGtdUefSRSJRY2cyhmW564NhtNHTJNM6/KyiYywYDy8wMCHZnavXx4M7P6vozlhYjTV 0bwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TTpH/Amkk5QWW5qv7DGlz5zG9WnvhyPmO7FqAWwRULk=; b=rboRpVl3r/G66MmGGscQJy+NLOcxtn+2AIDlMCMri/nKgG/4I3r8XrYl70WeZTXlcq qQEIs2KR1DPuzA8s3rk+u0usi/s34cggH9DIw2lYcJvxXbDT/cagFXNMAkcTklOMJLQW 6DAyMyVFeVt/dJsobU2nLW/qavhh9v4zMG7Xnxif+KHeQ6oE3i3kexPI+3+FCQ7R0poP WybBvZOCC/wJFvLrweETS3kfEqRovNRUnQYsFOdsKgAYfcdL9j2nFLoUdS3pkc/95CcU eAAwEHvzIUvJZBC7n+9piHqwUC/gFsy2orB/lCAPwPswEmu5w1bEKEwc7grohjJDXoPu mtXw== X-Gm-Message-State: AOAM530007yY6pr2g3tsdIjyAr/b1XJe5vPqx44YBI2+EyUyy+8/Gk2E UrzipyjsOUviWu0eloqLVw1+jROk2B4= X-Google-Smtp-Source: ABdhPJxRvSqf18AdhTBWBnMoDqoQxcv4brFC2A+7biRuawhiJ3sseXThjgJtgxvGfTl4dTXu5fPVPw== X-Received: by 2002:adf:b34a:: with SMTP id k10mr15517788wrd.402.1597675091940; Mon, 17 Aug 2020 07:38:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 047/150] meson: keymap-gen Date: Mon, 17 Aug 2020 16:35:40 +0200 Message-Id: <20200817143723.343284-48-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 2cd3f5862d..f36ff09fd3 100644 --- a/Makefile +++ b/Makefile @@ -130,44 +130,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 8319d03730..ded5dba360 100644 --- a/meson.build +++ b/meson.build @@ -288,6 +288,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 0000000000..daacd2ffbc --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687311; cv=none; d=zohomail.com; s=zohoarc; b=iUiHVMXXuM/bbYJIqEYwEwxqZfuAJdiCggI76s/aaNG5BQ69wXQ7UB8RVh/0oiOEXF6Gm1SKS/BQZwrJmXmF4t8vMjBhPRyG0Q4+Gjl7YTfn16s/DkvZbYEup1S8+qMwquvNQHpuqwhlUZU1e4KhftSB7pX3ebmV42VUGHvaYvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687311; 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=VUHc+xjVtZxJS5B48mMrJNu7pQ1NfcyUU8XDWVv4fn8=; b=cKF5zYhDFwSUUtmaSuWmZvbsg9f1zG69gA6aLb7MOdbFvrgwVi96mORV8UzLVgTqUOcObfzFbe8CylJ4MdiuO+mpDpPvyAtGj7bXVBf8lrclOg5uF20Fjxgk1sCxxbZH0lb1dedesDTsUd1FaVrt/oIbeIWqBL6nwyQ2iArmNn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687311249352.1917900744353; Mon, 17 Aug 2020 11:01:51 -0700 (PDT) Received: from localhost ([::1]:40120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gbu-0005wN-AN for importer@patchew.org; Mon, 17 Aug 2020 10:59:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHB-0004aR-3h for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:17 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:35218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH9-0006Ah-Bk for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:16 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f1so15275362wro.2 for ; Mon, 17 Aug 2020 07:38:14 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VUHc+xjVtZxJS5B48mMrJNu7pQ1NfcyUU8XDWVv4fn8=; b=I5BTO75QKBB4hjD/HPx0ZOsbRoMbbhbCjbasy2Mx4ghI8fQE53c1OCCnGwEUI1RDUs VymBGdwoChgro6TBGKgnF03++0neBMwlEzpjvNA6YeET05p3TOqPVN5zdE4wy4HJGvWe dltalqcD8U7+JLLpJGQ/Tk+/dVHc37DuGo3Hcgyw+SxZiAlH2YEHfNKX+CpGyJXqu/nZ SPe41zdzLbBTFnjD4vEfgkLL3R21MylnhJHT1PI+8ohS+oQwc6t+vk4wFH1Enf7lguPw poQEq+8iUCWUjh8iijhqwJnf1kS2MFv7rZ2+S4Cp3ND8MlZP90haXKaLr3kc2kx2/6K5 kk4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VUHc+xjVtZxJS5B48mMrJNu7pQ1NfcyUU8XDWVv4fn8=; b=K2V6cifn+YG7Uil4xYV2TVgLkSFthmm9FKKRqzOWVm87UyJLXElSpaMdskZP8dj5IA vwGZTqm5i+Y/buw2ImqrHexkyVJm3KBohjINrRuA7sEfh9lOPdUxFBydvK+L6YmYOfqB JXAKd0a6IejDRE69UmSip5ERjrl9KD893pxksIvkS1ws44wsuklYqY1oOOEMH5Gc2nDs SyO96IC1mVMaZ3SIMHqGdiOnlWBLKMtflCS2L9hILaaX4WFyy8Es/HGxOndc2gUrEiiw uMT88dhf+mi4BgdgWgkjKGDPhl0LbGE84/5MjgvdCKI2X9tMJQlaKyjRj6MIKrNSi/OM zfwA== X-Gm-Message-State: AOAM5305vs45U7zghityZ3oJPjuM3Z6kWtksgoOobqlggSrKbr+mauWJ l+ALpB5RBRUxBJopWCLZt69QEAke9fg= X-Google-Smtp-Source: ABdhPJxxnn1imXqYFtmhjSwhY5YGHdY+QxWkOaDj2EX4WOXrnwNpA19TJtW3CmF0f1PjezLkMPSVVw== X-Received: by 2002:adf:ef4d:: with SMTP id c13mr17072298wrp.198.1597675092864; Mon, 17 Aug 2020 07:38:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 048/150] meson: generate qemu-version.h Date: Mon, 17 Aug 2020 16:35:41 +0200 Message-Id: <20200817143723.343284-49-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 f36ff09fd3..64255b9d32 100644 --- a/Makefile +++ b/Makefile @@ -110,21 +110,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 @@ -264,17 +250,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 ded5dba360..c6b13e1999 100644 --- a/meson.build +++ b/meson.build @@ -154,6 +154,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', @@ -179,6 +180,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() @@ -279,8 +291,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 0000000000..4847385e42 --- /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 1597686670645478.7350992896527; Mon, 17 Aug 2020 10:51:10 -0700 (PDT) Received: from localhost ([::1]:58476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ggb-0005us-RE for importer@patchew.org; Mon, 17 Aug 2020 11:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHB-0004aH-2Y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:17 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:35619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gH9-0006Af-AJ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:16 -0400 Received: by mail-wm1-x334.google.com with SMTP id 184so14108350wmb.0 for ; Mon, 17 Aug 2020 07:38:14 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+zP6tQrjmoss35OlaN/EolS+2AafGwaPfZK6CLHt+xI=; b=iT8Vjg+74pLOdmmVZtaLInuqXuUMjjKtWyqPr6tXXX8UhSRk/b4kRNgUoNuAEGu1r2 uoESAbd8Iwg4GKNQq5LAllo5Me8AFQM82Sa9ac4A0vWRAj6pp8dYsg+c2ss0aHmrKgQp Q35xD+zOJoUUPtbLWo4KZAuaFjIboLXLtoBpHubQd3EDAKz8UejgPmXM16KS6zZkY09A pMR48B47RahEZCXPDSPV22Y+SCxnADRaVxryuL3ECS30UH1OfELSGzzjYdr1NuD3A9CZ iEp41wO09xfsOoAVRXgq+Vy8MDlGv58vs6ZfLG65VqOUDE2WgE3PC51UWr8M/zYs3Kbi HBHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+zP6tQrjmoss35OlaN/EolS+2AafGwaPfZK6CLHt+xI=; b=oNmo7F2IVnZurrolEb71FHG1cwRI8x7mpmVVpkNRHe89K8T2VSiFWZlMkGs23+akgb fzn9uVX+gyxA2T9odHrpUPZKqybiPaA9qCcint99guNTHQlX0SNGuLeFnvoYhKp9BM22 D6jOSm4Q5wk3rIxKpxGY7hm4gcVil2T0g3Sa/JbFSNncD6sOzy1hgkHDPi5JyeAHiChb kE6CQVjCHX4cSam1fVcRwNfohEIR0JsutdJRZXsApLdOAkEMCn4V6oM2XlAHesASx/Ls HbXjv54Cf6H+t8T50Lxsi+HRNPxxy21fYeULbHNNdGXl6B/HfdhuR6BjBYLTbuINPkBz ylNw== X-Gm-Message-State: AOAM5324Ebm65Vakae6QZh5JxLwYAf7I2z7xSZe43Rx2RtWLGu9gfp33 EC9FwPvx0qJBBK1nz+Pdv89uqvq5TJo= X-Google-Smtp-Source: ABdhPJyGDr5uqZesDSixS+Cc4BcxoWuf0bLO4ixGSg/UB/epVJWHEZJFcWDgr0B+qCEcBGgk3CLSDg== X-Received: by 2002:a7b:c084:: with SMTP id r4mr14642428wmh.20.1597675093621; Mon, 17 Aug 2020 07:38:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 049/150] meson: generate shader headers Date: Mon, 17 Aug 2020 16:35:42 +0200 Message-Id: <20200817143723.343284-50-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 64255b9d32..11f1845196 100644 --- a/Makefile +++ b/Makefile @@ -382,7 +382,6 @@ clean: recurse-clean ninja-clean clean-ctlist 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) @@ -607,24 +606,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 1597686854980371.35874227213367; Mon, 17 Aug 2020 10:54:14 -0700 (PDT) Received: from localhost ([::1]:48424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gYl-0006E3-SA for importer@patchew.org; Mon, 17 Aug 2020 10:56:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHC-0004fq-J7 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:18 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:50930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHA-0006As-3T for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:18 -0400 Received: by mail-wm1-x336.google.com with SMTP id c80so13420568wme.0 for ; Mon, 17 Aug 2020 07:38:15 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/aH4iBKN922X2HXuFdePsCa+x0naNeFT1q3IhKpEgnE=; b=f1MLTzskyMTbf9k4N1vclGvbUjb/a97cLiP/xqYB7/91v4MPalv0kl3oFGS2SsioKN N7D/2sKHnA7nQD2wCJ4ZRcHniUhWm1cBNvnfXhaSQ485QRj+VklSilPT1P1tiuvhALXs Jb9sKpLsrMRRarDqs/cWHq9YMeajSUPA7vBHQ/6BW1H0YVmmnnf4a6ZjI6eb8UIeXfJa ZTDl4nS3lIhgwfAGqzb5tqaMGWZxVyN2mIoJLutx1bhrOKvkEhlrAfBeccVcJInjjH5Y knDx+R+r3tqwLY8ayIa629EurBbPsNpJkWeGskqdh6pseKyXebWzQ+7k4KfySMl33ckj Zniw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/aH4iBKN922X2HXuFdePsCa+x0naNeFT1q3IhKpEgnE=; b=KxeAh9lUw94gDPhSYTXlqtoKpdgHpqNrnEa4aMe9eI1weRCkgxWETEhm1dIpoI2dQO ZQUgEHzb9Eyth6hb8fw/nVCV5EJY1e8MJs+JqqKk6/wMjUH83dOsBmqiLnEWTntDwOBm Yt67fs+ehwaaXqirmMzYnxTPk5xZnWs0YUjwemh3PqCw0/cFG1Wcy3MCoYItvmXPkKyE 7/FFBgeK6EU41iIu/T7VP+g/03wpWvKaP3DEudCUzx23LDbtfOOTGF8ZfAYa0eO+tA0w EDtRDMIzfKQNXlozlSuYAk4vT3egg3fYpc6Fj7PW/74LOrAkh4pTjAQb9rVNeG10wgmR 5Uaw== X-Gm-Message-State: AOAM530pGFEnutktNsa5KWhoTy0khH6mvLlysjFUVHP29jQeQoGkxMoM MjFnU9GE19wWhYm0fpn0XKJ8HWQ3PmI= X-Google-Smtp-Source: ABdhPJxyOPSzNI12lz6m4mOQvE6D4K3DZCytbxPUc90sjhP7F8+opznE20UeJ8adMz1FTg2ojC+Drw== X-Received: by 2002:a1c:a553:: with SMTP id o80mr14679747wme.50.1597675094536; Mon, 17 Aug 2020 07:38:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 050/150] meson: generate hxtool files Date: Mon, 17 Aug 2020 16:35:43 +0200 Message-Id: <20200817143723.343284-51-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 11f1845196..ca331b13dc 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,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 @@ -252,8 +252,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 @@ -360,9 +358,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))), \ @@ -381,7 +376,6 @@ clean: recurse-clean ninja-clean clean-ctlist 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 0b323641bb..257afc2723 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 f9bcf04533..131ba26c1d 100644 --- a/meson.build +++ b/meson.build @@ -155,6 +155,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', @@ -192,6 +193,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 7b1452f3cf..80516b9437 --- 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597685687; cv=none; d=zohomail.com; s=zohoarc; b=LCIk4qAHLkpvf3DdKeeYerr/yQT2absaPogiO8r9F7dBm1u3RdlTwpcHu9fQHvWoITdG4ajkaVJGFqZ3DtH47q2DRHkwrwsl2ZeOx+qc6m6q5huHfBedSjgvggwzNb7T46pIvgqSrC+P2Bbe9dt75c3jALxhmw1+1w9IFkf+yQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685687; 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=u9LHgiiPmGa38g/Fb0syP3eiMwtEunpU2hIQUxxiPH0=; b=k4AllCIAXG1xKi99hCrhMO6l9w80bwq7cJB3gS8RKzSync5Sk0Y5MyCVrmGDzQuwlPQlyZy2Ih1zETkf6EwDvwB3b+h/X7ipPwRSsWtCGcXxureru6J1WaAEvLj2lK5CjYsdTxIS0ailft85ZEtG11Boz+rV/ulue49Xj1rAL8U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597685687716456.8642538474478; Mon, 17 Aug 2020 10:34:47 -0700 (PDT) Received: from localhost ([::1]:49970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gec-0001v5-Vh for importer@patchew.org; Mon, 17 Aug 2020 11:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHD-0004gv-0s for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:19 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHB-0006Ax-2o for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:18 -0400 Received: by mail-wm1-x342.google.com with SMTP id k8so14101540wma.2 for ; Mon, 17 Aug 2020 07:38:16 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u9LHgiiPmGa38g/Fb0syP3eiMwtEunpU2hIQUxxiPH0=; b=OIVL0f18QpUOgr0A6If5b2CfwkNvJoG9OnnILoaukT59HaivT27sqN7bypVB7+iZev atOEnSF/UtjBsswWOg789UnVkvVEw93Wce+FeMRU+jTIcc0b8nBsL52oO6gOWepCQUX+ 1WMTwxHqxXBH7U7o5IJQ7g4M3B3IGbYextKBbByxPab1wtwCRBB9zB9YRKRM2CKCkNFS UDbGLpV4bX1kx1G+g+eZQtbCBFsgN6Dnfge8lyscjgD8iLUHwibJdHfkgBpwe5or0P4k HriHAfqq8Lw2fE7uPZHFvJHi85yuVf+vUw6ON95NdnLwLBi4saC0rHnFJBU5oXaAPTqO u/ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u9LHgiiPmGa38g/Fb0syP3eiMwtEunpU2hIQUxxiPH0=; b=h4+pA/0ssMCbY40nqskGcqPqFmNq01xd53W1CeMKXJxAoIv/1rUNZ3BKiAsxcJ/Wld 8JJu0fQo9jLRgEO/llxTwZcTnNtW51IUPfjz+XzjjXRyIi8I59NM6i34afwPXEoN8mRK VaptHkBdeXYuTAyxSSDvo0IA1N/6/XCdC7n7wu3OGfB9SZHZW/uKs11GZa0jITd9yiFq PsYBSV3LbjZxbwldTdEEqoy79BEXO6E4iWc1rHgWGb4pY/K7v3acUDm2EaojsjhLZdSZ uJgE0fLHFhL/BnPvV6KO+kXGEO/lEFM8LcaUIwbqBhoh4FcfVYFcyTp56fKn9JgtmzAa VWlQ== X-Gm-Message-State: AOAM531PapXAf0jO3ggCaJ/gi2OYiTEwJIgPWLny0awGFgfsL9d5TESE PW2NIFkGJsqxevH7h5eOfgR5cRGmH5c= X-Google-Smtp-Source: ABdhPJy85zju38mu4V6ZHHXGDKyPUSDpHQGD0UhEOd07aTgTiTuZSIFRSjhmm4wTWaMP0K76v4T74w== X-Received: by 2002:a7b:cf22:: with SMTP id m2mr15386543wmg.46.1597675095520; Mon, 17 Aug 2020 07:38:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 051/150] meson: handle edk2 bios and descriptors Date: Mon, 17 Aug 2020 16:35:44 +0200 Message-Id: <20200817143723.343284-52-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::342; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 ca331b13dc..68ad75d210 100644 --- a/Makefile +++ b/Makefile @@ -116,10 +116,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: ; @@ -263,9 +259,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) @@ -373,7 +366,6 @@ clean: recurse-clean ninja-clean clean-ctlist ! -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) @@ -450,13 +442,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 @@ -533,7 +520,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)) @@ -556,21 +542,6 @@ ifneq ($(BLOBS),) set -e; for x in $(BLOBS); do \ $(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"; \ diff --git a/meson.build b/meson.build index 131ba26c1d..bb9e918e4c 100644 --- a/meson.build +++ b/meson.build @@ -379,6 +379,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 0000000000..7c715bace8 --- /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 0000000000..6e3bfe3ca4 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682964; cv=none; d=zohomail.com; s=zohoarc; b=Ownq/GutMPglpH96Iv3H7I9GSD21JvNiQWYlFIv2dgYyomgrxc1OpVDZ8lo05HdjtV8vk45h8rWoONVEpxuVpH4ONb8SF1Kp03h93TYozG/jCtD0+Qem5cG1JywiLV/aepunSaOzWOmylI6rkE0XcuH8taSCCL7MYZb0DBLCZtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682964; h=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=qxn44X5m8nCQy0JhLgpfp9kpI6CKBarBDpEvs33icSE=; b=MSCy9EaSkLoZWEEsmm8hPPf7XRX3Opqnj2mQsF1mWbmPoHKc0btJfJ+mBPS4a7WFHiuOshOFD08PxoflRVEkrTRFKYNEi5ICb8yXK5q+mec4yg08Ufjzz/BdtHMoiAbHyeRRBxqXkrvZ8EmDM0+CQLjF2eq/Tt67TVm2PUYy0Ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682964507690.6106255444873; Mon, 17 Aug 2020 09:49:24 -0700 (PDT) Received: from localhost ([::1]:48606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gdx-0001Ia-M3 for importer@patchew.org; Mon, 17 Aug 2020 11:01:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHD-0004j0-Oh for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHC-0006BB-5w for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:19 -0400 Received: by mail-wm1-x330.google.com with SMTP id x5so13421687wmi.2 for ; Mon, 17 Aug 2020 07:38:17 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qxn44X5m8nCQy0JhLgpfp9kpI6CKBarBDpEvs33icSE=; b=p0AB1p8MD3Q/ypkHIKI8bHeGfVHm56DypVJ8U2V8QL0Nv/asRupa66NBPkkQzy1Olf nm09dPJJqVLhvcLs0thJBIBITR8gW26MR0wtq0/Id1imvvTc7vzPRFASzObAu6HaWHv1 6qoQcKBOvM3W5osI0z67qSaZPKpryuGKQYm0OeO4F/2Cwyk/sRgDdPHBWwlMNvuMi6oZ ONss6h7KHyqK+1o2VrpRt+trkX8z1q+QdRQZrbY0iu9i+s5QkwBmTFrtepF+5g7pM1HV IlSI9c3UqLhm9J4n65oNcIAEk5sfXAUuektczU+YrCgaJiygTlBEjk4YeKvwyQmiJcXF mEeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qxn44X5m8nCQy0JhLgpfp9kpI6CKBarBDpEvs33icSE=; b=a10xDWYrZFjvUHfQQVXqFfzs4qSIjqaVoU6nmWVwGrhm37YZctjsz4S2vQkEaglGtH 5EoyKy8eNa+dGCBeSRDByzIa6BM97eIR6q3FhL7Lc7pdPRJ3pjs1e+9NfolhndeagOuf +oRMDw8eS85pilKZBIPW/lG+fGLxiWk0HSNxVblMQxuxTB80/OMwjd4Sg2oAkkIOez1H ctaiohwPeH3p5D1zzKPb8NgRoSB1pFszNbr5LDVjRyCAQh0QK+nwWkMw7Mr0VnqCEBCX baxQ2uM93fal9a2wbRGk6U7Z/SeBd/E5slkqu/dO9FQWtqwtv4pS/9w08sNfFNDcarN4 b2iw== X-Gm-Message-State: AOAM53024um5/9vBLh2sC65Te50/gJ7jmBT4gliiJwBrZHTrRUx1mlUx Uap1dya20Vvct+o9yR4E18Ifj5MpNI0= X-Google-Smtp-Source: ABdhPJz2ozsp7Ra4gOmnmXQ2EToDgvAq1R5UL9YU8Qcb6JUSLXsxtdKVxPY7SSKSufMoasbxKsVW+Q== X-Received: by 2002:a1c:3285:: with SMTP id y127mr14869069wmy.104.1597675096516; Mon, 17 Aug 2020 07:38:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 052/150] meson: convert check-decodetree Date: Mon, 17 Aug 2020 16:35:45 +0200 Message-Id: <20200817143723.343284-53-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 bb9e918e4c..00b3220fc8 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 @@ -380,6 +381,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 f277d238fb..8e953a24ee 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 0000000000..5c52021dc9 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682809; cv=none; d=zohomail.com; s=zohoarc; b=XvWezT2YkQmdBvoCJbzfmTGBmm4kIh8ahVhQ6zNhRohp2jXuya2kwHriRC83QzgA22a74QpexrjbegNvVzqhxl5YLI7gt/2eBnajet3ufDh+RBsdfELdHqXL4jWcSrOkRynyfsOjQDIyaxYnvoylyy8on4i3+SKCV6tv2+3d3hA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682809; h=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=VcvZFJOfgRhfmScg8I4ZyG0nqR7sIH9JWaPeIlnfKRw=; b=BZduSRAJJkGqhQqVbk3KsTf4l53BkTI3hrkvfYA5m1MECh5ua+/EWeO5Y31zRatdsgbORAVACTzJMBsGDP0kZu4F4tAko+278bo1xIETwbaPEzVKm1CVHm4LcQM/pDV+mq62ewPqwY9JB7ttoKszThFLPAPhCxRfqvc/qoZJ1J0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682809198553.023748571154; Mon, 17 Aug 2020 09:46:49 -0700 (PDT) Received: from localhost ([::1]:50570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gk4-0005uB-It for importer@patchew.org; Mon, 17 Aug 2020 11:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHI-0004tW-0D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:24 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHE-0006BQ-04 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:23 -0400 Received: by mail-wr1-x42d.google.com with SMTP id a15so15234738wrh.10 for ; Mon, 17 Aug 2020 07:38:19 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VcvZFJOfgRhfmScg8I4ZyG0nqR7sIH9JWaPeIlnfKRw=; b=A24/tdAabD6+LCaQzG0YOkoM0VRkxW5srw8r2vUGd+QQDFqLhNcmovhkBbRQMLM9ba khC9dSAcZy+eREu4REqzlGbfM/ySBnUgpfl5VDRYnpLtGrAxdRC+ihzoN9j5yoOdCmAi 3xtSuNT/CSrke8iv0IqhKkVLIbRhSZS8V4/JzR/rZLvL3g0DIM/2PRQ/deiCrS0rINPZ MLbYBJAdeX2SDHcyi3dVZAtVbbwNWx4d+zGjdyfoFYsKNj8IbnF9OMtrz/jXsc4XbDci GVD71CiDLK1J+CNKL+7qJ4/WDQemUk7YFJEk+sVZ7dQmUcZNvjVEce/M+6YWVHCmYSZv gBsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VcvZFJOfgRhfmScg8I4ZyG0nqR7sIH9JWaPeIlnfKRw=; b=nlun7za22wsEn24KVI5O65HenXzG0fEEXbdiMCzC+zNV0Fre7wc4RVBczARcHOOjVR NWwVT/s5GR4gs8YnY6qpmC71Q+TsyYP3CM6ee6lv6C13XVmu6IQlJkLtPIllJAO1BFzX 4r5YgdVpQaskB/Jt71nBCzn3J9JN13nAEWci1IyhsHX8mRd+9u865y9nq1Tuib0+cJpf WYiSqgW40e1pWmX4xDKVYJjw8t7SiMd2H1iLuZ2dpuoLOLd6TMQEgt0eaS9IDHNYMXxN sx/eWvRANYgknguQGNsUk82G01fe9ROfCmTCqiDTe4dpXui7inbSEaxDrPb65Zd3CSd7 aGaQ== X-Gm-Message-State: AOAM533kR0ReFUdQvnWkG7/d9DGvunT0LZSb1C1oKVF8s6dBZEWC/Au0 XC9dNfRd3+AImrp6jBOjMOQ13UxRnmc= X-Google-Smtp-Source: ABdhPJy3FGRw54F26353RDCf9vF90uHgECwTH3WReYGiPyaO5wDhepwCzsr20nzACVitWG/GKO52lA== X-Received: by 2002:adf:dfd0:: with SMTP id q16mr17185969wrn.60.1597675097448; Mon, 17 Aug 2020 07:38:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 053/150] meson: convert tests/fp and check-softfloat Date: Mon, 17 Aug 2020 16:35:46 +0200 Message-Id: <20200817143723.343284-54-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 642f2a8f88..2123a79039 100755 --- a/configure +++ b/configure @@ -8329,7 +8329,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 8e953a24ee..b3f8fdd321 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 56768ecfd2..0000000000 --- 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 0000000000..8779a17aab --- /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 5c52021dc9..ec26f92937 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682962; cv=none; d=zohomail.com; s=zohoarc; b=RYnrthAgVR+tcCWqnhsbPqKUWHjLEzlXJ0PATS1b43J4cXYtkgDUEzthAT14iJWllvxKol28NNeAb/MlKfGz6buKwrIgwHFquWqXQTGLRwGZPVTFldOMVQVH4eCVLT09q9LI0aCgbyUkHzhzcUaqwjaqfVEuDU0hDCxu/jH8dX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682962; h=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=oV+3W0z2SKY8GvtrZaZqrI2d6ErQI+K2CaJOFXI3BXg=; b=LlPhoSgHPeNtAq25RyS1vLV1jIhLRmYI0eISasRMU7D7T4+24K58+3R1hNhnecz24syH3KC9Z7iSQcMRXkzUtBCZH8zxglGbYhnES7poHOgumH4n+BbOoh2nKmBy1WceldUa7x2LvODFvOURy/Kz/+/UnHkUM4T2ASEkoZlfnD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682962376179.75198551801793; Mon, 17 Aug 2020 09:49:22 -0700 (PDT) Received: from localhost ([::1]:41786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7giY-0002N1-JH for importer@patchew.org; Mon, 17 Aug 2020 11:06:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHG-0004qi-U6 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:22 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHE-0006BS-9k for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:22 -0400 Received: by mail-wm1-x32a.google.com with SMTP id t14so14087608wmi.3 for ; Mon, 17 Aug 2020 07:38:19 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oV+3W0z2SKY8GvtrZaZqrI2d6ErQI+K2CaJOFXI3BXg=; b=N71frTXISHhRUGwvJzl5txfVUqWWAEQiZSKsH+Xf+tWJLOUfhhDAOYkzwl1mOKMN2Y dIXAwEfRVaUzqBPeSoTcnrncyoMG2mDvELHvGDZJR5a73IgRa2aGMxq+uuF8PDbTBJQ2 LdY4kFodI8aRT/hFH3TW8+xojgZRghmVxFV9W0ILNvGkwtiTAIZGySE5a9BYRGwq47kP mBcpxJ5b4+dSLZgYbWmJyTzFEu9utGE0O4PwT9QF/ADYLN/toQ7U9Ow3ikKfW78SbAsj 9obkIAIx/jfdGczS6cWVDUBEZ5vxQKjYmCO5URg2vkeUcQJTPLHXkH1N+3PTLRmal5MS jKhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oV+3W0z2SKY8GvtrZaZqrI2d6ErQI+K2CaJOFXI3BXg=; b=kwAFdMCDX0lT0z2GXxLDA+0GQ2Mph5vGy0lIpj+HjUjKxXAjKQ9oXabm5VYztYmpe2 nY/VaCn1IbtFIUvFzRffEqrtYHOLgGdmdc9ePF0ZUU1+tk3DumFZ5V73k6eFYPjIsOK/ W9nGhoqohkGwkKqaPXqxeSE5CveNYSDSJgBPHm6iQU+jciW6CFhkunv120T45qQKq96x kx5ru+6k1UNBsZpLbjP1hhXn3WdbRHOB56rka5VzeZV60gKSby8Rfxdmqi7shm11Qzd+ M20nt18857lcSDqsH3Deuqz1FxSMGPghYi1pf0msX8aISLFqhMCCzvTh9mx7EMrGo67p lNow== X-Gm-Message-State: AOAM533Dz9vhApiR1L7HkYqIh/2G2KPFY5RqhPna2LIyEWh8J4ZFEXCW flu2fRFcE9VgP/Ku2FIVGUwO7gxXPMo= X-Google-Smtp-Source: ABdhPJz9GaUGnFn+a8ChzCAO4+Ckbk9irqmbZJG3tIHyjR9FwhRXYVKwIftIjbn7Vvrs8NQe/J1wAQ== X-Received: by 2002:a1c:bd04:: with SMTP id n4mr15735928wmf.83.1597675098359; Mon, 17 Aug 2020 07:38:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 054/150] meson: convert check-qapi-schema Date: Mon, 17 Aug 2020 16:35:47 +0200 Message-Id: <20200817143723.343284-55-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 225 ++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 216 deletions(-) create mode 100644 tests/qapi-schema/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index b3f8fdd321..676d099631 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 ec26f92937..8be9c2233c 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 0000000000..ae17017504 --- /dev/null +++ b/tests/qapi-schema/meson.build @@ -0,0 +1,225 @@ +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-commands.c', 'doc-good-qa= pi-commands.h', + 'doc-good-qapi-emit-events.c', 'doc-good= -qapi-emit-events.h', + 'doc-good-qapi-events.c', 'doc-good-qapi= -events.h', + 'doc-good-qapi-init-commands.c', 'doc-go= od-qapi-init-commands.h', + 'doc-good-qapi-introspect.c', 'doc-good-= qapi-introspect.h', + 'doc-good-qapi-types.c', 'doc-good-qapi-= types.h', + 'doc-good-qapi-visit.c', 'doc-good-qapi-= visit.h', + '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) + +# "full_path()" needed here to work around +# https://github.com/mesonbuild/meson/issues/7585 +test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), qapi_doc[0].fu= ll_path()], + depends: qapi_doc, + suite: ['qapi-schema', 'qapi-doc']) --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597683015; cv=none; d=zohomail.com; s=zohoarc; b=dfCIMI66tPXql6VFOKp2X913GCcQhKI5nmXIlYrTYAo6dazjA9PArBABLIyXTFG75WJrP9zy2O5mM0qVfyfo/BtT9NzAMRcZZoQV7gJ8EyxLBuWcrQZTNha3WCGRyWfWYIMPufO+hPfr+4dJ86RTxbYOMsNk/Q3DvKfrzIa/FJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683015; 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=MxRrNlWMa4peGdDiN+aPCZQxNRXBWH2i6GnS6XF+Ofc=; b=KZ/WZmthPEZDTUaW/KNImB8CM8DlajMGXpjxpx9bs602rzHpPS18tlTUcRBFFtbiX6h8AR7ZI88tszvqAUrCZvENkHLByBOeW6pyvpj699ywWZlCfa/rEDVlYSzmZsNqRvh2CPCWTIgQkUqzKDeF3xhc/6NV2YMa5178J7HcdXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597683015031773.4010792815876; Mon, 17 Aug 2020 09:50:15 -0700 (PDT) Received: from localhost ([::1]:56938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ga5-0001I9-32 for importer@patchew.org; Mon, 17 Aug 2020 10:57:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHI-0004uM-7i for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:24 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHE-0006BZ-Mr for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:23 -0400 Received: by mail-wr1-x42b.google.com with SMTP id a5so15258866wrm.6 for ; Mon, 17 Aug 2020 07:38:20 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MxRrNlWMa4peGdDiN+aPCZQxNRXBWH2i6GnS6XF+Ofc=; b=NhNeSvzKgniEF68kToAuUqCjWOWYcddHp31ToGUk8NUkr4ir1X0Kl+Jdehabsswm/7 qvftkomKG63pArHGNcMlWFwHeEcxnbvD+9g9LLm8xmmnxEo3l15rqW0tFWaa25A+Kami Twf0R24j45vgZeIVqf7BlhyxGbz943I7I0wyOEdXd1wHvz6ZT0St/jEgZa5K/0SkQiVS CMGXAkIE0z3NnMgLnjbsvUm3jDhtw9JX90/cTlbYXFA5Xlm+GMbKUlrr+Rg7P+rjYVIr 8fGwrxADjJbVsuzofJ9JKci54jQiMdptL1dpFfaGcGxN3ZoBlgoPxcSAnYllMMO8Cyzb ZMjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MxRrNlWMa4peGdDiN+aPCZQxNRXBWH2i6GnS6XF+Ofc=; b=AiZRlgXH2ayv96WzX6sUG3WDj6FTpFvgVAs/32b5otzrHlGuGv5+7n9JyZeOX2mh8o BgsNHdSbGrsJ5JEXPAbLLbK/qTbir5aWgCUMwETO79mt6WpKXkaMIM+gsMoqAzvSg9ef /fvsGINfupUVkAi5CNA2N80Tc7xgaUzl++Zm9U7wxKA08Tnlt6gahGSjqiJpYWc3WSex qBm7rmJ/ujSI6/bIImEMcX+AcPCLghJecJmoTMQRWCn8vbhuY8eLw7l7obtD0ggOO2S4 2XacKTWAaJ/c/w5jU9gEtWBHBECgdGsxHiSy+6Be93tsICIop1qKA0P10TCw0xwizD0U BN5w== X-Gm-Message-State: AOAM5310I2k4aVK/nZfMonSE/LrDA8wE52NFZBwzGf/M3qkqBNbuWAqX l5BNwy/W73OMl+/PRDVfJz6oWQ7eg2o= X-Google-Smtp-Source: ABdhPJx5Cb4RWKXzHql7txQgtEeny1rIKPkiilm9tzR7nJ+G0P0XhISv3pmgSjzWJzP6+Z4Rh6nAZg== X-Received: by 2002:adf:e704:: with SMTP id c4mr16993074wrm.81.1597675099215; Mon, 17 Aug 2020 07:38:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 055/150] meson: convert qom directory to Meson (tools part) Date: Mon, 17 Aug 2020 16:35:48 +0200 Message-Id: <20200817143723.343284-56-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 68ad75d210..1f95ba81f4 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,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) @@ -258,6 +257,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 baf15656e8..84bfa2a61a 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 257afc2723..1e04551a8e 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 00b3220fc8..30e7a0e35b 100644 --- a/meson.build +++ b/meson.build @@ -336,6 +336,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 1b45d104ba..b9629045e6 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 0000000000..3c41ed37e4 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687180; cv=none; d=zohomail.com; s=zohoarc; b=WmOMJgwUuUTpfLmfZjLuM/5d/MViJRFqkM8LFvaQBuWGXTAsNc47Qzeg5szYrlOLiHLEGA/k5DhUUOJ0teLJk7/wULmyLV0oH5dtE22LS2+Lv4s9ej626SC70TZvKOSIyDj/2QMy+b6cjd9cNTxTztv40GFE6VYLzdT5fjE5LmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687180; 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=4PQbF8bhzVMCICmYbql34FE7vRnqpkhqgrq1jHhjLTw=; b=MqqFOKET+mgAdmJipgIg4N86CWgqP/w3ovZfzZ8uxsKImZbN3urJyyp8goVt/eH3YXKRokAhbi3pwLeibNefmVPqYl5KkGwM7Tqjo88bf+bYZVMeyBq61BuMJImex8E6+miTzqXGOhcOWInt7rdxePmAgQPawIjc0FZGRDIgkNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687180163651.0194301671708; Mon, 17 Aug 2020 10:59:40 -0700 (PDT) Received: from localhost ([::1]:34356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gmW-0002U9-Qy for importer@patchew.org; Mon, 17 Aug 2020 11:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHM-00051l-6g for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:28 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:56087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHF-0006Bh-SY for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:27 -0400 Received: by mail-wm1-x335.google.com with SMTP id 9so13414679wmj.5 for ; Mon, 17 Aug 2020 07:38:21 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4PQbF8bhzVMCICmYbql34FE7vRnqpkhqgrq1jHhjLTw=; b=kVX7s4ZzBfEr6T135AHAFc6Zc/vw9fJfQ4yG/5I6DC/g9UNFB7NL/fs92ZqKnwFGOW MgWNRwCBXffDuoc3eMMLifk+XprZw1hTtPWsp7AVD9SHdcHRbJPcT9xZPrxCuSihdxEK PZB2FNMhFrH9LQT7Yl09bOmoHfr1iDTi87wC97OVIjTcPv3btWPrBukGCiMgEHUomJPT +ZBSqMjrDyx66vShlSq1dBMwXliA9GKzbRBrjK5AboFqtJZUxcOg4+hzIss9J55Z2UjB 4IGhv3jVtiZz6aaGm0yS7sqvHATo8W3+Emkli4+MD2Ukx8Ky9j6ZTAEYHDBj3SEcNqlP feuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4PQbF8bhzVMCICmYbql34FE7vRnqpkhqgrq1jHhjLTw=; b=uBn2Cy+cSofA1clCJdULA2EsKE3rPyJF+wvjiLVqg/m1HwcQyFebQ+ZmIIrTt5Ri5Q m/HAfHLYD7FprD+RKbiS+EAZw/y9FTj8hR+1RLCTLGJlNQnmr6T2KUdSmmoP6B9k235Y CMUAsj5IlkjVWU725RkjeRnr1xKNCHVkLIgB6MXzHqqUVLySb7y/Gj/x0qFzha5uS8Tb LInTwyrqOwNAeFGeEtX91kWpS4YSLRdUvNDuLDp+aV90mERH9OIaZMkrp8fOaVkj9RH8 YHNHHfks8IBp3KIjNFxkgBStGS+PLBPTTcWRI6shZJXXypqB2zwWPHJ/f/1aVGPMpsjA E7ow== X-Gm-Message-State: AOAM532l3m67Rm8T4DR7lsVIAb7jG2OV+5uSLsyiY+L1jXAFM7j19Ow2 Yo9aS1g6GDKvFikOj9kWRuBo/PMXWOw= X-Google-Smtp-Source: ABdhPJwtO4grclavmAk0gklVjKxhWBXj3EScdBPHchcRF9HEGus4xzz4R/ekpzd93Y/yEXy3Hwyi7g== X-Received: by 2002:a1c:f30f:: with SMTP id q15mr14687404wmq.60.1597675100327; Mon, 17 Aug 2020 07:38:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 056/150] meson: convert authz directory to Meson Date: Mon, 17 Aug 2020 16:35:49 +0200 Message-Id: <20200817143723.343284-57-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 1f95ba81f4..6051efe766 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,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 84bfa2a61a..0bc361d338 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 1e04551a8e..79b6e02bed 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 ed7b273596..0000000000 --- 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 0000000000..c1f63627c1 --- /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 30e7a0e35b..e1fc4c2169 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,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()) @@ -337,6 +341,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('qom') +subdir('authz') subdir('fsdev') =20 # Other build targets --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686669; cv=none; d=zohomail.com; s=zohoarc; b=mdR8S+5wcqm0tJ5UhNa77SRL47PY9iumVnynjWQYkmoah4N8+5WV7DW+QHqsi9ObLuJo6qpjMBZXpRKqhCq6/XSck2fQMGhaKjwO7RmxFjkw8rmo0v2+MVOW1ksn7WZEMFtrTO/hQ2o4nqTEYKixxMMj/p8ob/9DQaNT4OS1+eU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686669; 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=9j3aoWfTHUgC7jQe0Kp34kUY32UJw7xr9bRlvZsY4oY=; b=Szwcipw7xcxrot2AvGqiFygyCvFe2GFNSzWfmKbjyR78KasiysX5OdJYtY0SRJCfEGH0NKsOVICl0wpOrzDWJeK9v5gjeNsW3xdP789vyyGJfwlk/buygneJhoNt9UwpxJ8WaCdmUbycSD7LLQp7DMCNr/xAb9peM/yiGTHcCXE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686669265887.9088892345375; Mon, 17 Aug 2020 10:51:09 -0700 (PDT) Received: from localhost ([::1]:58434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ggb-0005nx-8N for importer@patchew.org; Mon, 17 Aug 2020 11:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHI-0004w5-TB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:24 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHH-0006Bm-0W for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:24 -0400 Received: by mail-wr1-x42f.google.com with SMTP id y3so15281339wrl.4 for ; Mon, 17 Aug 2020 07:38:22 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9j3aoWfTHUgC7jQe0Kp34kUY32UJw7xr9bRlvZsY4oY=; b=tdj8mXuqNZ43F+Kj0bNDbTuXWel470q51YNTF6+JchROQ00Wz5unAeSMZPKusTuN0u s9xQyBoyqn0tsXjT0V8suIsPl0Tezp2bQXa4sGuD5UYEHK90qeaL1LwpfXQ1EDK62pTJ bUMfMEnKY27PhI2Fp2x1H34emETOFvnak9xfCkXo05QmmYbKKIKyUD2RJf5J5oFPA9zp 7Ekv9PIPCsPtKrkBiKRtleLkDYZBmoMaDsFDo7wlV1aeL8HKfWI7sAJgWheHO+XklyKe 7jq2qKJRCerksmNVrUCvz9iBfquRxrNJ+qu/4lcnBcO89o5EG9z0CKQtCtjTzQG2Gz8H DNxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9j3aoWfTHUgC7jQe0Kp34kUY32UJw7xr9bRlvZsY4oY=; b=mvKLmtWYvlX/C6/f+c2kMJ05RtKRej6JrvEyGaeaVI/x6ORkk5CgDBO3JFJNxOUUuR gPQu3kQWAPjxk1WpHEEYm1wq+HWwmanq2a/5tLEmnE8wyHjOCE4GQeLZUlSFGlj6w73s mOQIQMX4D+2tPs4Khm/AJT0wH+/UzI7mOiEZ8anajCJANnLIs6ANC3XiH+luH5t5rDgG Vnc2uaXXKFjdCf8emKtiASGu3KRJT7Yu5/hQwhl9GvCFxVO/ZNLhAQQsfdQspcP9zJ6h 3rtKjvdCm5gFnVBKIsPq6WSSbimoDbQHT9EIofPYe/WZZUddSW5dcpJxBOgq3d2+lTu8 6Vfg== X-Gm-Message-State: AOAM531w5H4WwgiA5H35HsZAt0ocUkz7tZ9QONHY4yoTpe8ES/48WT2y HW+LNYmEJPcyuQe/aG9jMtpeb7JcsVU= X-Google-Smtp-Source: ABdhPJySs7d+hoRtGR1XoJ0JnSB1H76mQLZjxfcL5154NaskAVSu8PJWgStzVMFwnDPQ/Ii0NQsPGQ== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr15326192wrn.51.1597675101203; Mon, 17 Aug 2020 07:38:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 057/150] meson: convert crypto directory to Meson Date: Mon, 17 Aug 2020 16:35:50 +0200 Message-Id: <20200817143723.343284-58-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 6051efe766..6995661e40 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,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 0bc361d338..018338d2db 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 79b6e02bed..b213955a81 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 a9885919f2..0000000000 --- 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 1b244315b9..7aab8db9f9 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 e1fc4c2169..6b046f43aa 100644 --- a/meson.build +++ b/meson.build @@ -324,6 +324,8 @@ subdir('qobject') subdir('stubs') subdir('trace') subdir('util') +subdir('qom') +subdir('authz') subdir('crypto') subdir('storage-daemon') subdir('ui') @@ -340,8 +342,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 3c41ed37e4..4af044d858 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684241; cv=none; d=zohomail.com; s=zohoarc; b=cYxMRAqadlDXLzsT8wu0OEAbgkhwdxQx91/f5Kmve4mUjYvesvOCPS8TfmvZfBFzhfiOqimvBb15EfNkaD4fTv+BV7XcqDARBdnhussiEfP0m0o6Hve0mpnv/80NxvE2+idEGjK/MUkOpH4vFfFAnHf5de9ZUJ3wZlituuxhjC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684241; 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=2gAEVfLwds7d2Tav/gcydNw8MTDXwaqdfdKjcmTKtiE=; b=KaGPjejk2yyOvwvHuuq5/CuPpARCRncZ0KnjRn8oDzKL6GXDJh2Mkt4CEauq0lOJ915JpHW89gL1qN7F7WX75zZUZPO+Y903OwMZnOCyIViz0HNzXhhVsqDqjXwulCbntxiTpgVPzBWVu6m6VUc8ihBXBxWNVdG5GCy8AW0z3aU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684241868809.4662534609122; Mon, 17 Aug 2020 10:10:41 -0700 (PDT) Received: from localhost ([::1]:56924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ggJ-0004yg-D7 for importer@patchew.org; Mon, 17 Aug 2020 11:04:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHJ-0004xl-JA for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:25 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHH-0006C1-UV for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:25 -0400 Received: by mail-wm1-x332.google.com with SMTP id g8so13424427wmk.3 for ; Mon, 17 Aug 2020 07:38:23 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2gAEVfLwds7d2Tav/gcydNw8MTDXwaqdfdKjcmTKtiE=; b=ZJsZhHIiJ6Wg1r7IT8dULIyCJpL4mHCcc3kUrAl3PaWpPN21BTXhrw82hoJXXn9dC9 XiTBG+TKoQOaRNFKJwxN1UNTDvP40pXVUrWZ4+FBTgXVBbi4u/n4vqEJSJECqEJA6nMZ qlGchNINFRYQlP+kkG3m9RZDeo9ltDtduDpZobKCyJJCvoxAeiU39lf15ITuhtRsvtjK /Mk0xqxc+Lh2QXPL3khBhylDDXkozVBrnELk0N7k+wi+Rny5hFZdz6PLqjTKqWPSdZXL asHVjpPwkxRk1WOCCCWPKJa3uM9S34DWXS/6TQ99VcybA8rE4BUF8zrsHFWbPjogMmsv 0Xlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2gAEVfLwds7d2Tav/gcydNw8MTDXwaqdfdKjcmTKtiE=; b=K55JPNV4eYx8I1ApjpPVOE2XKVbQ3+Ir51izIwYdLs2FyHj3fx30EXYaZgnJKJycZy tdJsK/k/v+rp0sb91XMi/yebBP0eVRvDjovZk18tDv/vM1bEhWzLWe0TAB3/fMaoJ/Ec Mu6HITF64CXhz9cMC5ZhFfZxP7AZhsGArXL13TOmkMc3JFY+zALnHuXgcF8VeSeaNMdq 0hOh87PnryNyHc2syqmHJfEKB8RDyVi0GG5JTxwpsW7rP/nTnd/pEl85aTuVmHyKTBfK 5f0erXgG040mOYukv5VSc5XG+xmSn2l15VNT6zeKBGbderUgns909h5HuFNCLD+BEzyt 6ufw== X-Gm-Message-State: AOAM530COD1cphC48nzllUt+LqhBy+VZ6gAuX7oNkFBWRl2/8PZtXjJS zl3Bz62iWwyjy6q2a/BtZUuHBl5ML3k= X-Google-Smtp-Source: ABdhPJybxciPZff4aziRz2ZyCP2kqRjqiQZDJ+UTsb6K97LtKGTxAKN1q6awhqOL58V6kULvB4YsUw== X-Received: by 2002:a1c:14e:: with SMTP id 75mr15821893wmb.151.1597675102302; Mon, 17 Aug 2020 07:38:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 058/150] meson: convert io directory to Meson Date: Mon, 17 Aug 2020 16:35:51 +0200 Message-Id: <20200817143723.343284-59-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 6995661e40..25eca25d63 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,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 018338d2db..0920cdb40c 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 b213955a81..f6b7a86390 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 9a20fce4ed..0000000000 --- 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 0000000000..062e011bf0 --- /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 6b046f43aa..3e7d3e6b0e 100644 --- a/meson.build +++ b/meson.build @@ -342,6 +342,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684847; cv=none; d=zohomail.com; s=zohoarc; b=G/80QRk31KmYvUBzOwFEaDFsrD71KYLG8u49sxzAynBPUK0oVNknHBdLbPKsBuC89yyUdXCNmmXx1NEIrNrfHv7fMmWfPu9d0wthIAx5BDem8WJvewHmU4CPmWTcVph8PTNGcvpJAdv0sJvi+sqz5YGiP+IEPaNiE49eVr2Selw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684847; 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=INcTxbyIHqyKHSSMZcT5ew08N5/uJ0P11rmSyo5Fvb8=; b=Q7Nw9lRnWU0Y1D+MM+/bNxx1IEscTG9q6skQxY0Kj6iShyIO+nmp2oxfz89ScB87ZvH+K6IYpca0qpoIm2E6SOVgHh3KB9sb0/PtfyTd/5uR24R3/g1+YXzeYxCyEU0MWjKaTNrZygjX8pP9cdL0Mq8Z+3gZggSBZoNV4c4yxkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684847743843.4927882670107; Mon, 17 Aug 2020 10:20:47 -0700 (PDT) Received: from localhost ([::1]:38548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gi5-0000zo-Sw for importer@patchew.org; Mon, 17 Aug 2020 11:06:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHK-0004zm-H6 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:26 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:38551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHI-0006CD-OE for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:26 -0400 Received: by mail-wr1-x42f.google.com with SMTP id a14so15274608wra.5 for ; Mon, 17 Aug 2020 07:38:24 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=INcTxbyIHqyKHSSMZcT5ew08N5/uJ0P11rmSyo5Fvb8=; b=lIuPiY0lRw5wHMYn69wHzsHFJ3XIuBY9KWZfJcwbPlLSgmAMSc9cgM60IQByEwFaj1 RmIH1iCvsNBGaKclXyPgdiu60KYZ68iSRIPD3q1JGBIth6SXAGVis/gd+Mp/8wzIyY2Q TM0WtlwTqCBUvLzpC6O8F7htAgtVulwr3hGnjWA8801DqssYFvvxYQx7oR+a73E6eukD nxjGq7fs9ar77BrIyl/2xJXmRwWNDDRYj/LpB4Pg3RqwUE/VselPnsudf32rtWbquQIc 9pUhIZyIrfEa0cE20lx2a3U4qVbM5g2QFyIwv+TpI9JigtDp51Q2EV3mezB0mFajdTd5 YoHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=INcTxbyIHqyKHSSMZcT5ew08N5/uJ0P11rmSyo5Fvb8=; b=MSmahqmgPkThjM3Ieg4tBTo7oqla9srYH2qy+2CbhouUVVI5RhXisOYXYtvcHN81Rx kzhLYO2JmQZJ8vq2rBo4nWbupiWJG+dOOw5NEjlq2pWSyoND1zOqZjw21kAYTZePyppT y3U33tXvoVU+8C2vEfPGJkiuod7jog0mzzXcFLJR16QFLndLj74tEcb/wqfLRosNQR0C Gg946nOu/R5iKtFsj2fvZ2NNYQiwkUiN3dF0HR7IHFDS+F/VbFs7tit2tFLEX6IJiIGZ 4hmit+g5fKO4sHwkhOJy0iMXKbCs3EyaFkuSjsBn1q30bsXAR8A6w6vNAk9tikaB3nU7 twWg== X-Gm-Message-State: AOAM531erT9KAfYP+d0+JaovhbX9AYX7yl8w+snJXFuV/WAKfHLIkm56 oPRZEugiPs1fTOBd0i3tQyCQQlkSDWQ= X-Google-Smtp-Source: ABdhPJzgFcYqgoKsiCAo3s3y/+UeZP/+wWlCWnr/p+INjUfT4HWT8GRYAssfCmjsgnsSXxWrLct8jw== X-Received: by 2002:adf:ef4d:: with SMTP id c13mr17073021wrp.198.1597675103124; Mon, 17 Aug 2020 07:38:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 059/150] meson: convert target/s390x/gen-features.h Date: Mon, 17 Aug 2020 16:35:52 +0200 Message-Id: <20200817143723.343284-60-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Needed by linux-user/s390x/cpu_loop.c; this removes the only use of HOST_CC. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 2 ++ configure | 1 - 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 +++++++++ 8 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 target/meson.build create mode 100644 target/s390x/meson.build diff --git a/Makefile b/Makefile index 25eca25d63..2c6ced6cd5 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,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/configure b/configure index 2123a79039..606bc7378d 100755 --- a/configure +++ b/configure @@ -7785,7 +7785,6 @@ echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak fi -echo "HOST_CC=3D$host_cc" >> $config_host_mak echo "CXX=3D$cxx" >> $config_host_mak echo "OBJCC=3D$objcc" >> $config_host_mak echo "AR=3D$ar" >> $config_host_mak diff --git a/meson.build b/meson.build index 3e7d3e6b0e..baecc86a1d 100644 --- a/meson.build +++ b/meson.build @@ -344,6 +344,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 0000000000..e29dd3e01f --- /dev/null +++ b/target/meson.build @@ -0,0 +1 @@ +subdir('s390x') diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index 3e2745594a..9b9accc5fd 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 da695a8346..2a29475493 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 88bd01a616..74d1f87e4f 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 0000000000..ddf8d20a36 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686809; cv=none; d=zohomail.com; s=zohoarc; b=FG6zskgLBG8sBbKGXZtCfWrb2fCLxVIVDbshLw8afrOVIXHMDK5tyUv9ousU9VSh+6VxEyjxOufsFb2zN406V0qAAeRRTisl2tB9gMJasxOqxPMeO5GtGE/9DEDME7zBmoPhifZtn4KjtbqeK2K8/w7NhdD33E1l02TXC4ivMso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686809; 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=B1n9BSv4mUgwtikjQsYtCTa2OPrzeLVfs/HfNN1Luas=; b=EsMHTGIAMKr0HBIdEPIL322O691H+n0fX/3q30AOyVobANQMikQ2oGbIZsVwWNHu8UbgB5RL77A9m1SPS/U9YiPoS/7kObTyC4weFOvSdp08wbkcY4vF+u8iPFDDgIPaXqu1q1GwXOxiR2iYioy7oRAW1KF0CzFS3C1rQoofHuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686809228137.9358700989577; Mon, 17 Aug 2020 10:53:29 -0700 (PDT) Received: from localhost ([::1]:42658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7goL-00065u-9G for importer@patchew.org; Mon, 17 Aug 2020 11:12:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHQ-00056y-3j for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHM-0006CX-3L for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:31 -0400 Received: by mail-wr1-x434.google.com with SMTP id a14so15274772wra.5 for ; Mon, 17 Aug 2020 07:38:26 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B1n9BSv4mUgwtikjQsYtCTa2OPrzeLVfs/HfNN1Luas=; b=Zc9KWc4YUp5GIe76mGKv7Zdir7pdCDgAvm6yvtJmQ8HI6S5Zgeat7XJM51Ijzc1YeE CHZGfuTHHoInuXr6LJUWDvV6KKFeqIPZFIADOtj1NPmc+EmRQ8Sc02MdWv0u7dSiNt3p 8gQKBhlIKDKMvXnYjFiuj1AyzrTNlnA3/CQvtETgi94PxC2zsX32CUP01KExPImdEOVj pNMlJ2GReYJoKJm1BcsUGFlVMZ0FmXcteNiM4qpGTN7bwvYfh+Gs10/JZEU4Ts1Yw+D2 GXosAFwBKfyu0mOhMoV8WhwCgyZIoVvEu1FIYSYroqKy5pYOeeqGmnujyv7eJX1EVBi5 SW7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=B1n9BSv4mUgwtikjQsYtCTa2OPrzeLVfs/HfNN1Luas=; b=cy7xJca5EpBGLDeelkOn33hE203zmWYPBRXBG2VtRWDukv0/cRFsxYFlQr02WEA6AB oTlkBfKX0zt4eD4i/mr8/MI1joJxr0RppgD3dVI4sQ+kCHN6NieRRILzSU6grcyjM9nM xKtxGTaQUyhEeHe4n5qDx81rMCUiElZItYx/A4Sl5exsJF3EhHU/uSJFXvvQdZxsvzzY bAF7ZVFJLFEyVBtNsJyaXpkhR+YIgSW2eJTt5cwFa59A12DUIAsPFugIk2rBOyTjdHhG Yw74TAnN9OQa8G1k1qMTd2F7tGfLJPkGgUx8SK5C84NeCB0gXTsF3R8l/2lXPQbcu8rZ PlNw== X-Gm-Message-State: AOAM530imCAHF0n/Rs0uwvD2HwuDuHHLLfzKai41jIdZQGpXT49ZNd1e FbRQbUTF9OjYOqgEV1HyN7iAWnxGVIM= X-Google-Smtp-Source: ABdhPJzeOQ3Mo5cC6zbToUL1BEX/P7NYDKtO+y5gfnqSDTiafmE0WObRYUWiKsHOcO5JAH3vPNUO8Q== X-Received: by 2002:adf:fb87:: with SMTP id a7mr16899207wrr.390.1597675105282; Mon, 17 Aug 2020 07:38:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 060/150] meson: infrastructure for building emulators Date: Mon, 17 Aug 2020 16:35:53 +0200 Message-Id: <20200817143723.343284-61-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::434; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 2c6ced6cd5..46ff02ec45 100644 --- a/Makefile +++ b/Makefile @@ -110,8 +110,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 @@ -167,65 +165,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 @@ -268,10 +207,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 @@ -359,7 +303,6 @@ clean: recurse-clean ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t 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 \ @@ -368,8 +311,6 @@ clean: recurse-clean ninja-clean clean-ctlist 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 @@ -387,8 +328,7 @@ distclean: clean ninja-distclean -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean -g 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 f6b7a86390..43d2f9734f 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 606bc7378d..ba8bf8b134 100755 --- a/configure +++ b/configure @@ -8120,18 +8120,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 c55abfb01a..33441ad484 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 47c5ca3e34..cc616e48f3 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 b789e83f9a..456e336934 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 67bee1bcb8..cf384b9743 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 3a14b7c303..57150913b7 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 7740fc613f..8fbec77ccc 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 20872e793e..412962d91a 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 baecc86a1d..9699190f14 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']) @@ -147,16 +148,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 [] @@ -198,6 +279,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'], @@ -224,6 +312,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 # @@ -332,10 +430,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]) @@ -346,6 +444,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 1aa6394079..d8d35f735a 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 6d8f08b39d..bc82661041 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 0000000000..33c74c6029 --- /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 5672b75c35..4e439caec7 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 5fe1156503..38d31223d0 100644 --- a/util/meson.build +++ b/util/meson.build @@ -63,7 +63,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597681686; cv=none; d=zohomail.com; s=zohoarc; b=IY9ZVM+lgxuZcAoIbvIJSQEJbXrVnVRYWVR8l7T+hkwTx58MTFvwwwp7FRB2PTWFddtVEQv1/J9z3egpfaygEmSfk3TwC4k9bJON7xpuii0VrIReG/Bu3MDz91kAJek0mPmyZIUqHG+5/Rb2DpARSHQ1g1uSdAD9E4v/z1E3bY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597681686; 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=ZEWJfelYGw//d36sxX5zHGmQtSfLq0EM1+ukDfPVr48=; b=ZhUJJx5GMVFq1jQehzHqVTgV+/5fJ7xOLTerAO4E1SqZyanaU07NZQIoTNi1pJA76EgPPwfQQYag0C/SL58BzXH0h/67B/upw0L/uyrxqOMyHvwXPuR0BGOEUKILs9udkqF73pCSP+wZW7ZYcOT1NfrVpkrp995MjejJxfSQ3Ko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597681686579791.910788187531; Mon, 17 Aug 2020 09:28:06 -0700 (PDT) Received: from localhost ([::1]:37086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gbP-0004iB-Ef for importer@patchew.org; Mon, 17 Aug 2020 10:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHP-00055O-GB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:31 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:56084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHM-0006Ce-3d for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:30 -0400 Received: by mail-wm1-x331.google.com with SMTP id 9so13414930wmj.5 for ; Mon, 17 Aug 2020 07:38:27 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZEWJfelYGw//d36sxX5zHGmQtSfLq0EM1+ukDfPVr48=; b=DMUorRlXx1YIyc69O2eRiQA5oPtUPFp5Hy1BFp6KBOjc5LX2toqMahNUSJkcRrL8Qx iqbnBKYvj8fT6XQZFFYQzL5aksCFGloM32o02QEpNLboFZWS3CJ3SA1sckFg1LIy0HZd 5Uya/fXP2tvZLoPTXP/JteIQsK0B5XC6S8mK8wZ4B9AzD83HSBc1W3nCZAEfgm2e65YG otylVkYLpz7ECUFt9SDSutxe8Zm54MI5dHrxkHQH9TxQeMyMNdGVcDvhBeWZQ8tSX1Px lhy5Gs7eSIcldQ4wBxdmSF00qpvx8QIOHXcE460YYbZssCeGqlTooMgJ0kV0AKD8wUlK SE7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZEWJfelYGw//d36sxX5zHGmQtSfLq0EM1+ukDfPVr48=; b=TISr71M2DtvOD9/6EEWvZkmCcGUB9weT/+vW1pVZ/2QMgkuAqRyadlRO1x7rAbi/5j 9GUeYhZd23067kcbqht89Aedcz5TZqdjYx/rnsecN2cUxld/xaYMXerKNbt4dwFwAzMK xrV1C+8E4erC0uA84YGW850IklKSpaL2QyMNrdQ1V5K4jbFwoCk3oNJpuOmuQELUaFaI lPhN1JjCeCnZzjxBqPNloXvRilHRE2RQrKGij2QbTcxIZ/Vck+sK1dg+VewSibknGzvg UOA1AZQbCn1S7Djt1Pvf/Bf42/ir9PvQEk6pKegnYnKFHXZu8wGTisCxNiBGhLIZjyTt ywfA== X-Gm-Message-State: AOAM5337JeH6IU4s5e/J5bdYEbj0iteolhMv/y4RYRrYNnbd7lm8ygU3 LgkpP0fSzasnjkTr7O7u7kZfmmFmPYo= X-Google-Smtp-Source: ABdhPJx7nbrDh8gGVuKszf1TPNizrN5BUjkbiJlhyEYKEhKotcLKAz7YrMXP2W2OfUKxLVVYg2gTrA== X-Received: by 2002:a1c:e008:: with SMTP id x8mr14677644wmg.75.1597675106188; Mon, 17 Aug 2020 07:38:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 061/150] meson: add modules infrastructure Date: Mon, 17 Aug 2020 16:35:54 +0200 Message-Id: <20200817143723.343284-62-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::331; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x331.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 51 +++++++++++++++++++++++++++++++++++++++++++++ rules.mak | 10 ++++----- scripts/undefsym.sh | 20 ++++++++++++++++++ 5 files changed, 83 insertions(+), 14 deletions(-) create mode 100755 scripts/undefsym.sh diff --git a/Makefile b/Makefile index 46ff02ec45..8b55440e50 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,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)) @@ -463,14 +463,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 43d2f9734f..d1d8906b4d 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 9699190f14..ec2b0bdd73 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']) @@ -312,6 +313,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() @@ -319,6 +321,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 {} @@ -428,6 +431,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) @@ -444,6 +453,48 @@ subdir('io') subdir('fsdev') subdir('target') =20 +block_mods =3D [] +softmmu_mods =3D [] +foreach d, list : modules + foreach m, module_ss : list + if enable_modules and host_machine.system() !=3D 'windows' + module_ss =3D module_ss.apply(config_host, strict: false) + sl =3D static_library(d + '-' + m, [genh, module_ss.sources()], + dependencies: [modulecommon, module_ss.dependenc= ies()], pic: true) + if d =3D=3D 'block' + block_mods +=3D sl + else + softmmu_mods +=3D sl + endif + else + if d =3D=3D 'block' + block_ss.add_all(module_ss) + else + softmmu_ss.add_all(module_ss) + 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 : block_mods + softmmu_mods + shared_module(m.name(), + name_prefix: '', + link_whole: m, + 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 d8d35f735a..9da9dcd4f6 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 0000000000..b9ec332e95 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687117; cv=none; d=zohomail.com; s=zohoarc; b=EGYhlM0asOm1BjLeHCbGdq8pogYPHhBHMoWkzIJpYMaieRntPFNfCK2G0ubDBam5PqGYO+HHw4+Rb1XxZ2xN+Mgg0IXuf/Vff0zpzyfI3szvUi86oXhiQDpyFdqYSdC1iMPLCE57evev6USj/ouWVv91ezqxBMraJrArV+YtaeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687117; 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=K2Dcd9CsBr5fcSFFLkGoisbUpaXJzuV79F8xm2sV7iE=; b=oDwFDivM8ZLFUoBlyww/CYq+gqLIcOA/gVLR9iSCQm0V44+cNSVoGKE4uP7ujiVOk9mglBDkwXo9znuvCQOPlEtInBUdrBtfZ1mrVsriq9YSTb1WZb4FoJHNBr0mwWNsBn1UkNGM9gmCSCzBfyfbJnqRqz4Lg26d7aLGT5UcD2g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687117003477.0456855248143; Mon, 17 Aug 2020 10:58:37 -0700 (PDT) Received: from localhost ([::1]:36940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ghq-0000Is-9y for importer@patchew.org; Mon, 17 Aug 2020 11:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHR-000575-66 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHN-0006Cl-Ed for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:31 -0400 Received: by mail-wr1-x442.google.com with SMTP id a5so15259329wrm.6 for ; Mon, 17 Aug 2020 07:38:28 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K2Dcd9CsBr5fcSFFLkGoisbUpaXJzuV79F8xm2sV7iE=; b=fBIdc6tg82tbyumZLQ7wG2kOuwppGSMI0JMFFP8mIy4eYbNjVexK0dwHhjddRHBZ1H TnCUyXSgs+DtMGzUn4GUej2nL5PKOciBOK4F/VyNruIDd66QyKXxkHadprvJ10ffXRuI VAb0h370OiJQXtDNw9CzyxJw+kyPe0ZPa8SV80xZzCB3HvmfqJGdpxZAY9lR3XW18pit KmhVUw7qkR0fv7+AT+8D1hjo9Y8yyD5CWFdh/JQWhJSRqoK6MOQ6iKaJt4B85YiGundf U7OGA/lC0AsI0r5oWO3ZEUxva0DMcvFYTDaedm+de+sxv0qd7zd+OQiAnrS9WdBHS+8n GioA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=K2Dcd9CsBr5fcSFFLkGoisbUpaXJzuV79F8xm2sV7iE=; b=UjRHhv5FVa0CShx0qfyUJf6PnexW434yiXC4oLSxImRAwQrQoo4pZPvxG6onNw2iuc lS6DE99pZLDszzekIBA335P66S/PLY1NLL98YQGIBe40OH5DJOVjf0iA78ZganzbnBqc sum99loc72NeoT2mCQiY3BzrPoYspfhWyd02rp4PpsyzBhKc1hGVFTe6VUcf/LFQkFFo xoIQ42+W6NmDomPkhTCK6/0Yrgx5DkUvr1zS9HIBYs4wVPYieE9sKYyOiDwSSCtCDOBT Dvkx0A7R/y22XcrnY1/5rDfYoHtuWbjusVHvPWJluDUixLx2uP3ZfMRIB7jMjDKEbwNM l9Xg== X-Gm-Message-State: AOAM532cYsK2JP/MjwgbJyIf7fcCB3mmoyNaCG4xZ1Ei8szaGm3ovULW N3qvxxI9aSvhNsl07lCvEUCvnv16nYg= X-Google-Smtp-Source: ABdhPJyB7UoVnuKQuCZu23h6fKmHc3J1g7rDsfXRIrLI/CdxPNe2+uRQxEZa2XqcZJh86bbGjagBbQ== X-Received: by 2002:a5d:6a4a:: with SMTP id t10mr16626433wrw.360.1597675107245; Mon, 17 Aug 2020 07:38:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 062/150] meson: convert chardev directory to Meson (tools part) Date: Mon, 17 Aug 2020 16:35:55 +0200 Message-Id: <20200817143723.343284-63-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::442; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 8b55440e50..fec8be6dff 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,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 0920cdb40c..297bd5beeb 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 d1d8906b4d..6b9de09df5 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 3783dadc4c..6662d0df41 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 0000000000..a2e671ddfc --- /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 ec2b0bdd73..3e9a28ba05 100644 --- a/meson.build +++ b/meson.build @@ -450,6 +450,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('io') +subdir('chardev') subdir('fsdev') subdir('target') =20 --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686672; cv=none; d=zohomail.com; s=zohoarc; b=JIyucOUkOd2IdSa8t0/swWT760cVLE/DIpdT8LQ+FVbflXoqGUgLgDIFbNZdRk6bjfYzNwm4s9JTMeygnJx6syXWUz/cv3PFLQojai0H48jFkpnEM8n9XCU+koAcO8lOsoBh6JVf5ite2BRuFV6KJ9U5WnKmIEZ7iJJ6UUZz37g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686672; 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=VgAYXTpm64TIuyY/MgQDvuIxYiBKKDoFjnnD7KaBf2Y=; b=Z7hhaQ0RwF11cN9LmTJRm83xTvQLDjxixm7jNf0SZgcCDs2TOnWbcbthvpvg2sPIOXtCsH9L8JgPjzxLR9Cllft8w0Ba9Dus4E3Al0sLNDIv8xfCY7axwftCvDFiFsNHXSTChikXASj2mH46f+80Jost/s8GgopGsQ2EHRTWZMU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768667199440.27470553537944; Mon, 17 Aug 2020 10:51:11 -0700 (PDT) Received: from localhost ([::1]:54168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gfb-0003ns-6t for importer@patchew.org; Mon, 17 Aug 2020 11:03:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHS-00058L-7G for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:34 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHP-0006Cx-Dr for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: by mail-wr1-x42d.google.com with SMTP id z18so15242981wrm.12 for ; Mon, 17 Aug 2020 07:38:29 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VgAYXTpm64TIuyY/MgQDvuIxYiBKKDoFjnnD7KaBf2Y=; b=QWCnDxy9Kih+LRgwaMdOHj2jipsXMymal9c7qyIBEDMpkOOqb61PRNiPfZkdQhejW1 HwZ1woN7qLph4wEfn5RMfBY1n7mB+IZSxuA6QtQwHERr5cLPdM8/dwr56DAQd3NGsPsq 8+RAS3k51tp932NUAlCc6ZXgLTZ06sUPM97RTSeNlngjxb7qUlSx9iLaZXruExscxwjA CwALK1ecugvPH7z2gRxZop0KBozhnU+Yd++kuZRTiQaSP5AH4qyBbDDLJ8QRA9200T0D EQzs0E1HA+DTOEnEDuXSvMq7F1/eiwTK1Yl9EI7DgbfE8oWGFzYY+H1dko2TDpzbhBca O/UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VgAYXTpm64TIuyY/MgQDvuIxYiBKKDoFjnnD7KaBf2Y=; b=DY80sIDUv6cxdmn2D5CYpE282hiMapC0xnTtRJRaeRHrZkv7YyyxMGjYOIYP7ihHyE ydfelxyYPG+Opqd1l8GDxdf31v8YF35oB1njN8FF6infzLjxQnyTzT5/1RMmrLsoVecM /w4CyQMyFkmayo+TWiS7FILq9LdszPrZUpQa2e3O/HIe+nJ3wgo/R31VFLMw1cQnWXIt ffT27kSNho7Lp0W7aTglE5iS2pqOdetcSFZTm3BWTuYV7kCcvR4nJzIUgfJCCak7F8x7 9XXWjhJueQBDWpPOQY9dFb6emaeds2y437lNKE17wReD63ifjZa1AWWcKinYqvbG7z1r mM0w== X-Gm-Message-State: AOAM530eTDuahOL4grKGb5SUAyH6xJooMbmpSGGn9HwBJ6V5qZR6ST0H ll59zQ9vkxljxwNF1Aw/n7N4+ub3e7E= X-Google-Smtp-Source: ABdhPJziekoPUpU8fR7e+VIpwV1m2b431jzlYdrtI0Ycs3NUOLuT84B6PfZJvvEjtn8ShHlJpbLJrg== X-Received: by 2002:a05:6000:120c:: with SMTP id e12mr15578800wrx.354.1597675108197; Mon, 17 Aug 2020 07:38:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 063/150] meson: convert block Date: Mon, 17 Aug 2020 16:35:56 +0200 Message-Id: <20200817143723.343284-64-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 115 ++++++++++++++++++++++++++++++++++++ block/monitor/Makefile.objs | 2 - block/monitor/meson.build | 2 + configure | 14 +++-- meson.build | 69 ++++++++++++++++++++++ nbd/Makefile.objs | 1 - nbd/meson.build | 5 ++ rules.mak | 3 +- scsi/Makefile.objs | 4 -- scsi/meson.build | 4 ++ 15 files changed, 232 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 fec8be6dff..22247cb376 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,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 @@ -171,8 +170,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 \ @@ -293,11 +290,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 ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.objs b/Makefile.objs index 297bd5beeb..eeaa0cfa82 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 6b9de09df5..c0575da132 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 d9ac0e07eb..67c5028dd8 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 19c6f371c9..0000000000 --- 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 0000000000..4dbbfe60b4 --- /dev/null +++ b/block/meson.build @@ -0,0 +1,115 @@ +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 + module_ss =3D ss.source_set() + module_ss.add(when: m[2], if_true: files(m[3])) + block_modules +=3D {m[1] : module_ss} + 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]) + module_ss =3D ss.source_set() + module_ss.add(when: m[2], if_true: files(m[3])) + block_modules +=3D {m[1] : module_ss} + 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 39acf85022..0000000000 --- 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 0000000000..374aac1140 --- /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 ba8bf8b134..bc17695581 100755 --- a/configure +++ b/configure @@ -2643,8 +2643,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 @@ -4062,7 +4060,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." @@ -7347,7 +7346,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 @@ -7417,6 +7420,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 @@ -7449,7 +7454,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 3e9a28ba05..e01ff4b119 100644 --- a/meson.build +++ b/meson.build @@ -105,6 +105,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()) @@ -129,6 +149,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= (), @@ -148,6 +173,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') @@ -454,6 +501,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') + block_mods =3D [] softmmu_mods =3D [] foreach d, list : modules @@ -488,6 +547,16 @@ 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') + foreach m : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', diff --git a/nbd/Makefile.objs b/nbd/Makefile.objs deleted file mode 100644 index eb3dd4461d..0000000000 --- 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 0000000000..0c00a776d3 --- /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 9da9dcd4f6..8285fe529a 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 bb8789cd8b..0000000000 --- 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 0000000000..53f3a1f716 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686174; cv=none; d=zohomail.com; s=zohoarc; b=QV8Z5prVOXPE37qkfbdJvxDV0/10RDTty9rWyZ2sLtdoRO9zpFuFTK+HKIDwY8OVRjO/L0xXDTc0qEbVPHLAUMt5NaCJXJQ1W6hTVGdVSwC2BmgcNLKfw6bCrKWzh44rKK6BitriwucdBkAMRIZytgHD0Bgl289NXqHMlNRRn5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686174; 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=GCZEu26+ZlByYj6flD+0i+PBWz9jBredaJ3O6s3/97U=; b=aeLxS7+LxpzfJtZJnSu/5LoSVVTUJODF8fLFQylECFBfJxQ6TeQGKRSrexFQk8aNpeu/69rCF2j54h9/9ffKxwsSwd5OxPMsySxFMR87+0FUzq2KgRVK0TR6/yMSp9+HLb8ZY2ThhjMDhuuCgHvxgeMMh5CcLkkOefl1OE3N6aA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686174358624.6018540122534; Mon, 17 Aug 2020 10:42:54 -0700 (PDT) Received: from localhost ([::1]:45596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gd7-0008HG-LP for importer@patchew.org; Mon, 17 Aug 2020 11:00:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHR-000574-5v for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHP-0006D1-Di for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:32 -0400 Received: by mail-wr1-x42d.google.com with SMTP id a5so15259423wrm.6 for ; Mon, 17 Aug 2020 07:38:30 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GCZEu26+ZlByYj6flD+0i+PBWz9jBredaJ3O6s3/97U=; b=Sga27fK8he4uy+8BEMxPBiTsSLHid1Dsc92aSCdQTPoDSf4Zvimt0KcWKZO3WdCtzf lr12Nq1Q8xMbScersuUJx3svt/srTkV8mQa7FCulvlVmG5sohQINUiedqO9/qheRGmPa Rkk1ggSxBpY6b8dgAda+pwFC9nLpoyOOLc95ThC3UKSMYgax3DMBc00mH7ZN8FDez/uR 2NExttJEbLahMCW1oW80Uzi/M2nTaBZw3vNnmdPu5071JHU7+L9aWRBqTa/skrRe+nlh OvNG+jWleZI3tI36I1ZGjzuZAG7TASw2gUcrgDSsbNOsVTG/4GG2OSzNRfrz1J99sWi0 bO7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GCZEu26+ZlByYj6flD+0i+PBWz9jBredaJ3O6s3/97U=; b=MA1bcY+r1hRYacNMKZURs+DgLFT46V8Q3hHBFlr0TSsTfPl3XpmnZdum/1P94iEitN j3DvM8P2HC1foDur8ArKq6yIxn7eI99VW8iZmdidUknsmSIhftx2/cM3UdSdZJ9S7D6/ sS0IXjqq7XGagvnobyIAssidNO4E9WjlSWFyNz9YrqiLzlJyOC+jmcYulSPYREmV5XoP DWvVLyOe/8xzebX/q4SKZUWY3u2GsKbl2gXHVIr1KFcskQu84yCWIKOVUzr5Y3AkGTZl ojHrbuaL1MzLXqW41QZOm0R8ORLFKNgS/VR9OcUByatkKfHh5I3nXWNCAqBSg4lsoqs0 5IIQ== X-Gm-Message-State: AOAM532IfJjEv8K35lyFZD+IQTAxug2avg3jXnzFzS0LpljqMbE4nLNO kEnzOHGRcu74ZMoPvnYz33STDH80P84= X-Google-Smtp-Source: ABdhPJxWEL2xpFl0gmkAu8JK8EfGWXvNx8iKjp/TKOQjaOFCL2oQLv+CSnvuyuOVzc4tBuyuP63Yrw== X-Received: by 2002:adf:92a1:: with SMTP id 30mr17130507wrn.56.1597675108943; Mon, 17 Aug 2020 07:38:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 064/150] meson: qemu-{img,io,nbd} Date: Mon, 17 Aug 2020 16:35:57 +0200 Message-Id: <20200817143723.343284-65-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 22247cb376..e2f64b9c8b 100644 --- a/Makefile +++ b/Makefile @@ -278,11 +278,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 bc17695581..961436ea41 100755 --- a/configure +++ b/configure @@ -6670,9 +6670,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 e01ff4b119..b8f6cc49fb 100644 --- a/meson.build +++ b/meson.build @@ -346,7 +346,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, @@ -555,7 +555,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 : block_mods + softmmu_mods shared_module(m.name(), @@ -633,6 +634,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684746; cv=none; d=zohomail.com; s=zohoarc; b=QPk44IvTc+nftBBov1AcZt8vfcRovf1U/3ddJRSzyfOVhgWko4++4BOa8eMT0qEPWCO4D2MjYSqO1Z2YwWfe+6L43b5kBx0mr09nGmxePAXIKsMYTBvMFC7um1tR7LXxREXBrQV723bTVYrIpCyGIEi2rHXUuxlmxlSSPFIoBxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684746; 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=UvepImufTOkKXGEhsXevW6x6eLEJ38fEauCGd02DUaM=; b=jaRYIcfGrl02gjaqIILVLoJTTN3NH4T0Xm3327QCuMz1Z4gThpSQBa3976OGryYi0deEdYI02SjwcmRnZSbf7SldgBIodKdvsVJ3apIbUYtYsEdto05RW3VIKO+QTMzeaHnf1cPDUUDXg5KfcP3yQYnii9N6Le0Jx2ZcjPGEMR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684746090370.772130022335; Mon, 17 Aug 2020 10:19:06 -0700 (PDT) Received: from localhost ([::1]:50922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gq1-0001Aj-7Y for importer@patchew.org; Mon, 17 Aug 2020 11:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHR-000576-Bp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHP-0006DF-HG for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:33 -0400 Received: by mail-wr1-x444.google.com with SMTP id a15so15235365wrh.10 for ; Mon, 17 Aug 2020 07:38:31 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UvepImufTOkKXGEhsXevW6x6eLEJ38fEauCGd02DUaM=; b=N0d2tAZgdgTuXVjGWr2e5VxcpoF1FcNHehzxODm5kgsk8YZhFiEuFXF3d7ur3MCVZ8 SRCMN+xkAGCEhyMOZ95vbkor0YY4vHfx2FmjzYSjoq6zT9c7Hgw6DOiXpvchs2GzutNS 08DdUPqGxoT5UNkN9SlEKJJtRBUTqoULYyA4LRPDnWmAFAuHFVxfpGWTeNhf6MAzlSvs CDTGjm3oIj4yeQJ8nHU6bvBNVpayaKwOAt+FpmWtcLT5kDoSfotD0cJzFusJXNg5G+gv t1ujrzvGMsUMk9Pu9xDYSuKuZxZQQSiHHU45VnNjNnxkn5kV60BtV+HpfRtC2+kEQ9x1 JwKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UvepImufTOkKXGEhsXevW6x6eLEJ38fEauCGd02DUaM=; b=FbgvjlOFpw5exKz7r3fxvxSznbdiw9KN6+bretBI/yEqm/6jeEA95rLIcqsm7AmSo+ cahBtq2V+ip0gngdSTn5CPNsABZjsnNstXITEcexbIk3C/CVUTzW4otj/jLY43d6zPwL ldKQtSdns5QOUZi7XLY8V9eFOPBVE8rOkJ1XpLg1VEce1B0zcsxjbwMAdzozTBIKVxDl ih1dqFsHhodSRh3gDxZYQuKaErZz73+461VcUlH0tVbx199MM4p8BrbjV56CeZHjzpmE G7QZU5lcKeQp+gj1xoh18kUv6Hh9ZRaiRgEPgXNFY6/UlhVPOR365rRVlonxtdkb3xCG IQXg== X-Gm-Message-State: AOAM533ZQhDs+UJAK2xaXYcyUryIHX1bdboTfa3fOgL6Fk7mg4dm060o tsFBqNgygual10vNJTP+3Lpg+1WWWeo= X-Google-Smtp-Source: ABdhPJzoKuuL5gTQW5kdxgGwjTTHcwXfKAUUi7uUpTMwDoz3imlikanXtS5JOfRSYwiGpSxSj3iUOw== X-Received: by 2002:adf:9125:: with SMTP id j34mr17456203wrj.157.1597675109941; Mon, 17 Aug 2020 07:38:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 065/150] meson: qemu-pr-helper Date: Mon, 17 Aug 2020 16:35:58 +0200 Message-Id: <20200817143723.343284-66-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::444; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 e2f64b9c8b..cd8d9a0b02 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,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 @@ -280,11 +280,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 ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files diff --git a/configure b/configure index 961436ea41..0262b7b661 100755 --- a/configure +++ b/configure @@ -6668,7 +6668,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" @@ -6692,7 +6691,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" @@ -7770,7 +7768,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 b8f6cc49fb..92f2da51e5 100644 --- a/meson.build +++ b/meson.build @@ -144,6 +144,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(), @@ -629,6 +633,7 @@ foreach target : target_dirs endforeach =20 # Other build targets + if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif @@ -670,6 +675,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684221; cv=none; d=zohomail.com; s=zohoarc; b=jjakiSDzsHB9BfQSJmmm4B5q904FQ8KmoICASExwOYFgj4yWzxHaewG1lR+jBKxNMNa0lL+tKIqmkcJeJYEYVab6E1E12xV68qRIGxuR2ZX+9ZOGal2TXTSsGLWovyqr6MkZxhe9Aywam+p4u3XdsXkhino+eU4VRMtUo78Vkho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684221; h=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=0hJu4Nz1L7VKg35xvN8iIIF1HPKnw8palwRCJBCZ874=; b=ZCBQdLIql1Jq5Lma13O3DkfIY8ctbgLrT78ADnHVd1XPuBIHClDlln41FRWtKZwae2OMP4VYK/+Mwece3nd0aP0QuSg/Q8WCuAE9NaC8Ax/dpOCH88pnBOBerUok/EOW3CFT7x9nLAHgYKiKSctImOA652yl5zDbfdlv7D6ddSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684221620372.9394820343281; Mon, 17 Aug 2020 10:10:21 -0700 (PDT) Received: from localhost ([::1]:59182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7grM-0004hb-JV for importer@patchew.org; Mon, 17 Aug 2020 11:15:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHS-00058R-98 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:34 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHQ-0006DT-SW for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:34 -0400 Received: by mail-wr1-x441.google.com with SMTP id r4so15225494wrx.9 for ; Mon, 17 Aug 2020 07:38:31 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0hJu4Nz1L7VKg35xvN8iIIF1HPKnw8palwRCJBCZ874=; b=tu90EZe4o0mdU3WmUMFbe6V+G6fpABfmEFPbHQjP57lucp1x0CAWeX3gRFZIXHdC+a zg5cj/tl6XBmN8plTGBhw70fN5jzg7hoTk8INlwv6L317n0iF40RK/l5QU1mVlOIOAGj tnbAK+lLLojZ93OfrT4uwoICUjLFxd0huxZWHocJakqpAjBROBuJCHpso3ARLOdHGwks rqEBQnDCtntdnj7vpu8madMiF9HCPJUsiFQNYm5T5KLTElO5tEbCIfBfHl+uVXlWpUME i1N0wIqJvVlAiLQ1TL1F6+yNjdkafuGcdQGdKz5UeVF6OctRhoPQaikg12XsOnqJpwEF HjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0hJu4Nz1L7VKg35xvN8iIIF1HPKnw8palwRCJBCZ874=; b=Op4RV+o+77tJa8EdwS0i3dvZ6lcywIUTBNyUC0xnbc6alSQRDvwdb/OS2zzTJcnmmI y8pJjqa90ZTr3YE01eJ1pacwEShGw/YElmpczE3LYdRUQdIFXeegQ3xGHtpIsbNhI70q +/AW54/Ru6my+TizwzyLgKIF1+8R1epzyriC0RKfvuuj26vUC6wLLp4cXd+MhaY2fWKv f9pzlyFSSmgwN67kalL3z2kXp+/EOdfihcnVicgusSRqQdyw0XW1QNLGnWZM49BwCaku JTDDCS+FjH6LR6ubt1Oqm/nYZLy4eY//3Lzn4fOgRnMVkIFHP+WhIlmSFzfs4kwQMRms yYKg== X-Gm-Message-State: AOAM532hkcaVWqjxddFu7XhqRstf1OlG5AT2ORFe0MKUVDvyPmVvCDoa 3nNoTFSpcnG3FpbeVi8p6wYVAxvK6O8= X-Google-Smtp-Source: ABdhPJyDPORSldIDe95s81HvRlKr+CLtLwzkwGV/BVrsV5vT9M132+Tk5u3SJOAj52IG2eHx1Bm8Pw== X-Received: by 2002:adf:e704:: with SMTP id c4mr16993917wrm.81.1597675110742; Mon, 17 Aug 2020 07:38:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 066/150] configure, Makefile; remove TOOLS and HELPERS-y variable Date: Mon, 17 Aug 2020 16:35:59 +0200 Message-Id: <20200817143723.343284-67-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 cd8d9a0b02..135175c5ef 100644 --- a/Makefile +++ b/Makefile @@ -127,8 +127,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 @@ -177,7 +175,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 @@ -289,7 +287,7 @@ clean: recurse-clean ninja-clean clean-ctlist ! -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 @@ -441,12 +439,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 @@ -706,16 +698,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 0262b7b661..a77177f4e2 100755 --- a/configure +++ b/configure @@ -6667,12 +6667,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 @@ -7768,7 +7762,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684235; cv=none; d=zohomail.com; s=zohoarc; b=O86R+ceVIlYPLF7IJuBbeHf317dM1uUpr4IpAOYXpV15kvRMvX9yWqFoA7RmY6zKtN87LLZ3/nRWoINfOigqXnXLHfB2zDKV9CelVYCPq36dLYKYa/tNTOYTmIEGRFsMVJEoWB4HsEvxklEdrBNXscR7CfFTgYAHitpIaHMmKOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684235; 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=Ye+eN0K6SwtiPkKz7oTowsHX3twAyqMhNNP/Wn9Nzu8=; b=dGh1n8gd/+hZp4kQeYsxAE55T/jXGNdAHsXWCVnUeqDgo7VLARvDbu+ffWzriYOVC45JnxpwfnvGTt25nNGy5aw9yh3CHAKbrO4E2v8cHGw9kvic+5r8lQW/VAF8X+KDJs1qjFa8W+skeQ4Qsf5R5owjKZXHV2SIqDcAuuBkUbk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684235627590.4669985791849; Mon, 17 Aug 2020 10:10:35 -0700 (PDT) Received: from localhost ([::1]:34400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7ghJ-0007gR-Jt for importer@patchew.org; Mon, 17 Aug 2020 11:05:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHS-00059B-Ug for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:35 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHR-0006Df-DZ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:34 -0400 Received: by mail-wm1-x335.google.com with SMTP id x5so13422357wmi.2 for ; Mon, 17 Aug 2020 07:38:33 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ye+eN0K6SwtiPkKz7oTowsHX3twAyqMhNNP/Wn9Nzu8=; b=NW2OfgK9tuMqHkMofuDzhtIgOCUBd9nX5GoI9MjnhYljWG/5kaHLzq9RAcU03EeLO5 XtojwnoEPvGxe9nVbzBImMIVJ863HEqo/4vxRU0UGa5yO9gbCAB6R9pLfeag7AYoKvJ1 wWc2i+8tYS7yCsAVRPZ0QVdX+GQs3vrCT9oIIxSIMUrixs3mftU2feS1KVsfZ+zTFon6 JDEeH9YlSbso39W9BoCAxsVOE+BEa22gOKXhvpdeuiczqc4Q9TiZEdIPM49b0mB52E8W 86SQ/YQqf8xsD0+RGr61/pwfzPgfo7OrkIIy3BnlNlCEF57bFQfA3nFzJWghrUmKTS6Z cEWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ye+eN0K6SwtiPkKz7oTowsHX3twAyqMhNNP/Wn9Nzu8=; b=G1v762XLrERgWw+dnXdpT75RRbb7SuT+R7R5vsI+aGLNy7jTMJSD5uepGU4swUTmnY 3SeP/6TTrmJg2AxkkPl+GEA2bt+VHWKs2HjAYQ40icpDoqvd18/rZ7RcIIWbfGZh3zAv 3h3boDmp9sHCmEH5x7lAwUrIQcGyz0gC/OQKiQLlMOROvOk7e+ykWqLdlxQHL4uRE9jC QQluvC+dzh0PloufC5Mw1dmgzl6c5iK1TA5/6eQaKxZCTqN0mB/RjWSAKFWftMFoXbFP 9o5BBFtyQ3xiqExstC8hQiOP2V8zxCpcdPsD0qpegoe8J/bSpp+HlzD/Shrc1dsdL5xd Mk8w== X-Gm-Message-State: AOAM533FFch3KMqYrVdEg/iGeEe0xeUIexI97d3QnXUGtEc3RRQvAbY3 79utV/DR0wqDiSrP/tg4qBShZ/VTStI= X-Google-Smtp-Source: ABdhPJw0U2VEVvdWQouh2QGOxI2Ys2UnzWF6tGwg8Koxu+KNT3K5dcer07F1OEqKoxPtnf9Q+Whp+g== X-Received: by 2002:a1c:3285:: with SMTP id y127mr14870025wmy.104.1597675111692; Mon, 17 Aug 2020 07:38:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 067/150] meson: convert chardev directory to Meson (emulator part) Date: Mon, 17 Aug 2020 16:36:00 +0200 Message-Id: <20200817143723.343284-68-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 13 +++++++++++++ configure | 2 ++ meson.build | 14 ++++++++++++++ 6 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 chardev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index eeaa0cfa82..e43526fe5f 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 c0575da132..c8c4b70162 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 6662d0df41..0000000000 --- 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 a2e671ddfc..f79efaaf09 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -30,3 +30,16 @@ 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') + module_ss =3D ss.source_set() + module_ss.add(when: [sdl, brlapi], if_true: files('baum.c')) + chardev_modules +=3D { 'brlapi': module_ss } +endif + +modules +=3D { 'chardev': chardev_modules } diff --git a/configure b/configure index a77177f4e2..50e74b1e79 100755 --- a/configure +++ b/configure @@ -7344,6 +7344,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 92f2da51e5..c20b379b4d 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,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') @@ -177,6 +182,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684293; cv=none; d=zohomail.com; s=zohoarc; b=k7d+hOEz07Yn6q1/1gYjWOlLL2UbG+YOAij6gGE3UKtNwf3cRvld5+cSKLJh5nXHXTi/hKRwL+wVWjGRFw0nyZqbhB1V2JLIChPiVsGw2haJvAhf7XOjNtOLNql2kPrx/0ACvSxTOmRNOGT2CJr4ydhrCdkXJQxJI1nvk6+A68c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684293; h=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=0u5gtuyDHH9odtz5poi9FpzCWtsqIH6cLT7NiLRWGDs=; b=S/kBcyOd5fbZr/TYPOR/mzZkEINIAaslhv4n+EbnnU8ChZi3Dp0U1p0rps20FzFrWAEj0l9m798Y1WoUnrRwDmTjpIN9si/jeQtfwWDeLnllYNunNiZOTln1Ym1ZTSx3ibBKQmJo7I6O11dw5TQDIKn4bjelElheucXiM1DhIKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684293959255.19047232259675; Mon, 17 Aug 2020 10:11:33 -0700 (PDT) Received: from localhost ([::1]:40238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gnz-00057g-8d for importer@patchew.org; Mon, 17 Aug 2020 11:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHa-0005IK-Vw for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:43 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:37375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHW-0006Eh-6T for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:42 -0400 Received: by mail-wm1-x331.google.com with SMTP id k8so14102542wma.2 for ; Mon, 17 Aug 2020 07:38:37 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0u5gtuyDHH9odtz5poi9FpzCWtsqIH6cLT7NiLRWGDs=; b=akmg0txFN+/g3SJJTdWKjpRVOp6raLiqm4f83Qjkb84YylUB59SHEBcuY381n2lAxR 7i0jxbSzsIw4nwctxawaNzg3Qs4FCtnLpG+7F8+HYUziXUJXLVEw41C5/c0zP539X1Sk ulmGe89DhHcMi3knsV28k5jd53lWltaXCsFAkgjrtlLyRht/5H7g4Jg6VybNQAMHQTWT WATZRzR2n5G7b0fD2Mhg8M/BKIpx3sL4amInd+hHGW4Qlr2ft7vCGoZzfCrJV/t9yD+Y Q2tsYxVisXDhzEjWtb+OsqdV8sjxJvW6PsbAYEHvXm/y+aNSRDgFSofnTJIFFZ9UlcAN 8PNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0u5gtuyDHH9odtz5poi9FpzCWtsqIH6cLT7NiLRWGDs=; b=m6bw3ckgfblfGlrcJWB/XNAYP2CM5ONbDFXXtAmGn0Jf3BXWETpZHMSCjZ27ybjxL2 d0VqbkHDMS7liz5mIxZgpSayCx+lzjtqCDOmM/uc3SefWsv6CZaIWOmNfvYFmKhYIXR+ Ud/hVFCHnqukmot/a7160YhEubeMkL583ciYmLe3Yh1c1MEIV8tugKhq+wn/ZcRNMY8D KJ8AO69Ge6+e/PY4le17r8yMjIBXBUw0u2sgrig/oI5sPdRjecF6IvMdStK94d0RFCGG SG93Qm2MwuOIywssUZBj9nQCwYMs1uH4LULkWZI8eCE3AAolhzkkvC+T3x6tsaiKguK5 BDvw== X-Gm-Message-State: AOAM532nXZJ7mLd527jD03hGFoNzNlRppQxKP07OtRqluSGlN8gcfK6d qjeNfdx9W8FThX/SCJXifnI4xgJKFJg= X-Google-Smtp-Source: ABdhPJwJ8EcutxnRUM22CfnDGXvBXWZcWHa0TVGqxT0r2WeSuloW1cTC8aAQKWNOtk/zNQYpcEaIUg== X-Received: by 2002:a1c:80c1:: with SMTP id b184mr15764360wmd.121.1597675113011; Mon, 17 Aug 2020 07:38:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 068/150] meson: convert tests/qtest to meson Date: Mon, 17 Aug 2020 16:36:01 +0200 Message-Id: <20200817143723.343284-69-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::331; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x331.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 +- .../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 +- .../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 c20b379b4d..06d9287005 100644 --- a/meson.build +++ b/meson.build @@ -531,6 +531,9 @@ subdir('nbd') subdir('scsi') subdir('block') =20 +# needed for fuzzing binaries +subdir('tests/qtest/libqos') + block_mods =3D [] softmmu_mods =3D [] foreach d, list : modules diff --git a/tests/Makefile.include b/tests/Makefile.include index 676d099631..66acf9cdb3 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 8be9c2233c..d724402cf4 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 b0204e44f2..0000000000 --- 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 b084e31bff..e09f2495d2 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 0c86780689..261784d251 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 c8d42ceea0..ca4294f44f 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 f7e062c189..77b5e30a9c 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 2f1c07221c..fac580d6c4 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 9e66c6d013..24df5c4734 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 6ee6bb4d97..b339fdee4c 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 bfe7624dc6..b6b1c23cd0 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 833a0508a1..e9afab693c 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 2e5e47dec2..aca9b98b7a 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 d68b7856a7..9f22340ee5 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 318e422d51..9214892741 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 5f8839b232..2ab11ad225 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 f6ade9a050..c5d46bcc64 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 c387984ef6..ea286d1793 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 8dbffff0b8..d72ad099f1 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 cc088ac01a..4e79e22c28 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 adccdac1be..2fd7fd2d3d 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 031594a686..1ceea84702 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 9ca3d107c5..8eb765edc8 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 bf966d478b..f45373f5d3 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 d52f3ebd83..b943577b8c 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 a33bd73067..277a9e2b64 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 5dc807ba23..95b3907c18 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 48e8e02d6e..f7b7cfbc2d 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 8b7aa2d72d..561502052a 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 5cfd97f915..3f8081e77d 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 53a8c9b13c..65ce10b81b 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 ecda256472..d5c8b9f128 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 8f827aeb52..79631cc7a9 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 cc1b08eabe..2946abc15a 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 44ab1104b5..88835b6228 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 0da3f19c0e..6692adfa4f 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 35f82070fa..ff2049c3a7 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 8480d80669..35bb4709a4 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 f6e403b538..72425f0ad4 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 eebac7feeb..321b8826d4 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 9316598f9e..e0f5932284 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 473acce993..56e53c745b 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 e2927ed2da..a451f6168f 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 35183b2875..a22f5fdbad 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 1f46258f96..6b8e1babe5 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 f33ece55a3..8f9a7e3831 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 9ae8214fa8..eb4e453485 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 38f800dbab..ade1bdb40e 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 c65f087834..1341bac1c5 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 d04abc548b..db420a596e 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 a0e4c45516..1a9923ead4 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 8766d543ce..db0e87ba5c 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 49bd72d20b..c61338917a 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 f229eb2cb8..2251e864ef 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 8e971c25a3..e0b2bfe7ca 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 6f92ce4135..16ff9609cc 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 21e75ae004..d8d79853c8 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 2a6b7e3776..84862e4876 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 e5fe9bfc4b..f99572fd71 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 615422a5c4..f708b01432 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 0000000000..19931b9248 --- /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 3bb2eb3ba8..f97844289f 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 4690005232..49ec9507f2 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 d6f8c01cb7..262226985f 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 d9e25631c6..20a43718b7 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 2309a724e4..e1e96189c8 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 590c175190..ee64fdecbd 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 5d7bd88f2f..24ca179976 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 eb0af8ab4a..fc49cfa879 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 db1244eb59..10543269ce 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 aa3123f0f2..968fa69450 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 0dfc05cfb6..10ee0f75b2 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 56a2f37fde..8446e3df0b 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 d81ff4274d..db29d5554d 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 459e23aaf4..f38f99dfab 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 fbf2e36aec..65f0d07fc5 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 1acd3096e2..22d647b1fd 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 ae590a456e..1787b1f188 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 d7a9cb3c72..8b45b02984 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 eeced39a2f..50030d7fb1 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 c87b56132a..2e300063e3 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 be9621a5e3..b1e6badc4a 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 9745f4a83c..a3da5c234d 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 5b919303a6..309894c338 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 5fc69401be..5da02591bc 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 5170f13cfe..dcef38851e 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 e0a2bd7bc6..75efda3029 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 0e45778b07..30803bc91c 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 a9e253afe4..1cae07f60d 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 b8cbec04af..5ba2161de2 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 62851c29bb..cd3c0f5bf3 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 294d5567ee..f5115cacba 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 46f8d95b1f..2e09dd7c48 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 9342372efa..9ca102b599 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 c8c3598428..5644e32fc3 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 9e3774d99a..531315e6ad 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 b95654085d..ee34afd95a 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 3328c6cf19..3db43b2bb8 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 9aa360620c..6fe7bf9555 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 529ef7555a..b8bd06e1b8 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 0edb1c9144..ad96742a92 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 6f1bb1331c..176979a2ce 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 fd4680590d..26f1223642 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 b94a1230f7..6db3234100 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 57107f1aec..aab06b9fc2 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 d6796b9bd7..eae70ff95f 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 0000000000..30cb88d919 --- /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 04e199ec33..2b255579df 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 a11808b3b7..d63bba9630 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 21ea5ba1d2..00a233cd8c 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 88217686e1..c238b3f422 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 3fc0e555d5..43cfc4535a 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 e1ed6d4322..b25ebf97d8 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 ff0442150c..d32c953a38 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 d80ed93cd3..42a1312665 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 4b2092b949..e15d4d94d1 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 900944fa7e..7583aeb3c3 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 17aa669b2e..afb702b565 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 2c46d5cf6d..c8d4043362 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 60e6ec3153..f41d80154a 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 ff9176adf3..e57639481e 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 1161a773a4..32bbae33c5 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 c922d81bc0..b7cf144990 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 f7b1aa7fdc..f34e68858a 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 1a8876b6ca..5950c3ebbb 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 1acf0d7369..eb34af843b 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 167b42db38..a7e83e7d40 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 6275e7626c..a110cfe321 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 093dc22f2f..ea8d596507 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 254f735370..47bc7ad301 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 1e3ced84a9..bc0dee64dd 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 e4d53220fd..829db8c2ea 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 d5e7ebd176..aea1384bac 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 55fdb5657d..1d82a48c04 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 7b20035142..f7126eff9e 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 90131cb3c4..fa590e68f1 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 58a9593745..e2b29ef0f8 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 2fb6c4d5a7..da16cbfafc 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 092ba13068..e6b8cd8e0c 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 f7c6afdcf1..6313417630 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 efba76e716..6781a51447 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 a81025252c..97c23fd3a8 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 797288d939..6c36e43fb8 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 d1b4c3e8ce..4ac4c22109 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 5c7e457075..267291c6ed 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686789; cv=none; d=zohomail.com; s=zohoarc; b=kbsuLLuxlyBvbGAtRfQ05X//oj4b8tJjCD6bP35WZbumA3rvN2S+R2cZ9qYPzgon4G+8toKG1UxZ2TIaOtrSZhSoowouuJ0MdJ5d9/MDnjNE/yooP+wNpYb9kh1XE9Yq4k7aJOTMHKBStXGDH8xcQUNGefdJ2EauPBmsTH4iO1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686789; 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=aXdjHqDn7Dx5PCb35bX2WOyvYxDDE/R6Ug79m5dFQdc=; b=SaMAM++ncQP4MxcSHEHM35pluVvQ74zdEylwHclJS8MIXWZpVfkSw80v1AojlNRuUHMrnhTK+5sQT+e4XnzQk2NnwbWbAjMVSIM2K6M1t6iKuDnb4BJc0zcGeZ65GeJ0uM4lRLtyZ1KMQIfJHZBfIcLbMDexRisHTiKQ3Tr8bhY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686789769256.315990757809; Mon, 17 Aug 2020 10:53:09 -0700 (PDT) Received: from localhost ([::1]:46872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gjL-0004OU-4F for importer@patchew.org; Mon, 17 Aug 2020 11:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHY-0005CO-LM for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:40 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHU-0006EG-Ha for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:39 -0400 Received: by mail-wr1-x429.google.com with SMTP id a5so15259763wrm.6 for ; Mon, 17 Aug 2020 07:38:35 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aXdjHqDn7Dx5PCb35bX2WOyvYxDDE/R6Ug79m5dFQdc=; b=FTSljtP6QQzBCvBVePRrLHxknzFAhwVLzYODcQv97uFXYoaVNXpU/lCril8f9enlL/ Kn2DikM+Q9ugDlZIpaUBDLdDCudDKbZeRERDssHhowhshuw60f34OgpVOxMgCrGwhEHu eWWafHGYFHgpIhMYWipqyeW/tnb2+Yli1n2z5dSs5fMydnrGxuASgRCeWhdJtihlGn7B qngo8AI7+DWWLSwIheKhxqO6lWbFIB4aBliMNXdwmFKCdKODv1RvjkSga6jsKvASYb7R xCAHjRcezGdw7nqzFpSTzc1SxdgqyyehWnvN5z6DIVugW4Suv/ElfzZOzGctdZu/r7bK 3qaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aXdjHqDn7Dx5PCb35bX2WOyvYxDDE/R6Ug79m5dFQdc=; b=S5vi7JlkQiwVEop5NvcpsPuzwFhZAchuySHEtwGQnFLGK4a9njZ5nyuXaDdNnMXe/I AudYdrhWi7tMk36z+syUDYZ2pVgFLdwXuyFTOjFquKHkwh+KlOQR6RFHVE/mNr30Otjt POlAvivVAjvtpwPR9fU44OQg4vgxwulk0oVyhPzpcbNNwp9pDNOO/XWDRgTYX6UV2sgi g9EZs5q//D1/egcN7bvWotJwCMnIWGOKajD1P3a3wjfytLlSvYlD0lV4bTe7FnXr1NYh n8RlwOTR1YAdmUCw6WFU2MLcczgWW1OrSsP0SvyYcDQQb6RX5jSN1VDODk2Jbndf1Ywf Q+2Q== X-Gm-Message-State: AOAM531nBDWPmapB2fsIzji1dh5n3KUse7gkXtNenERDYt8E2bsi7GQ3 gKB+D2nyw3Og44NToYiTFTKG6tx8XFU= X-Google-Smtp-Source: ABdhPJzEbwTQyUGGizfh3vPeEC1ISgEDQ9JQdH+64zZw/fr1L6Md7MAEjWKHGPQ8rvuUT7eIXwablg== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15504446wrq.422.1597675114348; Mon, 17 Aug 2020 07:38:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 069/150] meson: convert audio directory to Meson Date: Mon, 17 Aug 2020 16:36:02 +0200 Message-Id: <20200817143723.343284-70-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 30 ++++++++++++++++++++++++++++++ configure | 16 ++++++++++++++++ meson.build | 27 +++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 38 deletions(-) delete mode 100644 audio/Makefile.objs create mode 100644 audio/meson.build diff --git a/Makefile.objs b/Makefile.objs index e43526fe5f..ec7627a4c6 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 c8c4b70162..ff0e1b2d10 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 b4a4c11f31..0000000000 --- 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 0000000000..15c06ba045 --- /dev/null +++ b/audio/meson.build @@ -0,0 +1,30 @@ +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 {} +foreach m : [ + ['CONFIG_AUDIO_ALSA', 'alsa', alsa, 'alsaaudio.c'], + ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'], + ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'], + ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'], + ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'] +] + if config_host.has_key(m[0]) + module_ss =3D ss.source_set() + module_ss.add(when: m[2], if_true: files(m[3])) + audio_modules +=3D {m[1] : module_ss} + endif +endforeach + +modules +=3D {'audio': audio_modules} diff --git a/configure b/configure index 50e74b1e79..f52556fef4 100755 --- a/configure +++ b/configure @@ -3718,6 +3718,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 @@ -3733,7 +3735,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 @@ -3776,6 +3780,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/') @@ -6987,11 +6992,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 06d9287005..9dda687575 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,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(), @@ -213,6 +227,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') @@ -514,6 +540,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') --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686737; cv=none; d=zohomail.com; s=zohoarc; b=Y9UtvL9zGmgm0RikuL5QJZL/qouoDoj4qfbn8sOMwUXewSANd6EXscTDajrRrGjJBRY955l6+9TQWqEDX2HXA39IibrnWsj7dQCDpBiYG9/RhC4PlUPaq2+xRniqEhPT9DgSzG4gRCOUs9by+5IT3bkbWl7ZU1VzTOF8B3HuOhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686737; 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=W8zWBTa0YRH9+iU7a6/4GhzG0FCxM32LubUxVCTtLx4=; b=mhZAUteGypGyGje+Bc8MpGFaWqq4RBx1/GNBgJJdZFkVeq7YGQC8ZLVf7ffMeYoUyYjlH4ldicFE3qCWynA1lPt+mrfHOBZwOI1uof2MKZYSvP67b8Yq4cjSS7DN0kQ49hkGMxD1xsrAz7rsCPHe/8qFtQB+Z0uzRYMyLt5Y3IY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686737964536.0379625426244; Mon, 17 Aug 2020 10:52:17 -0700 (PDT) Received: from localhost ([::1]:42818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gih-0002mc-Oq for importer@patchew.org; Mon, 17 Aug 2020 11:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHX-0005CE-Bk for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:40 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:53493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHV-0006ER-5X for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:39 -0400 Received: by mail-wm1-x32d.google.com with SMTP id g8so13424994wmk.3 for ; Mon, 17 Aug 2020 07:38:36 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W8zWBTa0YRH9+iU7a6/4GhzG0FCxM32LubUxVCTtLx4=; b=IO169P2UiGqwp/eNOmgfRgjMMsROm8onubLMfqjMJ8oIGOddchWlaAV/JNXlw/yO54 omZbdX3Jv+zF9AzwrvW0TPgkPje4H0tH3FX4zD3l4CRmgdSdt746vdSr7rozlQq4Z5kF NmqQ70ipfdjjoI7UssfVUrjQSilrIqkxtcX8/TRFNYEjwR1qNgmJ5HbGmex92O1y4GUc cGNMWisimJsiM4/reRrX5gqMxRu7ggPep+loXnJaCv4RaiadOndKwdiy3ofM/jHeO+nG hp8qnrHJAlOb3NsO+QCpdMYm7dZ2yU+K0CxVdsusbB6QGwhVNYKHO65124SnvHjRdDL+ 0epQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=W8zWBTa0YRH9+iU7a6/4GhzG0FCxM32LubUxVCTtLx4=; b=kKnlb83SayTZsNCM1eOV7RduP/QFwVRtkWuJ/cIMEwCm6ImfjUrZtqkFGP8bAe64QB nQjXjJILqULDCVTLQ7ACtiGaFhadKVImD/XSB5jIK9cBbMElKvLLIq1hJ81flyO8cQ8m YZ6g/Ch73SUhlg1jUtaMjA0GGixoDEMeLKnXaekt9kHFw9oOAu3h/ddOaIB2Bn8KCRJi YBLZaimT90p3XpP9ktBMjv3cPyzq1HAk35C/I5h8gsOxjzN2APb15EecQ4tFr/RZjUpP qVV7EHpyXbDGAj8tCJyKEdYdtddgbdHEPaly4dE1f5KHTfwpr3N+UnyALUIYmpRtKfba WOrA== X-Gm-Message-State: AOAM530P+Gqs6gFTt7l7LP0G4NH2pWZPOZUwgQUUcw/XgDJn7wPGe3Hm nNq9nXuozV8uo0f+0UJNSD1vHdKo2cc= X-Google-Smtp-Source: ABdhPJyZKy7nG30VzIaKlItC+4G5mw68nFd304SHLN6TOoB1lkKXXMW/JDABgP4mAYTDJJlkUY4ZOg== X-Received: by 2002:a05:600c:21c2:: with SMTP id x2mr15338683wmj.142.1597675115167; Mon, 17 Aug 2020 07:38:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 070/150] meson: convert ui directory to Meson Date: Mon, 17 Aug 2020 16:36:03 +0200 Message-Id: <20200817143723.343284-71-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 | 82 +++++++++++++++++++++++++++++++++++++++++++++++- ui/shader.c | 6 ++-- 7 files changed, 149 insertions(+), 84 deletions(-) delete mode 100644 ui/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index ec7627a4c6..72e935023d 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 ff0e1b2d10..16f1e781e9 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 f52556fef4..9ff9502621 100755 --- a/configure +++ b/configure @@ -7020,12 +7020,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 9dda687575..899826f611 100644 --- a/meson.build +++ b/meson.build @@ -239,6 +239,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 504b196479..0000000000 --- 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 8cf070c130..060639a326 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,82 @@ +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') + curses_ss =3D ss.source_set() + curses_ss.add(when: [curses, iconv], if_true: files('curses.c')) + ui_modules +=3D {'curses' : curses_ss} +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')) + ui_modules +=3D {'gtk' : gtk_ss} +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')) + ui_modules +=3D {'sdl' : sdl_ss} +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')) + ui_modules +=3D {'spice-app': spice_ss} +endif + +keymap_gen =3D find_program('keycodemapdb/tools/keymap-gen') + keymaps =3D [ ['atset1', 'qcode'], ['linux', 'qcode'], @@ -24,7 +103,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 +112,5 @@ if have_system endif =20 subdir('shader') + +modules +=3D {'ui': ui_modules} diff --git a/ui/shader.c b/ui/shader.c index d78829f43b..e8b8d321b7 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686832; cv=none; d=zohomail.com; s=zohoarc; b=Huj8IaChTEmTerQvvcmgg3ARrwJA+hjd+LWybUaeaK0DWFwzSefBVEeOjq87OQi4kwjwpcaltlRxgRJCqXoTQtKlYFG1OBTbbJDr8jKYVizUWmiOyy6VZ+0PnmdNOLczReGznh3aCBpbVIhS1RG8RyFSNbCG7YQ/4n9Jm7TjIyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686832; 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=cvvT2/vw466fLHIR+D+5HdwpIyUGKe8k5YxqXSy62yI=; b=UqL+BeVWqArNofQD/3ciAxZbwSJcDSH3EQfN0fVgaUTDafXEuFFES6kQdw7K1vp3RRgOx2zo77g3YCiSrOxRWRvq3qcnrI9aWc5DsEN+wvbaTcX7iKngPvR15yDGo8L0JJwXqenfiUiU6YeA8Rb1dHOL3oZptmHZILtq7sPmOMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686832819427.26659479676005; Mon, 17 Aug 2020 10:53:52 -0700 (PDT) Received: from localhost ([::1]:53454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gkV-000750-H4 for importer@patchew.org; Mon, 17 Aug 2020 11:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHZ-0005DD-3R for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:41 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHW-0006Eb-Cu for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:40 -0400 Received: by mail-wm1-x330.google.com with SMTP id k8so14102535wma.2 for ; Mon, 17 Aug 2020 07:38:37 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cvvT2/vw466fLHIR+D+5HdwpIyUGKe8k5YxqXSy62yI=; b=Rt71JZwECrVE04j9ayhj/2pg2s2bMFLDbKTpI8G2bvDz0/OE0rDolB0Y8KHY+XtwbM 3/MWS45rf2gd2PHHG6fjbl2tSJF7e+qZRNw+ut/GggRHwkUQEkpUd79V6EiO9tSgEyMi eHPuhBtRuvBoHY87fRdJLPnllw9sj2+z4opXdoixL5OCwb4X0cJkLwr+OuLyFHstCAMb CRi7rlqsx6693Tb2HtUO9tDL7YfeD7S0N10y/ISjhVwRuaMCpRcZcZcPg8APgYAqz5WU lIUp+UvmaK3o84jMvjpJdpKUy2RowdBSHsNym+9uODsqAmNshT6wEOf50HD4aAj6Mjpn 2E7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cvvT2/vw466fLHIR+D+5HdwpIyUGKe8k5YxqXSy62yI=; b=T58cOmzfFgq9p8K845m3Q1Ete+c6iyHi8PVr+UfpTvp8xiIHO3WBIwGX1erRgahanF iWY9A+n6kshda75xOLLuGOeQedBAXHsbXCNkijEy/QSK8dXh7pistw1lHtjOOxY3FWwd +55IjetLfgWLciZzFat4y/z9HMWQ4QabyDNLumwoALgSzgaadBkthajiEYMdPn9Ntoiz Eroj2gSC8ASf9m7ZNoldQXMNh7rmeXS1aKad08up2XURVWjmU/R/AD/wKGWM7JJlwCmG gMGED0YjAh43h1Dw01cR7HDDVitpbyIL4MkvEh3SimF1fVDQvE9rgtTOMKcuLNhDXtjt Rjmg== X-Gm-Message-State: AOAM532p8NGhcCZQTMwTkez5ns8/X8InUKr4kTXACr6Yr7WTekwuQOgS A8nP55TAISMKrKWRyNH4LOWXOduxiOY= X-Google-Smtp-Source: ABdhPJxZwphPDh2Z6u3wj+Kcb+9NAmXwMm/rWSFdK2722VgAzPrJG/r9TrHSMcOlXMSNfrwN0KMczg== X-Received: by 2002:a1c:e008:: with SMTP id x8mr14678369wmg.75.1597675116250; Mon, 17 Aug 2020 07:38:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 071/150] meson: convert root directory to Meson Date: Mon, 17 Aug 2020 16:36:04 +0200 Message-Id: <20200817143723.343284-72-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 72e935023d..ec15ebc4b4 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 16f1e781e9..5f926e5bfa 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 9ff9502621..8711e33f21 100755 --- a/configure +++ b/configure @@ -7331,6 +7331,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 899826f611..a9e52e56c7 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', @@ -289,6 +291,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') @@ -455,6 +462,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() @@ -608,6 +616,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684819; cv=none; d=zohomail.com; s=zohoarc; b=PeSTXyPJqPcvYHr5mvJRz23e4HyyrqIGv10qcW5tm70FlGVoFe3mN3tIFhCL+W1BTeRkD5LHJ0TkzGD7yK3RNTax1e52zBaF/5lBkJ5VNO8zjMtZqowpxmB8DZIt7pHrVZTxOq6rj5EFtQ/SUI1KNLqXb2kQ/tMd5Me8modwxOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684819; h=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=Q89jAjyHBRq6xfP3HIT0eKnoY4vV+s645d2y/Ix2bG4=; b=jkvyR4KoYjE1zBe4nVjYupX+BOxg2x0vzM5QMV5Esyr9ruP5jLsToN17HM7KvEFf+/2K3xaRrwdgQbP3mU46k5+NPqKRlTkJPgap+bcmUXSqqQcHMEyacgzy7pQamOPmrK9wU7MfSbOj6dg46NfMJKuh1qVUlxfSNarKq/YWV8g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684819095785.1648703643056; Mon, 17 Aug 2020 10:20:19 -0700 (PDT) Received: from localhost ([::1]:45234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gj4-0003kc-S4 for importer@patchew.org; Mon, 17 Aug 2020 11:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHY-0005CP-Le for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:40 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHW-0006Ey-Up for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:40 -0400 Received: by mail-wm1-x342.google.com with SMTP id f18so13347432wmc.0 for ; Mon, 17 Aug 2020 07:38:38 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q89jAjyHBRq6xfP3HIT0eKnoY4vV+s645d2y/Ix2bG4=; b=t2Zu0UfQzzVFV1nHFdnDfv1HHeHlCG6iLHSvLwcwljkIyPPQxZhhhUTJCzQ2ndlbWW jUYDziK4NJbkvUVVLN+b58bR6iZ/VvdijQ8SLq06aMgllkOYzqqXV2/FwcrWP/76DHUv wHbKD9Q7sbH3UzzVpoYCuMBNoVl2A9fzruwlp7Cd/XLkiK+SqECYVWzN1Ois8ZTXI/cT XEFBjihdUPWYFOa+mLoCeVmkMytB1hpUJtevdlKoCYTrjzHdugUPBuvRAftWAJ9cs+Ha aBIHmAvz9iJaNocQdzL0MJfoByccbJ//zCSQwGjsvBO5zO9DGnVx/dr9ZVDe5uwIPrEx q7Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Q89jAjyHBRq6xfP3HIT0eKnoY4vV+s645d2y/Ix2bG4=; b=DG984yj+1ukhRsGjHScTRCnffL+HfqJhdG6qYZKp/FEc9arJ5hvsFB4XQA8P7FV7c1 ys13K8uFgP3qSmC8Gz2nQmrHkV7MbZYh6O/58rEJSTi46aqmblAMGo11uMoKQ2quUyxV TbgiQ+QIuUGPi1TEVWHCoLNDFKsFEWCvAyXRQc8LUGh/3icLyJJpewrqyIu7AIXWwy97 ZPM/vEEpAsrlgL/wrBq3xQ4/G14UQuzZyTphtKONEBhbc+UsEL6L/4jH285PMCePfpjb Edxjvm08o/l2fLuIb28XTJIciD6sPH8ccGFzW055Ija5VkFb+747bEzmmInRBJeXzGPZ FMdA== X-Gm-Message-State: AOAM532srrdK3S3tkNm5DVA+Zioo3Wb59tj7xLuybkHMDaDA2+spO7R0 FyI5z8AJYKzUkUQIZLKH4ilZ4cnv0mw= X-Google-Smtp-Source: ABdhPJwWdcZOtj23YVy6DZnCx6HfgZengAoBNYwOpweV4R1vpBl51hg0tJ2GofINiUTcdCvG0ukzzQ== X-Received: by 2002:a05:600c:2116:: with SMTP id u22mr14803455wml.35.1597675117398; Mon, 17 Aug 2020 07:38:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 072/150] meson: convert most of softmmu/ Date: Mon, 17 Aug 2020 16:36:05 +0200 Message-Id: <20200817143723.343284-73-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::342; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 a9e52e56c7..9169e9d880 100644 --- a/meson.build +++ b/meson.build @@ -641,6 +641,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 c036887500..ec74d8a9fa 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 $(SDL_CFLAGS) +main.o-cflags :=3D $(SDL_CFLAGS) diff --git a/softmmu/meson.build b/softmmu/meson.build new file mode 100644 index 0000000000..95d38df259 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597683045; cv=none; d=zohomail.com; s=zohoarc; b=J7NorqrkJEhYPiNHsPL0KZL8sGV85IIO1AP0tvnEW5sQCnxYl/ONTP8vkIVfwdjsm0FRSDrlxEZd0A0W6X/0AfYbpQh5q64go1vQsLdydsP+V6aL2UcahEJ69eW0AQjCvyeuUqayQlsztzaqbxGD+KTQY76PcZd+hDdURp+pt10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683045; 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=2m9BLaRc2vYcN4AzbMEg1k1RBUEJSYEg5EY4KfBueFg=; b=ioWTWHbdSvjetd35yVro1pXNro082YCL/bIbUiXlAyh9D51pHDcSeY/0w+MUIkTnPWz0YilChoW3u/jnP3W0+ypLV+Nv6SZppPnX0JvlCWnK304GybpVZMhUQmeTdu2HC9mg5tZoCTlwREwgkYuRgTekJaUhsOMmDCJRdJSKNBg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597683045798692.7016488135481; Mon, 17 Aug 2020 09:50:45 -0700 (PDT) Received: from localhost ([::1]:51144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gk8-000687-FE for importer@patchew.org; Mon, 17 Aug 2020 11:08:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHa-0005Gi-CB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:42 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHY-0006FG-DB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:41 -0400 Received: by mail-wr1-x433.google.com with SMTP id f7so15277502wrw.1 for ; Mon, 17 Aug 2020 07:38:39 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2m9BLaRc2vYcN4AzbMEg1k1RBUEJSYEg5EY4KfBueFg=; b=WRFPMaCNdVXthCpZyQJrCLCKQLwppToc9gDtCQTOVvoBDHHgD4H4BIOZTuMiszpY+T ONDMwcaR0ub3eAear9oebFe9TZMTEWxpCOgPNBhnKmPSgeJZJgHz98Z2k0FwZVeJEim8 pCICcC8MdKFryrf/vmjI3x2m5lfuaweVabZoenBzz6mo+MjeIDdcf/9sFPqXAEmtJLA2 stSK4iAC0TXKE2QnnmWr2qcuHMJ4qdiZDM/+PbaGAfeYbJcp4VnZD8SI8PcAnoWxYGHK Miit+pnnMCZlMqrEE0yEaJoJZK1/C2YGFD7XrPfdZyyF741LHc9pmGV2qxEptRI3kSDW vgmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2m9BLaRc2vYcN4AzbMEg1k1RBUEJSYEg5EY4KfBueFg=; b=TPw5OOZsY/DQw21puQ3c+Nxqzcb5GKpULEMER9ZQqCPQsAYX/LNrd55vMWBu4i0Gsu 9wFOdluNON7+I1A63tF0u6h+Mu7NdZIm/czUryAoaB8VoosZPO2hl2pkJBaphqScnjJJ SMVis0tBXylWKpHSQP6R/kj/l7+lco2U2VTGgNLymL5ebi+i2zeN69RomkLUV1qIAkLs MQ8fGzpa8au8h3s/BAoeY+lV18WOsItzconTjBFxWyT1MIMANL4vbRPVNt0K5DMKvQ1h Av1SbCuaAMw+nlGS4p6MK+742Y8DqBe32EJg3HSrEEPzSmI+2E57DaLPuf072fjN0E8l Bbcw== X-Gm-Message-State: AOAM530II33MlYr0SJonlpdou3zxJMUPurZ8MJ6IYq6mCEE5jBSTpCdH CmvjXYD7frYruh28x2fJhGvUsBfPbX4= X-Google-Smtp-Source: ABdhPJz1K2/uJ6oUYsYk8zTaW939TXAmxnBGicwvcRGM/2hJ0u4iwSDEZ7siwuh2XmKByRw4On7+KQ== X-Received: by 2002:adf:ef4d:: with SMTP id c13mr17074204wrp.198.1597675118327; Mon, 17 Aug 2020 07:38:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 073/150] meson: convert trace/ Date: Mon, 17 Aug 2020 16:36:06 +0200 Message-Id: <20200817143723.343284-74-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 a429474618..0000000000 --- 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 cab36a248b..9c3c128164 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682862; cv=none; d=zohomail.com; s=zohoarc; b=UxTtqEJsgWV0PpdXdgDEl/DqpQMvjQSlE1T/NpOrILqa1i0a6Y+z5QJ8CcSy6gpl4X09TAWubgRzepAZU5woOZ0NNh5Ec7GZtElSGdHYtMqy4MMGwfrVjrUXFYNiapz7zmCXxTCp1K5NIPIWOVVSuGW9RhL/7rI2NcqvJ6azIIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682862; 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=RBMoXnf+y3Js1gL23HwqA1CCjiUwc+RJFGNpxIwTuW0=; b=KtpmrUGx9n54/LqV1z7ExYANVY6Vbi8F7tOigPAX1WSPOss0IyxOPlWU3VzBZMOOuDlEwgT+i5Rc3+vd1o3yb9Hghym0WNAR+8UkoR6By0kbVoGVMREonxKi7QETSFVjWjhvoFOC2+GDvjKn5tOkcwjeEzknm5f+TmU40KkDB3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682862369476.7419705005144; Mon, 17 Aug 2020 09:47:42 -0700 (PDT) Received: from localhost ([::1]:59386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7glf-00016Q-LL for importer@patchew.org; Mon, 17 Aug 2020 11:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHa-0005HD-In for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:42 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHY-0006FI-Nq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:42 -0400 Received: by mail-wr1-x441.google.com with SMTP id 88so15284118wrh.3 for ; Mon, 17 Aug 2020 07:38:40 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RBMoXnf+y3Js1gL23HwqA1CCjiUwc+RJFGNpxIwTuW0=; b=Rn7jUs2hIFsv9NnJPGAD1CopgTHNx6iRIETNqrDtO5f+SI6qugxpw7S8s6M+nX3O6c iqm95CSuVy3532bgxzHDtmpLNgCrBMQO+tokyBWQX5L7SqyiBx6FupzQQnXewduhBbu1 0L9hZHJ4STvdxZdXgn0FdtzpVLkS51dJa689B1j38XeUxaPm8rvW25qyICPAKgyLSRil 0e8l+egmDXJ8vGh+rBPYi2raYfbaj/ry1soFK+KANwgoUrh1/3dyFK+EFU1Xf7kKf/SY 6gpFFADGNm2we7CIHRE1E4IN5bWi2sAjN2o8okc1XvfTmwMJhKNwzVy2pV/6QYOpy5hV Xr8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RBMoXnf+y3Js1gL23HwqA1CCjiUwc+RJFGNpxIwTuW0=; b=VoaMb90zYAq2XA41W55Fu62qzXnuAZ9mb64g96hM9//Vns6BxrfiAqXlXed0Pmwpl9 tdGMqI8OnQ57iGRML6/Sq/affoxgDQr85kHDNzC8XAm7tDUU3ZO3uvvGPBynBwG3jFMu GCnTINcnp52f/DSdeRYa1UAwqmsijcel0/bnDulbBnoIJyAlATQ97K85Kk192WI85HXY ExqyeBZh1nm386zZfm48j00IW2LeE2w66r7qF9i3HpNWPeB2xLHMTtwmD9VtMOn7ERTR H6uWxhz4KV2Xaf642/nuUpr6t2GE7UkqBuzbvgQ/q4oEyPE5ksvw5VcQ7Adx024A9VmP HJBA== X-Gm-Message-State: AOAM532FYCo44lproVGQYgvEzO6JFFwisVuPmBnwJzMcyPivBnFGJX4Z 7XhDPX3mGxFHe8dLMFXAZgZ3Uo5IRdk= X-Google-Smtp-Source: ABdhPJyQLWSFBZedYNu47xbC1nMetu4eZLslt+EWs+lwe2KfeOj9IufxAulSDie6sCYNlJfP1lhnCQ== X-Received: by 2002:a5d:6a8d:: with SMTP id s13mr16892188wru.201.1597675119144; Mon, 17 Aug 2020 07:38:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 074/150] meson: convert dump/ Date: Mon, 17 Aug 2020 16:36:07 +0200 Message-Id: <20200817143723.343284-75-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 ec15ebc4b4..6657a6cce3 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 5f926e5bfa..c8f7a6c04b 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 8711e33f21..dd1f039554 100755 --- a/configure +++ b/configure @@ -2571,6 +2571,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 @@ -2590,6 +2591,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 @@ -7419,10 +7421,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 d2a5db3b81..0000000000 --- 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 0000000000..2eff29c3ea --- /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 9169e9d880..e28937dee2 100644 --- a/meson.build +++ b/meson.build @@ -296,6 +296,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') @@ -603,6 +611,7 @@ subdir('io') subdir('chardev') subdir('fsdev') subdir('target') +subdir('dump') =20 block_ss.add(files( 'block.c', --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682945; cv=none; d=zohomail.com; s=zohoarc; b=C63NMz7F9yxrZXQwVzHW2kx+nPaia/Skxo1Q24tD66pA92O7HySBLwmtNYxlDswAaP6sAM/iMsiP4ZPvWMihrQ6fAfyzQ8Z3eF0FV0v/5B1M6UrhpqXudSdVFq1VUHFwEhmvta0zBN65k17vqdoO9hF4Br6CrSMth6U+8tGukg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682945; 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=GQ0FBqMMB50mRn7MFpTrLJW86UCkKNmSBW1pI3/NZfI=; b=ZWfHe+gtnHLBFDPFMj1qC+gGaZrAoMd4TW5lwiqKh+Vp2ADszNjH5GFWq7igwm6llYg17tS5TVoHoEKphf6UQzFc6/RSbceT0ghqB6d33KB5GJ1M1x5HCCJsaIn957CyKxrLBHVx+KEcdiv6Fw6YN/24k9q5TEUCA+YWR4pdVCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768294567717.85979788048894; Mon, 17 Aug 2020 09:49:05 -0700 (PDT) Received: from localhost ([::1]:55222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gko-0007p7-Lx for importer@patchew.org; Mon, 17 Aug 2020 11:08:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHb-0005KU-QW for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:43 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHZ-0006Fc-TC for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:43 -0400 Received: by mail-wm1-x343.google.com with SMTP id g75so14084377wme.4 for ; Mon, 17 Aug 2020 07:38:41 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GQ0FBqMMB50mRn7MFpTrLJW86UCkKNmSBW1pI3/NZfI=; b=PUvph8QcONT0uEbLI7J4nV78pPz0xi94JPPpAhzaBFE8+IhaWafYaCyAYSJqjA1DWG +CtcV4H5bBwGqVA65bv887gkPBgW2l1EZX5DbRPd0/AZXWufXdtLxAwUX1v+x8asnfmY JDBqxzY1fXZi8uQCQCDXNumO5rOl1qIYREQzBaF+PgTozSGesX8q9iu49oOIF8lMQrjm 9l3IhaY54UngUmQz1N2xb5bpy3u44W4jENAKqecS/5bRA278qP5opfIjfe7MDMHTtfJG ilZHuvNmzjW2KMFdcUf8Nri30c9SF3lchWmMcucv85AxHc/uh9dkCiysSa+h/uokhQVw SADg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GQ0FBqMMB50mRn7MFpTrLJW86UCkKNmSBW1pI3/NZfI=; b=Su5nvWw96f/2f2WHJ9SXEVFzekUVpZyShh5s8KBAoCoS+vlF2KjYA9ez9+jf2g6R0H +GgjdmSbCqDEz+B5/5Zfjw16cFdkeKbe9/L0gzff+rfRX6Wm47gDXU5qfErIGga+/Cxd aSx9UE1CfxC/yA0FxF/wZCVBWhHo6gWA9i80Zx1LLqzLjiPWOc3D+LjTjATnfpX5Bydx HzBqsctcHKnpyEAyBX5VgvQYgM+NdvKjQHXvQenW2ZkAs2ZLGlYLEtTHBVzvzf8bg1Db q9cYwqjI3AVjgLK4jZjec6RZGy7i90ZvTM051uNNSuFmR43Tl59dflLvSC2vMv6mkPb5 Cbhw== X-Gm-Message-State: AOAM533gZnlR+mz8mUEJaxa+OgyqDtk4CvwfXw4gbnLK+sYjRFZVikeQ Cw4NB3KlAOb1TwL61IAkpppZ+av0oyY= X-Google-Smtp-Source: ABdhPJw3NIT7Nw7tPBWiivy3Fm0Cv4m7ofPL4AKE4AUzxS7cZNzcooGP7kD4VK5YUIOztFOZ90LKFQ== X-Received: by 2002:a05:600c:21c2:: with SMTP id x2mr15339039wmj.142.1597675120167; Mon, 17 Aug 2020 07:38:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 075/150] meson: convert common QMP bits for qemu and qemu-storage-daemon Date: Mon, 17 Aug 2020 16:36:08 +0200 Message-Id: <20200817143723.343284-76-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 6657a6cce3..d7826c1e5c 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 c8f7a6c04b..54a9ef1330 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 e28937dee2..d7d10cbbaf 100644 --- a/meson.build +++ b/meson.build @@ -471,6 +471,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() @@ -651,6 +652,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') @@ -700,6 +702,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 : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs deleted file mode 100644 index a8533c9dd7..0000000000 --- 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 0000000000..0484a64341 --- /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 b9629045e6..0000000000 --- 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 4af044d858..35815f6c04 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682951; cv=none; d=zohomail.com; s=zohoarc; b=FSe8eytN3cPTwvwdLMbSYUVEBSjz/svEjQHWkbaFuehXU1/wH5kgIrp3cgPOMXGq0YXQBFVQ3QpGRQR3TcN0V0JlRKP87iUZaKCcWd5EenSbKruhsHjFHDPinkFJac7lyzwWdMHHZepLl7lzaOKFOg6j4EepSqG+2GkrslQD1iM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682951; h=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=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=dmRsTISVai164Rb9InGEtkqC7kwL3WtMhQX+NZ6dc8KeLB0jHldBTJDEisaWmsCGbtE+90RRQWPWQfa4c7G5xWoD2YUgA/RwX9dM8DKy7BZK8WkMVErzLmFCuP6mArBBYn8xVB0CWuN2VI7weSyYlD/2Yl/EZmP6H8hsyoF+hrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682951847166.6558830373408; Mon, 17 Aug 2020 09:49:11 -0700 (PDT) Received: from localhost ([::1]:42142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gtY-00010D-E3 for importer@patchew.org; Mon, 17 Aug 2020 11:17:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHc-0005M0-DS for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:44 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHa-0006Fn-Lm for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:44 -0400 Received: by mail-wr1-x443.google.com with SMTP id r2so15269262wrs.8 for ; Mon, 17 Aug 2020 07:38:42 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=VyZ/NyjtdT2xpMVT3eoqy3Bmg3wmdFW3tmQhxFbPlj1oWYSWZGcTFUGcrtBGw5AY5M rwg2fLA6u8ACLXlJ+Xjdul0w4FfE9Kd6m8GvB7mTFgBMN8R0oORhKE0xZOGXipgKDQoQ cZ9b88uUXSwxhOAfOJOBMWktlRV3KMOkW45iExtMoAxzNeXvUKCJnO3Rfzzi34YyCqX2 QIMN7rS+hHBUsue4rewT/loz+vDDQcrHYXdNcmfDuMH9jw6UX9TXnm0Yl47hx/Rix2VV yHqXkcVrEVVwVx8c2CHJ3aVrAGnh4SEiYdH99+42CPjnsJdWn4oG+wifN8n3VeirhX31 c5pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=S/gEhDX6OiKjFE99WdDcWJWrfLklCOJG29IT2KmR6nvGUGXYL5Z6ME6BCsy/2ObTaJ LluWjMBti6gv5D1Y9US85Wg52iivt3c1GqoGBVfc931Hu+uE+pvqG4aleapOslIsNvf/ 1F9zdlLsIzNc6yOV2htg/eSZpMiO3874uOj/UwnhSPzAtUbRFLAZB8LJKYsLHoN/Lqjs p8wBRiqafsZCbZW4nmUE1zs00ZeLS5paQjZAchJObM8Un8iIU89Oi2Cqqt29EAbxKE3Z yTY/Uz78CgshwYVAu6E7KcorHxo8gca0kbn0MaaTf/UXRGMOLi6gUlCZd1pO+jieNAuY OnGA== X-Gm-Message-State: AOAM533XJ/L2iJBYN+X+iVbvQckkM3g6kOy3Y8pQbP1ZYbapanMgqvSA yA6gby/9sGIIwOIxCyv7TRbkAhFy06A= X-Google-Smtp-Source: ABdhPJwQ/CmzJ3BPg7tkhrDp9tHJV50I5i9u/u/j1YZLZ6211kP7HxTKB/9mHvFiua93rQXYahqH3g== X-Received: by 2002:adf:c401:: with SMTP id v1mr15102930wrf.379.1597675121024; Mon, 17 Aug 2020 07:38:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 076/150] meson: convert qemu-storage-daemon Date: Mon, 17 Aug 2020 16:36:09 +0200 Message-Id: <20200817143723.343284-77-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 135175c5ef..a523898da0 100644 --- a/Makefile +++ b/Makefile @@ -168,8 +168,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 @@ -185,7 +183,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) @@ -276,8 +273,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 ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.objs b/Makefile.objs index d7826c1e5c..e304d92954 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 d7d10cbbaf..cae4b2dce2 100644 --- a/meson.build +++ b/meson.build @@ -586,7 +586,6 @@ subdir('util') subdir('qom') subdir('authz') subdir('crypto') -subdir('storage-daemon') subdir('ui') =20 =20 @@ -796,6 +795,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 41c0d02178..0000000000 --- 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 35f8949924..0409acc3f5 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 7a2b041247..cea618bec0 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682831; cv=none; d=zohomail.com; s=zohoarc; b=DGg3E7APC1TxytFi3oMJEAM/zu7dF19pQMaGkRNlVMmzKaN3IAbH9Y+SXJ2I2Omae3vbB6RaIvolPK4lPGdI8qbg9cYU6BrLMeQawkT4uCnS4u/79H2UL7kIAUEExFsafGwFdilfWw4qCxEjfviWtMvFqHDT2BKSMpBa2+ZIItE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682831; 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=3REw3lOnIPKtBmuqPqRRs54RBlXKhwodvkw9HHvxT3U=; b=AEFiXq/E2z6rlWZVmusnQxLWZKR9LnlQokK3Pm8ircoQSji1yJMWOs6hjcLE48Gv4R6G3w0PtFrqd3MXcMWf86MaC4fCJRncNNUMfc1NGNUrTP2AomHfgz3+Xfyn6MjtlG6LkPreu/+DOlDiFk+oM3OoVdKc6Z6xZFVxhZhZ72E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682831274488.1730112617837; Mon, 17 Aug 2020 09:47:11 -0700 (PDT) Received: from localhost ([::1]:33380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gmK-00021S-Gq for importer@patchew.org; Mon, 17 Aug 2020 11:10:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHd-0005OH-6E for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:45 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:34761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHb-0006G8-Gu for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:44 -0400 Received: by mail-wm1-x332.google.com with SMTP id c19so13338335wmd.1 for ; Mon, 17 Aug 2020 07:38:43 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3REw3lOnIPKtBmuqPqRRs54RBlXKhwodvkw9HHvxT3U=; b=J+VTgHXCqlFGz/lBwvKpCSK+TX7pYUaxftRFrqEnL75151LRGN5zIpN5WS3M+fnqI+ Fj2eTmOHGatRyA39xx69GUmLS0CLZ3mtOmqtogLPPUEp/UDn6V1t/Xm1iKW5n2wphdZv 97q/DXjFB29oELBueA+XwyWMb9+pykYvrfBRiTyzQFOz5BXyXCT5sE2IJA7D5cGBkhff IZRQ3XPQsBgTlIqxpCrhvgyYfemLk/iOKFJnpLGBd17wCfNFM5fXaUK7H7flJkyuDDSD 7B+XdslpxtzHZA82ohiFmlaco4S2HYVHRmTtKMwETCIcUlxyCiOap7j1D0FGr7qyEZVZ 9xXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3REw3lOnIPKtBmuqPqRRs54RBlXKhwodvkw9HHvxT3U=; b=ZpvDnXQfTLc0TEThvhv1BvRmRBRMjd55VpZi4iyBoq/65kwN9lWnkH7C2yjufeRGVp ap+mw7XRB1DLhtKxD+OCf0/5TKGt0iDf9N3J7BWaI5gnC6SYBt1N8xnqexqGKLUtB7Q/ n8QMukHnTrUnf3Yh7Pe22RRGL7N9DLPv5j7lovpRSPQs8ZlxS55Nl993/FOCHPgPpmOy M8cli0kxvjX5++Z0MdZQQ6QPfL1fhJR5II9PG4CAjoxznIh50/fLh7z/myCp61rV6dCE qbgPQwyGpPSdB4Z4AZYMfdF23Hn2L1WzgJa7iaAGMPq6sDACTsJeyMgTM+RbyuqZRhSR tU6Q== X-Gm-Message-State: AOAM533g5KaaylCP+UnXfS1uM8YfwYUKYBlC7gcJZoad5qwAq97AbWxI 7ObVWuakATKqV0oKnINDXbfM2BhK4U8= X-Google-Smtp-Source: ABdhPJz1UfhsZYeP4ExvaANWucedTfiGC7kHlQwanH5S+xkVA6ZqiCNBm00E5Ejhy+W1tbiP2DsszA== X-Received: by 2002:a1c:e008:: with SMTP id x8mr14678766wmg.75.1597675121932; Mon, 17 Aug 2020 07:38:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 077/150] meson: convert replay directory to Meson Date: Mon, 17 Aug 2020 16:36:10 +0200 Message-Id: <20200817143723.343284-78-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 e304d92954..cfb2cf2b49 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 cae4b2dce2..3c79d0cea3 100644 --- a/meson.build +++ b/meson.build @@ -652,6 +652,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 939be964a9..0000000000 --- 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 0000000000..8783aea7c8 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684202; cv=none; d=zohomail.com; s=zohoarc; b=gVc7pHgogL1Sl6ufvAkAm/he+0fkzEAuHfCzCZigQwHq9oNJVqf02Ysh82P4zBCwttfNf8oHEHunFyZvwpi1dTY0M8R8SPTKC81TKT6Mna3m6B3HgN1w4FqWQd7LuY7c6Z1ZStAAQcH4u2Ph34an81Q06m+4uLEbXBvLoHlNXok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684202; 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=0Mmk59c4EQAPRiDRW+X6xYt7ikYTDWIzvbsC0+nBpJk=; b=OXDYJkavNU8HWGaUZjjwsUGmGqgVfqYiyzOm2uEmdauQQGSQc6BDU+04qMTxr4gDBm3Zc2WjODgoMzF/0mYSLypPH60FOak7j2QV1DHsmUffQgPiM3ZMJl0KPvUgffnzC7aAErCxbjW4/gwTdFeLzPYzgjOI5s+YfbXyinKSC7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684202871418.5750017205496; Mon, 17 Aug 2020 10:10:02 -0700 (PDT) Received: from localhost ([::1]:50440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gvM-0004P5-E0 for importer@patchew.org; Mon, 17 Aug 2020 11:19:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHe-0005SN-Mg for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:46 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHc-0006GP-R6 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:46 -0400 Received: by mail-wm1-x32c.google.com with SMTP id p14so13425805wmg.1 for ; Mon, 17 Aug 2020 07:38:44 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Mmk59c4EQAPRiDRW+X6xYt7ikYTDWIzvbsC0+nBpJk=; b=pCvHRiY1Xb6zoXUlifvVhxD2PeK+uKMcV+AzS8iAL1aq+JYbiRJX8rB7PRPBSt+LSq QtrTNGvTMm7MISIyofe1pr18NhSG6umEZWD6O6x13uaBIw6Xuq7EWiLsi4ItJFUeM2lZ qdadvV7GINClI1erGoaa0fAyQRZmRbPkp0AQmDcRipqELbKUJKIZ8JG+vfbJZcQEZqqF DIhqd+eShCwqPWuwgfWVl1GQeLR8L0PRgJvb+FVvPcvXwAGFUE6nKXrsojfqSwOOy+lV 7km7KYhwoaUfYaKKQMsBsCTXdWtmqAlK4u0FBOfkMboDPSE1JKnffh6pxdGfhGZdyPyY gG4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0Mmk59c4EQAPRiDRW+X6xYt7ikYTDWIzvbsC0+nBpJk=; b=IMrVRyNNX6yCqrM0y0XKHYDCAVDO+7YShYRP5akfu3BGJSxBXtFkkoicCEvNuU+dQh HQ2T85ljvluF/PDNU+s7zwQgvvkohZTMFHs3BdisjE+bFkDS2Zkh0eHqAKohUkJix6gO YCLLmNruqayB9St+7IGY6GGmt38oioUS9fcj1n/an7kZXfvUsn5bXDTJaJxKsaHbx3x3 qVYB4N9bH8vYay1vaV7lpsOLYeurL2ux0286ETcrSWkGY3qkPPWrd6x9mPt2SY2RxHDt J9jrNpw9EROr7KDneqRRVjyL7m28XKyG+zsSEGMaq5KvarSG6PrMUn+wBWF53yBH1Ga4 DA9A== X-Gm-Message-State: AOAM533J9feqeJj9+Ox0hfDDzHPUOM4qyjhu3js5qqYLxIgetQ8aEFol A2wSLyKKFfmvj6YLJbIqlZD9NrvlDTs= X-Google-Smtp-Source: ABdhPJwm5vZBk9WAJKf61yYuYSFu2bX5LaAhNd1+sIurcLJLd4ABzQR1K9gyKW47U/aYLw6xhx8UCA== X-Received: by 2002:a1c:5f54:: with SMTP id t81mr14418069wmb.2.1597675123060; Mon, 17 Aug 2020 07:38:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 078/150] meson: convert migration directory to Meson Date: Mon, 17 Aug 2020 16:36:11 +0200 Message-Id: <20200817143723.343284-79-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 cfb2cf2b49..9d0a82d82a 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 54a9ef1330..4d912df3a3 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 3c79d0cea3..dc9ce85689 100644 --- a/meson.build +++ b/meson.build @@ -304,6 +304,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') @@ -651,6 +655,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 0fc619e380..0000000000 --- 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 0000000000..ac8ff1419f --- /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 66acf9cdb3..425c8ce699 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682831; cv=none; d=zohomail.com; s=zohoarc; b=HdwqgsgpdPcemWWn1GXbAgJbbMm/kiUglzVDJG7jXi+8zyt056JGnJ+ZzMNONYWgkBu/T2NUWTAY9wWhKMJXm7lWIwLvtY+aRHM/dT+4/PfZI4Olztx/6nCQZ3OhZXyBOxUKvcf7akJCKC2HFDsVCvbdy6KYv8dYsuImftMi4gM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682831; 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=iF22jc7yBxBhWIXE4smsSOGpHxtCBg0En2HKApL02yo=; b=TlXkbVUaFwKUVAsgPOv73nsuCiPGDaW8JHLc1x1g8ZiDaiLnGuwG4s9+qt/UNsex/4q2tCmCqovoaeDWjcEuXdj6vaYBaAl9oHMKdx1EjKW+FfLFTycWDULySOpZqqP8tvWXY6hg65s2iVlPXnGFBsamlFqrU3ZFwNCH9THWWVE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 159768283102296.71963433046108; Mon, 17 Aug 2020 09:47:11 -0700 (PDT) Received: from localhost ([::1]:41606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7go9-0005g2-MZ for importer@patchew.org; Mon, 17 Aug 2020 11:12:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHg-0005WH-7D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:48 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHd-0006Gc-Lx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:47 -0400 Received: by mail-wm1-x330.google.com with SMTP id p14so13425854wmg.1 for ; Mon, 17 Aug 2020 07:38:45 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iF22jc7yBxBhWIXE4smsSOGpHxtCBg0En2HKApL02yo=; b=aXdeI2d1RnhH+jmWZKAKI9IOweU83PQ2N2e/0IoV8CGyzbHiYlUFokBSQpYi43tK4I /azC3s5X1rNGpnSZnWbFS5EHasxWd6ho8F/iJwhWCj9z0qMuA4NN6db8f0Te8VFgjdpv pIAkjMMcRvuma397QQdSZrrTpdtx9jrBbh+//0Z4baDTZOC6mu9YNzKvnMZubTguibx0 c5EcwsKAi3Z2D+ZBgCjwSGujBm6hihsDZ7MDf4MZbr4112ci6t+xQhSo4Rc7j4qjnDob /J+Dabidzwuk0WyGBEn6ci1eY6AlTGad9YL8cCGFeQOSSVuC2wmZ36uWYvyVqaAYeVi0 Hm+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iF22jc7yBxBhWIXE4smsSOGpHxtCBg0En2HKApL02yo=; b=Pa93UH3IKSTAUgU+388Mtaocn01cMH/MKFZv7QzbdOhs/4JiE/ACNC0oA/ih1sJ9YH HbDIA7bCwgaPfmWeOqj8j/6VzugW0R6MfdgDektRnstcFmB1QnTf4qY+sBQ0A70hhTGy fkINeRmHCooWKJk1DMYZZmV4tde1zgQXIEewryIBt43YQ5LAJJYs65YFC9YsXD+f8F0H nkmQ3ho+29QrqHOPPk25QUqjTv0LI3ekvt6Zzm28FKIuEy1geQvjAqEttFLSF3qFtgBo s1kWoJklTq1JxfJRHdc9tn20FVyDb7YjYZba6Kq1b4oyly4yQWBmUqtCPbiIIPjmB59X pkwQ== X-Gm-Message-State: AOAM531fYYTGAiaeL5x9a0INHAx0/U0fGYCADNaHoHovb4bl3D+wK7Pm d8MH4G8LElJbY+ISfEc6vTl/THQq8HU= X-Google-Smtp-Source: ABdhPJzEeFRkZKORb/I6T/OQebzTe11oXoMjMtj/PNcaLkQ9RPKyp6kmtq7xbASbqRVZs56rYnPlBw== X-Received: by 2002:a1c:7215:: with SMTP id n21mr14468194wmc.156.1597675123933; Mon, 17 Aug 2020 07:38:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 079/150] meson: convert net directory to Meson Date: Mon, 17 Aug 2020 16:36:12 +0200 Message-Id: <20200817143723.343284-80-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 9d0a82d82a..f2700442a4 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 4d912df3a3..bf3fda92c1 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 dc9ce85689..207a47cf07 100644 --- a/meson.build +++ b/meson.build @@ -145,6 +145,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(), @@ -657,6 +666,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 5ab45545db..0000000000 --- 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 9f35dc5c87..0000000000 --- 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 0000000000..f53d9ec54f --- /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 0000000000..6c2ec47dd5 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684149; cv=none; d=zohomail.com; s=zohoarc; b=QQItkK694PbLYyMZQ2zPPCqyVR+aUL7ElVy6dmyQGDUopRyTcoFbGZR/+9puLhg5TUfvpYdYAAnVHUua9PuXwZ2DuClmp4Nh3k8QAnPP2a4eEgv2r12tBn9X+aQkX1h5aJid0NXD/zn7WE7lLW1nb+Sb5hwyKrsnQQLoraU6Re0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684149; 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=Z5txgW2pBwpTpCBc6Ym1NOtBUVIzfRB/CfXeEdnGCFg=; b=m9w6a0OCGIQ9TCWjSXZcWH5wJoFMmNjl/K18EPyz68F2i97XYbCSZ2Sc2aCnYJ6HLj08EdcJib5bc1p0+G0zxDVRWPsJfhZi1bCC5WKfxXsYbQHOlyYTpA1Is8PAeCCbVzm33tHz05p2KikQhHvOXrUnFi7N+nlT8/o3eEG9sdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684149672390.1815070933219; Mon, 17 Aug 2020 10:09:09 -0700 (PDT) Received: from localhost ([::1]:59028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gx3-0007wI-Ra for importer@patchew.org; Mon, 17 Aug 2020 11:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHg-0005XS-OW for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:48 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHe-0006Go-OC for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:48 -0400 Received: by mail-wr1-x435.google.com with SMTP id p20so15285736wrf.0 for ; Mon, 17 Aug 2020 07:38:46 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z5txgW2pBwpTpCBc6Ym1NOtBUVIzfRB/CfXeEdnGCFg=; b=B/msVHgVmS12c02Q+Ob4jGecFCE469+m1qcyjvvjUc7GPYztFt+FFU8vasBmM9YWXz GfjZ4za2bkB3EuHiRU9JexqdFmG+DX9mdDY3eypABkK2xf7su5/7ZBEABEvlfSp4pb5z PAB8wdqWGoQnmkEbdj0kE7BnjiRXjnO9Xg3oCgEAPFduDwO+nxgZDWfMLxdPuURBZmkQ PkRYfrEEVpzulIj+behFZ5YdXUgk4E0VMaDDzr+4HUDovxuJ2AuJ1VvBe/PnxHb+3sv2 XHuEXEYACy8EudvGEHwo+v4sOUEDGlEJjb2EC0ZQf8/VeUXPoP7UpxSySOBfp//JSpkP P2yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z5txgW2pBwpTpCBc6Ym1NOtBUVIzfRB/CfXeEdnGCFg=; b=oAM4awaygxMPf03LDbojtybAwoSwjbyu5nrhFXeFqbd4pPB2kgmFIgHAwEgUde/yj0 +U0NzLNDKWOZnQ8d+IGk8tmO0mnU9Ay3212ViYfiAgMEsDLrTkaf09htzOEPI+nNqIaA h+3I4Z2DofU8BMTNvLGwD61Xwnk3eqQG94cvOl1F82jmW+1ards9mI5fj2QwxOWgDWOZ m1+Vq81JlBoXhaW2rnpV6egJj2KK+zk3GTkUUNzt87H+aSRDM8gb+O3vO5zsbgKaXASv TEVkUtGZ7oNBGUqDkLDX13ayARXlw0eIrOeCct8rq2aL8uz9VUmSxWToyPbzQtYwXcP1 rKXA== X-Gm-Message-State: AOAM531XbL4z8iY69JoSKc7OoEz46Ebdu7E8ychM5vn9lCLzs1ZU/Gnv CC2w6C7tmnApcRMzPxCgu/Ryi9ArvYU= X-Google-Smtp-Source: ABdhPJy3HU0iJ8COi5FZK+Dsdb5ZcplwB1Y+UOY6WeqfQ2qjNOY5j8UuBDpLpWz7bOyRGYMkI1cOwQ== X-Received: by 2002:adf:e647:: with SMTP id b7mr16946532wrn.220.1597675124998; Mon, 17 Aug 2020 07:38:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 080/150] meson: convert backends directory to Meson Date: Mon, 17 Aug 2020 16:36:13 +0200 Message-Id: <20200817143723.343284-81-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 f2700442a4..c00851a0cd 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 22d204cb48..0000000000 --- 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 0000000000..484456ece7 --- /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 db2731f634..0000000000 --- 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 0000000000..857929082e --- /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 dd1f039554..ad58d67863 100755 --- a/configure +++ b/configure @@ -4692,6 +4692,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" @@ -8318,6 +8319,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 207a47cf07..dd80401d11 100644 --- a/meson.build +++ b/meson.build @@ -317,6 +317,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') @@ -664,6 +668,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687097; cv=none; d=zohomail.com; s=zohoarc; b=MVP6gPx5B47xGDwLGN80KEt4kIK+A+BPVQ6hT8dlB4qHu0loYDKHgzTYF/TKviyRb5H8beC7IJHErsNbseOxgCxI7wR9rWRE8yC1fxNm9p8qMRhj5WLCBEpvB+kIaGgpC0+TgC14V7VOqqmT6CIDh7Lmxfd4CkKTxUnfv0buD5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687097; 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=8fIsegobaRhgd+yQyDQqInGxwcNnUvqAp6ZKG3liY6M=; b=X0szUlCVky7s0bH7op+ZdgDAyWXreAjwAq9JuzBPf6PsQkaBtMsU4cKE/MbHX6JzaWx07h4fwU487sXdMZyyiBOIiM8DVu0nUMgHWJVpgw0h4iGYrHfEesFlm3CdkO1EAY68kNPim579+gJynEZKTchVy3PUnDdjWm938aRsvs0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687097743768.1027881282407; Mon, 17 Aug 2020 10:58:17 -0700 (PDT) Received: from localhost ([::1]:49546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gpe-0000aR-3v for importer@patchew.org; Mon, 17 Aug 2020 11:13:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHh-0005a7-Qf for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:49 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:36766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHg-0006H4-2E for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:49 -0400 Received: by mail-wm1-x330.google.com with SMTP id 3so14106729wmi.1 for ; Mon, 17 Aug 2020 07:38:47 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8fIsegobaRhgd+yQyDQqInGxwcNnUvqAp6ZKG3liY6M=; b=SxxoLB7ikf/4CsiMiupXqRWsTmURTFECIxC+jCiN9M9KAEIxgsyjUkrspUcccLj/8G RBk9UBeWvk76YppOiIDEQ9kCYeDNDB4ZkMrqMxTWh2JrcvMem6DQviaAYgiW+JLVM8u2 cBn+Ft7Z4kECd0B5KazsGtIXmEqLOewy5Ac3Aw7CETA4g4npNvHs3XOvXHvAFMmGp4AJ kFwjfEp52vr3qISDfdPu31Pqm9UrVzwGihRyFNTyF8oQ5HVj9j8qZVBcSV1yE1kWudz3 tfG7G5qRQjho3ehroWEX8aQpa4OeXhHfgm8vtC7cSGrrmNQ7v6rCTX5hcMya8db8GEqz BONg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8fIsegobaRhgd+yQyDQqInGxwcNnUvqAp6ZKG3liY6M=; b=iRvRUwRQYZ4fR0iDGYhJrRdlo3VfuKb7NyQa6CqrOyIAA/l8y9oMQkyDYiO538qsMP s5xg9GCoUze9ITSmp2hQTjLtZI+ajaQpekx6zbIEM/g+VaECT9SDCnk4y5mpH3cEj6eV CM2oLeMjwL4bshK2+ZQQGNGg85dgmGqkRygaXW1IPLDzbegQSFTdPn9yurCL6spXVq30 2S+vnyiOg1Zt9Cz+WztfN271WFUSCWtyl9M3Oua/Ql9mwETzPQTbyjxb8ul5YrOFUubt OLJfzw5xlwAiJ15F5eOs0rx2H2NFAuWlO2Gg7bfujspaH/SgkI5svwWHAn2yWERJHEVm +qWw== X-Gm-Message-State: AOAM532m37USvofVIpNaM+y3fMeGV7XwbnAc+Ad5/dk+8U2dXqv4MOri YIJSYDobfBj325XUpM+3DSzg7aq11H0= X-Google-Smtp-Source: ABdhPJy20eQ79QvWxy9G5xAyh2cKIvEq+kpmgcPyuGm8Kom9D/RGXiNauYk+8eEc3CBmpgWHqAL2Qg== X-Received: by 2002:a1c:bd04:: with SMTP id n4mr15737872wmf.83.1597675126474; Mon, 17 Aug 2020 07:38:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 081/150] meson: convert fsdev/ Date: Mon, 17 Aug 2020 16:36:14 +0200 Message-Id: <20200817143723.343284-82-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 4 +--- configure | 1 - fsdev/Makefile.objs | 12 ------------ fsdev/meson.build | 10 ++++++++++ 4 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 fsdev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index c00851a0cd..7158031c0c 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/configure b/configure index ad58d67863..b037d175ea 100755 --- a/configure +++ b/configure @@ -3702,7 +3702,6 @@ int main(void) EOF if compile_prog "" "$cap_libs" ; then cap_ng=3Dyes - libs_tools=3D"$cap_libs $libs_tools" else if test "$cap_ng" =3D "yes" ; then feature_not_found "cap_ng" "Install libcap-ng devel" diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs deleted file mode 100644 index 42cd70c367..0000000000 --- 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 30e2319960..7dd1cc9bfb 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682901; cv=none; d=zohomail.com; s=zohoarc; b=FSI+8qfBUfqNhGBFlKgFEqng1ElOKoFykdGi6iSVXf5O87o1KaGv42F7x+oVst0QhcvBEJpLhsAitZmb+bRpp4C4HWsDGjnGY/cmoNy5Po9Ih0/xnCwKFu3f7WW9qInjy2rnKntjfwjbFx9TiIvTNceKIQOiOXffJ3/Fc5ClECo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682901; 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=QkSUKaQSRTqap5DCYMIG/XBpbSZg51wHSxqCC8/Qs+8=; b=JwR7VGAGeWWZUTibm/a6Zu2JCjxiTGG3yUh1CgKlKnrEcSFzsZKB3cGr2/Ss454x2FrXk7VvhJyF7Rgq9SYALEbTf/6i+CJmzVMZAfO5xMmaAXHRqz4pjrO5QBHABPk5o7NwIpgilFFkl/Hi6m3lpAKs40NoQ58TuSjccPwfq4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682901045349.3496749542975; Mon, 17 Aug 2020 09:48:21 -0700 (PDT) Received: from localhost ([::1]:49110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gpZ-0000PS-Ir for importer@patchew.org; Mon, 17 Aug 2020 11:13:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHi-0005cH-MU for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:50 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHg-0006HE-Ua for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:50 -0400 Received: by mail-wm1-x343.google.com with SMTP id g8so13425487wmk.3 for ; Mon, 17 Aug 2020 07:38:48 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QkSUKaQSRTqap5DCYMIG/XBpbSZg51wHSxqCC8/Qs+8=; b=Ns15tRZIMJSFvN6JSndeX0TVvYj8oJnRod3bzN73pq98jYYMLRMLzrm7inKVju7Q4e ejGZzmSR64a+XK1X0mVY2gJlioCdIqSFXI1yoBPwCnG7TVJdhTEQAdag0pVcGfIH37bQ tie4ktR/x30QSJjAH8sf8WGqjEyBEruZEKpl7Rn7qs2zqcG0CPyDF0hXZBM5NGMj2O8N WwZ+/gniNnJFM0d+EtO+EWt04YNfuaqiKHKA2LHT8fcq/fNizdFHL18xQD9QaAa22TnP PucWO3i0BC2BTNvUUBrncVN5yd2CWzwhRlb4kveuwFTuJB/MHrrNHPwwoZdV65UvqxEy ENFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QkSUKaQSRTqap5DCYMIG/XBpbSZg51wHSxqCC8/Qs+8=; b=OjmdM4ZhFVok45dvwYW65FvVkLuH/N/mGP2fiqlQh6U3hLBMsWUedQJQRGrt5KmbpQ /5b+FaJCCSty+/ZqKU++iLVbOh7MDx+DidTGb80+Lo+3YD+EETJPy+WkO7ZDapQbGv+j M8vga8cso2jqjVdN2crV8G/5H/dxsh9DVGK8AAkXSmSZZqOQAOQ+Z5Cm0noKTdzfMS3v JPEmwxg47W/Vz9/KsQfrFfd2AXzDyqbvTGplofkfblQptpbtiqNZZh2Cz+QxhW12Gz0b l2NP1Qer680zZLtm+xxWb8sCauoWsxHvxIVpYjda05QYWG8c1T1n4tANuPs3ZWxYW7P4 wHSw== X-Gm-Message-State: AOAM530mO9+8Og60p5g0z1vJifBNS2kJ7Hj4M7GpfxT0crvERZVitKoV jSALHEKkDpG+hw6QovEKHJCpZKR1NPY= X-Google-Smtp-Source: ABdhPJxmjQt8Mtz+OdrAdvGIQ+GcVLWDkmtSgWLhkax5qpc11lj08H5E5cTp4dX4NpvT4M0xR63prA== X-Received: by 2002:a1c:f30f:: with SMTP id q15mr14689214wmq.60.1597675127281; Mon, 17 Aug 2020 07:38:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 082/150] meson: convert disas directory to Meson Date: Mon, 17 Aug 2020 16:36:15 +0200 Message-Id: <20200817143723.343284-83-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 7158031c0c..3b32a4c9bb 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 3c1cdce026..0000000000 --- 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 99a637f6a0..0000000000 --- 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 0000000000..5e2eb33e8e --- /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 0000000000..0527d69128 --- /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 dd80401d11..acd730ba92 100644 --- a/meson.build +++ b/meson.build @@ -669,6 +669,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') subdir('backends') +subdir('disas') subdir('migration') subdir('monitor') subdir('net') --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597687040; cv=none; d=zohomail.com; s=zohoarc; b=kICuZtD0xlVkWf70DBJCig+jPeAeMsGiA2WbClyNJ3w/fV6mCbZSZ2o3TUnoOLK9YSNd6hoJBBs5Ts2sXg74OW+0ytsfeah6SO/dXc7pL4O1+3j3Mrrk6Rs/FNPjAg5eSDe6Ruy6PIOXjUu4R0F9oWoKF4b99cEcsJ6Jwtwj8+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687040; 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=vJYRzFczP3G71nLXPxT7FoelYpxmkicx4WZGHD1y9RM=; b=WUcdbfyLJ7OdW/HIMmTawmhpsM9nqhbc4cecbPfDGA7lPe4Xww/F9fKRiad0t7R+6HwT/0obJ5J18V20/CBchfQ9DPdRnpPttiSZulERjkFFZoDHXYhbrOZbVvxAz1rNz1CpzDb7yv3pza8bs2FVw7i+tV1m/k/oZTRmBZtyDwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597687040800242.43644580286605; Mon, 17 Aug 2020 10:57:20 -0700 (PDT) Received: from localhost ([::1]:38296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gnS-0004J6-Lf for importer@patchew.org; Mon, 17 Aug 2020 11:11:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHj-0005e9-Hx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:51 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:32994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHh-0006HQ-Qu for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:51 -0400 Received: by mail-wr1-x441.google.com with SMTP id p20so15285942wrf.0 for ; Mon, 17 Aug 2020 07:38:49 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vJYRzFczP3G71nLXPxT7FoelYpxmkicx4WZGHD1y9RM=; b=FhqNMLbqwag88fzLuyfmypOKCewKXIQ6RU3bszYK19rS+fnGuC4TYIOmB6h0DdNb96 u5JrUyOrwjt7ll8cM83j8hYa7Pn/cWVMG6YZa5x5vP2HwPez+3ChNpMvkG6u6qJvbkU5 hsJ6I/UjEAGM6rGpIQLjqEOTLI9ySo8gd1F/M8nuFQDObSFdYcvJYe6lu7ZeL/ow11Ib ESgOSulwiwkRYgPe/HS9UdwzIBGSIg4hjRNzpDtm2z01ycCL2IP/HiQgTsMYyrG/GHYt Is3y4BMIYjrxgrE0E9VnXKcBPNxhYBtkFSoYrlnPoI4o5zO2rSW449f5GMXwlPDv3Ot+ 8dHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vJYRzFczP3G71nLXPxT7FoelYpxmkicx4WZGHD1y9RM=; b=Ja/9TeIlY0iJcHKApA+1RH2MSVRx7CFGaqwrBd2jM4hehtzQ6t/6DDesQk1G9yL5SZ VZ0htq0tBl8Lv6yOBZuwEsJz+ZKOBVlFNC8V1LS9Mdis/b62IlT2+h7pE3LrmODJ//wW fF0+bv3vOOee6IckpMdZdwYa6OrvoIWZp2Si8eCc+4zGy8gVDsNlwNQwtPKYv56lvop7 5jeMIGCO86y+GSEGYaL3n82EobKPa7tnjzSgrctNYUs/jxUBNyBXJ5QwiPXvy5SAWPmb mUpNynEaczzd69coUmbCN+kD6uAd9Pfz7ZPbnchCFFtiq3HmteH377bD6scJ3OGa9Ubd jm/Q== X-Gm-Message-State: AOAM5307baMUopA9OqGogeFJDuO238LqHh5Dc7hlCus1LG9YPqqAjikH DaNO5r2crZTvf0eetstKadfZ5vJz5ak= X-Google-Smtp-Source: ABdhPJxCtmKl+Lp+LZKS7iTo5ONQcVduXqP3f0GRGijbsf6bOh5mU6XFxlcczeQSj9AZDkn+XcX/nA== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15505487wrq.422.1597675128181; Mon, 17 Aug 2020 07:38:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 083/150] meson: convert qapi-specific to meson Date: Mon, 17 Aug 2020 16:36:16 +0200 Message-Id: <20200817143723.343284-84-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::441; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 3b32a4c9bb..c332323b81 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 bf3fda92c1..386378b9c8 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 c0a31be1a1..0000000000 --- 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 f45b80bbfa..2b2872a41d 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -114,8 +114,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684841; cv=none; d=zohomail.com; s=zohoarc; b=FyxxoNIyCrG4tKHfUxNGOFCO9u+LL/WkmJhuyAT1LnZpG0py55h4StW96pgDJWAdFu2EXFzjjTr3bsQm/NsTxHeDZwViMtiR4QwMWB0ULLKDDDfju+6dDvq4gZiwuolDsiEb53x+D9uCkYrK+5XD1r2ONfAyRmYNue5IKYoVevQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684841; 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=/tsncgwQh4W0ceyyi2wK+lJDdvVOT/ajFgeIk/PUNhA=; b=nhWAshkAc1uq+nsqXthqHfM05ISdvFxYIkhleYFtRjIj7bk58qqlYB7/tG0fIoYvKBStAEgY2mRlyvlUUDYsNc2LUSVo37N0WaCuMlk4Z3ClQGoHyvLNl2acm0v19RO1J270SnKRTsiwRHsw1q//iErKfzf+GKSyMbxG1YnsW5o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684841278651.3103976668114; Mon, 17 Aug 2020 10:20:41 -0700 (PDT) Received: from localhost ([::1]:57720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gr6-00041C-0j for importer@patchew.org; Mon, 17 Aug 2020 11:15:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHk-0005hF-MA for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:52 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:56079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHi-0006HY-PQ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:52 -0400 Received: by mail-wm1-x329.google.com with SMTP id 9so13415915wmj.5 for ; Mon, 17 Aug 2020 07:38:50 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/tsncgwQh4W0ceyyi2wK+lJDdvVOT/ajFgeIk/PUNhA=; b=WngXz3PCr6DddeZxvqNygPLOXtECsX6h4S9zlK1GngwRR0KKK25eECIL0g6T4KNSGD gqWlxANOOAbAxUBJ5vFgMyGN7GgJLRbeQWtq/MR0T5nhbo8N4GC6Q0nw5zKwKw0g3nR1 xd8gpz+G240voF2WEDuLpgQICrjYeBhTTxTn4Hf9c3KIk6MHM/Sy/Bjs0vFdcuIZSjzn DvJaACymDgbr7X/ezvr3J0NNIn5XRoA+HT4CPMBkct4ocX+WlBr9JS2SUZpE0nNv5Hfg ZKcVbHY9yY5/nRFgcSLIujpJDbek20/RETBAcINGzg8+R17gTpg+vXcGnwTjz5lH+2DR 3d/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/tsncgwQh4W0ceyyi2wK+lJDdvVOT/ajFgeIk/PUNhA=; b=Z1EJRyYc0v/JW7WDfqCZ45TOfWfH/oWy6/HiGja4cmaePM/WPgohKhPlL/ieVRZEfu T/krBIDQjy1Zgsa0SFZNxgU1Bt0TwXFfDW/Zmke8XSuSHXWXTQd/GwF7fttEF83oG9LY qYkLCNmxsTE53V3Ypt/ZpetxyBqhj6er9YrgNOqNwShDmbCFwdmpOTLf4sT7PARY6mdQ iyHEDvuHoq6k57jJoUG9qEpCPeIb3LJr/CgfH8KV9KE/GSxh2pwgnIB4/jx+y7eQUw08 PLnWmNQ3ht+fGqlhkwnnNi41SH/aJarlq206Kv3Z+dSWJVr/e5qbdhXCei5m1cGsPzeu XSKQ== X-Gm-Message-State: AOAM533u6Qt/ib2SSUcEWfv7Rmf8FR/WiYO2H+F/GMSg1LWc3OpmaLhj qdlEhYcmNEFBiPG6XnvymJD+eARKtbs= X-Google-Smtp-Source: ABdhPJy06w0S9GWJbHcgoTmmFgnWEsk89XdC5yGqDld4MTzJcWT9aKhrGira41ZGocwKhmP3AsPruQ== X-Received: by 2002:a7b:c3d4:: with SMTP id t20mr14602091wmj.8.1597675129120; Mon, 17 Aug 2020 07:38:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 084/150] meson: convert hw/xen Date: Mon, 17 Aug 2020 16:36:17 +0200 Message-Id: <20200817143723.343284-85-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 b037d175ea..6a964de121 100755 --- a/configure +++ b/configure @@ -2691,6 +2691,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" @@ -2971,9 +2973,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 @@ -7264,6 +7265,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 14b7ea4eb6..d204a906af 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 0000000000..08112a5e4b --- /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 502b32d877..0000000000 --- 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 0000000000..076954b89c --- /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 acd730ba92..86608e99d4 100644 --- a/meson.build +++ b/meson.build @@ -321,6 +321,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') @@ -674,6 +679,7 @@ subdir('migration') subdir('monitor') subdir('net') subdir('replay') +subdir('hw') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684029; cv=none; d=zohomail.com; s=zohoarc; b=Q2V6FkCPAWgjK8yo7YOckpfT0t0vBP7NiuUNgCJbKiA4xsj/Sg7ssWuaCvDfJ6J5GHCZB7aBAoriQiqNLbVFdxyvlrXthkFxucwElYosI7qFOOe+rFwxpCViMAv9kSoUOB+Muh0dYhpjlnXfmBJJcDvcIbvPjj+IBBgxaLbm+a4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684029; 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=m1vdLqyZHYPVpKZYlNKe7l8hkA0P1BlGDeAlf+ZccV8=; b=IdXnQz7NZAI9BCdVf/ff+Z9SK4a3XTv+HsdbO5GPMHQxbpAG6WbMeX+A5eR2OjS+7/G7jxkECah69O+LHet+skiFMNg2VfUW1AbLN6TYmPRdts4RP4zCfaFxiRT4o+K0RgpxCPn8uNV9PwWS/mAyKgAg2YiwHHrwN9zH8Ghn0PM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684029021923.7779906190337; Mon, 17 Aug 2020 10:07:09 -0700 (PDT) Received: from localhost ([::1]:46222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gov-0007bi-2t for importer@patchew.org; Mon, 17 Aug 2020 11:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHm-0005l2-4r for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:54 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:32796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHj-0006Hh-RJ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:53 -0400 Received: by mail-wm1-x32b.google.com with SMTP id f18so13347781wmc.0 for ; Mon, 17 Aug 2020 07:38:51 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m1vdLqyZHYPVpKZYlNKe7l8hkA0P1BlGDeAlf+ZccV8=; b=TwFCZUfbcAbSQqFLDAquMRXayRE9J9oLiZniVjSp/9IiVBP1cfTJm2iakYPr1rIYH/ HcpL1YNDMZ4l9/YTpf5kjnk1kxn+rYqh3I69ElbIh33PG+0aW27pY3HJGrJ2P4js+a4I pIA//j3SlKgunmlPqEQaifH8gG4TgDRSNybZJ0yUhW+2hm6/GJ0S5HJ+4hBnnUoNHWNb Y3/3JMDCMqOTe36ScTAZHLz5hbYPQF3UGFS7g2xTbWOPM/8+ZbBCPxeEbmXq54WDy1TA 2pLlMNvEApq0KkF+nw/4MxrPm9apLVmfY2aBVWTI9BquBtPSeEIZmV8VghZ3jRyofOm+ MgEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m1vdLqyZHYPVpKZYlNKe7l8hkA0P1BlGDeAlf+ZccV8=; b=JLCFaePO4CKq9ppM3WXGzcYsjvXMyAtMcmwpuYW5PRkGg/WxbKac/O/IGJFyBmf2Y2 aZ/N9t8Zp6T+ge6X1nYf7YNXOFVUajjMiAU8xHm6lYt2r/epoch9EvowT//enZmmZVd/ iJ7guE1WH16cP/kxQu1dOqs9tP8VvEbvmXKzYlTsTHrv4aEOZmIoSFAWJ2bOG6p6X09Q vD/gevyuyZDeJIQRzKEOy250Gc054P49HAbR7zPted/mkT1eVk/rgMkdcqwmHtDXWvbC vBIFnisxCWGN4HjW7mdFy+avFzDz0iMnBiCr6fZRnSY0+jjQ9kCp638qk+ZMhXjnQClU 6IYw== X-Gm-Message-State: AOAM533f/0IkG/OtHpcrRUdIk7LXWl5AjmFn6ZHAgEPUg6bqGIvOzORk U3IDupIpVKuOzOkSUwtZsovz2R6Z31w= X-Google-Smtp-Source: ABdhPJzuaETWV/G0wtOayZ3IH4/EG5FASw+qiFW1nCEd6TJP5RiA8l8zGJ+6dnsYCZtZQPmJJJjpGQ== X-Received: by 2002:a1c:de41:: with SMTP id v62mr15679638wmg.163.1597675130084; Mon, 17 Aug 2020 07:38:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 085/150] meson: convert hw/core Date: Mon, 17 Aug 2020 16:36:18 +0200 Message-Id: <20200817143723.343284-86-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 d204a906af..bdf8bdf256 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 d8fee8effe..0000000000 --- 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 0000000000..fc91f98075 --- /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 08112a5e4b..fe7c466460 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 425c8ce699..b6d96614cb 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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684900; cv=none; d=zohomail.com; s=zohoarc; b=lrGFLBpfnkWPZqpOUtefOIUWEjmlMObrW9SQm2v6dD6sN6JwZYAW5U5rs5vXG5JaEQVLMMVzq40OfEmvx1piYU3snUEFwwCvInLKJN1LlYQtp3YjwbfsrVb6oTp7hKVTt+yJvjmY5OPvKThTZkQLP7smCsLYsI/J6mC6DKD6tk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684900; 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=iCxXfpTM81EsDq1JksQIVS4Yaq4rtllmbbY1pIXiot0=; b=TBZtBbEPSe9Ozcix2/4AibqDcI9pLS41S4poYI/nxK7IZR3QSS+PazTupjWxC8ByYUAROrkNLg9HSmUJ3WkXUnL2Sl0cIlxdEWbiH0Ys0XiUC4+1onwdGvjYQh6TTVTaEhfK1ocn8jO7Roies65aTeXj0r1tHSkrE+p/DpEkB9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684900190765.8144822132286; Mon, 17 Aug 2020 10:21:40 -0700 (PDT) Received: from localhost ([::1]:54238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gqU-0002ZY-Ow for importer@patchew.org; Mon, 17 Aug 2020 11:14:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHm-0005lj-Fp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:54 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHk-0006I0-Ix for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:54 -0400 Received: by mail-wm1-x341.google.com with SMTP id p14so13426164wmg.1 for ; Mon, 17 Aug 2020 07:38:52 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iCxXfpTM81EsDq1JksQIVS4Yaq4rtllmbbY1pIXiot0=; b=izzkcj8+k/ebG7ZeSzqk7VRm4zccQEGl1FLJeM4bGqk/PK/6H/GOCTGVcn4IWlsWus H5tHpJRcGWiCgGbJurFoXMkxQ2GsnH0TIX2uHHbfbgqQUYx46lDoG6tqOXJQnxIxGrUI fjitOnX4H8aJK56KSvYi0YpAPPKKqO0ak8a+gfKc57PWZoQHsJRuEY2Wz5oUdxDcGUAS 3jBiBolbpkgrRvCfRFiQTH+yci1MosIqph3zQd1xHjnIjmGp06po5x4vHhyL2EcAWrr+ bQZoalFEFd5WjBRR59PwkKhOwmqlpzI+AM1iqFW+bZdeMxvphWy2ahCR0eViB6H7fcwz Dk7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iCxXfpTM81EsDq1JksQIVS4Yaq4rtllmbbY1pIXiot0=; b=kL+PytMuN5cw26jPI74rNPeSc8c17cSSbKoB7QdmzYPDPsI3I3aYJghEjENQYb0pra CMWXbaLEk5VURmZbdcJS3KNrUPhF0BbJ+Wyi8OeCe/KZDpzyNj6cKpSh8YYxkv8RH/mA XlEVw0CZKoRZV9J0uOVZosbYZWBTWzp77gYMarll/kAgErejKXL9du3JFfUUzNsUhddw 3UQI3ZU9ikaIo3F10StzpyGPwFfSV8Yx03d1slJkbRUKFNYSUulJZ95FfBg/BhUkYEgZ NIUk+AAhreKMxj/Uf43r3MnWwyXwecWRzG7OPGC4NDtrSnrttFJlCWqkEp819d/wGeRq rRgA== X-Gm-Message-State: AOAM530RWLGBok9leIp55mGaoyK+qIpgRnL+tgckreTxyQbNz4W07XRz Rfq4EWlc+rMrd+p0SJbkVYxNjSAHL58= X-Google-Smtp-Source: ABdhPJxFfGZyEy29vCz9YWuhOks/CF+JviQKlMKiIRNsWctGG3B/MmtrM2pRF7cuqXndIBDWcq1ufQ== X-Received: by 2002:a1c:a1c7:: with SMTP id k190mr14171897wme.1.1597675131015; Mon, 17 Aug 2020 07:38:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 086/150] meson: convert hw/semihosting Date: Mon, 17 Aug 2020 16:36:19 +0200 Message-Id: <20200817143723.343284-87-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::341; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 bdf8bdf256..6a7ca0fcfe 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 fe7c466460..66a2f6cddd 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 4ad47c05c0..0000000000 --- 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 0000000000..f40ac574c4 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686298; cv=none; d=zohomail.com; s=zohoarc; b=jgxzsnzPtBQo+5RoKE0b5/+wm2UyLW2ot8qRSY3D++2jgV5Vy8vZvmFiEXQg593L0qERVC7MpDoxTn4NeksLiZVYXpHVVmfLDQGBGegCsTehsslV58tx0iMHeJtLXzXIR9x2p7r275nInHe+vWTJytX2IRIjAQ8GSqj53jPig14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686298; h=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=uhqRQfxgZKwJ96ol0mbenRayAvfbDPlr1SxB4DAAIBo=; b=KUsVHRD495QZpP6AeqfRfOq3ERHlEQhkXqSD8WEIJDBIse24Y/DPc3t/qJKsLmfhK4GeTpV/DI61PWnkeKAXdOerKgieV5Van37FnG9c84mAZz1YnYvRqmPKiBPG30OgHGEVF0tT3gXBCID/jQA3PAWogMf2VmXTus+JJMY3Bqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686298272445.50405192276276; Mon, 17 Aug 2020 10:44:58 -0700 (PDT) Received: from localhost ([::1]:57278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gr0-0003pd-Sb for importer@patchew.org; Mon, 17 Aug 2020 11:15:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHn-0005o8-Ce for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:55 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:35230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHl-0006IJ-E9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:55 -0400 Received: by mail-wr1-x432.google.com with SMTP id f1so15277527wro.2 for ; Mon, 17 Aug 2020 07:38:53 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uhqRQfxgZKwJ96ol0mbenRayAvfbDPlr1SxB4DAAIBo=; b=A40VzTOQYLbyjaSvMWyTsc7kh7qGpKau+iZfS6s41N6h1M7JENGsYhhm6aYIy/3OHI 2GKoD7lfIk7ml2CuYEHKWczB43HCnd9snBCgKCjpPo27AgSivfXiYF4Q3qeQgCVzstNt EH1kTkGCi0QULtohC5SjrUOVqbAn4pOCMoNk8HIVv2n9URWc9bHF/9cvEgqRnmu9Y499 QGCPb1VFCmsQtST0+W19B0ufe/idO3/ZGLLwtFH2BzrS8QMiJXwyAWnuwor0UQjpcwy6 /3zm4Fr44xAGPbpW1VXzvo6xgyCdpORl9FkdztjCKjbhtFhVunyf4tWtWlNQBocnlFn0 GEog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uhqRQfxgZKwJ96ol0mbenRayAvfbDPlr1SxB4DAAIBo=; b=P8/5c4ZlSpoebJyBS7I/WqphMLFfeDlvWlU6ERJC7p+z6FHpfrOSPfOp1hsOZgiC1B MAyjL6ogcKaPjwGt8tF5lHf2fqap3oMBby9O4Z8IDKDZJsSNBzqsVSIrVvH7wnobRI1l kIsT0VQr1slLwYnVPkfDNKQVOOqVwYBI7mI41xOMsVLFpLki9I0Zm+kEKrMcUyYSAE1S XloTSgwANrOrTrgziRqqcepa/2jQaNkdfxGvRhyaJ3o53XxhIwKzavRSmc/X5JgSXL6D 2hIkdYDP09MwSJGBW7/8U2inqCFkkBj4KwDi6HvQGK0F9Oe2G3KrzuJxcMMp+vGSe8Vx 14Iw== X-Gm-Message-State: AOAM5328dxyb2U9x+TVa+Z+DPbaBaTLA/uuPI1hmjNLtw1TyegSMv2x4 HHT91jiWlO+PJtEjHBqPy/oaxgJ1mKk= X-Google-Smtp-Source: ABdhPJyIYGFbDFYK4emxkzrjkwz2qq56MBnmwHDJv9T78/O3OL/m+rweKiZz9tFSPSNFb6QoXUMHng== X-Received: by 2002:a5d:544a:: with SMTP id w10mr16080777wrv.317.1597675131907; Mon, 17 Aug 2020 07:38:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 087/150] meson: convert hw/nubus Date: Mon, 17 Aug 2020 16:36:20 +0200 Message-Id: <20200817143723.343284-88-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 6a7ca0fcfe..86bc201a55 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 66a2f6cddd..03ef30212e 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 135ba7878d..0000000000 --- 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 0000000000..9287c633aa --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686746; cv=none; d=zohomail.com; s=zohoarc; b=LvXQWcReh8vehY2wmFkKMljBaLfgZYLRAFDszkgFTA7+qIcCxxwyzDnENJWdXDjGDMGU9/J48TakOZym/k/oinxmVA2OpJXUpuacrVqlsEUKwjlXykey5vZu0Wb4GIRA6E8qbdC1AUDn6S5t0JpXvpaBon5/tn5Ucff28IzUCbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686746; 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=5zJ/gMBs+ekLNo528KUwmyOGqZXXOiNxoFGixHsiJLc=; b=NzMKUmBACEn9+Xx93Pv5FjM3mUKays3CLHA5BiB4PDngp6fQ1B7SjzYJffPsg9I7RoTEuALUhdCyicMQ2EW3qRVdFPlnZxd96nbJrx6ytnwz7T6gylzFpx2R5RBrcKmLILRijqYqH+LIfJ9lQO69K/gWtqMgWIYRyJH1MLYykNs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686746310235.17411681262195; Mon, 17 Aug 2020 10:52:26 -0700 (PDT) Received: from localhost ([::1]:34146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7grt-00062G-Cp for importer@patchew.org; Mon, 17 Aug 2020 11:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHo-0005qH-68 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:56 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHm-0006If-FS for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id a15so15236629wrh.10 for ; Mon, 17 Aug 2020 07:38:53 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5zJ/gMBs+ekLNo528KUwmyOGqZXXOiNxoFGixHsiJLc=; b=ePuOgY/Wa+z8hkncOL5irz3sDtdSxSKcJD0/K4rhouxaPTodVl/Kv2F6ZqK25cetXQ lpFmYuZT14f6MQPWYjJOYBFi9cOkI3MM8roMc412tuIg+dbJrQkMdPzxI9BYfS8j8552 joqszGTHZFqgEWfoHlmMCZLntrfW2gmUDt/9Rxhj18Xsd2gzC+A387zphuxg1519e61Z n6o0CxiWxGvl1jsJJldmPDt0d556bK7ADWdhjXejD9/vg9JHs/P/kwS2bfv3szQey7+c aAM/GzscXKGZQ8zQlcyGBqbqWx3IZxOKp4i0Ckz2KvcQaFaBc6NiCvcVkqOMN4w51XNg chuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5zJ/gMBs+ekLNo528KUwmyOGqZXXOiNxoFGixHsiJLc=; b=ufiUz8QdraWBOd7ZYpQYMxGaQTjnf94lSJi5++eo6ns4LlWYkpGvWA+x5290by6Y6l 6WrOFxNG6/1/T24E6wWXaxxf5GNmTh0alQCMUyy7lK2qVOji/IM1SV9UgKySHa3UFNI0 zWjIJc1MGMaqraS2KQMVqRY/KPD3FuEVeC7+EenqPvRUNyV8obPbnJ1w4wRKeCPFt7/P We9lVdfCdFn9bzYbKFvhcTE4Cm2Y3a2SFg7puMil4ER3I+FUCxOYLPyzW4VUWbUNpJcF fdc/zpNScAe/Sws4Doi/nE+XwsZdEjU74XOO5syZEMIBKXtRcyEZ9YtoXHEqkxzdE13T JVBA== X-Gm-Message-State: AOAM530SfV2y54J+P2tB5Kalh6W6rTkebHhC7Mit0XgNAsLTre8fJkhL +zWpFDOzH0mnPaI6m+l9ranDBoRabLM= X-Google-Smtp-Source: ABdhPJz2cAOxnI2Mnspf0ROHyaItRUxzeFatAx6wdNyywb2vTsZhlqvShQI3ZwQ1/yYjh7W4XDdzRQ== X-Received: by 2002:adf:efd2:: with SMTP id i18mr15259326wrp.32.1597675132859; Mon, 17 Aug 2020 07:38:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 088/150] meson: convert hw/smbios Date: Mon, 17 Aug 2020 16:36:21 +0200 Message-Id: <20200817143723.343284-89-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 86bc201a55..73c49ddd3b 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 03ef30212e..dccc2d19a6 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 23bb2bac07..0000000000 --- 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 0000000000..9e762c7108 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682945; cv=none; d=zohomail.com; s=zohoarc; b=FGvwRNh/qpHYu00++wfFP8VBPsdi8yDLNvTdsdzSaReNj8mFLfRnH9w+S0FVy5KNJbqesadMJi1a5ln38Oi/VhoayHQoHMctP+XCl5y+wEzJYJLdMxT3ACi5TL01xOo7tMVcAnzeOh+oVdSsDMBK+54tGacSjf1qI6Q3PHwRti4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682945; 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=EqxqYSBV7uEMenTXBSHXyP24ul4XVhFr0o+0x9l/sqA=; b=XiSt0b77EvGUY2ZZMgn2Y1cxiQgRy3zUDGuKsHYD6r1IjhfzoDjEyhia/Oe9FksCpLReIxXPa8yy+NXPaXD7LKXiLOj23bH8hHJ2g1pAWDkL7ckK0/pazaC66EiG22t3QFRDH5RBrDSHqx22JoRYiETI7Swlkj67QOzkn1b96fc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682945144910.6359998852417; Mon, 17 Aug 2020 09:49:05 -0700 (PDT) Received: from localhost ([::1]:42188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gtY-00011D-VC for importer@patchew.org; Mon, 17 Aug 2020 11:17:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHp-0005sO-4q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:57 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:32997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHn-0006Iu-Gr for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:56 -0400 Received: by mail-wr1-x443.google.com with SMTP id p20so15286319wrf.0 for ; Mon, 17 Aug 2020 07:38:55 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EqxqYSBV7uEMenTXBSHXyP24ul4XVhFr0o+0x9l/sqA=; b=HaW8+Rqv9UgL2E1Lii0pa2zb99aua6U8bbg/VXRiVqa1rvYWT/yBq7C6ouXzFBXSSY 2aCXyNNNEB9dwPMcfjEeg6YpUme7/OGE1rvGuyoIUW1wwCgWYmkRcEhQQkLonbABp1KC JYdDfryY9JRFgYraseicwX/2128AOubNEgoBGcbvVwzU/YYx3JTDnJk86+wMXZPSQRMd 4RaLAfiDxg6jjwFDzk/Mx3c7ZMHtejJdF3uJyH7u7pYCj7CUDUetyF2Or9VQfn6eR5CK SjQYEbiHf8+BwPE9vCUM6rinL38mNrT4tXvicFJyQfRVgyoEtGtGndBMJ/i8c688LZ8S a2rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EqxqYSBV7uEMenTXBSHXyP24ul4XVhFr0o+0x9l/sqA=; b=GN09eXYUCIvuInVGRD2dj5P3ngy28odWRTVn9x442px+xZTdIH4j5RGRakP/EIhmzf K0OZYEkmAdwha3BkzRcHREk6SKQFGbRWU/uZTUaSB8pzUhYDYtXNjvkv2lsg4QfVNZGn ML4w+l2b4K+0HVNCaKCn0aqiRsdI0hlxAYYoheYTn6lBMJtrw/1GpJh5mYCcop/Sfkxr KIDaPy+Dk23uQdIvQt5qqZUwSqjt6H7Xau8x4Jw/TEjXiuQx8vTJXk60d/i5YXbuRJG2 DEPOHqe7jv+BEAWS0fTSFXawNim7XSTwTDQ8kGg9fid1ioeyW/jwUBliaxsbSxwrgaw7 kkKw== X-Gm-Message-State: AOAM531IyWMav5rXhMpCfKaB17XhfD3qx+pbFMqFXOXw4p+7evoSCj1B ElUtIp7jPsdVC9tI/PoHTBO7wE4FPSI= X-Google-Smtp-Source: ABdhPJy49dAjWZK2xEe6eA+Ocs7xYaXGe3LuBlPI/QwbXOGvE26seMyuGxfsH1yIWmIYsJFFVG0sKQ== X-Received: by 2002:adf:fd41:: with SMTP id h1mr16845136wrs.124.1597675133941; Mon, 17 Aug 2020 07:38:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 089/150] meson: convert hw/mem Date: Mon, 17 Aug 2020 16:36:22 +0200 Message-Id: <20200817143723.343284-90-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 73c49ddd3b..df72b25a64 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 c27844900d..a0ef2cf648 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 56345befd0..0000000000 --- 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 0000000000..ba424622bb --- /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 dccc2d19a6..542d675618 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684216; cv=none; d=zohomail.com; s=zohoarc; b=fbsbHaZ8kvXFXla4AGvSV7DKes/OkzPhzJWngfVRmmWFgXYWoDFuMVLGsxBH8BBkjnwuepbKTfJMNwx2jdnngwGm/P7HcRIKrXQJcl7AdgKvjT8qoHI/N+Yw5u814rNTYqk8Wc7LKxjZvvxxsyqgjvhCGja/ESJyHBYPPuFwJNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684216; 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=+WDdT7Yf8vTezEDuWurk22ER4j+BIDWuWinVB2Aw+DA=; b=DlJVuW7r3UfyWHzBzcXnsD1Myh0Pp81AZ9v6YBpSMjVgUMY7q6XFRuWl+GKFLtlGypEbSDzkb+xQAfhqIJu0W2OZa4qIUwJ7gJ+8XkmTswZy7t3UrCbJGD5Y3nvSc4HnWL+zy7HTcHVfDk1QPAx0PJ0AbLON+nq5/F6+AyWUD84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684216631628.609539772946; Mon, 17 Aug 2020 10:10:16 -0700 (PDT) Received: from localhost ([::1]:50450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gvM-0004PH-9t for importer@patchew.org; Mon, 17 Aug 2020 11:19:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHq-0005ui-2I for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:58 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHo-0006J8-Bh for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:57 -0400 Received: by mail-wr1-x444.google.com with SMTP id a14so15276467wra.5 for ; Mon, 17 Aug 2020 07:38:55 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+WDdT7Yf8vTezEDuWurk22ER4j+BIDWuWinVB2Aw+DA=; b=cdYC3istWTOOExZxKzmAS8y9xn0vFq7O6YIcEGTiOww7yu8SqpBJEedkMUcVigeDQG nB52e6ffEtSRqu9CaWp1E0v2+ln7QP/pHoQR8Jy8i1lUrDZI+YGWohDt4rvC6wdXwRbU 8M36HiuEuoxkD2neJJBY/WkRGNbPqQBRmNs8AcSNz65ap8mXRsdHrmId2UE4KMdA50cU 0VZjCupyrTsRjxuNmxPU1zcrIvlLmFVCrRVyfJ9owK9ZNfqHQsXjucJ8AieTU6PYw58Q MhQuYVNWdE5x0OoybYdVvoMGlRv+6EqvslNeNKt/LJjjOik3wA2q0Ma/Bw1khq0IEQz8 HbJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+WDdT7Yf8vTezEDuWurk22ER4j+BIDWuWinVB2Aw+DA=; b=RxVPfitwTFH1tjUVyISJuiiiItqQybdSdmozHgIJq+ymdJyrzllB/M3VXwrZQORAiT +VMsA4dKOW8d0EyHCjG4gbVdZdpl15KxG62aHODI5Uja1v0xXAmI2EtkxIAasu5X+KGI AsT0cZrVznVVs9D0GalUSJ9HROkDfVFIx9Aq2BjZUQl7c1ltOKiF+ipIoXrfZmKUEjND FEAfNt861uR9FaHZEoAhiA5yle13NA4skZyDAmF3sVPZdNToozQiNxIgWnWrHLOoSqs+ qcAqrErWtI1HHThgx39JA+9Y+bEl4Y15w1Qi7mrJuxgkjnCrXO88oCM/NvdlDMOcLS3Q BsmQ== X-Gm-Message-State: AOAM530f6x44aYJoi5wASS8CDw6Xp57Xo8T+WzvR1HIAG0fJgkcfbnt+ uyapkV7Q/XI3NTWm9oQkhq7s7eC9GIE= X-Google-Smtp-Source: ABdhPJx3J+YyQmWgL/weOe0M74KV0Gu8YpeMRvixWtkMq8poa+3rkKJXy+JR8D69cisJajaeJEuqag== X-Received: by 2002:adf:e647:: with SMTP id b7mr16947275wrn.220.1597675134664; Mon, 17 Aug 2020 07:38:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 090/150] meson: convert hw/watchdog Date: Mon, 17 Aug 2020 16:36:23 +0200 Message-Id: <20200817143723.343284-91-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::444; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 df72b25a64..9ebd13d7cd 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 542d675618..f2209d900c 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 631b711d86..0000000000 --- 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 0000000000..9b8725e642 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682888; cv=none; d=zohomail.com; s=zohoarc; b=hgQvZs6nReBU7oqGAeckQuBHo+xEZE3w/4fm8UTkrdAfBbABholMqO+NJoqZhOl1XQiqTFe0MVlqrHgGTdLJIudSlOczkAngLkCCJ3P6r6Xgqta+bcgWjuY0TlCtZf55YAZBCGYy0JT4WjuX4yG9ZwGlNZWccb7nVtJ8ZXKuqos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682888; 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=I5sTwjY55tIx6VkpEdnjtkbMh7zB2PQKI/MqcK86Yew=; b=c7Oa7vJmtd00KjNvDjNQZFMre4l7bu/2LqSjlkbBQvV12MGSaH81xZbjm1sTCmaJXNFZalFBjnyQX5wyJI903eBxAO7ES4Oai9Ltoe0EWnNPbAhmzFK/dYjCdLcuDnH3K9mHBWYjXSiXysgSD+2+vgkeR3Z8yPCDyqfAPeSiKp4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597682887934687.5551143635458; Mon, 17 Aug 2020 09:48:07 -0700 (PDT) Received: from localhost ([::1]:37602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gsf-0007Ue-Nt for importer@patchew.org; Mon, 17 Aug 2020 11:17:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHr-0005xW-2l for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:59 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHp-0006JP-6S for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:58 -0400 Received: by mail-wr1-x435.google.com with SMTP id a5so15261137wrm.6 for ; Mon, 17 Aug 2020 07:38:56 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5sTwjY55tIx6VkpEdnjtkbMh7zB2PQKI/MqcK86Yew=; b=rp0/kuAo4+PvF6pRHbTQIfXagA74XGXDvowwYWDvzJCwVB6Ou9nozPzZymnHYdi/Tp B/f/57IScHxW2oPOBN56yUlWgV1xXwA8DVJsC45cIbJxGBI45ntIeshktmLoOkBsNxVN uoz9v7CRMPd8S0qTt2qi0cPxXGqVmlfRp8DqaK8dET9jNLrY80xv1bH23iEHieO7Jiwd MuHs69FOSvTs3Qmt4PmVrkadXwYp9dnYytSVFMvdWgdZbqQUhmur74iAF+NL21/p6/nO EEKx2LThZpgfRBNWeLJu4Jmi2i9hrZ3GO4QF5HrM2DYZPWsFH6zeREPB3HsfTgzwJOIv 3zbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I5sTwjY55tIx6VkpEdnjtkbMh7zB2PQKI/MqcK86Yew=; b=IFhY1QNYIaaebrl9f8b5nHoHWh4vEVFuYvqgxrOQXm1XmVqe8Xgi3EpQqA0TbI7xx5 oABFChK6orq9YBdoGO7Fz80q34HpUVFc/OaqGQuwDN7dfaadT1Q3jSvZerJEc/G8gfy6 jBim4JPWsBogy2StngP1LU+33WIk6COyeFl/zshyFs6kST7oUrob+MYy0G2lgMLK9NEi G/ahJ0+kCj2js6snGJ0Jdgnf3FidsUZZjhNtk1SR+5XDQTU9CvFjfGU7HJNxy63gGEmQ Df/0i/IS4AIhCOrZ+JB5ZERdVbHupkT3G48U3D8jq8Ws3hPITGWpLiEISvamql1iR7qa 4w7g== X-Gm-Message-State: AOAM5318gRaSS0dH5lw5GZ0Epn4TI3lIH7BXJ+bj4QdvJ3muCBwkBLsr mX59l0tDybp9N4pNl/FIsqXfehzyQfk= X-Google-Smtp-Source: ABdhPJyPNCXPGCbgmbMQHM/812CyyE1hU+gKY0dha3E9Czt7j+7Y1/FtN2E0s/xxP/AKWHAyCNOx0g== X-Received: by 2002:adf:812a:: with SMTP id 39mr15323136wrm.137.1597675135551; Mon, 17 Aug 2020 07:38:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 091/150] meson: convert hw/virtio Date: Mon, 17 Aug 2020 16:36:24 +0200 Message-Id: <20200817143723.343284-92-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 9ebd13d7cd..a1cfb99334 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 f2209d900c..8338fc4408 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 fc91719b4a..0000000000 --- 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 0000000000..fbff9bc9d4 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597677696; cv=none; d=zohomail.com; s=zohoarc; b=UaGEGMhb0UuvdhfZe6RWhRqvcoUsN3i1z+l0Pe1cfppKMNTWQszDpg+IOh0CrXNAa5P7hBQGmOufRQLhgN93rB1whZJ9k6a8v6j907ORBo2Sohg7CV6QEPWxgyCPKFl9lDozpz3e5aXp2WgiygydeJV2tD/qBRGtQ/mx2w3YHG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597677696; 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=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=f1ZxkCHDepYcsAWdb8LRR5B+rWEpvvW2yfKyZXoyzPiScQVa2ZspUtyOD4oAVmHmO6tjJrWlvqyoDqvlfcqBn7IijT1BTbOeHhUP7hoB5vgoolLMGwZsqSg/UEp+sbxc3Qit8LVSQWWOIkfvr/S+hzEnQQcai28bQhJMCU/f4F0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597677696308713.3490043574343; Mon, 17 Aug 2020 08:21:36 -0700 (PDT) Received: from localhost ([::1]:58972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gx3-0007ur-2S for importer@patchew.org; Mon, 17 Aug 2020 11:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHr-0005zr-VR for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:00 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHq-0006Ja-9y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:59 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l2so15252463wrc.7 for ; Mon, 17 Aug 2020 07:38:57 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=Pi7YQVO4jxzoAaWRhm/qCl5IDSHvNMrG5klVB2CCN3CmUw6cjzp55W2kLvndKjAPyE BkWM//RB5aHT8Ts1Jes8Jm89X+Id0ReKxtbCtenOAt84GhkoYFrvwf1+nRo4OBXn63gA pgAFyEpKga7rC1kmR3dOmXBOwaCm5DZcP35i0igbnUOqJvR3DgnB3TKCR/jdU/60tK3b 0hC4ncXme9CF7RjAW+riJ7FsYhWv4tY19/MRhGbfoyG9EMfiD+IvvnAwZlrXlrnq2nym PmbcDEPPcEvgwSm75yiYVjcqKGOq6eN7WUk0sWW/cUY25QrDhTmWwrEO5fiCFTfaIg/7 2ltQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=biF1DdDwGLH5s9zbg7HZCJyaT6KANTeisyRxvBGpYuZRld1NL2yoX9X3l3pfyrUnYY ITBg0ZmtsAumH4GkM8nMW6/5ZO2NSvojSe6xy0PYng6FUrMfjEzO+Hgmy7ixiobErdkm VZ4TnGvwwGRT6tsEDXE534BPOy9pSN9gLkpOnugd1uMM2AkW+TCuj8NrfhiW4g2xpQai wIHZKfCfspK5fWY0nsfv4veD397QvWqMlDpZOQyVcGcKhjip61bbPRzXRmQNZM0sNH9a KOoN2tSV4yPgaRsLBSSo31t0ZsGS5wATaAyMF7wO14EoiNug6923wYdnSY/nOMx4U6B5 idcQ== X-Gm-Message-State: AOAM530xTLIfAoeLzj9gqls0w8epIxRlem8YoEyG8DAPGZb2mF2s/9uI IqSQ3ruqhS18ereFzd9yFqVuZcYWD4A= X-Google-Smtp-Source: ABdhPJwQLvbbwyNFV49FrETW8Ao20tqm0iSftw46YNbVWso7mAn8cwpP7nOb5MJgm+4Y5tzISSAEnw== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15506103wrq.422.1597675136611; Mon, 17 Aug 2020 07:38:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 092/150] meson: convert hw/vfio Date: Mon, 17 Aug 2020 16:36:25 +0200 Message-Id: <20200817143723.343284-93-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 a1cfb99334..f6e08f6660 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 8338fc4408..4dafc8a08e 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 9bb1c09e84..0000000000 --- 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 0000000000..37efa74018 --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686741; cv=none; d=zohomail.com; s=zohoarc; b=K9JPgo3cc7iIBe6l5jTrm3vJAksmm2B7ruEFHPEBRGW1ENn9FFB9oF2WWDupnBzCavtKIkNf9lJxbnKFVppQQCJLidJ7Ku5i6SjNG9alZc+BlxL1ea/1kAapmr7DHmox+vfVXlGV3cHIi5MSIll2w8fC4OhCBr40so29iEo8UL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686741; 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=I3hAXXDQZbT6V1cgkFNsmQgTsuan3+zbGwErQay8hrs=; b=PV71htJqRZOzBt5MzPubqWXohM2CcxTMo7ZbDsGTgRPp15eNK9jCvdVbOhk+HvvhiP+ojFDFAVtJxE56k6HSCyG0ZyZ4aRpK0Ze/elmxTKSJ4mcDgjPj4jhRGF3/68RgE7WB5JAhZeKCK8+s2IPKNIUFjY+diTSxzDP5eUG/9NQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597686741420307.9434226641125; Mon, 17 Aug 2020 10:52:21 -0700 (PDT) Received: from localhost ([::1]:48520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gut-0003cw-L8 for importer@patchew.org; Mon, 17 Aug 2020 11:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHt-00063R-BI for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:01 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:39408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHr-0006KE-CU for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:00 -0400 Received: by mail-wm1-x329.google.com with SMTP id g75so14085360wme.4 for ; Mon, 17 Aug 2020 07:38:58 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I3hAXXDQZbT6V1cgkFNsmQgTsuan3+zbGwErQay8hrs=; b=KuNXEtVzBEpQirOm0coz68RW6eB1541Cey0DD3d5AW6biwSvSucHv0bkXFX93OG4cr +O43OUosmC98Ax/Q9yGYQUQ6Ap4r+/IKSFhDizbrmMzV7+iHzTCaw5NINgL1p2VAaMEK bRe7zkxVFAgGW4XtoGxFTj2isJh+n8932EN9E5LYAnt7khE1iSeTFd6z13gtiJ258dtm P/g6A/Ck1bYj8a6ZmQrUtZugEI2xG4CiQzvNnDILUfyzPmXzdij1txbT6Q5jiegZEBS0 xKrYHbn0QVuy5F6kALgWU2vw0kLFpoB/QcUke7PH3fJhbNSejVhVOP0YzqXlfi7N8QFy c7OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I3hAXXDQZbT6V1cgkFNsmQgTsuan3+zbGwErQay8hrs=; b=sHBsjtB59nodbW8zaszgBGz9HBkytUL+rDOflyx8JR6Yh9YgXIVFozq57/7RhoD3el bQ9VsnYjfHE5dutXTkmjptz0hEUt2ZV4VJBSYKkciIP8EXF45MCTBOcGIY8eNJyrG4jm LFYyM+AncdD685Ifybym2ZS8rn11IzXYbc/Z28F59a6ayYmPRQ8wuGcEYjMMjTBvCKlM kbZfrIHV1tzYYeO3ZR28Q02BVmWZ+BS98rSAYNgHpkJRqBG9fjjh7MYjkSyL/U+jGrOR EumAD78zfu8yVwkwO9WwNQ4UMVdLPnCwew9YHWPDonw95ADeoCpzQFVIxAPDMigs3AXI 3T/Q== X-Gm-Message-State: AOAM532vaeoUWZ1qbJ+snzbTArxG2mAGfpAepjmWtQ+/0wS9b1ze09+9 eWnu7ZqP7meGiwyJj8spIRzM4X4TTGw= X-Google-Smtp-Source: ABdhPJzXGINQlvYqm+wVtitvIG1ZHrQRUVrbN4GX2h23+L+8gQ5F4i5GDKO9SA2CTRCYPzN6P8taLA== X-Received: by 2002:a1c:b603:: with SMTP id g3mr2073wmf.116.1597675137599; Mon, 17 Aug 2020 07:38:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 093/150] meson: convert hw/usb Date: Mon, 17 Aug 2020 16:36:26 +0200 Message-Id: <20200817143723.343284-94-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 386378b9c8..3d5a2af4af 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 f6e08f6660..c2619bbb50 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 4dafc8a08e..89bd6adb70 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 e342ff59fa..0000000000 --- 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 0000000000..3c44a1b069 --- /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') + usbsmartcard_ss =3D ss.source_set() + usbsmartcard_ss.add(when: 'CONFIG_USB_SMARTCARD', + if_true: [cacard, files('ccid-card-emulated.c', 'cci= d-card-passthru.c')]) + hw_usb_modules +=3D {'smartcard': usbsmartcard_ss} +endif + +# usb redirect +if config_host.has_key('CONFIG_USB_REDIR') + usbredir_ss =3D ss.source_set() + usbredir_ss.add(when: 'CONFIG_USB', + if_true: [usbredir, files('redirect.c', 'quirks.c')]) + hw_usb_modules +=3D {'redirect': usbredir_ss} +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 86608e99d4..260c0c659b 100644 --- a/meson.build +++ b/meson.build @@ -326,6 +326,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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597685805; cv=none; d=zohomail.com; s=zohoarc; b=QvwUvUWwBvCQJt0dPulGw49KoKKSotyfoDU7ddAYU5iG2t8iBESDNr0e3CBTp1e2J2MRZkrdodA8kfDS4hVR8ig4D0z3W5xJUPyR3DylyRJn7s0J/3bI7KfpX7du5KiG7E2ctaszC67Y8LlLVncwut7H3caGRPDFALG0CGzEHGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685805; 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=n8upm3BapCkLlRkXboJxxZ9NvS70YwkGjkzhPIn1foE=; b=YNqgHCJnT+kjZzEZJx2TYZKW5f2e2dAGXwHvNQ/misQ4pLRNkkm3i9vrkPm8SB1p+ROIE70htT+tm4hi9fLhA4Slo2wEL/6hc+w9H08OH5LDNa7zPke+YPJWUkz5BdzAEC7Llp5kcXPF7OX4gjifDTA04D9xUhg7VzCOIWGlLuQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597685805131946.9794514463829; Mon, 17 Aug 2020 10:36:45 -0700 (PDT) Received: from localhost ([::1]:57004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gwk-00077g-2p for importer@patchew.org; Mon, 17 Aug 2020 11:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHt-00064Z-Qc for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:01 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHs-0006KU-5j for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:01 -0400 Received: by mail-wr1-x443.google.com with SMTP id c15so15231392wrs.11 for ; Mon, 17 Aug 2020 07:38:59 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n8upm3BapCkLlRkXboJxxZ9NvS70YwkGjkzhPIn1foE=; b=qRt859zehxDr7mdTRuSsV8ilBal9bsJUUQDHe7cn06iZ7RFDS7EFrZjIEg8k/Ghetl TFbJXCUegK4cP77rQvKkfkVE1ZFZrGZz1Ml2r57Q3tWGLmLQCp3XUKEWN3qjZPAPe7rE u/w6yqSCd9CYO3Uy0fpNnmMQOEFvcJUgRA1kW/qW6DoD9MGnrZVrKBdiSULUy61eglDp N7PsJJZt0z6zGXHPcw2mXSbcvDFUvMwo0VYS2TacDHbrUeTrC5xwcHwOYPP5nLhTl6An qnKSdsyez3v0F9X2rRwW9OFnCgsaX36E8VrkSOohDKvXbiWPeVkM1psCjKBDkoYljfVp ypXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n8upm3BapCkLlRkXboJxxZ9NvS70YwkGjkzhPIn1foE=; b=G6HmnNyY5uzMk7bvsgogSJ8GtBsaX2qEguUnK+U50AUHhLGK+8AAHKApH5VLgw6JiL 7HRN2VN9CP+BSFFlUwoMrZ6JE/2OlELF66W1Txe8L4gDVQN4HwXPIgLukJ3o0YiwZZzL HlJQUyw0tU+DJtpor7xe9iYLH/CPL5QztchV83yGKY9tXBFhuDBh+KP2x8RgBgt3kmvj lPPQfOkdifUj0QNpmc8Df2Qqz8sVrx8s5Oik71NmYzgMZYnI8+2Jb4zW/huFATbokJcP cQLocJhyt32Hi+ghAwvrnlIuuNrogBlRoqwjVHWapp6VAFVjRhEuXQYurpDRSihEy8ue mXpQ== X-Gm-Message-State: AOAM532b83OzIswZygen4uXOWuoMvTNOLSE6bsS++O/wmlT9Fk6spsHp RST3Ho1dSRSZH9VKyuQ9lXqt4nEpDcI= X-Google-Smtp-Source: ABdhPJyTNW9ocNGii1oJ+CiAMotg1I9hqY8NNVwib7fdjM2NRM9uyDLSDCFjK7ROupwn6qBiBxFokQ== X-Received: by 2002:adf:9ec1:: with SMTP id b1mr15675342wrf.171.1597675138662; Mon, 17 Aug 2020 07:38:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 094/150] meson: convert hw/tpm Date: Mon, 17 Aug 2020 16:36:27 +0200 Message-Id: <20200817143723.343284-95-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 c2619bbb50..f0e5728d13 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 89bd6adb70..2ddf6bad33 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 6fc05be67c..0000000000 --- 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 0000000000..1c68d81d6a --- /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 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684085; cv=none; d=zohomail.com; s=zohoarc; b=Zlwsf4CBcCLe4haWi3fxqTggvmMcp2mBCcjfJ2HlN1OKwFwdV5rsrAFKle60RJoc4VzmLhnV6AFqHdRAGGSlh0nhqtOBTm/C+ylV+a9+rvHbrHXekKh3906yEjp6/61mTvzTG8yzA3gASN4AsjHYeXdvE/O88P+lqGrhglvcU9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684085; 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=zCtt3wfDk2U6pD6XbYja2DKFOXpiv+tulHE30GporkU=; b=eArNjzg99OigOf2fY6xqAzkZtFScgDDI/c9fJTEoK875h4CbFoAoDaSDsH28z+9QlDZ7xrAEV3SztSj9vsO/UhbINRP0gibNGXevBlfuH9L4XPZThfrSIcsktB/uuhLrnKc+Y+qIVIKvbPOX1q+HvNQgOzf+Kg5e3E67jnW2EWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597684085572960.4572929317113; Mon, 17 Aug 2020 10:08:05 -0700 (PDT) Received: from localhost ([::1]:40052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gyw-0003GK-UZ for importer@patchew.org; Mon, 17 Aug 2020 11:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHv-000681-5Y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:03 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHt-0006M3-5L for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:02 -0400 Received: by mail-wr1-x42e.google.com with SMTP id r15so5345115wrp.13 for ; Mon, 17 Aug 2020 07:39:00 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zCtt3wfDk2U6pD6XbYja2DKFOXpiv+tulHE30GporkU=; b=OX45/wVVCBCwZ+CM2yqcqglODCZFViwVW+FrqB8DpFQ5FItklX6/UjPZ7q7dIs57xk FVH8eWPeM0JOHeLVm364dwjRFlFSuW02dYpGjyOJUie/hbOv3+QmlOsgBW0BauK03ZJX W4VNW1hhNkZD8aMRkazwcx5r/65qgqMzKM+MVoEiYW6Rd+snSSwFKX5EhOIVChb29xyE Oup/f/KcFx3Q4JbOZP/PTMyMm+4eTs0LMVybtY/H/fogITEqc+fWLUBaJkfmi0pHQiLD KsxhomOuUywhQMTnpPRR/JoQ3L8vYJu1fdRa8YdDgfClGR8DVV6NSVUTmLpL7aKsf3jf rS+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zCtt3wfDk2U6pD6XbYja2DKFOXpiv+tulHE30GporkU=; b=ZqfWqRri8Kw94FaUerGT71NaZ0W3jGOeViC66YMQOYg2aR6U5fhoMHCfwWgpZ9CybH P7gwANUAMz90s9wDYAv21BBKIUj5/xeiK2kMx6rS4uLymnCBhwIEAWyyozWLfBDqp/Qi lG3RXR44tZMpVkQvx6biUYkw7npy73IuPAjrloDahKtqQcXxxFTHVBsfJgx8kpkaW7ez 8y99okEoE7LhbmATb9hr1VZUuycJ4LCz587ObMWhoJz9eeiCT4kbmjWcoxLzdF+z0aa4 Vn3gJ+T2iRIZsDRqusXqkrlCYfFOTc1LsZHy2LzehA0uO7q4J+qP3qV5gzDW2fo2PEyA ttYQ== X-Gm-Message-State: AOAM532AkY2AqeWU85ib7DPsiKroGYJJIHzozMFGf0w/z8fiHljytvpV 4x09Z8pNoABq/JSbKVFZL1hoK56DmtA= X-Google-Smtp-Source: ABdhPJzhe2H+CHWwRPPA4Vj0oV5db7DsfWXq1axgN7whjG29e3cqYTRj3aZmlqE7VA/Hd4DXbgKB4w== X-Received: by 2002:adf:efd2:: with SMTP id i18mr15259787wrp.32.1597675139496; Mon, 17 Aug 2020 07:38:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 095/150] meson: convert hw/timer Date: Mon, 17 Aug 2020 16:36:28 +0200 Message-Id: <20200817143723.343284-96-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 f0e5728d13..70ecaa8135 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 2ddf6bad33..50b26db852 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 1303b13e0d..0000000000 --- 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 0000000000..9f0a267c83 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684378; cv=none; d=zohomail.com; s=zohoarc; b=LhNBt9w5aQJl/xtffQdgrqOmZBuzrFzHYg2iiNQ9bYfX3soEd9JJgbALRO9c7iodXsERLpKyADsqiOmbmtwuCj9nRCRQJwdMEX1DmvWoUDMRpWkuGrUVJ6AMx8u+7eeT4FxJRRnNpROX4zmBDU2Wj7Fq5iaNccrEE8cdHn3Phx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684378; 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=6T+Fp5nse2UFE2qjL4ASZPlrj+hnm8DBvwFbw6WgtmQ=; b=M83IPWS2PB/aJ7hFaiRC3gV0VGkmkJl4zam3IFK3ap6aVdd4FBPdY3ivtb3no0YI+0FuQAk/L9NnyfYxhPJXyG5sAJSclONioC2w6P86sEVOmvwNSQyDFJqXjcFbhGGxokdir3kn0YZsyp2y0znURTIQZjFMilHLfw0AjuNE15c= 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 1597684378264928.5057041361044; Mon, 17 Aug 2020 10:12:58 -0700 (PDT) Received: from localhost ([::1]:45944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7guJ-0002Z9-V3 for importer@patchew.org; Mon, 17 Aug 2020 11:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gJo-0001hz-Pd for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22162 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 1k7gJm-0006mF-4z for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-276-Fan9CjyiOj2KDzD-8GfrEg-1; Mon, 17 Aug 2020 10:40:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01F4E185E521 for ; Mon, 17 Aug 2020 14:40:55 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B29470C3D for ; Mon, 17 Aug 2020 14:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675257; 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=6T+Fp5nse2UFE2qjL4ASZPlrj+hnm8DBvwFbw6WgtmQ=; b=OhTsvKBIjbhfYvYBVsrhkcphWS/m9ALJ+ZL52Dn3cTMdKAPuAks4nA1DkRyYhWaFHa8kur +rWPIApjbEkdEG1IZp0wasqZ5BIr7z2ceC1bA0Y1E5at0Eu6eZPXETG7CopbnghfPGwx67 VnNavAg9APnGQKqu/83YNQ/A0WU9v9o= X-MC-Unique: Fan9CjyiOj2KDzD-8GfrEg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 096/150] meson: convert hw/rtc Date: Mon, 17 Aug 2020 16:39:59 +0200 Message-Id: <20200817144053.345107-1-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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/17 05:13:21 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-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 70ecaa8135..f60fd019ac 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 50b26db852..1fb1687e1e 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 e4c1b8617c..0000000000 --- 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 0000000000..7cecdee5dd --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597682839; cv=none; d=zohomail.com; s=zohoarc; b=BA8hhEXfEx9mgI1APZMi7xwf+15vCSTiEuTJtHgrmuvX54+1lGmqEdymuezt+7hnDvsOsJFvkqxxBGacg3xmdqx6rYIAzvELKCsiGyWyM6eI9k61NX8UYwkv3mQqrk69uOA9ghY11iecHXi8CFpdXRErPD86kjVZG9EzHH6WKW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682839; 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=Sg9YVJRv6wW6cfJ0v4OQv28WxAZBM0uAS+h3Qkeg40s=; b=FEstOSsaamFTb3QhNz/Q8uJ4wgmcVSx3kkg5RdRNzBLHCLc9X4MNybq/a6zv3NqKGAWo3vxMCpchmtZUa0srWH1aQL8nYcmoKBJzolud54k5Wur2d5a41dnEMHPF1yYTB3Pzz53mDdvRyzf8/B6zguM64w+gEj3s+O3hUYzAiIo= 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 1597682838804797.5248828655958; Mon, 17 Aug 2020 09:47:18 -0700 (PDT) Received: from localhost ([::1]:37332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gyK-00029r-CG for importer@patchew.org; Mon, 17 Aug 2020 11:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gJs-0001mQ-JP for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:39757 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 1k7gJq-0006nT-D9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-8-FkH_GiQuOoaJXhG0sxnJ4g-1; Mon, 17 Aug 2020 10:40:59 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDD7457085 for ; Mon, 17 Aug 2020 14:40:58 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5209F756AB; Mon, 17 Aug 2020 14:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675261; 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=Sg9YVJRv6wW6cfJ0v4OQv28WxAZBM0uAS+h3Qkeg40s=; b=V/eGCTJZrq0iS9+7Xkd1AN+ZsXcixmCg0kHzTiKl+znijk/ZEn47iM7Hd8sLgIxKNTv95Z 0MheDXt/lMYsA3vDPIS3+b3CVrg9TGvZ48hcFC7vPlppSnbgMykd+gjedAzVmRlJkH6Smv ODmyPzW4cwJqNsF4zsH8SmF6pP2Lp6U= X-MC-Unique: FkH_GiQuOoaJXhG0sxnJ4g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 097/150] meson: convert hw/ssi Date: Mon, 17 Aug 2020 16:40:00 +0200 Message-Id: <20200817144053.345107-2-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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/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 f60fd019ac..e50eb04635 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 1fb1687e1e..75644266f2 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 07a85f1967..0000000000 --- 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 0000000000..f1f5c287d0 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684274; cv=none; d=zohomail.com; s=zohoarc; b=DY57ogf2WZQBpmtZEwZQTPbbMhstPvKvV4eq9ju2xWpU5gevEeoV2FTk7Dyl26xwb8dH/2HhHRIvEAjXiG9FxweX4kvh4Zkk0ZFSIUsTI42UwEeuLsOMIDbk8EfB1wn0C4VU7Tir+iUXbhcRnqDWZJL3cBoeMftiBZEEx3kbk7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684274; 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=r0H/PbuCy1aEOaKCgJR+ud8u9tQH9sGL3dOMQQTQs3A=; b=I+NeOv94AG7m7+Bh/tu0e2esNnd9uCd5tjy5JRszFxCWcsKUa+hrvwW6iNnck4IrUfsReco0YpSn4eTK0qSaOJpVnGk0llCwBH/KkSAzuJJfAOljWOeB5JHvDlbEwGTrlwm83AwFz4g3uflD3tcmlQ1u0tpo1B/u3sw5+dqJMzE= 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 1597684274771634.0462952408005; Mon, 17 Aug 2020 10:11:14 -0700 (PDT) Received: from localhost ([::1]:45758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gzz-0005dg-Ts for importer@patchew.org; Mon, 17 Aug 2020 11:24:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gJu-0001qT-5D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gJs-0006nd-7W for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-340-BJ8Z-wcAN82cmYGD1N-nnA-1; Mon, 17 Aug 2020 10:41:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01C8A100CEC1 for ; Mon, 17 Aug 2020 14:41:00 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 498DD756AB; Mon, 17 Aug 2020 14:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675262; 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=r0H/PbuCy1aEOaKCgJR+ud8u9tQH9sGL3dOMQQTQs3A=; b=SAcJidLyVSnwWm3MaeYiPntbnV04XLv2CfqI07J8a+yMUbmPiupc+Mm+oDNaP8hSHMlGq4 MmcVNJRs8oor4LUNZOSV5K9f+KzDpEsCDyOakWOzKXI0gaAjZYyQQibuhsA5xGTPWj8FD1 SUBCBchQ0tNRMDEbVv/J4u5UZzD06YQ= X-MC-Unique: BJ8Z-wcAN82cmYGD1N-nnA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 098/150] meson: convert hw/sd Date: Mon, 17 Aug 2020 16:40:01 +0200 Message-Id: <20200817144053.345107-3-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 01:24:49 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/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 e50eb04635..6f9c0b7983 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 75644266f2..a73f4aebde 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 0d1df1721c..0000000000 --- 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 0000000000..b43e59bd00 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686473; cv=none; d=zohomail.com; s=zohoarc; b=PcxiPSToP9C6vd19uMJykW2zChfZYK3DfdE6mS4N0VyHz6d0+WWMGQGW/LYoOunLx30BTnnRYdw4r+rm9q+ThdmdITfkgZe8jLwX+rj3NlV3Zm5Fdwz6zrg1irmhD6QQMqCQiDyfXU9SbKjnxhhNmdEKFIBGLbaNhWq2VzMy8Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686473; 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=bdZIMAMnoqGyH9qLhE37JTAtwVaZ5pf9xbmcPjCZVHk=; b=mA5Ezu2T1CcXP/iyXS0Hhf/+i9lwGsbVk5VYdEyxW6w0ghNSqmp4jyResGCyQ1rMzz/VwLklscWSOxpGtRF1cy5bm+TrFo7kJ5Zb/tty3BoPDZCAkiPdcVbyO9sVIiv0wTedh1mpg12ZyUJca8N5eznEA+sWj2aUDG4f1RT21uY= 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 1597686472853208.30164781478527; Mon, 17 Aug 2020 10:47:52 -0700 (PDT) Received: from localhost ([::1]:39332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gyp-0002y5-TB for importer@patchew.org; Mon, 17 Aug 2020 11:23:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gJu-0001qv-Az for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gJs-0006nk-CT for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-302-jUQ2O1mTM6OzCS_gQetuEw-1; Mon, 17 Aug 2020 10:41:01 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25B02185E525 for ; Mon, 17 Aug 2020 14:41:01 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50CB570C3D; Mon, 17 Aug 2020 14:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675263; 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=bdZIMAMnoqGyH9qLhE37JTAtwVaZ5pf9xbmcPjCZVHk=; b=Ub8pB9WBucXSP7NwJzyaNBzUMbjvmtBNynDM2dkrTiMNEgu1bDGw+BYQf9Djqn6f692P98 T6hrNg4HF0lb6XFMuIqu1FWSfa5WNyKrMFRzNJaEsJ1FZ2K55hedKVPfBFLIeTJeg0g9k6 YuRl/vbBR+jMVtlmiaVZmVm4+GGSaLM= X-MC-Unique: jUQ2O1mTM6OzCS_gQetuEw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 099/150] meson: convert hw/scsi Date: Mon, 17 Aug 2020 16:40:02 +0200 Message-Id: <20200817144053.345107-4-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 01:24:49 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/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 6f9c0b7983..b6461c2f5e 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 a73f4aebde..d4abb67715 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 54b36ed8b1..0000000000 --- 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 0000000000..923a34f344 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597683057; cv=none; d=zohomail.com; s=zohoarc; b=mpt9g9NR3Ov1KNu6liuQHhbK/dh1mbRETMG0keO8KDmXQNdoKtpDgtQHPSDRusGBuP2sEKzsOjk+BD5xMoUFpdOdEkj58dEhr0zPAN/7Fx5bewFcIr5u4Noa5d9k7N6vJJZEQfhak3zMFBB9stBhI8Rx06wxli6G5xcXO1UspMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683057; 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=LgfUmN6Gj+5PZygsdXsRV5kX5y5WGH3XD+D9Is6CdRI=; b=G3Fwjcx8gjSydIclaZ8AU1iSXpYv3YEOnKQvrMql2tCkc65h06RCC5vKgXc/Dx2TxDqApE3du80oeOvXFFspfStlcmtkCO7q19lAsf7dSkNa0+Xqyu9EUJV6UIjMXk9FmAXHfStHw4MWtpAW6Pp/ipkf2bepqM/A+38y50RSnek= 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 1597683057977340.74314155982336; Mon, 17 Aug 2020 09:50:57 -0700 (PDT) Received: from localhost ([::1]:55116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h28-00017o-BX for importer@patchew.org; Mon, 17 Aug 2020 11:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gJz-00023X-O0 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23330 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 1k7gJx-0006o7-SX for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-335-IZodSX97O1qcBliaHC8Ldg-1; Mon, 17 Aug 2020 10:41:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C4C23FF7 for ; Mon, 17 Aug 2020 14:41:05 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79F8D70C3E; Mon, 17 Aug 2020 14:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675269; 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=LgfUmN6Gj+5PZygsdXsRV5kX5y5WGH3XD+D9Is6CdRI=; b=Sa+aJMS/BVaud/DtMuhwGxWaVaLNfkkAZAJKd7tzczdAF6v1EIPIk/D1nLktbsrqgZAiq1 4KkrD8g947PIM/QV0zU1ZNSDAQxFpEAJMP2t7yx8kmzWeM+mdy9yc2HWiG7hyxuu2U/hCE GTvP84WyRp+6Ei/UL6AbwmUuuiTyddo= X-MC-Unique: IZodSX97O1qcBliaHC8Ldg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 100/150] meson: convert hw/pcmcia Date: Mon, 17 Aug 2020 16:40:03 +0200 Message-Id: <20200817144053.345107-5-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 00:24:04 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 b6461c2f5e..f28da5869d 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 d4abb67715..ed25644237 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 02cd986a2c..0000000000 --- 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 0000000000..ab50bd325d --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597682864; cv=none; d=zohomail.com; s=zohoarc; b=ac8LJRv3FIP754HWMHT5dfqgDLN2y8MZ1SBZ+aP2WtKq2pbK1e7XLsIWuO6wm7AyLNCW7gOLaP+IYDNGj0iESJE9Ggv37/+/ypOnllHm0RkD6tvCUk75VG5AeNDA/dbcKJYa3ap0O3NPHSHaagZF4QjdxEfkfXKuxXR3J/Fmml0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682864; 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=RdmpmrMElCNaVrxMEyBFO3Mxt6qDIJ7MNPRDYW7tDkI=; b=AEaqm66h7qdzykEPDbMYnIL2oy3FwPfPRRshW9orqtOhODrsdInOZc8E0xW+eQ7OB8eLw0JZAJYGQYPCsfF0tr61HCWaeD09QVB7sAznHDhR9/QhF8YSylfihZSO0QQRRgrxhsjFDxi61QC9SOjQS1ttkzbz5COFyQgAI3oOPxU= 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 1597682864928412.38963574046716; Mon, 17 Aug 2020 09:47:44 -0700 (PDT) Received: from localhost ([::1]:48560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h0f-0006l4-7A for importer@patchew.org; Mon, 17 Aug 2020 11:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK1-00026Y-1K for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:13 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49753 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 1k7gJz-0006oB-17 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-452-Fg_5ShG-OgKuAjS08OB-sA-1; Mon, 17 Aug 2020 10:41:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 302E0100CECC for ; Mon, 17 Aug 2020 14:41:06 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6994570C3E; Mon, 17 Aug 2020 14:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675270; 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=RdmpmrMElCNaVrxMEyBFO3Mxt6qDIJ7MNPRDYW7tDkI=; b=gFDsDPFTr1VZisUj2fa4qaegdIImDK843NielwojzysqZJYei/OX4q9PY38GykqZl2uzOr trrv8gUAaafQ7Filod1fH8hdGZZedhJDT7VMLV612vbPP0VDQZyxaG8kufBVX70117YgNd sA9Vfu6OUGARnIp7jjId9pp+tjqlO9M= X-MC-Unique: Fg_5ShG-OgKuAjS08OB-sA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 101/150] meson: convert hw/pci-host Date: Mon, 17 Aug 2020 16:40:04 +0200 Message-Id: <20200817144053.345107-6-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:03:47 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 | 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 f28da5869d..0038cf89d9 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 ed25644237..ca36e486e7 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 e422e0aca0..0000000000 --- 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 0000000000..cd52f6ff1c --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686917; cv=none; d=zohomail.com; s=zohoarc; b=AdhJ5XulN/UIhCvSJl2GvECdLAXFiKvPtHkr3kPmWQpkBzW3g98g/w6RKUFLXYbj9qHuFw2uEea3MeoBpEWhEiaaehUXO5KOv/YrVG7lD9D6UYQi329jVOYjLeSlJPEf7TtuGnB31j/OnsbaIgGkkRSFaLgtiqy5YthNvE7qYBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686917; 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=H1/obpthDPiI++kV8GyCWd8c/EELxIwncGfunuXqk48=; b=gkNxkKlvSWhkYOKIG/CS5FbkQMUY20jC9BfDfhcUTx++nZmcw8vKd70BXvw7cZqEzuJUU9PkWhxxdUTLkKpwcc1UCOuFlhdzkVqGTsmCO+t9E+ZrTJPsDjhwPaepPI1QuejEHdZfh4NAan7rV7SUBk5DDvr3VVTOug5hX5h910c= 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 159768691779565.44229956928416; Mon, 17 Aug 2020 10:55:17 -0700 (PDT) Received: from localhost ([::1]:34692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gxl-00015a-IP for importer@patchew.org; Mon, 17 Aug 2020 11:22:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK2-0002AC-IA for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:14 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:20931 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 1k7gJz-0006oI-QH for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-408-Q8ueVW3qM4WmR4HruLUm_A-1; Mon, 17 Aug 2020 10:41:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 618371008301 for ; Mon, 17 Aug 2020 14:41:07 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8896A70C3D; Mon, 17 Aug 2020 14:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675271; 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=H1/obpthDPiI++kV8GyCWd8c/EELxIwncGfunuXqk48=; b=CAht4bHdGRWu3Dzj850ClIGz+SHv8RbXJ3VcbI3Mn2KUbcpzfTfMMuQRxx+wiiUfNGyrws Cge012hFaa8WQDaHUzcBfuivhWG6OvQz5MUXNwxLWMXetb7jI93q/Yui1bOmZLvzk4PMhn gl8QcCUz2dTgTt2AISmOyJdlk1kWUlA= X-MC-Unique: Q8ueVW3qM4WmR4HruLUm_A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 102/150] meson: convert hw/pci-bridge Date: Mon, 17 Aug 2020 16:40:05 +0200 Message-Id: <20200817144053.345107-7-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:03:47 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/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 0038cf89d9..3513040d4a 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 ca36e486e7..a7301f21e8 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 47065f87d9..0000000000 --- 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 0000000000..daab8acf2a --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597677648; cv=none; d=zohomail.com; s=zohoarc; b=O26buqzTgbjg69HLfKQcDxN7nuFi3o/gFwKtdDY9P5U3+sJtbTZ0OOLYxVGHTH+fkBxCJ5fVt2L/hPWeDC1+FN8GVCElYNBU72v0avrIm5noB/ipJzuxL0CpyNeD7bh6qR8TPP8Exy0jbSMVK/y4PTHfOa8IV1MliC4iVtclEP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597677648; 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=kdtnYpfA9bNc4BnUL/Dc80Bvmc70dfiEOExC5HyIovE=; b=Se+iUEZjORnoyO44KyQNH2NSKME8eWrs4lJiO0htCUOKkh6EBtJppFYmof1uPLyR0p0xq1i6RzGs2UX2UH6c85ji2ND1JBT154kDv4L5ZjD51Jufc5YA2tK2vBCpEAunXPWNtKO1wCO4LCMDNxRvN6uPPAOd5JxD7epbRQyRXcA= 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 1597677648817424.97689205351105; Mon, 17 Aug 2020 08:20:48 -0700 (PDT) Received: from localhost ([::1]:54334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gwI-0005x9-SY for importer@patchew.org; Mon, 17 Aug 2020 11:20:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK1-00028F-Kr for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:13 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:35884 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 1k7gJz-0006oG-Oi for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-32-A4CYb88rOUK-Rn2DeyZeug-1; Mon, 17 Aug 2020 10:41:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79BC5100CEC9 for ; Mon, 17 Aug 2020 14:41:08 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C064E756AB; Mon, 17 Aug 2020 14:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675271; 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=kdtnYpfA9bNc4BnUL/Dc80Bvmc70dfiEOExC5HyIovE=; b=ih/jS7NZss72HGkrOyvqCZCDBulvZv/LaGK1bzYFbx4/3y4t4xn8wbKlFOKjzAYbirbEtv gwqs09bh1MbdcZ3ZWZYtLWkKQ8dqHvnLSJ5B5PxrUUxWrUs/69uhqgAWWvrXeVLqrIpgA0 qGiX5bxdMMIrm9yosWVil1cM+IQFKao= X-MC-Unique: A4CYb88rOUK-Rn2DeyZeug-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 103/150] meson: convert hw/pci Date: Mon, 17 Aug 2020 16:40:06 +0200 Message-Id: <20200817144053.345107-8-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:03:47 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/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 3513040d4a..20832841d2 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 a7301f21e8..53c347c395 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 c78f2fb24b..0000000000 --- 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 0000000000..5c4bbac817 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597682913; cv=none; d=zohomail.com; s=zohoarc; b=lqRTGF5OmG1KGiUsC+iuybj2aqhSDTn40lQ1koDyvyvtyK4b+SvuatbfOW/pwpXIAG0Doqvew8iS/klsUQxv57FivxibL67PY43qW1AdhAC+o5jyuXPL4CszCjAhyD9K6McGrhS1fj6OSy3gta6oic/CzvGb4PBmDIiasyHTkfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682913; 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=lsKD/IZ/ybi+/QCUoBcf65hoizOPZc27Qg+cQlKIV4c=; b=AJT2MXY+LxXSQNyz6y0rVc/Ho4sk2eKeU9ajicixi9Mmhp2P4fasNvmQWviJYVpzMyCe08nX9f0BezkGLnMwIPf0x/z5KzRrxTjynqGSdcYdb6JqyoGFnamxEttFTbkYuETPYN0bv672oUmdfq62HEbeUf2c3oZIXjS1GpkqsGc= 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 1597682913415825.6130807030752; Mon, 17 Aug 2020 09:48:33 -0700 (PDT) Received: from localhost ([::1]:56764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h2N-0001mt-0F for importer@patchew.org; Mon, 17 Aug 2020 11:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK3-0002Cr-LE for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gK1-0006oc-Lv for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-366-D1_y8iPwMtqKvpLA7bx-Ag-1; Mon, 17 Aug 2020 10:41:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B869F801ADB for ; Mon, 17 Aug 2020 14:41:09 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF80470C3D; Mon, 17 Aug 2020 14:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675272; 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=lsKD/IZ/ybi+/QCUoBcf65hoizOPZc27Qg+cQlKIV4c=; b=XuhCq1pPngHLAh+DnHD97/9RhhoYlJSqwCOe0GHt3DVZ3/Gdv6lZ6FdCp936In0rDwPUon FxIHpZ10qAxJRhAN3j3s8kKBve1V227OTs+BXAnCjov9JfDNgtj3ndMm98Bg4Q180q1Fn9 oOhbXMDxMlgbC2jFVguzocomq/l9dco= X-MC-Unique: D1_y8iPwMtqKvpLA7bx-Ag-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 104/150] meson: convert hw/nvram Date: Mon, 17 Aug 2020 16:40:07 +0200 Message-Id: <20200817144053.345107-9-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 01:24:49 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/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 20832841d2..78860ae9c7 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 53c347c395..0bdd6a2613 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 f3ad921382..0000000000 --- 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 0000000000..ba214558ac --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597683020; cv=none; d=zohomail.com; s=zohoarc; b=aI4FJaoUPBfJE2iF1nGyLoilFpMkdy0X10ljkeKNFkXeO69p3xLCUUIc73fuYTQ5G1UN/ltaJ203paZQ+0WVpFupYw2+7GztJCDOp8hifzoZdtouleo4HXCU83Z8QfDsfKapoMTIUyka6KRIrh8vxGjShW24pAZE0NZymMLh6yY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683020; 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=x350yu0iiIWdawy91SCA3LKUTDwTaxSjcoiN5Aj2s1w=; b=Xnx2guAzIPuvSiDiDeJfS94ge+pvj86OAgK1h7YyRIBnD2HTN5UIi3oLuS7+HFvFiTimjsiaoHS2rJFGYx3p2uM1wzqMQZonyCfPbqk27EzBOngDV74pRyp4UiCocBPPHuna8T9BNIyTZVVCArgQHziKXmTQnhbK93i33osX4gg= 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 15976830201981010.2416931676102; Mon, 17 Aug 2020 09:50:20 -0700 (PDT) Received: from localhost ([::1]:36914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h48-0005Ht-9U for importer@patchew.org; Mon, 17 Aug 2020 11:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK6-0002I8-3e for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40028 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 1k7gK4-0006ot-0C for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-559-xAkDPUX9PZ6GP87DkLNLkQ-1; Mon, 17 Aug 2020 10:41:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0818D185E521 for ; Mon, 17 Aug 2020 14:41:13 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2412A70C3D; Mon, 17 Aug 2020 14:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675275; 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=x350yu0iiIWdawy91SCA3LKUTDwTaxSjcoiN5Aj2s1w=; b=N/7BOUoUuC69DVs13ZhDBa3bylJJ2On29HOnEhAFw64Xzj+hKXCmVEQ7PuBAUt1DIfLWEx CHRQCOACIl2sr/rC5KRsXWQgldHokTVvyXQrkPS/Dyk6PmYO/UQlrYOoXxxcEAxgW0jW3Q 4ideQmKxlZEcOIXdte7KkzeWtDDWR/I= X-MC-Unique: xAkDPUX9PZ6GP87DkLNLkQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 105/150] meson: convert hw/rdma Date: Mon, 17 Aug 2020 16:40:08 +0200 Message-Id: <20200817144053.345107-10-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 00:24:04 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 78860ae9c7..748a718b0f 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 0bdd6a2613..f704e51361 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 819bb12a35..0000000000 --- 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 0000000000..7325f40c32 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684873; cv=none; d=zohomail.com; s=zohoarc; b=Y/eDrKLATM+kE7dI1rIX+ewRNHlECa0sIPRriR3bpS0Qw+77KmZqoMKYOEcllbA8QWHLD2/elOAMzMxDw7Z+KGKBMT7UbVsCQr4swo41/TubLJk6wu98E+85wpGRvp8Rsi4PbaQmTqa9k+BCDU8IlQENKHc/JtnWNcpvlK2L484= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684873; 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=eiaFAJXIrf6BAIh0OylDB2lLg2Tw9yqbjMjHdWAqMeA=; b=fLM21tgtoFFkT8XVkLbNtA59WMiRxVzIEx4nDxulyomq1FVsxxkCSXF17r+S5ZmSZgX0CU+1mu9+H5fbuZFMvt+Gi/7rQMq9AtSGTFOc2pxUO+6GFYav0+pTLeVjfyItJ4yJKKJ3izasrfpIekRcD80aVRi7OHXhanN8ObYE1DE= 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 1597684873224697.9469346616015; Mon, 17 Aug 2020 10:21:13 -0700 (PDT) Received: from localhost ([::1]:47784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h0T-0006Rf-Ky for importer@patchew.org; Mon, 17 Aug 2020 11:25:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK8-0002ON-5u for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31884 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 1k7gK5-0006p4-LB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-3-LcqfBwaMNBO_AoPsfRjldw-1; Mon, 17 Aug 2020 10:41:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26F5881F001 for ; Mon, 17 Aug 2020 14:41:14 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 593EF70C3D; Mon, 17 Aug 2020 14:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675276; 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=eiaFAJXIrf6BAIh0OylDB2lLg2Tw9yqbjMjHdWAqMeA=; b=AeSPX95glr7WipCUXKahq+x+qV7IlKMEcXlNa5iTeL8DjI5Y6AaM8J2j7vgrFLGzydtQs7 TYY8RhRSNs0Ffa2LtZ+9d23eGR3zEJNkWaJy+VKLuQxor4Q7LSwquM8Arw+eko4wY9z8f+ wQ6cNNu7gGZxd4GzFyCx42m/t8lXZwA= X-MC-Unique: LcqfBwaMNBO_AoPsfRjldw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 106/150] meson: convert hw/net Date: Mon, 17 Aug 2020 16:40:09 +0200 Message-Id: <20200817144053.345107-11-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 00:24:04 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/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 748a718b0f..d0d7816118 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 f704e51361..1f7b2c4fb9 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 7ccbf72ea7..0000000000 --- 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 9f0c4ee332..0000000000 --- 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 0000000000..c9cfeb7954 --- /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 0000000000..4a7051b54a --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686751; cv=none; d=zohomail.com; s=zohoarc; b=R0c0mR8wG1n/iZZCMsOgNkp4Glf4F+XpuaHskFBpJ0PVifaNNR7W4m1qxHAs8RgNuxpp9qRL5JswCc+0v/AJtgLjBf3BMiPGdMKdbkOSkfn1mF7Hiyb1/WxTEhC1+CD/gpGrC+yAfjrM8j2NZKxWmnSHWk5GAYFV1C8dsm38k0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686751; 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=yVsDX30RTD9z+oD9dhmNp34h9p3joMXuW8pOt1DLvWk=; b=NW6fbio9dcFC4nHOaYH/oGZomulSvflm0MLdFrE/pzUvv695mbv/k4BvgEReSVggtZCyLrhM2h+bKnbJ27iy4qZ7NdLpaj7xHnHIqil3B4GZ0QC+/5E7IVyQ6otwQZFZjrW1TaJaARVMezoYz5ZB9RhlBu1k4yDGD1JjyEtb1SM= 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 1597686751657639.5735463137621; Mon, 17 Aug 2020 10:52:31 -0700 (PDT) Received: from localhost ([::1]:59480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h2t-0002sP-PG for importer@patchew.org; Mon, 17 Aug 2020 11:27:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKE-0002eA-Q5 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:26 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:48053 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 1k7gKC-0006pd-6D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-519-Pe8OkyL0Nq2KnRhPBQ-z5A-1; Mon, 17 Aug 2020 10:41:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 635E2100CEC1 for ; Mon, 17 Aug 2020 14:41:20 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7912D70C3D; Mon, 17 Aug 2020 14:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675283; 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=yVsDX30RTD9z+oD9dhmNp34h9p3joMXuW8pOt1DLvWk=; b=aT/ZWp8ecHaoyZ58LeHPM5mGxjX4MYMogpKyWo6X3Wnza3HIN4CK6FiNhLw9mFFH/RTOWG IWMydbqyxEM8sTz+NdJJozDPY6+7f4JRtDbtbf1IMVBNFRecb0jw+KGw5bq4GA282QP4h9 S2V9jSYOo6nS6JfhRvX8RdGVdS5db5U= X-MC-Unique: Pe8OkyL0Nq2KnRhPBQ-z5A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 107/150] meson: convert hw/misc Date: Mon, 17 Aug 2020 16:40:10 +0200 Message-Id: <20200817144053.345107-12-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 03:34:42 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 d0d7816118..ac8278edf7 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 1f7b2c4fb9..6ca82b0375 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 6be3d255ab..0000000000 --- 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 07fdb320d4..0000000000 --- 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 0000000000..17282da20a --- /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 0000000000..84fed0494d --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597685719; cv=none; d=zohomail.com; s=zohoarc; b=mcbaWuNTbfXupHFazrFaHJ6Of8L4lgSLiYabW/VsXJ2iNt4ysbeYUUDN/4QryN7paOAJwRY54dPJpuT0AeJC6x4NKVVEhTU7E3KCSYyO9v4RLy2gGzsV7rDn6gL3aR01oDvZ7W7UB/+J6H2LaT8u3ZAG2m5DErY1WqkcA9W9uPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685719; 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=6IcjMD7wz7lT8tuax07AyeIM3dMjwWq36Mk98KP+2C0=; b=LPdCmaU/p+I3tQelc43R6bVYfeZwGkQd76w+q9SkOpnYNlWNXJQA5dXoEJbuUgyYTWw/FxvIat7aujGuzJwRgR0sfjO8+nOqwpWoM7hxWISA1vWH7dFgVntbT4+6Ukmnp4jYZTwGwW37WzuOBI4KFSs7OXsT3ePwIbM6C49RlR4= 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 1597685719436587.0882954981562; Mon, 17 Aug 2020 10:35:19 -0700 (PDT) Received: from localhost ([::1]:43250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gzd-0004a8-B0 for importer@patchew.org; Mon, 17 Aug 2020 11:24:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKH-0002jo-3a for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:29 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33867 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 1k7gKF-0006pn-7D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-294-jeqF8-ZsOaCUq0y0c307lw-1; Mon, 17 Aug 2020 10:41:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1FB6801AC3 for ; Mon, 17 Aug 2020 14:41:23 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1BBA756AB; Mon, 17 Aug 2020 14:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675286; 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=6IcjMD7wz7lT8tuax07AyeIM3dMjwWq36Mk98KP+2C0=; b=K75oSbZpC/W7TQm2BlzBQ8yHDt0ipZDXLY5Y48Nfq4AioAewPw5QDKE7qQXu4H2M+ec7vE DJ4YCTbuwRwXg4+yA4a6qmOepZHJnwshCfOV6gXCu+/XsdHmkclw+e+AImuad9PMVvvLHj RSUmKrshMhdGacPPZ0Iw1Ok0puVK6PI= X-MC-Unique: jeqF8-ZsOaCUq0y0c307lw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 108/150] meson: convert hw/isa Date: Mon, 17 Aug 2020 16:40:11 +0200 Message-Id: <20200817144053.345107-13-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:03:47 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/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 ac8278edf7..a28e211e78 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 8e73960a75..0000000000 --- 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 0000000000..8bf678ca0a --- /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 6ca82b0375..86598544e6 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('isa') subdir('mem') subdir('misc') subdir('net') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684068; cv=none; d=zohomail.com; s=zohoarc; b=YATkfsEBS/bvKVZ1OvL4man0w5t04CwsgGjM03h4wiMe0xPDsvsZSl7VOUBOcdmQYqZym0NyUsWdvp88CeQcEjuDBAwGX7YqfvoqcTdHRicnM3ncpKDiNrGXCDiQgAB8N08giZAkWCcNJlyTZzoTKMrJl6NRllQMNpmgUN33F6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684068; 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=jOIdmTH1CYl8LnZvB8zBwKIw7Tiq/rsBYfxJzBvBBYc=; b=SPAoIQ5nMbVcKevCYi96fTEADYucS+aFHn3QOl2zusgyBSK2/DgRPKBRxEmsUxdcb7n+h6frozGBFevDo5LBq3lXhdjJvikich7gfagU8MiliUkXSEvatJkPUxttIAuLlMbq7Mknn8DgxmTYr/aDdd+RFO5E/3OKUM5GcH3oLVo= 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 1597684068363111.37364551019766; Mon, 17 Aug 2020 10:07:48 -0700 (PDT) Received: from localhost ([::1]:39810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h4g-0006SG-7v for importer@patchew.org; Mon, 17 Aug 2020 11:29:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKJ-0002nD-GE for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24265 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 1k7gKH-0006pw-3Z for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-263-gVEqQm-kMiOr1NfFqKxjOw-1; Mon, 17 Aug 2020 10:41:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6832A185E521; Mon, 17 Aug 2020 14:41:25 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C56A756AB; Mon, 17 Aug 2020 14:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675288; 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=jOIdmTH1CYl8LnZvB8zBwKIw7Tiq/rsBYfxJzBvBBYc=; b=H222xTnG5NRL1rsY7u8RMJBHZ1dNwWcOQnxgKj+uUb9cWAo7fQ2tAJo9Xnmk62+549YSRA PFdgr1tSJFpQoofSsTB1oY73zWCjo6KE0Xo4mDQXVuMSAYwee/SK93A7Kk0D0pFobrFoq9 wCG5NZ21eu8Gz9+jrKYBueChgJZOAb8= X-MC-Unique: gVEqQm-kMiOr1NfFqKxjOw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 109/150] meson: convert hw/ipmi Date: Mon, 17 Aug 2020 16:40:12 +0200 Message-Id: <20200817144053.345107-14-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 00:24:04 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?= , Corey Minyard 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 a28e211e78..f136377866 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 3cca10bc50..0000000000 --- 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 0000000000..9622ea2a2c --- /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 86598544e6..9796f95e5c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipmi') subdir('isa') subdir('mem') subdir('misc') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597685861; cv=none; d=zohomail.com; s=zohoarc; b=aa1GL5Qr0ea3/amylptFKPGQ7GfePaHxzn8h9vc/hscMk3FmaNRx2vfE0IP9Mddqt1R4MwuRGzLVHbvEjvWQBP8YMbiZ/WsxpR3zrzTTpFAAB2abhtJY8GEyaoPb+udOD0wTmBsgy57GFFeUKyFqgCFSoXqo9YDqgRMwZjoy0IM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685861; 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=NfyB9OFP3NC+XP2rys2fAFHGh1rpKodm28QmEjGLxY8=; b=O5gOyBaiQT8KvVojxCEMwGtYlN0ZhTkw/A80NuBen4QUiCh6WIbeNifjjcGCBbfKt+cXu+kuGXAm2T1zZ8Yoq9yOE8a1lA26+epYz/ld/bIKxr6vnkpPnAqjx57wg5k3CVHARNwxUlYDdRxq6PfcvrxIacHKMGBy8dzMV46f1mY= 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 1597685861019563.044384549366; Mon, 17 Aug 2020 10:37:41 -0700 (PDT) Received: from localhost ([::1]:48264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h6c-0001ds-8u for importer@patchew.org; Mon, 17 Aug 2020 11:31:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKK-0002nq-Eu for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:32 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21545 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 1k7gKH-0006q3-Nh for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-216-txBibZIANvOFdd8YbdXTfA-1; Mon, 17 Aug 2020 10:41:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95D291005E62 for ; Mon, 17 Aug 2020 14:41:26 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6081756AB; Mon, 17 Aug 2020 14:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675289; 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=NfyB9OFP3NC+XP2rys2fAFHGh1rpKodm28QmEjGLxY8=; b=CG7J44mzyjhoDDEg5Lk+kGYzD1Dr7SRR8skrfdBLTTtj2SsmIKWF0o5bIOyPcZTEtpKEDp k/Me/twEoT0eEwd7Rp8zngy4Nv2IXs+jhDx5Rs5xdIkMQ1sNfuEflOhEfntvhO/KlzmoAW vevLLmm5gQPFxzmxZS+u48MsFyOIqVc= X-MC-Unique: txBibZIANvOFdd8YbdXTfA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 110/150] meson: convert hw/ipack Date: Mon, 17 Aug 2020 16:40:13 +0200 Message-Id: <20200817144053.345107-15-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:13:21 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 f136377866..76d9305959 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 8b9bdcb549..0000000000 --- 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 0000000000..3f8138b6f2 --- /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 9796f95e5c..ec4bb48a0f 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipack') subdir('ipmi') subdir('isa') subdir('mem') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597686806; cv=none; d=zohomail.com; s=zohoarc; b=fl2vSSQA521IXMZpkFwMG2Oem8WA6UJdv0bUSmGHgIUClGXCUqEbF05TH5TYaJLTeLOAdUKrfJ8AZIdC6x6yi6Pe/h/zFDyE9RW5sMUD+YXJZqUy0UJhuDNx6KClhDIfl+rA7IpH8N11QWgzWq29zM/AWH6qVx5eaGNMrWqmEvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686806; 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=uaUF+HI5OBgPlVZE1fhg1N02BtoL1RcmK+wFLwcqqGk=; b=J8j2jA+iRkJTnaNh1Ru9xbMkzK+MKc2q2NE/lHFakEeYwtqBZSTxmiAj4pYJJR8+MwQalsEh8B97BH/gBEXt+vP6CjiJvTdcBgITcrrOl52jz4qai8tZ2qjOcwHOPZ9rrjqP/vYMIMJD2QeLtfdm6PuySZn/gj6p5QYwS2MPGJY= 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 1597686806002856.4254707834444; Mon, 17 Aug 2020 10:53:26 -0700 (PDT) Received: from localhost ([::1]:51748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h1L-00084z-8d for importer@patchew.org; Mon, 17 Aug 2020 11:25:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKM-0002oj-WA for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46425 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 1k7gKJ-0006qA-86 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-278-9aw427-bMhiwYLkk4Xg4hg-1; Mon, 17 Aug 2020 10:41:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D870B801AC3 for ; Mon, 17 Aug 2020 14:41:27 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A034756AB; Mon, 17 Aug 2020 14:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675290; 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=uaUF+HI5OBgPlVZE1fhg1N02BtoL1RcmK+wFLwcqqGk=; b=fcUhZmAyxYpOd6DcdqE1Z3f0SYh8Rk/SbZ4NaMh+WSq+ajjYiXEWFXY+Hk9CmGTLuanUk9 l9tpnt+gv/mdUd3ANGV72oFBBKFqphboA+cdEZOgXod6Q5XytKa3al2qvgM1yNPaU62Tbs NtaeF/gaMPzCsuUnN43gGVkea3D76r4= X-MC-Unique: 9aw427-bMhiwYLkk4Xg4hg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 111/150] meson: convert hw/intc Date: Mon, 17 Aug 2020 16:40:14 +0200 Message-Id: <20200817144053.345107-16-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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 76d9305959..80b104168a 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 3ac2b40fbb..0000000000 --- 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 0000000000..c16f7f036e --- /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 ec4bb48a0f..986e710287 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('intc') subdir('ipack') subdir('ipmi') subdir('isa') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684935; cv=none; d=zohomail.com; s=zohoarc; b=gpqhOOJ5trLmh86LfbnJyn6GVpchd3yHnXZW+IzIgKC03MCSk6tZAUegJEvlbQfv4eAvcQEZoPws1hKDUDYakSfRx6USZjRV1DAu9MLyUavJ3TEYkrOwLz6J8EklAUiUmRhuP9TW/s/gp5IY74XVrnRy6eD4+cZhv5srmqfmozE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684935; 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=H9FavuJqmxsGLhsOxpQUaI0es2WjXRSahOLPo6Hf8MQ=; b=HrnN8Pcckl9FPFEd342DhhDk4Vs30ATPxSutM6ltaz2Sf3D2JYhuigneEaT3b6FemYG02QK6BHyrY4ffS504sZ2TtYUpfBGgIvvPUJdVfFRxAYt7fd7nTjTqOz62cO3aH+7BkCoDJ+voQ9XsKlfQSkIVdnO4et6eqefJX0t/gn8= 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 1597684935566481.98704532595696; Mon, 17 Aug 2020 10:22:15 -0700 (PDT) Received: from localhost ([::1]:49560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h6r-0002Br-2I for importer@patchew.org; Mon, 17 Aug 2020 11:31:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKN-0002oz-5w for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:36 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:37501 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 1k7gKK-0006qK-8X for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-364-69-KUK-wNUqzOAuxdHVkjA-1; Mon, 17 Aug 2020 10:41:29 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEFDE185E524 for ; Mon, 17 Aug 2020 14:41:28 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41C1570C3D; Mon, 17 Aug 2020 14:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675291; 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=H9FavuJqmxsGLhsOxpQUaI0es2WjXRSahOLPo6Hf8MQ=; b=a35PHzUfF+68fh8FMkc5vU7imgc/btEfgpWGwIrq/nC8bFC7tDignIfSebnVTqPpr25AGe 28FjTvDc+RAEeNDvKgHvYRvkswbjK+5v5oVKt+2JZAeZnJDQBGALnx4vJvCnfNv2W89yAV xVP2aFzM8Tjb5l81jRmHC+S3omZxZdI= X-MC-Unique: 69-KUK-wNUqzOAuxdHVkjA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 112/150] meson: convert hw/input Date: Mon, 17 Aug 2020 16:40:15 +0200 Message-Id: <20200817144053.345107-17-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:03:47 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/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 80b104168a..3feccd83d7 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 abc1ff03c0..0000000000 --- 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 0000000000..e7285b15ae --- /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 986e710287..b15c8d0970 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('input') subdir('intc') subdir('ipack') subdir('ipmi') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597685968; cv=none; d=zohomail.com; s=zohoarc; b=DLqEjroFSL1VrjT0y2OY3U2zln2wEpjITZY/h2WrhP/PjvpAalA6AQMCgayd2k611HMO/yS5TgqPMOS36BuxQGNkWjP0UznqSg343WrKel45i1b2Y+PnUMsjLtGEk++WcfthHm/xWHDZl3DaHn+UXSktWF+wMhcTduVUUUvgsxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685968; 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=ynfbcLl6Zdt9MTtUOILAaaGn/q/GyrPKPhNf79w27O0=; b=gCM5mEqVsExK0Y2+NdxIzQ3EsuYyCrIvJ1xk5Ylw5z6qYtFuTDuCCrhpAyJKZe5PMgbfhXJFiE0P8y63f81uXy4PyqYG2HhcnKjG6QzYtRrnhmvrp1BiM0Hr6NMUErzn09EoQXXHrViLn5KUxy1mTlpV4+/LZJqPYPNl4Zwmnig= 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 1597685968360192.86928016500553; Mon, 17 Aug 2020 10:39:28 -0700 (PDT) Received: from localhost ([::1]:60108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h37-00037z-CI for importer@patchew.org; Mon, 17 Aug 2020 11:27:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKW-0002uG-2l for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40522 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 1k7gKR-0006qn-LR for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-225-57OkwmzkOmiziB-ZGDKuEw-1; Mon, 17 Aug 2020 10:41:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27E371DDE8 for ; Mon, 17 Aug 2020 14:41:30 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60B26756AB; Mon, 17 Aug 2020 14:41:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675296; 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=ynfbcLl6Zdt9MTtUOILAaaGn/q/GyrPKPhNf79w27O0=; b=IgN3bWJaqZoDdmYKGhR9zX5M3eWIPjPY+u3+dMwXOTfebqA7xK1iqm+t772czYGCYVZIb5 6ocONtDs/0J3lPGGDmvRAvJIBmwINOHlYMEaMJNV13F97udizwNTx3Z2oFGFEHzdZmpPMn 1fTKq56IT2MskGbP73gSFY11nZ3C4ME= X-MC-Unique: 57OkwmzkOmiziB-ZGDKuEw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 113/150] meson: convert hw/ide Date: Mon, 17 Aug 2020 16:40:16 +0200 Message-Id: <20200817144053.345107-18-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 00:24:04 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/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 3feccd83d7..02c5c0d94e 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 faf04e0209..0000000000 --- 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 0000000000..ddcb3b28d2 --- /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 b15c8d0970..4d7c31c652 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ide') subdir('input') subdir('intc') subdir('ipack') --=20 2.26.2 From nobody Fri May 10 21:52:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597685744; cv=none; d=zohomail.com; s=zohoarc; b=mkQMCYJXx3LkUMIWpK59u6XLa7PZPi+ocVd+2YMs6scav++bq906r/v5xtytXMx08hcPYax4K0icHpBrqgboNLUrEQH+bDD/+X0EHem9TdpY8GjPVXOqWKP0VaVgp6X2/PCLhZmk3eEHeRpMeSqOPpBM4cWas5m5MZHceMGqzfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685744; 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=2uZT/s+uo12wT2bnnDViCCQzfljp43iiPWFYn7ZUdE0=; b=gxNe6S1jiY8Pf4ZLd5Adww5aHWR7Bmw05YQ/j55CGXEPhwk6+4WvNR81vOzdXP6Y1xzrhy6Ur/B+06eKRVgQAn8V9GmvLPAHEUGETNIQAyUrVU5eNyc4Dvlo+azmZrB5cSXVDWTqjIzI8gMUmb1WDftVvJgnRkSY600vT4ZrIyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1597685744754765.3069462721339; Mon, 17 Aug 2020 10:35:44 -0700 (PDT) Received: from localhost ([::1]:35230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h3d-0004ax-7b for importer@patchew.org; Mon, 17 Aug 2020 11:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKR-0002sC-Tu for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:40 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36572 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 1k7gKN-0006qX-G1 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-118-tyh3QHmONhaDZFUFaTE9Mw-1; Mon, 17 Aug 2020 10:41:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B438381F001; Mon, 17 Aug 2020 14:41:31 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F795756AB; Mon, 17 Aug 2020 14:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675294; 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=2uZT/s+uo12wT2bnnDViCCQzfljp43iiPWFYn7ZUdE0=; b=fRVTEzXZTDEkDOYloa60gGZTzVkpW7Z22RG55oUohzqPApkQtYd+a47WNB2KV7+SVY0KS6 WB/h3CDdOS030YPs3yHQWQyMGp6zwfT5EV0/12xOsiL0vQ1mITJNMP9CWNXsJ+X+IjWXUw +dJKcNzpXfyri7PdaksFmCzi3xGbvps= X-MC-Unique: tyh3QHmONhaDZFUFaTE9Mw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 114/150] meson: convert hw/i2c Date: Mon, 17 Aug 2020 16:40:17 +0200 Message-Id: <20200817144053.345107-19-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 02c5c0d94e..22eb804730 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 f2c61eaa8b..0000000000 --- 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 0000000000..3a511539ad --- /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 4d7c31c652..983edc1d47 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('i2c') subdir('ide') subdir('input') subdir('intc') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597682883; cv=none; d=zohomail.com; s=zohoarc; b=NiTTMEaC0wRPuD5dRAkJKU+Y4H8aYnKqu6BGtgokdYE+S9dzEq3Rl++6grfCduAKBSR9htnV3EWxxveMLGJe8pL/4tSJpVelT+A2LGxvkIZudu7qSPoh/j0luC2dlZNH+1LygphcAgDQC8N2S4pp2YoTFnxjXPDf7Ru7CXylL+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682883; 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=yaNJ6IuIrRUXWAqx7sgSBGNyDiIOBarS60pmB3FgTrg=; b=TuQCj2VvtqBctV5n3MigdVwR/M09uZrMLD8y81iX0kCCFX5DxpePwmbpFe1h8eMsBEjg/HAkmND27xtAXgCJOG3lkDQZ0JrcKFi2KQcp2jli0OIVHMoFI4m0aAvO3c2DrlBfXNJC8q9NUySiGMzXObl4H2lk5T/nTs4XXkiR5D0= 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 1597682883875223.95019298183013; Mon, 17 Aug 2020 09:48:03 -0700 (PDT) Received: from localhost ([::1]:57890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h8Z-0005ho-Sa for importer@patchew.org; Mon, 17 Aug 2020 11:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKT-0002t2-Er for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKO-0006qf-Jf for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-241-W7Wo5Z5wNJeBUr6n2ANvUw-1; Mon, 17 Aug 2020 10:41:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 005D6100CEC4 for ; Mon, 17 Aug 2020 14:41:33 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27074756AC; Mon, 17 Aug 2020 14:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675295; 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=yaNJ6IuIrRUXWAqx7sgSBGNyDiIOBarS60pmB3FgTrg=; b=Fp4kjd6I3fk/3g+hqZ2eDOAcQXUtvxUr5bYalokSLNA9tCcOoqcnunVdNLDVGkRzXc/MuD aKywb271EQWnS6CjHq53AMK0cVLwGzdm5T2zBo/d6n7o+L5wSJo4Fkvv+RMFM+m7zxfQ4P ivY3ldROmDk5x98nMVscvnxoMfnOLiQ= X-MC-Unique: W7Wo5Z5wNJeBUr6n2ANvUw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 115/150] meson: convert hw/hyperv Date: Mon, 17 Aug 2020 16:40:18 +0200 Message-Id: <20200817144053.345107-20-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 02:47:08 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_H5=-1, 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 22eb804730..a2c2f6d1de 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 5b614e040c..0000000000 --- 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 0000000000..1367e2994f --- /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 983edc1d47..f9e5adfb48 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('hyperv') subdir('i2c') subdir('ide') subdir('input') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684070; cv=none; d=zohomail.com; s=zohoarc; b=VdAsFRaSB85KoSs+q7unoRY5QwafvuTHsqkgWANt4A7aa0udT3A4DpjWR+flMFe6mQs2GcOgVgYSrKG0U2Q6WubX6Fi+l3n+LJ9T8u3pVG588hk/cmjrVggSDFkpYLR66mR7x3eAft9M+SoaVL/tkW4ogCws1wbxVLFmG8A1cWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684070; 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=ODJdNdWjjNTd8b4kfugM0UtLCKBeocnqITNVNdo3kn8=; b=DnmzthJlILVFHBvc6bdJD64Mz0MqCeE3MF7B600DT6H1MIuKp7wUEElUmZ0kDD0G1A4stJnLEQEE8oKYL9VllCpMzWLEqAshIcsMDwq9WiGKv4+RW67xmqnWvs8dZQO8dIedt7sC2GC0ZZiLERwKvVTKtkwXbV1qz+5Z3KPJ7HI= 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 1597684070251500.8296103332667; Mon, 17 Aug 2020 10:07:50 -0700 (PDT) Received: from localhost ([::1]:43832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h5g-00089N-S9 for importer@patchew.org; Mon, 17 Aug 2020 11:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKZ-0002wl-ED for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40292 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 1k7gKW-0006r3-Ak for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-470-ys893nGPNASsxHaheRS7Jg-1; Mon, 17 Aug 2020 10:41:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10CCB185E521 for ; Mon, 17 Aug 2020 14:41:40 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 574A2756AC; Mon, 17 Aug 2020 14:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675303; 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=ODJdNdWjjNTd8b4kfugM0UtLCKBeocnqITNVNdo3kn8=; b=WjG/5fPYpT5IbRLQBTIxsfMGEymfDXksZK6MXqzpxpmpU2gMP/9PIUkal0l83niAXzsSv/ 92dh711hzCNfGnVmxh8LIVEuQFOPFhmNJi69E6l+J3BbEm71qJOsyT8YKXfIVB2h4pfMOF t0b20/fv7nTrZUQjg7bN67Pigm9E6TI= X-MC-Unique: ys893nGPNASsxHaheRS7Jg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 116/150] meson: convert hw/gpio Date: Mon, 17 Aug 2020 16:40:19 +0200 Message-Id: <20200817144053.345107-21-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:13:21 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/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 a2c2f6d1de..c04dfe589c 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 3cfc261f9b..0000000000 --- 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 0000000000..6bcdfa6b1d --- /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 f9e5adfb48..52577c3205 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('gpio') subdir('hyperv') subdir('i2c') subdir('ide') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684080; cv=none; d=zohomail.com; s=zohoarc; b=YowRV5/1gOQhRdHZBdRUkAkgt3mqcGlnT1/NovaRtzqZfCTX7fcOt7goW7AWdyMvYQPUhY0bRjIsF5D04t2cIoEjM5AhJptqYK47Axwhg7d4PSuv0+q5dDpeZsKfD1usTCsLknluPz5VwKq9xN6k6b70ES9XvHBz72/wiJlFsFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684080; 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=Avrm7+QSz2JDaUSsDG3e4jcUoGqDFFfk2VHkyPFsAEo=; b=M2GPs1GeK/U16a/x+lqWbLCcu+K6V+elRl6U/TxjrUn/7gO8S944yTjlb2b5z6c8MR4NWySsZ2N7uJ1yhdJFy+ZI3fJWmhdmMB2yRTWoZ/yrY/8NfRZG2ewVmyWWeL4uT70+Vd5d0FaRXuOduOfW0tieUrLcxEcFCkuQHIgNoLI= 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 1597684080782253.55832803565147; Mon, 17 Aug 2020 10:08:00 -0700 (PDT) Received: from localhost ([::1]:38208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hA2-0000mW-Io for importer@patchew.org; Mon, 17 Aug 2020 11:34:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKb-0002yg-Lx for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22558 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 1k7gKZ-0006rE-3E for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-160-NzfCZGGvOz-L7vBDhCXt-Q-1; Mon, 17 Aug 2020 10:41:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB2AB100CEC9 for ; Mon, 17 Aug 2020 14:41:42 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F5FC70C3D; Mon, 17 Aug 2020 14:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675305; 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=Avrm7+QSz2JDaUSsDG3e4jcUoGqDFFfk2VHkyPFsAEo=; b=hXnBUF/R3ggcy1hmBaLnN1seBRz2FOuHYM+Y/x0tfCmyYRndCjkKHmOpznbdB5UnMrABik GuPI4YBwN8t8QJgmikYyTWTHVFy3IgtPQB4Dk+bqrmtek/oGQc1P8GslS1mMk24OSd1Wa5 T3TteGwhFJj0ZLNi5J8a+OkrLSHc6fk= X-MC-Unique: NzfCZGGvOz-L7vBDhCXt-Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 117/150] meson: convert hw/dma Date: Mon, 17 Aug 2020 16:40:20 +0200 Message-Id: <20200817144053.345107-22-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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 c04dfe589c..26917a4e1b 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 f4b1cfe26d..0000000000 --- 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 0000000000..ff5bb3748f --- /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 52577c3205..96da0bba7e 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('dma') subdir('gpio') subdir('hyperv') subdir('i2c') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597685743; cv=none; d=zohomail.com; s=zohoarc; b=Q06As8wjdA0/2TNmUb7OepThVyR6X3B8UCgSooGVKsHfBGSR/ah33HFMSOqS6CKc4GO8hMu7WkzlMslsWQTtfOMbChbK5ElZqSjh2CGdGWvHot3LbW8sx7GMcuesfxzHGyaB2aH6Xym7iEyjia1epWLWzZB+Wbs3z67KiaAXGwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685743; 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=TSsMqdmMCMfkXupUFs34oZSkfx6BbapuB0jvch6famI=; b=Iyx06IFUfw55XxETnGmzLMih7Eo0yddHWnnH+FKntT148kwHU5sC7Bq2/u3v+FWF6w75MNekR1Bq7wIf9G4F5/mBdbVXswS5ASvHvcm5GR98hXoXleXLhs874JLlHzXDRHiKJ3s0gLnHLIs+jsY6epbNX+Npl5zrFHTiaEH8Kp4= 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 1597685743092145.81275776628456; Mon, 17 Aug 2020 10:35:43 -0700 (PDT) Received: from localhost ([::1]:52254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h7d-0003LR-AI for importer@patchew.org; Mon, 17 Aug 2020 11:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKg-0003AD-Ed for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:54 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:56116 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 1k7gKe-0006rn-3c for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-503-a8ieGbOiMaaHcdPqmBboHg-1; Mon, 17 Aug 2020 10:41:48 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C8E8801AD9 for ; Mon, 17 Aug 2020 14:41:47 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35721756AB; Mon, 17 Aug 2020 14:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675311; 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=TSsMqdmMCMfkXupUFs34oZSkfx6BbapuB0jvch6famI=; b=NlCJl+AF1Qu+ZgarWk2jKFfWdXf5y7dAfBTyyY+o0xzqDuKv7tNqTkmBzZ9PT+KHz6kP/W 0IIognwtJGpg22DShMTiM4we9+0+HzMWFPt/7uMz9ALP2cII5NzOBbTDueatv5ZFPiW6FI k67ordDpMdpXuRsL7VQUjgKXzxGiB/o= X-MC-Unique: a8ieGbOiMaaHcdPqmBboHg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 118/150] meson: convert hw/display Date: Mon, 17 Aug 2020 16:40:21 +0200 Message-Id: <20200817144053.345107-23-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 03:34:42 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 | 84 ++++++++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 5 files changed, 86 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 3d5a2af4af..3534ece38a 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 26917a4e1b..6fce6a1473 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 d619594ad4..0000000000 --- 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 0000000000..78adaf9db4 --- /dev/null +++ b/hw/display/meson.build @@ -0,0 +1,84 @@ +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') + qxl_ss =3D ss.source_set() + qxl_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', '= qxl-render.c')) + hw_display_modules +=3D {'qxl': qxl_ss} +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(when: 'CONFIG_VIRTIO_GPU', + if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', '= virtio-gpu-3d.c'), pixman, 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_GPU', 'CONFIG_VIRTIO_PCI'], if_t= rue: 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. + + #hw_display_modules +=3D {'virtio-gpu': virtio_gpu_ss} + softmmu_ss.add_all(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 96da0bba7e..dacd26c561 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('display') subdir('dma') subdir('gpio') subdir('hyperv') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684117; cv=none; d=zohomail.com; s=zohoarc; b=C5gs+aAwNcgm40atwbXeYu9S+9Xs39C4/9S5sSo6fHj9aoBic++b6y81m0QHKv5kCd3XxdC0yojg++w/fDu3Dd1iJfSi+wjL6Tl7fLbdzbZG7i4ykVvKeNtEPZx+fPzuLbn7F+U2cAdcAtOyymPLuc+CXVl2QgIg7Q+OJlNAnO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684117; 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=HTuuY+vzPCumqamfPl3OyRF6+4QIU8lduY21tqFA/Tw=; b=c8QykbPi9Jlz3qpmUowSBOBdorHI5PEbcC8E4rPthgoOfrNnYg1ELTqUjnNu4diD2NXs9yx3FYcP1/D3Hmh3Y7trD2KfI5qi2KEnIYb3KYIZvszlTamV7Os4mBL5aam0CWQrtcaPpkSs6nB/Ye4NIQGEXKZGEDQxwr29DqIRQDM= 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 1597684117483703.2506389231539; Mon, 17 Aug 2020 10:08:37 -0700 (PDT) Received: from localhost ([::1]:46670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hBa-0004IL-BG for importer@patchew.org; Mon, 17 Aug 2020 11:36:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKf-00039u-UK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:54 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:50109 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 1k7gKe-0006rl-2D for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-145-14Qb9sJrNjy1xbpylWckiA-1; Mon, 17 Aug 2020 10:41:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5A33100CECC for ; Mon, 17 Aug 2020 14:41:48 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA458756AB; Mon, 17 Aug 2020 14:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675311; 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=HTuuY+vzPCumqamfPl3OyRF6+4QIU8lduY21tqFA/Tw=; b=WSvPgzrXb2HnVwCybcZLL9N+PgOterJTwJEKKVRgI9nkMc4yvrQlmZb2H2rPjSyrIYLaIM fQrMyS3d/aBc1O4XGnZ4haRmOQp0HYMTnwPuD/8L8Ie1Q3fkNV3ZBUcKcT9T2QnVGAuSj+ 4K2NnFLJ8QSHknktf4LYu+2J+R6K3T0= X-MC-Unique: 14Qb9sJrNjy1xbpylWckiA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 119/150] meson: convert hw/cpu Date: Mon, 17 Aug 2020 16:40:22 +0200 Message-Id: <20200817144053.345107-24-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 03:34:42 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 6fce6a1473..97ad30295e 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 8db9e8a7b3..0000000000 --- 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 0000000000..9e52fee9e7 --- /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 dacd26c561..103da4840b 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('cpu') subdir('display') subdir('dma') subdir('gpio') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684608; cv=none; d=zohomail.com; s=zohoarc; b=hUorKa7eXCpWXiwNdhZmP3m6TyaBe8c5QkYMyArskXLs1f1bHkoJ7IPQjemlC60yBloz2Lhiv80KfvA//zOXsg+NV1oqsQyEqos01wRA2dI4dGcfWM3kERTXtQhsxQFI1Y6xd/2cXugZJJ+AlkSfmRkmzPuY/KWLHaZodQqLZj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684608; 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=RNT/jS4WliFELB3Y4N1skk3//tCoNoB/v6xjsu+GKJM=; b=FL7WgOzX33gqwyXq8bzHM/x8gl/xNbNsOUvQZ2LoFDlbAjBLym1KmrBf3YFa8uSbiKDN7dJBzKVQsRFpzrpnDrtvLSUYlsRP5JlUpFqa73y4pqe4wpk6Entwy/KrBSWDOm8wrbgs+pBTRMXh9AIgLoJM9JCaVdSlbFpMphWZDVg= 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 1597684608331172.7920970648512; Mon, 17 Aug 2020 10:16:48 -0700 (PDT) Received: from localhost ([::1]:60722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h91-0006qO-Fq for importer@patchew.org; Mon, 17 Aug 2020 11:33:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKh-0003AQ-HW for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55662 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 1k7gKf-0006rt-3j for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-289-zDd1oy3cOjSJEhtjMbGZag-1; Mon, 17 Aug 2020 10:41:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4AC481F000 for ; Mon, 17 Aug 2020 14:41:49 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 005D570C3D; Mon, 17 Aug 2020 14:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675312; 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=RNT/jS4WliFELB3Y4N1skk3//tCoNoB/v6xjsu+GKJM=; b=KFIFHP0bP+ol43EqyBGjqZ+v+udDQzna28aVvPoTt8iCoVFP5biBFK11+J1I/tycTk+Kdf E0bDYgozm19I9pqMvU38zkv51fJEf8YIvDpHIZ3r6uegOxhj8KrgGCOHna+WJBZZqdBxm6 SlhaX9i+Q6d0ejPAKRnbo0gp/Hrq0iI= X-MC-Unique: zDd1oy3cOjSJEhtjMbGZag-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 120/150] meson: convert hw/char Date: Mon, 17 Aug 2020 16:40:23 +0200 Message-Id: <20200817144053.345107-25-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 00:24:04 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 97ad30295e..04cfb6ca6d 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 bf177ac41d..0000000000 --- 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 0000000000..e888215145 --- /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 103da4840b..dd0c77ec2b 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('char') subdir('core') subdir('cpu') subdir('display') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684931; cv=none; d=zohomail.com; s=zohoarc; b=JD9EsHhDFHRHZTpQUEsyeN7jfHrjugzzAQq99K7OFoT7Or2kll13haeMJT/SP7GDSDAZl0nsyDdnPfTOPs4U/+88WxP4d1v5H1hzB/Ge9XXaiqzq9zrE7Lpbh64J1CJYLm9nlks7WyPXXNV0Mgg21VWSGm9F8RW3LDKbKxrNBjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684931; 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=zeqJ/1Sm+Fvm29kxgyAv/NFi2pw/pN96WZxTtdD3hbU=; b=TGUPaT4cyTfOCwxfMB2jUFhu7pymzCCJ/G9Bn/iLm2ClYfIHDtiCJmiuATiB5hNWB+HpGf/VWdbCLM6YHjTBrY2RKV8DA9UV9OqDjo3Da/xSvPpVDKFJFlo0kVt+DB0Ktjl4iqlXrkhwSv6T+bgvQtLtFDsRIfAz7cVQ8jVMYCs= 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 1597684931084672.3641477745499; Mon, 17 Aug 2020 10:22:11 -0700 (PDT) Received: from localhost ([::1]:40272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h4r-0006dp-Ci for importer@patchew.org; Mon, 17 Aug 2020 11:29:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKj-0003Db-SJ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKi-0006sA-5J for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-295-GRymt9e9NtShPVcTfoVBqA-1; Mon, 17 Aug 2020 10:41:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED8C51DDE9 for ; Mon, 17 Aug 2020 14:41:52 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DC4670C3D; Mon, 17 Aug 2020 14:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675315; 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=zeqJ/1Sm+Fvm29kxgyAv/NFi2pw/pN96WZxTtdD3hbU=; b=WWx0T/Z/PYYAnz00/KpiljIcH86OPREwpmVcCPTWo1ffoOawIUWrTRXS/qinZWFQuPnS0x vdew/AwzNmZjkdYg21cf1ahcnKErsCIcAyPDylQ+NYWQvAjSTLZn7P+v4Df/s1fCdxyBji PPywHZPx4hAjkgO/vO/gc2YOnktiV0o= X-MC-Unique: GRymt9e9NtShPVcTfoVBqA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 121/150] meson: convert hw/block Date: Mon, 17 Aug 2020 16:40:24 +0200 Message-Id: <20200817144053.345107-26-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 02:47:08 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_H5=-1, 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/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 04cfb6ca6d..9068859ef0 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 8855c22656..0000000000 --- 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 0c5270268e..0000000000 --- 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 0000000000..12c6a264f1 --- /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 0000000000..78cad8f7cb --- /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 dd0c77ec2b..f968aa8374 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('block') subdir('char') subdir('core') subdir('cpu') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597682850; cv=none; d=zohomail.com; s=zohoarc; b=kw9F9k9fsw6vuY8I7nsaFew2pvokr1XkyPb3JMBskPwBm6eVTqnIX22tQNAtor0J6FO57R9So+eQGAGZGo4i+GZnjGrJ+DJZzAk0xfPsB368pST46L68toIuXf4bm1rLnPBUAelB+LE9Y/k22wtIfqYuL0Ir773xK9alKS64svg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682850; 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=GR2JAOoihvMbG8M0xyCavn1TY8P5bNTcVFUjDnvW2RU=; b=MSN4U0AVVFasA+K4zvxWkcjAy/icrTIF7mnyGjQldssBqjMPsKMfsoVtpRghHhOGzFQO1r7kCupnE9Grg0MMWswjsWBnFHd5tAZ8ehA5rSUe19g0+bdaBXxqzl4XzuvVQdb4n9PJCj+A8lG/XPwMOqqmQea1u1ZC7QfnlYoBGwU= 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 1597682850844322.247356266683; Mon, 17 Aug 2020 09:47:30 -0700 (PDT) Received: from localhost ([::1]:55118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hD9-0007gW-0k for importer@patchew.org; Mon, 17 Aug 2020 11:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKk-0003EJ-R6 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:29982 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 1k7gKj-0006sE-4x for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41: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-315-3bR2_RPFMSObNsAHDlrVxQ-1; Mon, 17 Aug 2020 10:41:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2727C1800D41 for ; Mon, 17 Aug 2020 14:41:54 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52BAD70C3E; Mon, 17 Aug 2020 14:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675316; 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=GR2JAOoihvMbG8M0xyCavn1TY8P5bNTcVFUjDnvW2RU=; b=AEOI1ML8AMkS/+bT6T0oBmQ/uKLlO0uutjD5DdsAZraF/Hf8Wt242R37L+b0z4fGvnR8Vv Tw7du7YSesCeKitA0Q+dHnN4QDIRrQ28EeqWPDhVo61UZ9VOQ/HqQ+mqfVR22TWSS2bCyt HJIIty5HQzjxujJ8A/G+o+BGOl8rtKA= X-MC-Unique: 3bR2_RPFMSObNsAHDlrVxQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 122/150] meson: convert hw/audio Date: Mon, 17 Aug 2020 16:40:25 +0200 Message-Id: <20200817144053.345107-27-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 00:24:04 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 9068859ef0..c0cbc0f132 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 63db383709..0000000000 --- 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 0000000000..549e9a0396 --- /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 f968aa8374..624335be90 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('audio') subdir('block') subdir('char') subdir('core') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597682950; cv=none; d=zohomail.com; s=zohoarc; b=DvzZf/09zVfkqg0KBHN9w5H2Fweyu523mZPmvFS5vI0CpcKZ5wSFf6IAqxkvDUEfqIxUCbfspNadzsS0P8ZoGadMilD1aFhn0yy7Wd1r01ehVe1B/XoSGj5FUg92MWcvJpx16nRD5+9TzeVhQmFuejelRsEmmbQ0Olpvp0ifNys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682950; 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=1NSbOfWCrI6b/KL5ZSnotqBYW9sbxsmW87Ogx2fpl+o=; b=TACd1i5lpfULS6X9mr2Gub1pPA+4rw/tICd1qlIuifo/lck6ljguBHkrc0VomEAktH1VxHblHvjdsxamojlXQJSuStMkO+UTEazb/IJHEXSEDhCfM+jhoIkBG1kl+Cmd1E4l4bBDioiOASFQ+lKQnyQGTRQqJHGGfS0jWCrl310= 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 1597682950200800.5888966102798; Mon, 17 Aug 2020 09:49:10 -0700 (PDT) Received: from localhost ([::1]:40860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hAY-0001rW-CB for importer@patchew.org; Mon, 17 Aug 2020 11:35:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKm-0003Fc-EH for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKk-0006sL-Sp for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-484-p3DW9mH1M5Wo1RbzhpfWVg-1; Mon, 17 Aug 2020 10:41:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 682C481F000 for ; Mon, 17 Aug 2020 14:41:55 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F2AA70C3D; Mon, 17 Aug 2020 14:41:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675317; 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=1NSbOfWCrI6b/KL5ZSnotqBYW9sbxsmW87Ogx2fpl+o=; b=IUXAYgmvrvPfN1Acv0jEeICM0x8nYE/heAJ2vxK2jEr9OrCfXBfOu+7U6/Q7Ovq7M+Pcv7 SVfnbKYLSzPQeQa7n8zzp5EGWY7wJfox4P8eyrDfwhjNSVjGcJ3qQEuCnW//6LFUFsQ7On nLmOJHuX4T6YvagYESZO8iYp1jtaJj0= X-MC-Unique: p3DW9mH1M5Wo1RbzhpfWVg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 123/150] meson: convert hw/adc Date: Mon, 17 Aug 2020 16:40:26 +0200 Message-Id: <20200817144053.345107-28-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 01:24:49 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 c0cbc0f132..4bdb674ef0 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 2b9dc36c7f..0000000000 --- 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 0000000000..0d62ae96ae --- /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 624335be90..ffa3f06dc0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('adc') subdir('audio') subdir('block') subdir('char') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597683098; cv=none; d=zohomail.com; s=zohoarc; b=E9FW/wS7A/ReNMvpIDMYRu2LEQEQa317qTb63CR1uRQGYsotMzl+yuey7QhdBT/83tPVm7oLDdZEv+QOkTKUg3H0EWdBo+eqQPsvFctjyajnFeYu1Fcm+MvnkqkRP0xY5SQGjcx1jglJdezoWbE7gwMHLHaU1nZXlTsl28c2E48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597683098; 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=rU4n9sn0xbo37T4jGj6ROAEzLR5VNUSmn/MPgqW3AxU=; b=QEDIJejVP2n/QpnVHwgqJyNitDnCaQjIv87Ohx1zrQTtQnQnnQS3FQqY7/ams0nI6un83ebJ2vx+/kJCJ3H1IEH+2bfg8KCcjqMv8dFPQpR2YUKTaBNEo1CrN1hGOem6dhyReCDCnN9FyBJDojcoigUbZ39c6Njt3HvGCJcnKt0= 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 1597683098563441.0759663360601; Mon, 17 Aug 2020 09:51:38 -0700 (PDT) Received: from localhost ([::1]:59886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h8t-0006WH-NA for importer@patchew.org; Mon, 17 Aug 2020 11:33:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKs-0003Ip-0Q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKq-0006td-5J for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-265-2WNNz0Q4PAWm6lWcZDTH0A-1; Mon, 17 Aug 2020 10:42:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7FCED81F000 for ; Mon, 17 Aug 2020 14:41:59 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7421756AB; Mon, 17 Aug 2020 14:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675323; 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=rU4n9sn0xbo37T4jGj6ROAEzLR5VNUSmn/MPgqW3AxU=; b=dhJqVg2rbXXahs0QDtmzVmmMyTmK4LL2ua0Mbyj3QpSyE+9e29O9pG/K6YDFIkMwYQpXYY lSLI5UZg+uKpb5kUp2nB+AHvQtl6+NWNrMwhNrma9ZA3l+lVtvWiVUJ1lnUDfUUVcc6GCd R7uZu+1Rv30Nzfz1AfZl6W1YWnQ11/Q= X-MC-Unique: 2WNNz0Q4PAWm6lWcZDTH0A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 124/150] meson: convert hw/acpi Date: Mon, 17 Aug 2020 16:40:27 +0200 Message-Id: <20200817144053.345107-29-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 02:47:08 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_H5=-1, 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 4bdb674ef0..ebae00af6e 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 72886c7965..0000000000 --- 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 0000000000..dd69577212 --- /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 ffa3f06dc0..55ca2b2b61 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('acpi') subdir('adc') subdir('audio') subdir('block') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597686259; cv=none; d=zohomail.com; s=zohoarc; b=dvNHBkQNtBuCN54sK3g02IeYJ0CCVadN4qkN6gQgzUQ1khWOs3vWohgqdSmdAbU9sy0QmGG9y3TBs8gNjNCzcmkTuBF50L8aZnMcyMP+jf9oEYA6X8Hh723aSvvIAm1TS2t3fbxufcgGqS3TKS4msKEakZ+BPjyci1pXC2nWtcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686259; 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=XxNDI70b3/0e7kXgirS50nvDaO0T9WjLPkIdXZfyNbk=; b=YA0CGTNrJvFUA3CSypz3WNGvrapJjJsEzeKvBfdo3xUBGtDLnZfhiHTzg10KnIGBMWf9NEbI5k2PRU6K8nZeDBy4hVbf4T6DSfI2cdxReanXRSOckEG5Ut3lbpc3mpn5IzZMqmK4axpueu1NLtdlbrqX++qQYVXawBy/t9xL7N0= 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 1597686259249158.34093448865258; Mon, 17 Aug 2020 10:44:19 -0700 (PDT) Received: from localhost ([::1]:49278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hC0-0005L3-7w for importer@patchew.org; Mon, 17 Aug 2020 11:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKt-0003Jv-87 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKq-0006tg-6Q for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:06 -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-329-ph1LIC1aOwyRb_phrFMyGw-1; Mon, 17 Aug 2020 10:42:01 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B93001DDE9 for ; Mon, 17 Aug 2020 14:42:00 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6EFC70C3D; Mon, 17 Aug 2020 14:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675323; 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=XxNDI70b3/0e7kXgirS50nvDaO0T9WjLPkIdXZfyNbk=; b=PbsM2vVFQKuGOFqdQoMg4ZWYZLEUkQ/y1bnh3P4TJYY7eTgrmuTy2o1l8Cl+GcTDmlJ/Yn dqOz/LRr9Myv8yezVbeN1zHBxRqIldi90dr1NiBCR5oQWGkdZ1sQO+dugDlMEJx6gomNnx L0Rr8SCIkicwgWLGmW0kgzqClBiuO0k= X-MC-Unique: ph1LIC1aOwyRb_phrFMyGw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 125/150] meson: convert hw/9pfs, cleanup Date: Mon, 17 Aug 2020 16:40:28 +0200 Message-Id: <20200817144053.345107-30-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 02:47:08 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_H5=-1, 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 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 a523898da0..99f8033cd2 100644 --- a/Makefile +++ b/Makefile @@ -167,10 +167,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 c332323b81..c9720a92df 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 3534ece38a..c95e0deb79 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 3ae5749661..d3ebd73730 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 70ded6fd8f..0000000000 --- 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 0000000000..cc09426212 --- /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 ebae00af6e..0000000000 --- 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 55ca2b2b61..ba8763cad8 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('9pfs') subdir('acpi') subdir('adc') subdir('audio') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597682886; cv=none; d=zohomail.com; s=zohoarc; b=inZsoejbA1mXNy3TLDAZ+sd+idmiNjsBNtDwfk6Y3el3yat40Hit0vdZrFgAc/hXeI3JL2TCBwWI2YnvWIwnrXT/nDXi+pwBbyam2CH8OXhZooYDAZBP6ZS6m/ENB210ljl66aDXyx4mrNri3ViA5itcOIKWRwXwbaenui5Qk2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682886; 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=3HjiQdlJVtCeJ7M/gDjAmecZt20qrsksV7h28neNqVg=; b=I5PfK1b2PPGujLdDL4r+EPNpp+T0Xkb/ABZ/7/fJLKw06jrQQ+GyI5s95wpkMWQSBnOO+ocQQcOa7Mv/TB3eqn/hXUlRQLUrjm2R5vE5fzjLw3tkixl2IRXZUT0BW/nMe2iwn5MXNViZ3cuc0qoyruiSeAoFV/3yFFINxYPGzC4= 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 1597682886277871.1807193505562; Mon, 17 Aug 2020 09:48:06 -0700 (PDT) Received: from localhost ([::1]:58118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hDf-0000U2-U3 for importer@patchew.org; Mon, 17 Aug 2020 11:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKz-0003MI-NS for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22910 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 1k7gKu-0006uA-DK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-564-MVsPm5joPUyB3SvN_zBB2w-1; Mon, 17 Aug 2020 10:42:03 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C7C781F00B for ; Mon, 17 Aug 2020 14:42:02 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 225C270C3D; Mon, 17 Aug 2020 14:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675326; 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=3HjiQdlJVtCeJ7M/gDjAmecZt20qrsksV7h28neNqVg=; b=A0njCiSrnRZJDYKpoeBhQC+Uts4Nq8ALOhsu7mYV3g4INDSwOuVmLjRsgUhnkfYOo03qTw s5SkIqgvMNT2ZKKiTn6KYzfkfVP8oZxMPLLeXB21phU3ZiFZbPd83wOozTAChdSPv+ZIOH vhxwgdPErdG58a2V5jDuwKkUJjPnPH4= X-MC-Unique: MVsPm5joPUyB3SvN_zBB2w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 126/150] meson: convert hw/arch* Date: Mon, 17 Aug 2020 16:40:29 +0200 Message-Id: <20200817144053.345107-31-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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 Each architecture's sourceset is placed in an hw_arch dictionary, and picke= d up from there when building the per-emulator static_library. 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 c95e0deb79..28cefba1de 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 62fdf3edec..0000000000 --- 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 0000000000..81ca215777 --- /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 534a6a119e..0000000000 --- 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 0000000000..1ae5e17eeb --- /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 4dca064bfc..0000000000 --- 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 0000000000..46d53fb17e --- /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 a4a27b3a13..0000000000 --- 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 0000000000..dc808a4e0f --- /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 eac3467d8a..0000000000 --- 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 0000000000..1deae83aee --- /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 6abc74551a..0000000000 --- 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 0c8d5f2dee..0000000000 --- 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 0000000000..95467f1ded --- /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 0000000000..63918fbe22 --- /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 be9d10cf2a..0000000000 --- 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 0000000000..be84130300 --- /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 c3941866c7..0000000000 --- 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 0000000000..8caf0a727f --- /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 b2c9e5ab12..0000000000 --- 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 0000000000..ca0044c652 --- /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 ba8763cad8..010de7219c 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 8595a62f6c..0000000000 --- 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 0000000000..bb9e4eb8f4 --- /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 739e2b7b40..0000000000 --- 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 0000000000..6ac9dc4cff --- /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 ddbf300f54..0000000000 --- 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 0000000000..05a7c2e00f --- /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 3e017981ba..0000000000 --- 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 0000000000..dd66ebb32f --- /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 aa04de7f5a..0000000000 --- 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 0000000000..57c42558e1 --- /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 c3d3cc56eb..0000000000 --- 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 0000000000..918969b320 --- /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 57cc708f5d..0000000000 --- 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 0000000000..2de8e5a2fe --- /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 4ef6b9e5b1..0000000000 --- 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 0000000000..d223512a78 --- /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 a46a1c7894..0000000000 --- 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 0000000000..b63782d87a --- /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 2a707f9473..0000000000 --- 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 0000000000..303c0f4287 --- /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 d57e33f83e..0000000000 --- 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 0000000000..19c442c90d --- /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 af0525c1a2..0000000000 --- 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 0000000000..58b5504651 --- /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 5501f6c1a8..0000000000 --- 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 0000000000..579aa13c78 --- /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 e0fd628523..0000000000 --- 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 0000000000..fc26d6bcab --- /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 8bfa4586ab..0000000000 --- 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 0000000000..40f911ac15 --- /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 2b40e1b60a..0000000000 --- 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 0000000000..1d5835df4b --- /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 260c0c659b..c7bdc4c83b 100644 --- a/meson.build +++ b/meson.build @@ -783,6 +783,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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686844; cv=none; d=zohomail.com; s=zohoarc; b=lva+n4jFWQTdycWBuj+MLw+qM4Wr0/8kdD2fKmBanTC4tn6lUTJYqbmv8bW98W3VRY6OlTFbyIbFgW7BvXllYkuvhFgJGhokdaW3S9gDwmmb6gq0dLR1Bf8+zrzIRkTzb54bIf1XvIvX5RQFyalxLmc1ZmDmhvwjUEO+9fmjpGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686844; 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=SZi/aq/B3dQ4Z5KOSf9JsU90C2X4Bk53Q/d7Zn/N4H0=; b=n/nu2Tu7HYql/AxrfGCSVq5dr8aUxrCxmzIcS7B5WcqPRxdtc2uF7id7IYOqmH+Drk2pil0DZqxFodMiZqLM8au6eBA757hV3hxaDRgEJ4QK3YVbJQlFhLzYvlnUm21OQf3L1/S3RISTA8dtEgvSPxj6xM/w1+pEkdac1Bs3+YQ= 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 1597686844456342.7041167880059; Mon, 17 Aug 2020 10:54:04 -0700 (PDT) Received: from localhost ([::1]:40468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hAV-0001hk-M4 for importer@patchew.org; Mon, 17 Aug 2020 11:35:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL1-0003ON-Ov for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:15 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gKw-0006uM-2U for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-16-Y_f43wdHP0uz958-AG7Kxg-1; Mon, 17 Aug 2020 10:42:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97F8981F000 for ; Mon, 17 Aug 2020 14:42:05 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A185070C3D; Mon, 17 Aug 2020 14:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675329; 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=SZi/aq/B3dQ4Z5KOSf9JsU90C2X4Bk53Q/d7Zn/N4H0=; b=AqU8Ao0gMU98MQB54ykMPvumzWf10OEjAgiB07K6dE6H/ZM8g88R0TNzEbHFi6ZYn2X7Gy 71fuCeeaVINpcSR4jHMRpCd7GhSCjLlzIk9btXwIOwfYpVWEgbYH1rDscL0nAp52e8v61j z1LzUsTD1Gzsqmzh1nkJwO7ISx5jFCI= X-MC-Unique: Y_f43wdHP0uz958-AG7Kxg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 127/150] meson: target Date: Mon, 17 Aug 2020 16:40:30 +0200 Message-Id: <20200817144053.345107-32-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:03:47 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) Similar to hw_arch, each architecture defines two sourceset which are place= d in dictionaries target_arch and target_softmmu_arch. These are then picked up from there when building the per-emulator static_library. 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 28cefba1de..1ab8773402 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 d81db0443a..0000000000 --- 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 0000000000..4d04139af4 --- /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 c7bdc4c83b..b14b1c9efb 100644 --- a/meson.build +++ b/meson.build @@ -643,10 +643,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 @@ -783,6 +788,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() @@ -803,6 +811,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 694757b6c2..4cd1e10904 --- 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 63664629f6..0000000000 --- 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 0000000000..1aec55abb4 --- /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 4a177ad914..0000000000 --- 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 0000000000..bd46cdb523 --- /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: files('kvm64.c'), if_false: fi= les('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 81d9bcd1ba..0000000000 --- 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 c45ab2cb14..5e20cbb517 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 0000000000..7e8e29c59d --- /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 8deb126be5..ad5706ac43 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 7779227fc4..0000000000 --- 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 0000000000..67c3793c85 --- /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 40dcb86ad0..0000000000 --- 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 0000000000..8a7ff82efc --- /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 31e292630c..4869999316 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 0b93143e27..0000000000 --- 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 927b86bc67..0000000000 --- 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 0000000000..c8a43717ee --- /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 0000000000..e0b71ade56 --- /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 c3e1bd6bd6..0000000000 --- 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 0000000000..ef0eef07f1 --- /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 ac61948676..0000000000 --- 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 0000000000..05cd9fbd1e --- /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 e29dd3e01f..9f0ae93b75 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 f3d7b44c89..0000000000 --- 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 0000000000..b8fe4afe61 --- /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 b820b3b7bc..0000000000 --- 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 0000000000..fa1f024e78 --- /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 6381d4d636..0000000000 --- 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 0000000000..b4beb528cc --- /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 010de0e7a6..0000000000 --- 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 0000000000..e643917db1 --- /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 0f2fcff6af..0000000000 --- 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 3f753164ed..d5e0a4396c 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 0000000000..9774a58306 --- /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 a119be2fc7..ffd268dd97 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 e8fa18ce13..0000000000 --- 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 0000000000..bbfef90e08 --- /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 1a66d8a859..0000000000 --- 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 0000000000..abd647fea1 --- /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 aa7f56d77b..9be49c4fc7 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 eddc62a61b..0000000000 --- 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 6450892051..6584509152 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 0000000000..8de0ad49b9 --- /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 272619cced..d688c9d1c2 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 9b9accc5fd..0000000000 --- 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 ddf8d20a36..27d248ef6e 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 2c25d96e65..0000000000 --- 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 0000000000..56a57576da --- /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 ec905698c5..0000000000 --- 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 0000000000..a3638b9503 --- /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 0db778f407..0000000000 --- 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 0000000000..678590439c --- /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 281b55f08d..0000000000 --- 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 0000000000..0ccc829517 --- /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 35d8bf530d..0000000000 --- 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 0000000000..0fa78772eb --- /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 c7e7fe6063..0000000000 --- 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 0000000000..27e453e1d1 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597687298; cv=none; d=zohomail.com; s=zohoarc; b=YHBwbJpRdBT4d2I2pZnhih+XtXhrMbmY9CagWmoxg7tGPHlSEftJTyPGntJH+KW1LdWG9/4Lhhh7F75ilu7b9zxcCBH6RuEFfTh+UEuu+XAr8Rk6ndjK/y1OFAisu+F0doF2VkA4JVcE3qA4d+5j1dsJ05HCznjvw7b1PaqX16o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687298; 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=2SK54a16DA68q6T/I9wzGpsv/gBJyipwwF1tkZV2snU=; b=fVw01fBY7AzUzVlwUbt1xoXzETtSpYUtILV0sZnELSH2dsDDjS4250kCxGBO1B4ofv5Fj9JGx0pyWmR8mO+/6kvoH46qsyF2P67+lbMV6VAk/k2ujc0Yw5DzculWau02XqDNssaLajPj/FQKpQfjV10K4czYEZtSL4skkTEse80= 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 1597687298046141.42445534044828; Mon, 17 Aug 2020 11:01:38 -0700 (PDT) Received: from localhost ([::1]:38738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hFu-00049L-5X for importer@patchew.org; Mon, 17 Aug 2020 11:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL3-0003Q2-D9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:18 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:55765 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 1k7gKw-0006uT-FX for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-427-3DyXFQoiMNKOXLeLCSV17Q-1; Mon, 17 Aug 2020 10:42:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C23FE1DDEF for ; Mon, 17 Aug 2020 14:42:06 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0666570C3D; Mon, 17 Aug 2020 14:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675329; 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=2SK54a16DA68q6T/I9wzGpsv/gBJyipwwF1tkZV2snU=; b=SorUBNUajqD9yYDqUqFC8qNk9ExO6uvKWaOYi4zU8NrK+F4DJzbcuQwiWCfZhoWs95/Rru QONNY2HvHQZXd1XSSyoxJSSh5t3UJWmWg3nBxnAPH1vBj8BOwRUCnWp/EAr+zSDFsuk56R Cp4qZoHD59LqVIWLD09pN48meBuevqc= X-MC-Unique: 3DyXFQoiMNKOXLeLCSV17Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 128/150] meson: accel Date: Mon, 17 Aug 2020 16:40:31 +0200 Message-Id: <20200817144053.345107-33-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 03:34:42 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 - 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 c9720a92df..83622c58a5 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 1ab8773402..8633e2b9fe 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 ff72f0d030..0000000000 --- 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 fdfa481578..0000000000 --- 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 0000000000..4db2388e2f --- /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 0000000000..26c503e480 --- /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 bbd14e71fb..0000000000 --- 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 0000000000..314e3cfff4 --- /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 a92f2c454b..0000000000 --- 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 0000000000..2a335b50f2 --- /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 7482cfb436..0000000000 --- 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 0000000000..002bdb03c6 --- /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 b14b1c9efb..6bb9841c54 100644 --- a/meson.build +++ b/meson.build @@ -700,6 +700,7 @@ subdir('monitor') subdir('net') subdir('replay') subdir('hw') +subdir('accel') =20 # needed for fuzzing binaries subdir('tests/qtest/libqos') --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597684196; cv=none; d=zohomail.com; s=zohoarc; b=l5Nu3CUzhI5Ns8kBJGSgo5FAn6JrmHT6HqE8BvDidNEVWbHM/0UaEMOqFykG7O3cTuA1ROIxBNhPGRoH8feE9WNwSCwo6Xy/vbmKGVR8IPGMQZV0sbW8UBJxotAdDhSqjz0R09dl/ujhlCWByTb104GLCUNCE22JQJnnQ3iH9x8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684196; 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=+15rDHAql91fw6pzTyHitSyec/0zmVdmrBoFrR2ZFcw=; b=PuY+2KiuBzj+aHZycrpg91xaiyPncoqBU7PRirzK4/IjyZq53QmbhkRDfQelOV2h6NFYlXghH0PmGyHL6JBo6SlJepjPNHWdonOycADNgN4cU9qaFItuwMgv4IpBFXvnPoQepyQYvwOGkjT+VUPjF5aBkCknCZDDVcMMj8m47ZU= 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 1597684196655605.9753072044905; Mon, 17 Aug 2020 10:09:56 -0700 (PDT) Received: from localhost ([::1]:49550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hC3-0005Rn-Ul for importer@patchew.org; Mon, 17 Aug 2020 11:37:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL5-0003SH-31 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:19 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58190 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 1k7gKz-0006uu-AN for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-471-wCGJf5lmM2OPH5xSW0BQog-1; Mon, 17 Aug 2020 10:42:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06AF981F000 for ; Mon, 17 Aug 2020 14:42:08 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C77C756AB; Mon, 17 Aug 2020 14:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675332; 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=+15rDHAql91fw6pzTyHitSyec/0zmVdmrBoFrR2ZFcw=; b=L+Dz1gGtLwStPV+Dy+pj8pqPxXVhJOIXmapd3FzxqonBJn3Q16SCczygD+Hqnm4mgNUNfG RP0VrzP283I7XUO9o6xFl06Ygsi3R5E78CnR7IP9IgUvWJPmKPUS+hXdBQonTVJusVLZ+m +1vlQZvuJEIIjvzHTE5GO7hL4RWXY70= X-MC-Unique: wCGJf5lmM2OPH5xSW0BQog-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 129/150] meson: linux-user Date: Mon, 17 Aug 2020 16:40:32 +0200 Message-Id: <20200817144053.345107-34-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 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/17 00:24:04 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 The most interesting or most complicated part here is the syscall_nr.h generators. In order to keep the generation logic all in meson.build, I am adding to config_target the name of the .tbl file, and making the generated file syscall_nr.h for input file syscall.tbl. For architectures where the input file is not named syscall_nr.tbl, syscall_nr.h has to be a source file; it's just a forwarder for x86 (i386/x86_64), while for MIPS64 it chooses between N32 and N64 ABIs. 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 8633e2b9fe..a68859d7c2 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 6a964de121..82dbdd50e3 100755 --- a/configure +++ b/configure @@ -1943,20 +1943,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" @@ -7950,18 +7936,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" @@ -8009,6 +7999,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" @@ -8017,6 +8008,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" @@ -8024,6 +8016,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) ;; @@ -8122,6 +8115,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 @@ -8142,6 +8138,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 1940910a73..0000000000 --- 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 d6397a70ab..0000000000 --- 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 0000000000..a3cd22d2c4 --- /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 c7eb94dcba..0000000000 --- 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 0000000000..432984b58e --- /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 51b0c32c2a..0000000000 --- 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 0000000000..1c27e55f2a --- /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 f8368be6f3..0000000000 --- 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 0000000000..4709508a09 --- /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 c25cf17bfb..0000000000 --- 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 0000000000..ee523019a5 --- /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 0000000000..976caab67f --- /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 961bd05c23..0000000000 --- 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 0000000000..c0f436fe50 --- /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 0000000000..2b94e4ba24 --- /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 bb8b318dda..0000000000 --- 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 0000000000..f749d89418 --- /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 9be4de07d9..0000000000 --- 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 0000000000..6066a50579 --- /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 0000000000..45d133c6f9 --- /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 573448f956..0000000000 --- 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 0000000000..0caab5fabd --- /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 0000000000..672f2fa51c --- /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 be92e67eb1..0000000000 --- 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 0000000000..19fead7bc8 --- /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 f30f1625cc..0000000000 --- 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 0000000000..0781ccea1d --- /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 83fc939570..0000000000 --- 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 0000000000..3bc3a6924a --- /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 29d3f066cb..0000000000 --- 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 0000000000..51a9c7795c --- /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 afcd535bc4..0000000000 --- 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 0000000000..9527a40ed4 --- /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 2cef1d48be..0000000000 --- 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 0000000000..203af9a60c --- /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 0000000000..760302cb3e --- /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 d4be1b7455..0000000000 --- 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 0000000000..de77f3b66a --- /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 6bb9841c54..edb981699d 100644 --- a/meson.build +++ b/meson.build @@ -701,6 +701,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') @@ -798,6 +802,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 @@ -808,8 +813,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 2.26.2 From nobody Fri May 10 21:52:11 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=1597687086; cv=none; d=zohomail.com; s=zohoarc; b=jyO8svb5XrpUVsgOqXGPuFSlQ14iqsU9IQv8FRYlawun79mbTZyGlillPoeW7UzHR0uYCalmzB5W0RMuQw9tYt2efRnuuD02WgHl4QA1QtZAa6PkFi5AssidCFzX8hIRoibhU4OWWNBIsCVNnEey2yyofnmHj+iqIpj6oerdgRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687086; 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=LUDrUqyo3AjXYCoO1iHgGJHDWckggrdI65rQfMWBGLk=; b=V58aHUPmjuubyBmjxEezAxqDJMAgOOxTtJiQxFiKW15ha6D4XWDBivd3zUSj/Bk6M6vYMf6SNA9tXQtXJTuXcroq4weIycKntBcYQNIpp9tRhG6dBptNYfhfIXVNgrOj+9v6hkwb23SBODkobQ90IPzZTy8yJcO4tZoCeCSzLVc= 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 1597687086247848.244336175265; Mon, 17 Aug 2020 10:58:06 -0700 (PDT) Received: from localhost ([::1]:58186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hDe-0000Vj-If for importer@patchew.org; Mon, 17 Aug 2020 11:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL6-0003Ss-JX for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46244 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 1k7gKz-0006uq-AE for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-334-bL3wpj5DMcG6HmlTzl4s_Q-1; Mon, 17 Aug 2020 10:42:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D787801AB0 for ; Mon, 17 Aug 2020 14:42:09 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C31C756AB; Mon, 17 Aug 2020 14:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675332; 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=LUDrUqyo3AjXYCoO1iHgGJHDWckggrdI65rQfMWBGLk=; b=BzzI3FbXNbMWPRYVzc8pw963KZ3tNfGGmyb7wovzWE0VrhLv33UkcFZrPCZhBRjUShrUZB V1/NrIG/HPQwKVO96JDUJNwO0RuFOVMMIg0GyfMZH9e/A4l55pVZswbt9JsKONskq2ThZL gBlsY4bCdPLTkWRJZy4uvk6hd99oNns= X-MC-Unique: bL3wpj5DMcG6HmlTzl4s_Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 130/150] meson: bsd-user Date: Mon, 17 Aug 2020 16:40:33 +0200 Message-Id: <20200817144053.345107-35-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:13:21 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 a68859d7c2..5c099fa79f 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 5e77f57782..0000000000 --- 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 0000000000..0369549340 --- /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 edb981699d..10e06acff0 100644 --- a/meson.build +++ b/meson.build @@ -701,8 +701,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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686594; cv=none; d=zohomail.com; s=zohoarc; b=f5fEqSE27cHUggQYZsD53cIFQ8gtTn45I+bWuBDhOYtSwhaVs76l5RsmdRvKSOI/ONePEaLIlNt4y+LSXGea/RCEqXtr39keBYNKDlb0D9dKMvlz7AmNi1mG5NFNkf0911YN+45Flp8Ifn/GN2953+DBwJvcCCw3T7AmzZE2F+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686594; 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=Dg2JWI65NOsNjS/YwjpdPhY7QCsZlisOKNHsoupPru8=; b=j5x54cTMSk7WllS3do7+oufKLbuW777DBQzcLn3tanC6NDfarqUCLfedxsZsQd87Zg0fzqz6o//dcMnn5yYPhayZ8mPfa97kD6UU5Y5/rwxhcY5sWEg7vvP2txV49xNgXwsRYf3KAuvKAyL9B4rxmAa80UuSG/u1BFAIXqbhUwI= 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 15976865945911002.5758401154293; Mon, 17 Aug 2020 10:49:54 -0700 (PDT) Received: from localhost ([::1]:43916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hGs-0006IP-Ee for importer@patchew.org; Mon, 17 Aug 2020 11:42:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL9-0003Wz-2s for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46757 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 1k7gL1-0006v2-D0 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-52-RlY2frIWMpyFOYNKvx8AVw-1; Mon, 17 Aug 2020 10:42:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7565381F000 for ; Mon, 17 Aug 2020 14:42:10 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C15E70C3D; Mon, 17 Aug 2020 14:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675333; 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=Dg2JWI65NOsNjS/YwjpdPhY7QCsZlisOKNHsoupPru8=; b=ejavc9jOWD0/J6kRKtA23vIdJz0pJH7LAJq3yPPUsQeYc+zN5MuNQD7rBED0l7bqm0VlNQ FWwhQc++AbX8MUOTRcmJ0gym1Dgei+jXJ5BPDux6kCVI45pX7+NADbvUOeM4l4HW4IKiy2 wCGhH6Fk3BIZcOawC75M1OFL3aENrW8= X-MC-Unique: RlY2frIWMpyFOYNKvx8AVw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 131/150] meson: cpu-emu Date: Mon, 17 Aug 2020 16:40:34 +0200 Message-Id: <20200817144053.345107-36-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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 | 12 ------------ configure | 10 +++++++++- meson.build | 37 +++++++++++++++++++++++++++++++++++++ scripts/feature_to_c.sh | 24 ++++++++---------------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/Makefile.target b/Makefile.target index 5c099fa79f..c180b4cb38 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 82dbdd50e3..1da66ee537 100755 --- a/configure +++ b/configure @@ -5429,9 +5429,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" ;; @@ -7663,6 +7667,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 @@ -7683,6 +7689,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 @@ -8181,7 +8189,7 @@ fi list=3D"" if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do - list=3D"$list $source_path/gdb-xml/$x" + list=3D"$list gdb-xml/$x" done echo "TARGET_XML_FILES=3D$list" >> $config_target_mak fi diff --git a/meson.build b/meson.build index 10e06acff0..2cfc183e92 100644 --- a/meson.build +++ b/meson.build @@ -341,6 +341,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') @@ -525,6 +535,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', @@ -693,6 +705,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') @@ -784,6 +810,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'] @@ -830,6 +858,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 c8ce9b88f6..b1169899c1 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684838; cv=none; d=zohomail.com; s=zohoarc; b=XgRuS/XQVnylwGWmXH4VUqP6UR3jbYius4F1vd3foVpFKCxKqOiPTTTj1sEow6MZtsOPW67R6jgyBFw5mjzaDLlZHkWdRPAuINgR5rHBClRTEt1XR3ULsQG7acbFndJTu9eH58mYGmqWCODpPBKZOQ6lWHtjWMtwSlok5NdUYaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684838; 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=o9bqyEisiOKzxcKPHKhjm9V1D8IK3VZjPQlCud+/rQY=; b=N+8Ua5tPxFwcI5IA2yv8Vf+XU7nFgyFkKRe8HuotTkmVxsv0jFfsF9Cq8jnIdNSaERu9/jaZNs//21hwiw5NtgRT27TkR9L8ii/vQpcx7ouxr78RRdtfB6vRj+DYzUxethyuGW/PB84n1ZF6QRuSJFLSy9eZ6xRaDmn6epGDCrA= 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 1597684838727674.9457146592422; Mon, 17 Aug 2020 10:20:38 -0700 (PDT) Received: from localhost ([::1]:35370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hF6-0002iZ-T6 for importer@patchew.org; Mon, 17 Aug 2020 11:40:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL8-0003WD-1Y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:22 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:25937 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 1k7gL1-0006v7-Fy for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:21 -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-529-E2uUcnQ9NDymreVLErDa8w-1; Mon, 17 Aug 2020 10:42:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C3F11800D41 for ; Mon, 17 Aug 2020 14:42:11 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id D43B770C3D for ; Mon, 17 Aug 2020 14:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675334; 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=o9bqyEisiOKzxcKPHKhjm9V1D8IK3VZjPQlCud+/rQY=; b=Im4z7Qo/2qDInmE669aeZSu22vAcXHuCFdFvleINNzHrBvD/WReNNTx6w5fWQWnMrdjjWS FqiAECCuyy7XpzpBDvVZrTbD8ZhvE1qJZ2NRWbrwq9knVGRrRLz7z4VSyPtBdM3k9cwO+T /mjoDNrvZq2lIhBC3h44C+odDy2z5s4= X-MC-Unique: E2uUcnQ9NDymreVLErDa8w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 132/150] meson: plugins Date: Mon, 17 Aug 2020 16:40:35 +0200 Message-Id: <20200817144053.345107-37-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 03:34:42 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-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 99f8033cd2..c26a713f82 100644 --- a/Makefile +++ b/Makefile @@ -422,13 +422,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) @@ -454,9 +451,6 @@ endif "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" 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 \ diff --git a/Makefile.target b/Makefile.target index c180b4cb38..2b7280b272 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 2cfc183e92..e86e672698 100644 --- a/meson.build +++ b/meson.build @@ -727,6 +727,7 @@ subdir('net') subdir('replay') subdir('hw') subdir('accel') +subdir('plugins') subdir('bsd-user') subdir('linux-user') =20 @@ -895,6 +896,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 6f14d91ccb..0000000000 --- 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 0000000000..9608e5293f --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684996; cv=none; d=zohomail.com; s=zohoarc; b=ZS27hKaUl4chaXRLPf2i0g/OEShQ0ACD/Wrm8v6d6R8/XI1qdnU8yZmdmk8SInRWY9cBp1X9rHciG79fHgzm31YOM8rN6LZtD9RKIcHMQFIGXufxupL0WpKwGnQu2WVljiRJv462nobBOR/kuq4lXYai3mTbD64IiUPgV9xDLQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684996; 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=BT8+12qQf4wJPOVVu7xpcZiWhcJON2kMBmS0ppQxqWg=; b=PJ27xPzU5cTmBvoEHVdVw9lwo0A6sTezOeKEAN7MAP52jJZ97Tm50ZIGby0yaJ8Pu6spnsR29NLtvOPmgRZ+tqpv8MA7nZHwWthgxwGNUj5yvnxo+aSV7fSzANMdhJs04oywaCks7/S+rP5w3EcLFa3DBS3HNFiR7g/EIv4X0cg= 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 1597684996819207.9930517388343; Mon, 17 Aug 2020 10:23:16 -0700 (PDT) Received: from localhost ([::1]:49112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h6n-0001zY-Jm for importer@patchew.org; Mon, 17 Aug 2020 11:31:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLC-0003c9-Aa for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:26 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60547 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 1k7gL3-0006vJ-2O for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-519--8W4Sm0VN-uVV_jpMS5zww-1; Mon, 17 Aug 2020 10:42:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E63F081F000 for ; Mon, 17 Aug 2020 14:42:12 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA0FD756AC; Mon, 17 Aug 2020 14:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675336; 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=BT8+12qQf4wJPOVVu7xpcZiWhcJON2kMBmS0ppQxqWg=; b=GTDvkBFn411Q06wcMcSsatN6illee7B0IPNdwEYyrPCwlspHzL+YXETzGe3+gsf92HI2+T L/tzdoQ6huTaW3saKcLrGpoQFV76leXH5eld0gDYqvF2GYeSPtce1ADYMRARHNf2GnEAG6 O1us4SCq3wPdZou74RMCJX60MwQD7bc= X-MC-Unique: -8W4Sm0VN-uVV_jpMS5zww-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 133/150] meson: link emulators without Makefile.target Date: Mon, 17 Aug 2020 16:40:36 +0200 Message-Id: <20200817144053.345107-38-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 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/17 03:34:42 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) The binaries move to the root directory, e.g. qemu-system-i386 or qemu-arm. This requires changes to qtests, CI, etc. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- .gitlab-ci.yml | 6 +- Makefile | 35 +---- Makefile.objs | 32 ----- Makefile.target | 153 +--------------------- configure | 41 +----- 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 - target/s390x/meson.build | 13 ++ 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 +- 31 files changed, 180 insertions(+), 340 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 9820066379..b7967b9a13 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 c26a713f82..9c8fb91f45 100644 --- a/Makefile +++ b/Makefile @@ -110,9 +110,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 @@ -176,29 +173,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 @@ -241,11 +215,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))) @@ -267,8 +237,6 @@ Makefile: $(version-obj-y) =20 ###################################################################### =20 -COMMON_LDADDS =3D libqemuutil.a - clean: recurse-clean ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files @@ -302,6 +270,7 @@ distclean: clean ninja-distclean 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 + rm -f *-config-target.h *-config-devices.mak *-config-devices.h rm -rf meson-private meson-logs meson-info compile_commands.json rm -f Makefile.ninja ninjatool ninjatool.stamp Makefile.mtest rm -f config.log diff --git a/Makefile.objs b/Makefile.objs index 83622c58a5..5295c3a623 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -33,38 +33,6 @@ io-obj-y =3D io/libio.fa =20 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 2b7280b272..8ee4c78b3f 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 1da66ee537..94e458f4be 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"" @@ -5428,7 +5427,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" ;; @@ -5437,7 +5435,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) @@ -6354,7 +6351,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 @@ -6866,7 +6866,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 @@ -7731,14 +7730,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 @@ -7853,8 +7845,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 @@ -8204,9 +8194,6 @@ fi =20 # generate QEMU_CFLAGS/QEMU_LDFLAGS for targets =20 -cflags=3D"" -ldflags=3D"" - disas_config() { echo "CONFIG_${1}_DIS=3Dy" >> $config_target_mak echo "CONFIG_${1}_DIS=3Dy" >> config-all-disas.mak @@ -8291,24 +8278,6 @@ if test "$tcg_interpreter" =3D "yes" ; then disas_config "TCI" fi =20 -# Newer kernels on s390 check for an S390_PGSTE program header and -# enable the pgste page table extensions in that case. This makes -# the vm.allocate_pgste sysctl unnecessary. We enable this program -# header if -# - we build on s390x -# - we build the system emulation for s390x (qemu-system-s390x) -# - KVM is enabled -# - the linker supports --s390-pgste -if test "$TARGET_ARCH" =3D "s390x" && test "$target_softmmu" =3D "yes" && \ - test "$ARCH" =3D "s390x" && test "$kvm" =3D "yes"; then - if ld_has --s390-pgste ; then - ldflags=3D"-Wl,--s390-pgste $ldflags" - fi -fi - -echo "QEMU_LDFLAGS+=3D$ldflags" >> $config_target_mak -echo "QEMU_CFLAGS+=3D$cflags" >> $config_target_mak - done # for target in $targets =20 echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_host_mak diff --git a/docs/devel/blkverify.txt b/docs/devel/blkverify.txt index d556dc4e6d..aca826c51c 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 a4264691be..196e3bc35e 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 48afdc7927..e13f5a21f8 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 e86e672698..6de00f8bb4 100644 --- a/meson.build +++ b/meson.build @@ -211,10 +211,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 @@ -525,6 +527,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 {} @@ -739,6 +742,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 block_mods =3D [] softmmu_mods =3D [] @@ -801,7 +805,10 @@ foreach m : block_mods + softmmu_mods install_dir: config_host['qemu_moddir']) endforeach =20 -common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) +softmmu_ss.add(authz, block, chardev, crypto, io, qmp) +common_ss.add(qom, qemuutil) + +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) @@ -813,11 +820,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 ['-DNEED_CPU_H', + '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(target), + '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(target)] + link_args =3D [] =20 target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] if host_machine.system() =3D=3D 'linux' @@ -828,12 +841,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' @@ -870,9 +886,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', @@ -883,15 +901,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 3572db3f44..8334193363 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 9608e5293f..e77723010e 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 8285fe529a..6488dc3dc6 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 305d0427af..866baf7058 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 52430cb620..f0b7442c96 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 ec74d8a9fa..0000000000 --- a/softmmu/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -softmmu-main-y =3D softmmu/main.o -main.o-cflags :=3D $(SDL_CFLAGS) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 27d248ef6e..d2a3315903 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -45,5 +45,18 @@ s390x_softmmu_ss.add(files( 'sigp.c', )) =20 +# Newer kernels on s390 check for an S390_PGSTE program header and +# enable the pgste page table extensions in that case. This makes +# the vm.allocate_pgste sysctl unnecessary. We enable this program +# header if +# - we build on s390x +# - we build the system emulation for s390x (qemu-system-s390x) +# - KVM is enabled +# - the linker supports --s390-pgste +if host_machine.cpu_family() =3D=3D 's390x' and cc.has_link_argument('-Wl,= --s390-pgste') + s390x_softmmu_ss.add(when: 'CONFIG_KVM', + if_true: declare_dependency(link_args: ['-Wl,--s390= -pgste'])) +endif + target_arch +=3D {'s390x': s390x_ss} target_softmmu_arch +=3D {'s390x': s390x_softmmu_ss} diff --git a/tests/Makefile.include b/tests/Makefile.include index b6d96614cb..c3874cafd2 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 77d1c1d9ff..db9c0f5d79 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 76cd797d1e..fc78770544 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 98df91e6af..f968bf797e 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 0657f7286c..3ab859ac1a 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 5bde793bf2..0000000000 --- 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 f45373f5d3..86796bff2b 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 0000000000..bb0a3f271d --- /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 713c830cdb..0580f8df86 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 277a9e2b64..0e873ab8e2 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 3a9ea13736..6ff6fabe4a 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 10543269ce..5f63d352ca 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 30cb88d919..8f8fdb1336 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 a7e83e7d40..16751dbd2f 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 102578caa5..7d714f902a 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597682817; cv=none; d=zohomail.com; s=zohoarc; b=BkiVqrOFgKPmaNO1ZpS4eRR80NNTy7AbdU7AeMwnh4qDjkBtyCth5HOuwV8BME4I2K1/lhW2YH2ydpsXUcE9v36dzvniiR1WI27y9EEqHNPSYMK1B8i4bItzyprypivdRhBCO2Np2KJhVUFjYoonzLEQLHcT5F++BelSJPqJjh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682817; 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=m8OPr1IUKjF4E7SxoUkhaUiHYxXfCi0JBVqyrkbF8co=; b=aLTtLwWhq8pSrHcNLiOQ3Mki4Asd270PMiWssXuMs2/fjm4MXGmFgHtBf0lM9F2Ww5emKohlni6f0Mddmo9NW34atVV5tlbNbCZORsJfWt7cxXZ+PsiF+xzm1L9RddjKZFZeYIwTFkB1TpdregSLKgmtWKv+3VRVLGAf+0n/otI= 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 1597682817441266.40891340354403; Mon, 17 Aug 2020 09:46:57 -0700 (PDT) Received: from localhost ([::1]:50656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hI4-0000fF-Qg for importer@patchew.org; Mon, 17 Aug 2020 11:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLA-0003YM-TK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44836 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 1k7gL4-0006vV-OF for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-64-Z8szQ8HAOfKJHh_0CpnJVA-1; Mon, 17 Aug 2020 10:42:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D085100CEC3 for ; Mon, 17 Aug 2020 14:42:14 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FB3E756B6; Mon, 17 Aug 2020 14:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675337; 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=m8OPr1IUKjF4E7SxoUkhaUiHYxXfCi0JBVqyrkbF8co=; b=SbcBO0kCEZyk+1gdbMcJeZfTPrK75E4dV7g7cJK9faLtZxWj64Sp1fWL67a8ra7aqSsNiL OxfifXZL431zxZAMvVP19gE86nM+jqR9psONt82BxXRaRYPn9VbrEpr3iWcfavb+Kb7ZHP zJfgDfCNRhPj0UQfgLYkPP5RhMVQJ/c= X-MC-Unique: Z8szQ8HAOfKJHh_0CpnJVA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 134/150] meson: convert systemtap files Date: Mon, 17 Aug 2020 16:40:37 +0200 Message-Id: <20200817144053.345107-39-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 05:13:21 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 | 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 8ee4c78b3f..a07149c0a6 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 6de00f8bb4..8ff7aada2c 100644 --- a/meson.build +++ b/meson.build @@ -819,6 +819,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 @@ -954,6 +955,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 6488dc3dc6..b983c7f83f 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 9c3c128164..56e870848e 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684210; cv=none; d=zohomail.com; s=zohoarc; b=il6SBU1OSgYe5oc2CtuYwJVJvoV4Tin5kDL7OVGnxuTrYrunkkD95Gvb5TPjyLB/GEfbyWQIGYMviSOprQ7XMFKgPr97wG2YXpqGV5sJxfOW7hQvMDxjE5Bvcr9XGvzyxbWywB9w7tduAI865psvuelRt3McUoomVOdGTaLd/X8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684210; 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=wT3++EskC3IekWaJAeSwmjipHmASvlsc4QydG7Qjtk0=; b=FMKnlE53xQ+mCzKargw3tIn4T4fotbcvCKf+XyOer2nrsJk0fN2qyGd5dVoKK5f63pTKWlKENrE9T4oLLABprGmNRMo25aVLHCNDMQrCNbt8B/TU1SvPF99JW7sIHw0Q2GHDTDrvGjHlCRKiXQ5mxTNmFIzeykURKnWb212oa5c= 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 1597684210503167.99270981612744; Mon, 17 Aug 2020 10:10:10 -0700 (PDT) Received: from localhost ([::1]:52354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hIM-0001Ms-18 for importer@patchew.org; Mon, 17 Aug 2020 11:43:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLC-0003cH-CU for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56360 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 1k7gL8-0006vj-Oq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-382-j57h_ZV5P5Oceu9c9K9cLw-1; Mon, 17 Aug 2020 10:42:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C974801AAE for ; Mon, 17 Aug 2020 14:42:18 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 878E4756AC; Mon, 17 Aug 2020 14:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675341; 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=wT3++EskC3IekWaJAeSwmjipHmASvlsc4QydG7Qjtk0=; b=HIq0Zgdy2FqtV/GHw+ijY9Px1gYB7kdhoWxQXN88vjxNnst9VJSzowWKXqw2AsiQSeAaEM WBpk+kzABmZke7f+xRY+d62XY7JV3TSrY+sBcMkDMZa1e+qllBCLa7nnaKaekWM+Ru6iZg mMitt4/3ncfzsZZdlWaC7fmDpN0aFgg= X-MC-Unique: j57h_ZV5P5Oceu9c9K9cLw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 135/150] rules.mak: remove version.o Date: Mon, 17 Aug 2020 16:40:38 +0200 Message-Id: <20200817144053.345107-40-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/17 05:13:21 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 9c8fb91f45..e6ede40f51 100644 --- a/Makefile +++ b/Makefile @@ -230,11 +230,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 ninja-clean clean-ctlist diff --git a/Makefile.objs b/Makefile.objs index 5295c3a623..c351b59641 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 b983c7f83f..6d89001f0a 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684938; cv=none; d=zohomail.com; s=zohoarc; b=ZGw6zZw2MNXJybNlcc6f11f1gKJDLB59rd1oucDWu8SMsLR/CFGXRRAuA87nUl/gma1lmnJ/2eZ3a6MXAdYb62wYpNWCiyap3FZ7ZOtRrEOB3gOQpntdbBNmVvAJVBMUjLaJdbX9HsUIvaBtjMuJ/A54BL2jngrOIIJ1XIAYd7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684938; 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=LvymUVZshpWhdrmlfGlQijeyhUn+w1f5RXfbWUnQhVw=; b=JncsyBnXQ8vrnpkfiIPKyG91SxISXaoidmeRgpERhvKfbN4Ci2CLemWGG4St4Ep5Y7UssaTvYnLpm8RwpQOWjad5XNgdSecKDTULtnWM9vlDUQWjUq+RcoKa70DMBSECiO5jCaACZi398CK8M3MAdWvBnsP7VyKepcBWG4/zH3E= 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 159768493880125.485190535487504; Mon, 17 Aug 2020 10:22:18 -0700 (PDT) Received: from localhost ([::1]:38478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hFr-00041v-Pj for importer@patchew.org; Mon, 17 Aug 2020 11:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLC-0003dn-Sy for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23069 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 1k7gL8-0006vr-SC for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-497-86g-t1gQM_WVX2NtTdpOaQ-1; Mon, 17 Aug 2020 10:42:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64082185E524 for ; Mon, 17 Aug 2020 14:42:19 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC86670C3D; Mon, 17 Aug 2020 14:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675342; 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=LvymUVZshpWhdrmlfGlQijeyhUn+w1f5RXfbWUnQhVw=; b=K5WQ4A9MByrbhaGhLvXaQpzamUt5YaB+AatX1Q7atXF+CoL3xqHlKNMEErRyCGHEOJK8R7 yHEcn00e19uK33o6xOft2FNh4mrr49ELS98tAI9V4yaySQhLkacSeCmuZuScBLuIwfvJm6 iLvPtP6nKW/JvJH8JtWnEwXmMxWFH9I= X-MC-Unique: 86g-t1gQM_WVX2NtTdpOaQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 136/150] remove Makefile.target Date: Mon, 17 Aug 2020 16:40:39 +0200 Message-Id: <20200817144053.345107-41-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 00:24:04 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 | 17 ---------------- 3 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 Makefile.target diff --git a/Makefile b/Makefile index e6ede40f51..175776d912 100644 --- a/Makefile +++ b/Makefile @@ -168,17 +168,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) @@ -215,8 +204,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 @@ -224,11 +211,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 @@ -283,9 +268,6 @@ distclean: clean ninja-distclean $(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 \ @@ -389,8 +371,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 @@ -420,9 +401,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 @@ -537,20 +515,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) @@ -638,15 +602,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 a07149c0a6..0000000000 --- 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 94e458f4be..840a90d987 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_softmmu=3D"" libs_tools=3D"" audio_win_int=3D"" libs_qga=3D"" @@ -864,7 +863,6 @@ Darwin) audio_drv_list=3D"coreaudio try-sdl" audio_possible_drivers=3D"coreaudio sdl" QEMU_LDFLAGS=3D"-framework CoreFoundation -framework IOKit $QEMU_LDFLAGS" - libs_softmmu=3D"-F/System/Library/Frameworks -framework Cocoa -framework= IOKit $libs_softmmu" # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" @@ -2555,7 +2553,6 @@ if test "$lzo" !=3D "no" ; then 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 @@ -2575,7 +2572,6 @@ if test "$snappy" !=3D "no" ; then 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 @@ -2675,7 +2671,6 @@ if test "$xen" !=3D "no" ; then xen_pc=3D"$xen_pc xentoolcore" 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 @@ -3420,7 +3415,6 @@ EOF rdma_libs=3D"-lrdmacm -libverbs -libumad" if compile_prog "" "$rdma_libs" ; then rdma=3D"yes" - libs_softmmu=3D"$libs_softmmu $rdma_libs" else if test "$rdma" =3D "yes" ; then error_exit \ @@ -4451,8 +4445,6 @@ EOF fi fi =20 -libs_softmmu=3D"$libs_softmmu $fdt_libs" - ########################################## # opengl probe (for sdl2, gtk, milkymist-tmu2) =20 @@ -4676,7 +4668,6 @@ EOF =20 if compile_prog "" "-lnuma" ; then numa=3Dyes - libs_softmmu=3D"-lnuma $libs_softmmu" numa_libs=3D"-lnuma" else if test "$numa" =3D "yes" ; then @@ -5218,7 +5209,6 @@ if compile_prog "" "" ; then have_openpty=3D"yes" else if compile_prog "" "-lutil" ; then - libs_softmmu=3D"-lutil $libs_softmmu" libs_tools=3D"-lutil $libs_tools" have_openpty=3D"yes" fi @@ -5237,7 +5227,6 @@ EOF $pkg_config --atleast-version=3D0.12.3 spice-protocol && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice=3D"yes" - libs_softmmu=3D"$libs_softmmu $spice_libs" QEMU_CFLAGS=3D"$QEMU_CFLAGS $spice_cflags" else if test "$spice" =3D "yes" ; then @@ -6390,7 +6379,6 @@ if test "$libpmem" !=3D "no"; then libpmem=3D"yes" libpmem_libs=3D$($pkg_config --libs libpmem) libpmem_cflags=3D$($pkg_config --cflags libpmem) - libs_softmmu=3D"$libs_softmmu $libpmem_libs" QEMU_CFLAGS=3D"$QEMU_CFLAGS $libpmem_cflags" else if test "$libpmem" =3D "yes" ; then @@ -6408,7 +6396,6 @@ if test "$libdaxctl" !=3D "no"; then libdaxctl=3D"yes" libdaxctl_libs=3D$($pkg_config --libs libdaxctl) libdaxctl_cflags=3D$($pkg_config --cflags libdaxctl) - libs_softmmu=3D"$libs_softmmu $libdaxctl_libs" QEMU_CFLAGS=3D"$QEMU_CFLAGS $libdaxctl_cflags" else if test "$libdaxctl" =3D "yes" ; then @@ -6837,7 +6824,6 @@ echo_version() { # prepend pixman and ftd flags after all config tests are done QEMU_CFLAGS=3D"$pixman_cflags $fdt_cflags $QEMU_CFLAGS" QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" -libs_softmmu=3D"$pixman_libs $libs_softmmu" =20 config_host_mak=3D"config-host.mak" =20 @@ -6866,7 +6852,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_softmmu=3D$libs_softmmu" >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak echo "GIT_UPDATE=3D$git_update" >> $config_host_mak @@ -8117,8 +8102,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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686715; cv=none; d=zohomail.com; s=zohoarc; b=T/t6axXNRHDWRHBXTswWAHp0SEvcE8SBn4iX7KiuIExzgoE2h8yQpoRS8qJK7WQYE9VZVHlsrlcprSUAh6yzZ9+h788kQ015oRa58bqi25pbrvrPRLqw13elG9kSz8CGxt6rFWTXbrcIMx2o6FN4JM8AqA53Q7okiUYO+ZYUoDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686715; 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=LedXecCt40e9TDykDffC5QUZbSE0DrmbXRzfa5v82bk=; b=B62/ZLylPncQ7wHl1faT/0SywF7Yq2XVAjrxpxnRvR1ckyq3/undpXMMS/wnlBPuvaL/e/awsTAzZwtYx9k0ODaFNFV9hpjMCNO7pLY/hSfJAAsJk9eU7si0HpKHJex0DgGxffEuGKmCip56vGXjyyHFitIyWnyKTXcPGYcq3V8= 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 1597686715790372.9977026407058; Mon, 17 Aug 2020 10:51:55 -0700 (PDT) Received: from localhost ([::1]:60634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hKE-0004tF-DX for importer@patchew.org; Mon, 17 Aug 2020 11:45:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLF-0003jC-6E for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gLC-0006w6-3H for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-38-8zeuQgKRNXqthvgw15hY5w-1; Mon, 17 Aug 2020 10:42:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97C0F1DDE8 for ; Mon, 17 Aug 2020 14:42:20 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id B738070C3D; Mon, 17 Aug 2020 14:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675345; 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=LedXecCt40e9TDykDffC5QUZbSE0DrmbXRzfa5v82bk=; b=N5CUdI9PZZbiJS7X1YdZ7mvTI624bYvUL2hST4AlNP4eN3FCYMMDPwwd/HtAjKZ4GU83LC 0y3mxCsJ8AEXAH8qPcpaxetYeZbHSYVozjriY86fIrfc43z5fDCoc9/F48sZ5RfG6aYzzT M/q8Ws4Z13tTs3zdIeoE+dQoFYlmypw= X-MC-Unique: 8zeuQgKRNXqthvgw15hY5w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 137/150] meson: sphinx-build Date: Mon, 17 Aug 2020 16:40:40 +0200 Message-Id: <20200817144053.345107-42-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 01:24:49 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) For now, sphinx is run on every invocation of make. The previous mechanism using $(wildcard) is not reproducible in Meson and was also brittle; for example some .rst.inc files were left out. The next patch will introduce a Sphinx extension to emit a depfile. 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 175776d912..fe7e719075 100644 --- a/Makefile +++ b/Makefile @@ -124,36 +124,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 @@ -237,11 +210,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 ninja-distclean -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean -g rm -f config-host.mak config-host.h* $(DOCS) @@ -261,13 +229,6 @@ distclean: clean ninja-distclean 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 \ @@ -301,28 +262,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 @@ -330,19 +271,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" @@ -429,69 +358,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 @@ -514,6 +380,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 840a90d987..d1cdd9155f 100755 --- a/configure +++ b/configure @@ -7775,7 +7775,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 6736fa4360..ca28047881 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 0000000000..20fc92e2fe --- /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 8ff7aada2c..bce7580726 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']) @@ -1047,6 +1048,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 6d89001f0a..6cab0b9cbd 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686790; cv=none; d=zohomail.com; s=zohoarc; b=XB222w1cPOib1jcR5j2YHQe2Zoay/ew9m5KPudQ1Rv94G9Irvo9JhYDi1spwgMDPXy6FHOd/VLEpkf5w4hwPmuh32k343Zi4wONMJ2J1kwf527U/6VZjv0m7vLBxnjA+WRTEHelFsw+ZDws+oBP8MF9jHBS6qOAYKo03y1EWRDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686790; 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=A/fODn4v4AYiOCnBLbWR2W6/Nc+bZU0GgOOKRamlgF0=; b=Yuf71WnCp5sSJOPPz7IpbqNls+IWZDAMpnD2LSRjCy4eXMXrxVzoCD7Wd1MU53juw0tpLe2AVBmU1PzPuOX8+HttjqeIWS271MfC6g9EXjtn2YO7YGItiZljW3yU3Fb0qGu+bDroCRbitwM9eC1ZIXLUJGxqlyv1ggOlSiyPinA= 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 1597686790972942.3572048658383; Mon, 17 Aug 2020 10:53:10 -0700 (PDT) Received: from localhost ([::1]:47008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hHL-0007ad-Sa for importer@patchew.org; Mon, 17 Aug 2020 11:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLD-0003fy-Qg for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:27 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59681 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 1k7gLB-0006w2-NV for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:27 -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-169-aPfWG8HsPfe9UfajwSZD-w-1; Mon, 17 Aug 2020 10:42:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D0B1185E524 for ; Mon, 17 Aug 2020 14:42:21 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01BA5756B5 for ; Mon, 17 Aug 2020 14:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675345; 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=A/fODn4v4AYiOCnBLbWR2W6/Nc+bZU0GgOOKRamlgF0=; b=ev7kJhp6wJLxOXeTXkKxT3kneOwUUSyZFJo6IXJPV3bT7vGpyW6cIIGC0LrxSbq0O9Tv12 BV+hCCUdejR7iIYcMLqHSax+huiOlqxUNGZ6/YUtnPUdIraaOsAhW2CF1VEWfZOrH8HQVu tXNcUstb0wdR3xJpPtnnijMCN22E0Uc= X-MC-Unique: aPfWG8HsPfe9UfajwSZD-w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 138/150] docs: automatically track manual dependencies Date: Mon, 17 Aug 2020 16:40:41 +0200 Message-Id: <20200817144053.345107-43-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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/17 03:34:42 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-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/conf.py | 2 +- docs/meson.build | 21 ++++++++++------- docs/sphinx/depfile.py | 51 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 docs/sphinx/depfile.py diff --git a/docs/conf.py b/docs/conf.py index d6e173ef77..0dbd90dc11 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,7 +67,7 @@ needs_sphinx =3D '1.6' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions =3D ['kerneldoc', 'qmp_lexer', 'hxtool'] +extensions =3D ['kerneldoc', 'qmp_lexer', 'hxtool', 'depfile'] =20 # Add any paths that contain templates here, relative to this directory. templates_path =3D ['_templates'] diff --git a/docs/meson.build b/docs/meson.build index 20fc92e2fe..08c9139fbe 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -34,16 +34,21 @@ if build_docs sphinxmans =3D [] foreach manual : manuals private_dir =3D meson.current_build_dir() / (manual + '.p') + output_dir =3D meson.current_build_dir() / manual input_dir =3D meson.current_source_dir() / manual - sphinxdocs +=3D custom_target(manual + ' manual', - build_always_stale: true, + + this_manual =3D custom_target(manual + ' manual', build_by_default: build_docs, - output: manual, - command: [SPHINX_ARGS, '-b', 'html', '-d', private_dir, - input_dir, meson.current_build_dir() / manual]) + output: [manual + '.stamp', manual], + input: [files('conf.py'), files(manual / 'conf.py')], + depfile: manual + '.d', + command: [SPHINX_ARGS, '-Ddepfile=3D@DEPFILE@', + '-Ddepfile_stamp=3D@OUTPUT0@', + '-b', 'html', '-d', private_dir, + input_dir, output_dir]) + sphinxdocs +=3D this_manual if build_docs and manual !=3D 'devel' - install_subdir(meson.current_build_dir() / manual, - install_dir: config_host['qemu_docdir']) + install_subdir(output_dir, install_dir: config_host['qemu_docdir']) endif =20 these_man_pages =3D [] @@ -54,9 +59,9 @@ if build_docs 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, + input: this_manual, install: build_docs, install_dir: install_dirs, command: [SPHINX_ARGS, '-b', 'man', '-d', private= _dir, diff --git a/docs/sphinx/depfile.py b/docs/sphinx/depfile.py new file mode 100644 index 0000000000..277fdf0f56 --- /dev/null +++ b/docs/sphinx/depfile.py @@ -0,0 +1,51 @@ +# coding=3Dutf-8 +# +# QEMU depfile generation extension +# +# Copyright (c) 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPLv2 or later. +# See the COPYING file in the top-level directory. + +"""depfile is a Sphinx extension that writes a dependency file for + an external build system""" + +import os +import sphinx + +__version__ =3D '1.0' + +def get_infiles(env): + for x in env.found_docs: + yield env.doc2path(x) + yield from ((os.path.join(env.srcdir, dep) + for dep in env.dependencies[x])) + +def write_depfile(app, env): + if not env.config.depfile: + return + + # Using a directory as the output file does not work great because + # its timestamp does not necessarily change when the contents change. + # So create a timestamp file. + if env.config.depfile_stamp: + with open(env.config.depfile_stamp, 'w') as f: + pass + + with open(env.config.depfile, 'w') as f: + print((env.config.depfile_stamp or app.outdir) + ": \\", file=3Df) + print(*get_infiles(env), file=3Df) + for x in get_infiles(env): + print(x + ":", file=3Df) + + +def setup(app): + app.add_config_value('depfile', None, 'env') + app.add_config_value('depfile_stamp', None, 'env') + app.connect('env-updated', write_depfile) + + return dict( + version =3D __version__, + parallel_read_safe =3D True, + parallel_write_safe =3D True + ) --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597686273; cv=none; d=zohomail.com; s=zohoarc; b=FNFpESaBv+vghy4lil23ImAEYK9EEpKZ6/Itu5k4odatVW77WEzy2mQ/l9JpDeVWgSce59buIyHImKcgAC5AdBFcO3kypFHTGqoFtRsHp831EahMx3P93WRHZWljR7c9HCnLV9AL+/uXhFuNyvH3vNK7DHVPcJozhSaQlvxc9bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686273; 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/za4A9kj35z4V8zRYzZxdU0L26jy7y+ma7iFE0p11I=; b=BsJKkXgsGycjFamT2DnyHzWH8STHZTTarcwshOAi/M2gtLWLU/MJWq9e0VDTvvY/WHo/1t6nixRjOJFev5uYtmNzil1WLIpp+P5W7QECsoJinN7KaSvafxcnFVfx7kmORxy/DV8Y6g7AwljshCXvzapFF1mtt1ABCYa8Uc8puAI= 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 1597686273744199.1974931541364; Mon, 17 Aug 2020 10:44:33 -0700 (PDT) Received: from localhost ([::1]:40932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hLy-00005P-8F for importer@patchew.org; Mon, 17 Aug 2020 11:47:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLG-0003lW-2H for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20310 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 1k7gLD-0006wQ-Gb for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-16-2yilabFpNA6kG7vi4ti59A-1; Mon, 17 Aug 2020 10:42:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D54E61DDE8 for ; Mon, 17 Aug 2020 14:42:22 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0775670C3D; Mon, 17 Aug 2020 14:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675346; 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/za4A9kj35z4V8zRYzZxdU0L26jy7y+ma7iFE0p11I=; b=RS/cAliorgd8hKsa6J5RTC1LNlpFI7XDe/glAK4bEUTMd2vrLgr7xwBHTU6GTO1GHUnDpz T/tsS2bp7Uy11P3lfgSGMVRG7Bptk1QgMlMuryzq7h1Dr2Xb2NuIVBHYAxp9RkKTF/bvvl VlaD0NDINqOz3gCbdIvD2RaCvCkI4ew= X-MC-Unique: 2yilabFpNA6kG7vi4ti59A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 139/150] meson: build texi doc Date: Mon, 17 Aug 2020 16:40:42 +0200 Message-Id: <20200817144053.345107-44-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 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/17 05:13:21 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 | 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 fe7e719075..9e4edd9c97 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 @@ -117,20 +116,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),) @@ -139,7 +131,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"" @@ -212,7 +204,7 @@ qemu-%.tar.bz2: =20 distclean: clean ninja-distclean -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean -g - 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 @@ -223,12 +215,6 @@ distclean: clean ninja-distclean rm -f Makefile.ninja ninjatool ninjatool.stamp Makefile.mtest 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 \ @@ -262,29 +248,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 @@ -299,8 +262,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 @@ -331,62 +293,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) @@ -485,7 +391,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 ddb76ce1c2..a23cc2ed7f 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 bb25758bd0..ea1d7fe6c2 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 bce7580726..c29627e83b 100644 --- a/meson.build +++ b/meson.build @@ -1050,6 +1050,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 7e7174b0a3..6fdddd68e3 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 0000000000..0a723b8be6 --- /dev/null +++ b/version.texi.in @@ -0,0 +1,2 @@ +@set VERSION @VERSION@ +@set CONFDIR @qemu_confdir@ --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597682943; cv=none; d=zohomail.com; s=zohoarc; b=CDGfzZfd813WusG7l2TDh5Od7Sw5CbArwiu4+uyGhT5CCvzvU0CINkpH5DI7unJvJdR35erRfS36icRk4lA9OQ+tbSyw3A5cOW/cIp6uMioVwYGvajSFifZT0L+s1aVVG0SIf78sIBmswDML6xNUuzKx6QLBZ8Ei9yz9PSfDFnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682943; 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=m8iALnws/4P8XFS7ASMygeM/FNJ8v2QCeJ8+FY6qu6o=; b=DJWdJq6mX8pt95UjkEBEwlP5Py45KMj80tuND1LkoDM85IrCuisshBuWuh9pQll3o2ioZNUBsa/wbfZ+dwYtthuVXVMQcLps5vWLBkhlzCxbNnegdAORYDxhNAnlYpcHYpkS9ywOvHvkKMchpe9EO8ycDyKPvaySRltnhHnUmkU= 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 1597682943156632.6702832591997; Mon, 17 Aug 2020 09:49:03 -0700 (PDT) Received: from localhost ([::1]:57826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h8Y-0005gF-Qr for importer@patchew.org; Mon, 17 Aug 2020 11:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLH-0003oM-57 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gLD-0006wI-36 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-416-7S2deayVPSOyZ9cEE8pHbw-1; Mon, 17 Aug 2020 10:42:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAB8C81F001 for ; Mon, 17 Aug 2020 14:42:23 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F30470C3D for ; Mon, 17 Aug 2020 14:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675346; 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=m8iALnws/4P8XFS7ASMygeM/FNJ8v2QCeJ8+FY6qu6o=; b=BsT5roKhb5VzmidvNFK1fMFFQOkji4V+BcExBmqWdBy22pd9Ao+D1QHYu3vrQ+R39S1WSK mtMq/6hDCuh/jRUpKAJWl2QTc0Ko0PZUe4O98goS5yopQlsiVy9T773o7OhvvaMn2+tP0X kqwst9PXxBhPK1vFAXnptYRT8fAmmqw= X-MC-Unique: 7S2deayVPSOyZ9cEE8pHbw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 140/150] meson: convert check-block Date: Mon, 17 Aug 2020 16:40:43 +0200 Message-Id: <20200817144053.345107-45-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 01:24:49 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-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 c29627e83b..488d0999a8 100644 --- a/meson.build +++ b/meson.build @@ -999,9 +999,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 c3874cafd2..e023df817d 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 d724402cf4..f834c272e8 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 0000000000..3de09fb8fa --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684972; cv=none; d=zohomail.com; s=zohoarc; b=am93qtm/wuMile0tttz7KUMoNd5ueGUcr0eos6X9UcD1TWdiPPjvjKXn312gIx12DQNyqzkSrfdXDNlOUzwSX4RBhfgrMgxkVWeIs9DlqfhSQXwFKNUPQLjgG+Gd+x8WrE6cauP9UqQ/8bO4ckWq/1CBEFfDc5biCsJxSfb360U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684972; 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=RDgnWuWt5Q8HhcPLEuYN9cGJqzaCRe6ZUe/+na/WoHg=; b=NcL6JNWlV+9YaE5SyQL+daQckTKVA64Y6qipdwbmZskYMa5L2cqiMfSVe9/O0pIP/hNrflBqPMIqQm5lGaVN16hxcLitUG0Oh1bi/KWUOpsIwMHIKJdfqbAx0j8DM7sUlG3t6fY5Id1zQ4lApC3G8yB8j30oTpWx10BhUsP8yCA= 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 1597684972777191.9330626087699; Mon, 17 Aug 2020 10:22:52 -0700 (PDT) Received: from localhost ([::1]:39314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hLi-0007rc-Of for importer@patchew.org; Mon, 17 Aug 2020 11:47:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLL-0003zG-NL for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:35 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49556 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 1k7gLH-0006wx-Uw for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-420--R-dYJUHMweTmexC2cHJzA-1; Mon, 17 Aug 2020 10:42:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E14C31DDE8 for ; Mon, 17 Aug 2020 14:42:24 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45B3270C3D for ; Mon, 17 Aug 2020 14:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675351; 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=RDgnWuWt5Q8HhcPLEuYN9cGJqzaCRe6ZUe/+na/WoHg=; b=PLYIl1Yi64EAdgVT1hBtXs/p9dSgBrKAMJaipZgtLheNW7Y/MlkbKQPaVQ6SquJgvTDOD3 i1p3ESfESH6VeAZLyENizkmLefNr3dusRIIo0qLnr7u64yzow7MmUWm8Eon9ZEfAwYeHcr IVVnlmNNpRlSNpF4bhfROM3jQJ9nyoQ= X-MC-Unique: -R-dYJUHMweTmexC2cHJzA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 141/150] rules.mak: drop unneeded macros Date: Mon, 17 Aug 2020 16:40:44 +0200 Message-Id: <20200817144053.345107-46-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 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/17 05:03:47 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) Signed-off-by: Paolo Bonzini --- .gitignore | 1 - Makefile | 7 +- configure | 55 ++------- docs/devel/build-system.txt | 5 +- rules.mak | 231 +----------------------------------- scripts/create_config | 6 +- 6 files changed, 23 insertions(+), 282 deletions(-) diff --git a/.gitignore b/.gitignore index 2424131c65..6b133a6516 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ *.msi *.dll *.so -*.mo *.fn *.ky *.log diff --git a/Makefile b/Makefile index 9e4edd9c97..7d2486f2a7 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,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"" @@ -186,7 +186,7 @@ clean: recurse-clean ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t 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 \ @@ -371,9 +371,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 d1cdd9155f..afaacf13bf 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 @@ -423,7 +422,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" @@ -954,7 +953,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" @@ -6206,31 +6205,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 @@ -6962,12 +6936,7 @@ fi echo "CONFIG_AUDIO_DRIVERS=3D$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do def=3DCONFIG_AUDIO_$(echo $drv | LC_ALL=3DC tr '[a-z]' '[A-Z]') - case "$drv" in - alsa | oss | pa | sdl) - echo "$def=3Dm" >> $config_host_mak ;; - *) - echo "$def=3Dy" >> $config_host_mak ;; - esac + echo "$def=3Dy" >> $config_host_mak done if test "$alsa" =3D "yes" ; then echo "CONFIG_ALSA=3Dy" >> $config_host_mak @@ -7056,7 +7025,7 @@ if test "$iconv" =3D "yes" ; then echo "ICONV_LIBS=3D$iconv_lib" >> $config_host_mak fi if test "$curses" =3D "yes" ; then - echo "CONFIG_CURSES=3Dm" >> $config_host_mak + echo "CONFIG_CURSES=3Dy" >> $config_host_mak echo "CURSES_CFLAGS=3D$curses_inc" >> $config_host_mak echo "CURSES_LIBS=3D$curses_lib" >> $config_host_mak fi @@ -7151,7 +7120,7 @@ if test "$bswap_h" =3D "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_host_mak fi if test "$curl" =3D "yes" ; then - echo "CONFIG_CURL=3Dm" >> $config_host_mak + echo "CONFIG_CURL=3Dy" >> $config_host_mak echo "CURL_CFLAGS=3D$curl_cflags" >> $config_host_mak echo "CURL_LIBS=3D$curl_libs" >> $config_host_mak fi @@ -7160,7 +7129,7 @@ if test "$brlapi" =3D "yes" ; then echo "BRLAPI_LIBS=3D$brlapi_libs" >> $config_host_mak fi if test "$gtk" =3D "yes" ; then - echo "CONFIG_GTK=3Dm" >> $config_host_mak + echo "CONFIG_GTK=3Dy" >> $config_host_mak echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_host_mak echo "GTK_LIBS=3D$gtk_libs" >> $config_host_mak if test "$gtk_gl" =3D "yes" ; then @@ -7423,13 +7392,13 @@ if test "$zstd" =3D "yes" ; then fi =20 if test "$libiscsi" =3D "yes" ; then - echo "CONFIG_LIBISCSI=3Dm" >> $config_host_mak + echo "CONFIG_LIBISCSI=3Dy" >> $config_host_mak echo "LIBISCSI_CFLAGS=3D$libiscsi_cflags" >> $config_host_mak echo "LIBISCSI_LIBS=3D$libiscsi_libs" >> $config_host_mak fi =20 if test "$libnfs" =3D "yes" ; then - echo "CONFIG_LIBNFS=3Dm" >> $config_host_mak + echo "CONFIG_LIBNFS=3Dy" >> $config_host_mak echo "LIBNFS_LIBS=3D$libnfs_libs" >> $config_host_mak fi =20 @@ -7451,7 +7420,7 @@ if test "$qom_cast_debug" =3D "yes" ; then echo "CONFIG_QOM_CAST_DEBUG=3Dy" >> $config_host_mak fi if test "$rbd" =3D "yes" ; then - echo "CONFIG_RBD=3Dm" >> $config_host_mak + echo "CONFIG_RBD=3Dy" >> $config_host_mak echo "RBD_LIBS=3D$rbd_libs" >> $config_host_mak fi =20 @@ -7523,7 +7492,7 @@ if test "$getauxval" =3D "yes" ; then fi =20 if test "$glusterfs" =3D "yes" ; then - echo "CONFIG_GLUSTERFS=3Dm" >> $config_host_mak + echo "CONFIG_GLUSTERFS=3Dy" >> $config_host_mak echo "GLUSTERFS_CFLAGS=3D$glusterfs_cflags" >> $config_host_mak echo "GLUSTERFS_LIBS=3D$glusterfs_libs" >> $config_host_mak fi @@ -7553,7 +7522,7 @@ if test "$glusterfs_iocb_has_stat" =3D "yes" ; then fi =20 if test "$libssh" =3D "yes" ; then - echo "CONFIG_LIBSSH=3Dm" >> $config_host_mak + echo "CONFIG_LIBSSH=3Dy" >> $config_host_mak echo "LIBSSH_CFLAGS=3D$libssh_cflags" >> $config_host_mak echo "LIBSSH_LIBS=3D$libssh_libs" >> $config_host_mak fi @@ -7813,7 +7782,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 41bd08ea3a..fea67b207c 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 6cab0b9cbd..c66c8218f0 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 bc82661041..ec5c0b4124 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597684174; cv=none; d=zohomail.com; s=zohoarc; b=UJfRIKk2MsMmpDkqwXJrkxOirPjXrlfbzNptAjwwBFomQXlCFr+avdtRXIMYutv5IwIZddXXMkkDLvL3S2qogTQabff5QlUzXzMSdbpX2E9iu+x5db/NYf8LUzI87XGMMlT0G1Xg0eXi0ThsWqTa/rsSJl9D1O2Pzo3RBNZ8f6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684174; 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=l3FJPNXoW9kwGQTAgoeqLLSm5qZRD0vxIe6EwDKoqo0=; b=oBDKjyyD3gPi+QIhyDhtlGTExTGBQQQ3+sOkK5cSOyab7iSsCHDT06jysnTSLizszvwTojn6kqaDKOSJKW4f9k30wa/sh7l5kljwniqKHsUVssQgqD/DTxwzq9EtUCh3CLYMyw6aTE63bSQjDtYU4JErwmgJEwf1I2Kme2COuKw= 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 1597684174525573.9869958534048; Mon, 17 Aug 2020 10:09:34 -0700 (PDT) Received: from localhost ([::1]:38282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hA3-0000oK-A6 for importer@patchew.org; Mon, 17 Aug 2020 11:34:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLI-0003qz-8M for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:32 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:41513 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 1k7gLF-0006wZ-Cz for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-471-W8qY7RjgO3yTQN70J1b9kA-1; Mon, 17 Aug 2020 10:42:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E659A100CEC3 for ; Mon, 17 Aug 2020 14:42:25 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B28F70C3D for ; Mon, 17 Aug 2020 14:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675348; 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=l3FJPNXoW9kwGQTAgoeqLLSm5qZRD0vxIe6EwDKoqo0=; b=ixifjSsiSu32lBgLIconUe9YEn0E6coMOxqNbTBdcnxwL0vWCvCquf9mBQKflyCeAu1/IB 5f84pgYkuyCG+cNSqGnNm1hjpUSODVxPr7bvFyAPG5qtGdlxo/j+gDnJ9lKyF1S4e5O9LI Es5oOunOfwO/HY+G7DuuDa6ZkFtSSQI= X-MC-Unique: W8qY7RjgO3yTQN70J1b9kA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 142/150] meson: replace create-config with meson configure_file Date: Mon, 17 Aug 2020 16:40:45 +0200 Message-Id: <20200817144053.345107-47-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 03:34:42 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-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 | 2 + configure | 9 +-- meson.build | 93 ++++++++++++++++------- scripts/create_config | 131 --------------------------------- tests/qtest/bios-tables-test.c | 2 +- 6 files changed, 73 insertions(+), 166 deletions(-) delete mode 100755 scripts/create_config diff --git a/Makefile b/Makefile index 7d2486f2a7..a6b8869357 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ clean: recurse-clean ninja-clean clean-ctlist 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 67c5028dd8..2ba76b2c36 100644 --- a/block.c +++ b/block.c @@ -433,9 +433,11 @@ static int bdrv_format_is_whitelisted(const char *form= at_name, bool read_only) { static const char *whitelist_rw[] =3D { CONFIG_BDRV_RW_WHITELIST + NULL }; static const char *whitelist_ro[] =3D { CONFIG_BDRV_RO_WHITELIST + NULL }; const char **p; =20 diff --git a/configure b/configure index afaacf13bf..a00d0cf2de 100755 --- a/configure +++ b/configure @@ -6914,7 +6914,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 "Makefile: slirp/all" >> $config_host_mak fi if test "$vde" =3D "yes" ; then echo "CONFIG_VDE=3Dy" >> $config_host_mak @@ -6987,7 +6987,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 @@ -7748,7 +7747,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 "CXX=3D$cxx" >> $config_host_mak echo "OBJCC=3D$objcc" >> $config_host_mak @@ -8235,10 +8234,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 "Makefile: 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 "Makefile: 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 488d0999a8..3c402e7c7a 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']) @@ -355,13 +357,40 @@ 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'] +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 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_') + config_host_data.set(k, v =3D=3D 'y' ? 1 : v) + 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', @@ -377,16 +406,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 @@ -400,14 +449,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 @@ -447,7 +498,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') @@ -477,7 +527,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, @@ -486,13 +536,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'], @@ -827,13 +870,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 ['-DNEED_CPU_H', '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(target)] link_args =3D [] =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) @@ -894,19 +938,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 ec5c0b4124..0000000000 --- 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 d49b3988ec..d25ff35492 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597685874; cv=none; d=zohomail.com; s=zohoarc; b=N9o9pTWbztBUBtQSJQU1oPjiSYTBOVduhlzne0bKtmZLP1P1/ndSauniKA/akROqEDBuPZr7P/2Iq6ApMpq9LdX/GuNzLZukBtToxyLdUXpfe+sAseTyivTe5GUFbFUy/x7sqk2bGuSwzPP+9cmVldmHqYOV/B9qJBoHLiHEHPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685874; 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=afI0bjWFAI8/sQwiWTeLYcsqB3BFM0DVvTZAz0LOc3M=; b=I6+UrUes2WWCuIFoFeCy998DdmdFGr+YKlfo6dcBgZLJXlC72OjvNn+coOXWDJzftvRRTp6tw7lAtc2smiWWw3LkfFqvwaiFKAyK+V4+zZ14OIGxCcymYWyxZ+LZFdrGOH6r4hum17SAtgglJ8Nz/2wMCLXhhvDN1MKi/d8a/vs= 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 1597685874725735.3832106063074; Mon, 17 Aug 2020 10:37:54 -0700 (PDT) Received: from localhost ([::1]:46866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hBc-0004Mq-Iy for importer@patchew.org; Mon, 17 Aug 2020 11:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLI-0003sm-Ul for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:32 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31374 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 1k7gLG-0006wh-9A for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-80-hb4L1ckhOneD3rXINajXGQ-1; Mon, 17 Aug 2020 10:42:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED241100CECD for ; Mon, 17 Aug 2020 14:42:26 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5123270C3D for ; Mon, 17 Aug 2020 14:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675349; 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=afI0bjWFAI8/sQwiWTeLYcsqB3BFM0DVvTZAz0LOc3M=; b=Y1B6Wyr/8KI3c8EJSXiFozYJKMtZ9YfMV3BAyDKwHnN+6hakjI1pDhb+uleT6prmvuteAR EZmI4QJJNJoCDscupsXBppXCiWpemUrjyFkBvFPyAbBqhlg4nhmglu7myAvvj394pnvhbG s2xnxCVpKQUJp//q2kI+Uy6WqbASQWQ= X-MC-Unique: hb4L1ckhOneD3rXINajXGQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 143/150] meson: convert sample plugins Date: Mon, 17 Aug 2020 16:40:46 +0200 Message-Id: <20200817144053.345107-48-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 05:13:21 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-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 a00d0cf2de..d76cae818d 100755 --- a/configure +++ b/configure @@ -6832,9 +6832,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 @@ -8274,7 +8271,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 e023df817d..aec293bdd0 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 f834c272e8..fe2c6d8e6b 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 e9348fde4a..0000000000 --- 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 0000000000..dbbdcbaa67 --- /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 2.26.2 From nobody Fri May 10 21:52:11 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=1597679100; cv=none; d=zohomail.com; s=zohoarc; b=eBYHuqE+IimxczUM6KR9IB8tX2znE3AfxGiD5VaLt8KkANr7T7D6k8/dDQOwH6nOuG2tLSoYb/50fjF0gTOQAoTZxi6pMISQT8YJXmozkfLSWBXXhFH5sE+qbliBGrK+bvs1kqQHIste1lNfCxJbjgCdycTJ6dh4NcSUBdhh6GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597679100; 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=mg+j2SJ3/MSJ1rV+xP0Unf5Jl+JGy4lzP4mrgp3eBaA=; b=gWOUuwz6SLtvmJ1yoKmyFoO2ZFFoiuNnX8mBqe3p1exjijhLSOWMk3zCg2ZYLmgwetim/1r4PJFMew3gX3HnJNH3z76KJ/5c6mQktwSNAuvanl+nds2lxsmXgJG9NQD6k7Px2jyM6t0XbAksPYcJ1r+25m0byTuamuLmPZQMqE4= 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 1597679100369254.00521301774836; Mon, 17 Aug 2020 08:45:00 -0700 (PDT) Received: from localhost ([::1]:58632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hJi-000426-VL for importer@patchew.org; Mon, 17 Aug 2020 11:44:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLJ-0003uz-Th for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:33 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34311 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 1k7gLH-0006wq-Et for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-148-qU8a9XQmPqm9-xPNU9lqrg-1; Mon, 17 Aug 2020 10:42:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F27271005E75 for ; Mon, 17 Aug 2020 14:42:27 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56E90756AB for ; Mon, 17 Aug 2020 14:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675350; 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=mg+j2SJ3/MSJ1rV+xP0Unf5Jl+JGy4lzP4mrgp3eBaA=; b=BdpfgdesRWDAYOjVH5M30M0ZI8oP6QHUZwX2rpLjYRyZWAOBEvrMYOeTpZIY9dn2nn2Qcc hJOa624rCf7eJDVH3numYfARwyPbVY6C9EOBwYa0cTbLodCfk6Pwqla0s5qLlcnEqpuSTb F7yVfE7BEismXpeDToM5MZ0wUg6htzk= X-MC-Unique: qU8a9XQmPqm9-xPNU9lqrg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 144/150] meson: move SDL and SDL-image detection to meson Date: Mon, 17 Aug 2020 16:40:47 +0200 Message-Id: <20200817144053.345107-49-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 05:03:47 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-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- chardev/meson.build | 2 +- configure | 142 +++----------------------------------------- meson.build | 26 +++++--- meson_options.txt | 2 + ui/meson.build | 4 +- 5 files changed, 32 insertions(+), 144 deletions(-) create mode 100644 meson_options.txt diff --git a/chardev/meson.build b/chardev/meson.build index f79efaaf09..993cfaf235 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() module_ss =3D ss.source_set() module_ss.add(when: [sdl, brlapi], if_true: files('baum.c')) chardev_modules +=3D { 'brlapi': module_ss } diff --git a/configure b/configure index d76cae818d..dd8f9923b0 100755 --- a/configure +++ b/configure @@ -376,8 +376,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" @@ -1088,13 +1088,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" ;; @@ -2386,7 +2386,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 @@ -3285,125 +3285,6 @@ if test "$vte" !=3D "no"; then fi 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 @@ -7004,14 +6885,6 @@ if test "$have_x11" =3D "yes" && test "$need_x11" = =3D "yes"; then echo "X11_CFLAGS=3D$x11_cflags" >> $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 @@ -8394,6 +8267,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 3c402e7c7a..f67440c6e1 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 [] @@ -214,13 +215,22 @@ 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', required: get_option('sdl'), static: enable_sta= tic) +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()) @@ -359,6 +369,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]) @@ -1230,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 0000000000..e548211f34 --- /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 060639a326..7289cd3bd0 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -55,11 +55,11 @@ if config_host.has_key('CONFIG_GTK') and config_host.ha= s_key('CONFIG_VTE') ui_modules +=3D {'gtk' : gtk_ss} 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597685030; cv=none; d=zohomail.com; s=zohoarc; b=bZjWqJ2teCqrIcIkSuhEl6flCH8XamZaBFVi2yo7s0EWZWwkos+DrDQCD/TwfC/Dn7bOAR/sNR7RnYPfX41GBRUGvPmcEMXhzegd4Ue4dllNcEVTCZZpTcOTdVY8vXUrfuwIbT1ETzh5SDeGbhJH0eGUENzzbrDEFIqK58W9cRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685030; 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=0Qqlus7n1b/LCKuGfQDu5fJLszwM3oQDDtyxx2p4i/g=; b=Ix7x3vepXyIZAWnKnEzbo2oa8yNAA5WQjHdl5zYVMSav9S1nb+w+uxbEY9i7IRAaRLVY1Pdmb+AUdj8jUEF9+K/rPHKRsz4eyZr49Oj5qJckItGQ7SHWV+FMb74ARTn56X/2S4Zp1xDhNTAqHHCvJjJqv6FqX8pyN6h9Y/Btz74= 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 1597685030446476.9450906181927; Mon, 17 Aug 2020 10:23:50 -0700 (PDT) Received: from localhost ([::1]:59134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hJn-0004FT-Fj for importer@patchew.org; Mon, 17 Aug 2020 11:45:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLK-0003ww-Ni for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:34 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46634 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 1k7gLI-0006x3-B4 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-396-OfEj5LypMA-aFL489S_FOQ-1; Mon, 17 Aug 2020 10:42:29 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D507281F000 for ; Mon, 17 Aug 2020 14:42:28 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 549B670C3D for ; Mon, 17 Aug 2020 14:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675351; 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=0Qqlus7n1b/LCKuGfQDu5fJLszwM3oQDDtyxx2p4i/g=; b=bXb92SqZ5Fb8FaIoVU6yOZlQsaV0cBDTqTyCfjf4VIBJfEieMaWCJBn8B6xysekVYSiDtL eBWfeQTkrzhCAodNY2LP20Be+6uSwKKGPdD/A6V2ml2TlOVs3RJTJWeSf4oWtJ+OY37jCl 16UauIgZqKdKp2ykJa/cdHa8PBQTCNw= X-MC-Unique: OfEj5LypMA-aFL489S_FOQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 145/150] meson: convert VNC and dependent libraries to meson Date: Mon, 17 Aug 2020 16:40:48 +0200 Message-Id: <20200817144053.345107-50-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 05:13:21 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-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 dd8f9923b0..48aafd2e55 100755 --- a/configure +++ b/configure @@ -380,12 +380,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"" @@ -1108,9 +1108,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" ;; @@ -1146,17 +1146,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" ;; @@ -3379,85 +3379,6 @@ EOF fi 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 @@ -6838,24 +6759,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 @@ -8268,6 +8171,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 f67440c6e1..d7d359a196 100644 --- a/meson.build +++ b/meson.build @@ -300,20 +300,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 @@ -371,6 +375,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 e548211f34..67455c57bc 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 7289cd3bd0..ab9773dfa0 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597685052; cv=none; d=zohomail.com; s=zohoarc; b=CmbW5b16fe4H2saY3ehBuPh/jsHh9sRnIl0k+lSSKTRfyY3V2l6Uk1AIhxk5uFwkcFFRsFkgwkkfoOIQshZmtalDOTE3WOpYIi8y4DM4HDQ+3o/I1pSqrsvFFeAgj/wkjM3FcjSlQ0qH7MYiLFGhHX0/z7Kl6EI4EulNVGJDlwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597685052; 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=qYhuBcMrQr4JCXWg4F0cjImBrNQRZ3rZesF8FFyQ5vM=; b=NkQygyKHglo9e6ZmrHhg2lpVgH8XnsiwEsqimNvylXgkmaM5uTM3J3qm+vGrESOd+h9aVUd24L0af4mKN3jYxIYQIaJuBQPA0qI3BH6BDe+jG1vsDY8W+hQ9xADOyhoFYgXYSliPxGTcSqqHpgXmZ+PBDz7d+fc80YS56gGFk3Q= 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 1597685052311616.8867028931954; Mon, 17 Aug 2020 10:24:12 -0700 (PDT) Received: from localhost ([::1]:57912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hOn-00072T-Pt for importer@patchew.org; Mon, 17 Aug 2020 11:50:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLN-00043D-6R for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:37 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:49315 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 1k7gLK-0006xO-L5 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-569-6XpYtQ8lOmOfgOSJqyxBag-1; Mon, 17 Aug 2020 10:42:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23295185E529 for ; Mon, 17 Aug 2020 14:42:30 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49A54756AB; Mon, 17 Aug 2020 14:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675353; 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=qYhuBcMrQr4JCXWg4F0cjImBrNQRZ3rZesF8FFyQ5vM=; b=hcnBlcDwTsDn2tUjRm+BmL/h4r0lp0soafUrRmsX7Zqu6xr8zieruVnE94hV4IEBLifIUA 55IcWPo+YFuPCmx2TCn3Js9RiDlKndp4f7axBRH9yoTgsO2gl9Nu96rqMBE4lCIXBSpDer LD3nYQXMj+BRmIf7Muj3n9AqDr5xbwo= X-MC-Unique: 6XpYtQ8lOmOfgOSJqyxBag-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 146/150] meson: convert po/ Date: Mon, 17 Aug 2020 16:40:49 +0200 Message-Id: <20200817144053.345107-51-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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/17 03:34:42 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 Meson warns if xgettext is not found. In the future we may want to add a required argument to i18n.gettext(); in the meanwhile, I am adding a --enable-gettext/--disable-gettext option and feature detection in configure. This preserves QEMU's default behavior of detecting system features, without any warning, if neither --enable-* nor --disable-* is requested. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 5 +--- configure | 21 +++++++++++++- meson.build | 3 ++ meson_options.txt | 1 + po/LINGUAS | 8 +++++ po/Makefile | 52 --------------------------------- po/POTFILES | 1 + po/meson.build | 7 +++++ po/messages.po | 74 ----------------------------------------------- tests/vm/freebsd | 1 + tests/vm/netbsd | 1 + tests/vm/openbsd | 1 + 12 files changed, 44 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 a6b8869357..c060fd8332 100644 --- a/Makefile +++ b/Makefile @@ -207,7 +207,7 @@ distclean: clean ninja-distclean 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-target.h *-config-devices.mak *-config-devices.h @@ -285,9 +285,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 48aafd2e55..273f070464 100755 --- a/configure +++ b/configure @@ -522,6 +522,7 @@ rng_none=3D"no" secret_keyring=3D"" libdaxctl=3D"" meson=3D"" +gettext=3D"" =20 bogus_os=3D"no" malloc_trim=3D"" @@ -1112,6 +1113,10 @@ for opt do ;; --enable-vnc) vnc=3D"enabled" ;; + --disable-gettext) gettext=3D"false" + ;; + --enable-gettext) gettext=3D"true" + ;; --oss-lib=3D*) oss_lib=3D"$optarg" ;; --audio-drv-list=3D*) audio_drv_list=3D"$optarg" @@ -2983,6 +2988,19 @@ if test "$whpx" !=3D "no" ; then fi fi =20 +########################################## +# gettext probe +if test "$gettext" !=3D "false" ; then + if has xgettext; then + gettext=3Dtrue + else + if test "$gettext" =3D "true" ; then + feature_not_found "gettext" "Install xgettext binary" + fi + gettext=3Dfalse + fi +fi + ########################################## # Sparse probe if test "$sparse" !=3D "no" ; then @@ -8045,7 +8063,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" @@ -8172,6 +8190,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -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 \ + -Dgettext=3D$gettext \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index d7d359a196..54e92195d6 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/meson_options.txt b/meson_options.txt index 67455c57bc..e5f45243ce 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') option('vnc', type : 'feature', value : 'enabled') diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000000..cc4b5c3b36 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,8 @@ +bg +de_DE +fr_FR +hu +it +sv +tr +zh_CN diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index c041f4c858..0000000000 --- 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 0000000000..d34d5ed9aa --- /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 0000000000..1387fd979a --- /dev/null +++ b/po/meson.build @@ -0,0 +1,7 @@ +i18n =3D import('i18n') + +if get_option('gettext') + i18n.gettext(meson.project_name(), + args: '--msgid-bugs-address=3Dqemu-devel@nongnu.org', + preset: 'glib') +endif diff --git a/po/messages.po b/po/messages.po deleted file mode 100644 index 065bd459a0..0000000000 --- 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 "" diff --git a/tests/vm/freebsd b/tests/vm/freebsd index b34b14fc53..5f866e09c4 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -39,6 +39,7 @@ class FreeBSDVM(basevm.BaseVM): "bash", "gmake", "gsed", + "gettext", =20 # libs: crypto "gnutls", diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 93d48b6fdd..ffb65a89be 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -37,6 +37,7 @@ class NetBSDVM(basevm.BaseVM): "bash", "gmake", "gsed", + "gettext", =20 # libs: crypto "gnutls", diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 7e27fda642..8356646f21 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -36,6 +36,7 @@ class OpenBSDVM(basevm.BaseVM): "bash", "gmake", "gsed", + "gettext", =20 # libs: usb "libusb1", --=20 2.26.2 From nobody Fri May 10 21:52:11 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=1597687157; cv=none; d=zohomail.com; s=zohoarc; b=ivMFyprVe0NCUqkW/0ZdrUkoIZ1wh8t8cyAL7ApCKjNjigBODuze9j0EOjjbj1wPsmo8fS26DgSlBYhsYVIcKDkJ4AV8gNM6QxUEpQBw7ounkxyFYnfA3z9mtVCc2xsAItvySKlknYkwB4kf7PT1lwndGcUILysUtnfMntkFt0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597687157; 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=0yESx4uQrlQDD7A1KJuXUBpw0lm9/dKGq7J7gF6Ild0=; b=HqpgcxzMuqXQSygRyDmIN8iZtz6xs7GnQhsbYxg3ppcanjIgufsXfNzaHayGAhdCTCIUJc0pUkjB3x777+zdVP24hTnv7/4jt9FKDli5Z3joSiBeoUL65BwOIW3nVw11x/VY18QPLOUYdWF08QFSOzjnhDDuytKVtPQ6TgIvqoc= 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 1597687157759530.5104431072419; Mon, 17 Aug 2020 10:59:17 -0700 (PDT) Received: from localhost ([::1]:49482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hNW-0003bb-Ko for importer@patchew.org; Mon, 17 Aug 2020 11:48:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLM-00040i-9m for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27885 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 1k7gLK-0006xM-KQ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-131-2mB6O1kfNTiS3BnrHYKJ-w-1; Mon, 17 Aug 2020 10:42:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2881A1DDF9 for ; Mon, 17 Aug 2020 14:42:31 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8125070C3D for ; Mon, 17 Aug 2020 14:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675353; 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=0yESx4uQrlQDD7A1KJuXUBpw0lm9/dKGq7J7gF6Ild0=; b=QZa1E1CAmVTsF8cV1dEZQn0M7njjM7y02EiEq7MvbJIfe2h+6dlMrWsl/W7forZBfu+UIM hfPuaoZd5c++AVBlJds76X5qg2ytkJBk8TnA7uuPMz5krvw1Lrl0o2Ngble68/d6QtmIiY koazlvD3mxjJmDiJCteym4KPku9wtAE= X-MC-Unique: 2mB6O1kfNTiS3BnrHYKJ-w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 147/150] meson: avoid unstable module warning with Meson 0.56.0 or newer Date: Mon, 17 Aug 2020 16:40:50 +0200 Message-Id: <20200817144053.345107-52-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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/17 00:24:04 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-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 54e92195d6..3a689d2d07 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597686710; cv=none; d=zohomail.com; s=zohoarc; b=mO15C4coH7vkJB/Yzv9OoOX0oeeP7oe0X+xTtDdQ5aVyTgUZbXlF7bQTcD53iusfhHV+4buB2tjAboa4SeDvsQdYdBeoUdEWaSgzp5Rm+Cpcj8klApo0avEopb4/Gl36Gr5AxKGupnAkMxAa2lUVtgZ9Yz7R0BsscQ3PdpYyCGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686710; 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=Y5p6tnd5BAiBsFkbSTHI4azK3cPkhW4bGUgbGxdos+c=; b=SI1yxd3gOeeUfYaUnpNCZJtkaMJ/rrfaDDzNWD1iEnR0SGbYgdxpT4b3QA/Ilmw8gjCNA/xIsbqFRZh9vj0Prhti193R/URFOq7dAL4M1HuZz/QIgkP/BizUtSZAvQOnlCmVfMNxRSKpDXHGbkUTreHphZWfIiNbV5z/NVHHwz8= 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 1597686710567386.01630230781007; Mon, 17 Aug 2020 10:51:50 -0700 (PDT) Received: from localhost ([::1]:47692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hNE-0002rf-WC for importer@patchew.org; Mon, 17 Aug 2020 11:48:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLO-000462-AQ for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gLM-0006xf-Du for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-82-NaOB1TKkOD2muF4kUskZ8A-1; Mon, 17 Aug 2020 10:42:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2DFA91005E5F for ; Mon, 17 Aug 2020 14:42:32 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8759470C3D for ; Mon, 17 Aug 2020 14:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675355; 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=Y5p6tnd5BAiBsFkbSTHI4azK3cPkhW4bGUgbGxdos+c=; b=UKKphi99o+Si/1kmeaxrSeFz1W/3z6DsKMON+4HooSQMywDIoR75b3mO1WM6JvURX8uRUl 026Q5PQ7RSxt/Y05owpNuBiWcTpM5aR7uJoYBPM4tZwxUKz931VtzyoXnKCEfLMT8hyP4W MWUVpwDyX/J/V5rNTilytsQrddsVh4Q= X-MC-Unique: NaOB1TKkOD2muF4kUskZ8A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 148/150] acceptance: use stable URLs for the Debian and Ubuntu installer Date: Mon, 17 Aug 2020 16:40:51 +0200 Message-Id: <20200817144053.345107-53-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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/17 01:24:49 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-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 73cc69c499..57ba6328de 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 2.26.2 From nobody Fri May 10 21:52:11 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=1597682940; cv=none; d=zohomail.com; s=zohoarc; b=b60DJrbt5Za0YImFTEOGg1uHwqnNPRwhlly385y1fsrrV6pbO8/RgQJ1+giJ9ENkTBihzokx39AonKJ03YIMTI4KNx9ehnldwuclLH5IqScHvLL+lrSUsybWhmIqncTH2KIuBEEOToLhwQkP86feHnvXtPAc03TnNNI/knTCBIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682940; 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=NhC3WN+7P3oYu/I5W9ozmdGow63gLRM3tv8jbIWeG3g=; b=WyharBCxW/IiKjkLnMox2kCLwvqxqeoOEZXHpotWGuFbMJ6fU7+N/PgaSbV6gECarc+zHqQBZMM7Cj+KmU0y1Q5ABBjDan0rwl7q6Z+GM2dcNS7eC2WLJMxyAbhWa/cRECDH+nOdbBdsGb3A28eXcMnkwxCsTRCs1jCEIqrtYMk= 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 1597682940012877.4158909532567; Mon, 17 Aug 2020 09:49:00 -0700 (PDT) Received: from localhost ([::1]:41496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hQo-0003q6-5w for importer@patchew.org; Mon, 17 Aug 2020 11:52:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLU-0004LU-88 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46932 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 1k7gLP-0006y0-CV for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-415-5_Bcn-Z_MJ-sHMskB_4xtA-1; Mon, 17 Aug 2020 10:42:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35097100CEC4 for ; Mon, 17 Aug 2020 14:42:33 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CAA670C3D for ; Mon, 17 Aug 2020 14:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675358; 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=NhC3WN+7P3oYu/I5W9ozmdGow63gLRM3tv8jbIWeG3g=; b=Y121lRMHg01WqGRPFbvxYkiswhrFA3e+piIsdVjpfxyAS0rt8v121ZDFPdypOBs4EpGrtB 6MkEmrwefmOyBP1bJj1suTdltcNwBRLnhUOsnpgJL8uyPPNi6qy3QoguJhEubD6QSO/3gs st6wdgTB4fKI/uvbGvFWkVHPm9/JP0g= X-MC-Unique: 5_Bcn-Z_MJ-sHMskB_4xtA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 149/150] meson: update build-system documentation Date: Mon, 17 Aug 2020 16:40:52 +0200 Message-Id: <20200817144053.345107-54-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com 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/17 00:24:04 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-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/devel/build-system.txt | 468 ++++++++++++++++++------------------ 1 file changed, 240 insertions(+), 228 deletions(-) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index fea67b207c..2ced8ca474 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -22,15 +22,34 @@ silent while it is checking for features. It will only = display output when an error occurs, or to show the final feature enablement summary on completion. =20 -Adding new checks to the configure script usually comprises the -following tasks: +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. =20 - - Initialize one or more variables with the default feature state. +New checks should be added to Meson, which usually comprises the +following tasks: =20 - Ideally features should auto-detect whether they are present, - so try to avoid hardcoding the initial state to either enabled - or disabled, as that forces the user to pass a --enable-XXX - / --disable-XXX flag on every invocation of configure. + - Add a Meson build option to meson_options.txt. =20 - Add support to the command line arg parser to handle any new --enable-XXX / --disable-XXX flags required by the feature XXX. @@ -38,63 +57,55 @@ following tasks: - Add information to the help output message to report on the new feature flag. =20 - - Add code to perform the actual feature check. As noted above, try to - be fully dynamic in checking enablement/disablement. + - Add code to perform the actual feature check. + + - Add code to include the feature status in config-host.h =20 - Add code to print out the feature status in the configure summary upon completion. =20 - - Add any new makefile variables to $config_host_mak on completion. - =20 -Taking (a simplified version of) the probe for gnutls from configure, -we have the following pieces: +Taking the probe for SDL as an example, we have the following pieces +in configure: =20 # Initial variable state - gnutls=3D"" + sdl=3Dauto =20 ..snip.. =20 # Configure flag processing - --disable-gnutls) gnutls=3D"no" + --disable-gnutls) sdl=3Ddisabled ;; - --enable-gnutls) gnutls=3D"yes" + --enable-gnutls) sdl=3Denabled ;; =20 ..snip.. =20 # Help output feature message - gnutls GNUTLS cryptography support + sdl SDL UI =20 ..snip.. =20 - # Test for gnutls - if test "$gnutls" !=3D "no"; then - if ! $pkg_config --exists "gnutls"; then - gnutls_cflags=3D`$pkg_config --cflags gnutls` - gnutls_libs=3D`$pkg_config --libs gnutls` - libs_softmmu=3D"$gnutls_libs $libs_softmmu" - libs_tools=3D"$gnutls_libs $libs_tools" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $gnutls_cflags" - gnutls=3D"yes" - elif test "$gnutls" =3D "yes"; then - feature_not_found "gnutls" "Install gnutls devel" - else - gnutls=3D"no" - fi - fi + # Meson invocation + -Dsdl=3D$sdl =20 - ..snip.. +In meson_options.txt: =20 - # Completion feature summary - echo "GNUTLS support $gnutls" + option('sdl', type : 'feature', value : 'auto') =20 - ..snip.. +In meson.build: + + # Detect dependency + sdl =3D dependency('sdl2', + required: get_option('sdl'), + static: enable_static) + + # Create config-host.h + config_host_data.set('CONFIG_SDL', sdl.found()) + + # Summary + summary_info +=3D {'SDL support': sdl.found()} =20 - # Define make variables - if test "$gnutls" =3D "yes" ; then - echo "CONFIG_GNUTLS=3Dy" >> $config_host_mak - fi =20 =20 Helper functions @@ -164,145 +175,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 +Stage 2: Meson +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -The use of GNU make is required with the QEMU build system. +The Meson build system is currently used to describe the build +process for: =20 -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. +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 -QEMU currently supports both VPATH and non-VPATH builds, so there are -three general ways to invoke configure & perform a build. +2) documentation =20 - - VPATH, build artifacts outside of QEMU source tree entirely +3) ROMs, which can be either installed as binary blobs or compiled =20 - cd ../ - mkdir build - cd build - ../qemu/configure - make +4) other data files, such as icons or desktop files =20 - - VPATH, build artifacts in a subdir of QEMU source tree - - mkdir build - cd build - ../configure - make - - - 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. =20 -A further complication for the system emulator binaries is that -two separate binaries need to be generated. +In case the script is not written in Python, use a "#! /usr/bin/env ..." +line and make the script executable. =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. +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: =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. + test('QAPI schema regression tests', python, + args: files('test-qapi.py'), + env: test_env, suite: ['qapi-schema', 'qapi-frontend']) =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. +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 =20 -Object variable naming ----------------------- +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.: + + qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a + +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.. + +This expands to '.exe' on Windows, or '' on other platforms. + +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'. =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 +Likewise, tests that are executed by "make check-unit" are grouped into +a variable check-unit-y, like this: =20 -When there is an object file which needs to be conditionally built based + 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) + +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 +371,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 +401,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 - -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... +- Makefile.objs =20 - iscsi.o-cflags :=3D $(LIBISCSI_CFLAGS) - iscsi.o-libs :=3D $(LIBISCSI_LIBS) - curl.o-cflags :=3D $(CURL_CFLAGS) - curl.o-libs :=3D $(CURL_LIBS) +Defines *-obj-y files corresponding to=20 =20 -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 +433,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 +448,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 +456,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 +477,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 2.26.2 From nobody Fri May 10 21:52:11 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=1597679220; cv=none; d=zohomail.com; s=zohoarc; b=a5EpWRvvDNkNRwASxB3D9xTqXZJ0ZHKFL8c4g1Oln8LrBdpQf1/DHE4/DA+PYSeKhLPpn7ykF2PqU6+zHPiGOu8qjYkqcW6/4lj3/pvbnCiEqODboVfu8Y3JvMp30/G4k3OU9mJTU6YP43go3+pwowsMihPhlT86Qm9+jOh+w/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597679220; 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=GAaZUA7+BY6e8BumbNUXRJSmw7xFqATVRXaDn0VDaIU=; b=F8/WwJy4wt+GkQcZ1Ef1yzO/bkGQnQi9vSIcdQj6S5dLqBg2aXoQ++TihVu2CNNGsDNUgyERb9z/F71wUhI/s+GW/H8ct+i6G1vf3rGxFQ/Xz/jsB+9Y96oQ3ExCDC501EZwu6H9OsK2cmZeP7gyp1BSUUF6Vuwy7iIRyq2Ffbk= 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 1597679220257814.478491243427; Mon, 17 Aug 2020 08:47:00 -0700 (PDT) Received: from localhost ([::1]:38928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hLe-0007i8-UQ for importer@patchew.org; Mon, 17 Aug 2020 11:46:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLS-0004H3-FH for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gLP-0006xy-7i for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42: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-202-eLlvDvUhNPCPdaLNl5lSGg-1; Mon, 17 Aug 2020 10:42:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B75F1DDEB for ; Mon, 17 Aug 2020 14:42:34 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9322D756AB for ; Mon, 17 Aug 2020 14:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675358; 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=GAaZUA7+BY6e8BumbNUXRJSmw7xFqATVRXaDn0VDaIU=; b=D8MEBCEzeVnENaR9OFSo9+61ne+CSZ8bRNVc3BynTOvJIIvH6PC/7txhdG0IENFBk2Qcdg 3R8EGwBpYw6IPgvHhOSI648qsCmVfoPBlBU5zmk6qDA4ym6wUzvyn4bvJ0eTet1oiOk4Qs /BggRnd5k8lKZHJVH+Ak0+9lgqfECI4= X-MC-Unique: eLlvDvUhNPCPdaLNl5lSGg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 150/150] docs: convert build system documentation to rST Date: Mon, 17 Aug 2020 16:40:53 +0200 Message-Id: <20200817144053.345107-55-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com 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/17 01:24:49 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-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- .../{build-system.txt =3D> build-system.rst} | 310 ++++++++---------- docs/devel/index.rst | 1 + tests/qapi-schema/meson.build | 6 +- 3 files changed, 145 insertions(+), 172 deletions(-) rename docs/devel/{build-system.txt =3D> build-system.rst} (62%) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.rst similarity index 62% rename from docs/devel/build-system.txt rename to docs/devel/build-system.rst index 2ced8ca474..58bf392430 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.rst @@ -1,5 +1,6 @@ - The QEMU build system architecture - =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 QEMU build system architecture +=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 =20 This document aims to help developers understand the architecture of the QEMU build system. As with projects using GNU autotools, the QEMU build @@ -26,7 +27,7 @@ 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: =20 - - VPATH, build artifacts outside of QEMU source tree entirely + - VPATH, build artifacts outside of QEMU source tree entirely:: =20 cd ../ mkdir build @@ -34,7 +35,7 @@ perform a build: ../qemu/configure make =20 - - VPATH, build artifacts in a subdir of QEMU source tree + - VPATH, build artifacts in a subdir of QEMU source tree:: =20 mkdir build cd build @@ -52,21 +53,21 @@ following tasks: - Add a Meson build option to meson_options.txt. =20 - Add support to the command line arg parser to handle any new - --enable-XXX / --disable-XXX flags required by the feature XXX. + `--enable-XXX`/`--disable-XXX` flags required by the feature. =20 - Add information to the help output message to report on the new feature flag. =20 - Add code to perform the actual feature check. =20 - - Add code to include the feature status in config-host.h + - Add code to include the feature status in `config-host.h` =20 - Add code to print out the feature status in the configure summary upon completion. =20 =20 Taking the probe for SDL as an example, we have the following pieces -in configure: +in configure:: =20 # Initial variable state sdl=3Dauto @@ -89,11 +90,11 @@ in configure: # Meson invocation -Dsdl=3D$sdl =20 -In meson_options.txt: +In meson_options.txt:: =20 option('sdl', type : 'feature', value : 'auto') =20 -In meson.build: +In meson.build:: =20 # Detect dependency sdl =3D dependency('sdl2', @@ -114,63 +115,51 @@ Helper functions The configure script provides a variety of helper functions to assist developers in checking for system features: =20 - - do_cc $ARGS... - +`do_cc $ARGS...` Attempt to run the system C compiler passing it $ARGS... =20 - - do_cxx $ARGS... - +`do_cxx $ARGS...` Attempt to run the system C++ compiler passing it $ARGS... =20 - - compile_object $CFLAGS - +`compile_object $CFLAGS` Attempt to compile a test program with the system C compiler using $CFLAGS. The test program must have been previously written to a file called $TMPC. =20 - - compile_prog $CFLAGS $LDFLAGS - +`compile_prog $CFLAGS $LDFLAGS` Attempt to compile a test program with the system C compiler using $CFLAGS and link it with the system linker using $LDFLAGS. The test program must have been previously written to a file called $TMPC. =20 - - has $COMMAND - +`has $COMMAND` Determine if $COMMAND exists in the current environment, either as a shell builtin, or executable binary, returning 0 on success. =20 - - path_of $COMMAND - +`path_of $COMMAND` Return the fully qualified path of $COMMAND, printing it to stdout, and returning 0 on success. =20 - - check_define $NAME - +`check_define $NAME` Determine if the macro $NAME is defined by the system C compiler =20 - - check_include $NAME - +`check_include $NAME` Determine if the include $NAME file is available to the system C compiler =20 - - write_c_skeleton - +`write_c_skeleton` Write a minimal C program main() function to the temporary file indicated by $TMPC =20 - - feature_not_found $NAME $REMEDY - +`feature_not_found $NAME $REMEDY` Print a message to stderr that the feature $NAME was not available on the system, suggesting the user try $REMEDY to address the problem. =20 - - error_exit $MESSAGE $MORE... - +`error_exit $MESSAGE $MORE...` Print $MESSAGE to stderr, followed by $MORE... and then exit from the configure script with non-zero status =20 - - query_pkg_config $ARGS... - +`query_pkg_config $ARGS...` Run pkg-config passing it $ARGS. If QEMU is doing a static build, then --static will be automatically added to $ARGS =20 @@ -182,9 +171,13 @@ The Meson build system is currently used to describe t= he build process for: =20 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 2) documentation @@ -200,9 +193,9 @@ to list the files and their dependency on various confi= guration 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: +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 libchardev =3D static_library('chardev', chardev_ss.sources(), name_suffix: 'fa', @@ -210,7 +203,7 @@ are then turned into static libraries as follows: =20 chardev =3D declare_dependency(link_whole: libchardev) =20 -The special ".fa" suffix is needed as long as unit tests are built with +The special `.fa` suffix is needed as long as unit tests are built with the older Makefile infrastructure, and will go away later. =20 Files linked into emulator targets there can be split into two distinct gr= oups @@ -221,24 +214,24 @@ In the target-independent set lives various general p= urpose 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. +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 -All binaries link with a static library libqemuutil.a, which is then -linked to all the binaries. libqemuutil.a is built from several +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. +of general interest are `util_ss` and `stub_ss`. =20 The separation between these two is purely for documentation purposes. -util_ss contains generic utility files. Even though this code is only +`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 +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. @@ -246,45 +239,43 @@ symbols concept. The following files concur in the definition of which files are linked into each emulator: =20 -- default-configs/*.mak +`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:: =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: + include arm-softmmu.mak + CONFIG_XLNX_ZYNQMP_ARM=3Dy + CONFIG_XLNX_VERSAL=3Dy =20 - include arm-softmmu.mak - CONFIG_XLNX_ZYNQMP_ARM=3Dy - CONFIG_XLNX_VERSAL=3Dy +`*/Kconfig` + 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. =20 These files rarely need changing unless new devices / hardware need to be enabled for a particular system/userspace emulation target =20 -- */Kconfig - -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. - =20 Support scripts --------------- =20 Meson has a special convention for invoking Python scripts: if their -first line is "#! /usr/bin/env python3" and the file is *not* executable, +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. =20 -In case the script is not written in Python, use a "#! /usr/bin/env ..." +In case the script is not written in Python, use a `#! /usr/bin/env ...` line and make the script executable. =20 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: +should be invoked through the `python` variable in meson.build. For +example:: =20 test('QAPI schema regression tests', python, args: files('test-qapi.py'), @@ -307,35 +298,35 @@ rules and wraps them so that e.g. submodules are buil= t before QEMU. The resulting build system is largely non-recursive in nature, in contrast to common practices seen with automake. =20 -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". +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`. =20 The following text is only relevant for unit tests which still have to be converted to Meson. =20 -All binaries should link to libqemuutil.a, e.g.: +All binaries should link to `libqemuutil.a`, e.g.: =20 qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a =20 -On Windows, all binaries have the suffix '.exe', so all Makefile rules +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. =20 qemu-img$(EXESUF): qemu-img.o ..snip.. =20 -This expands to '.exe' on Windows, or '' on other platforms. +This expands to `.exe` on Windows, or an empty string on other platforms. =20 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. The -Meson "chardev" variable in the previous example corresponds to a +Meson `chardev` variable in the previous example corresponds to a variable 'chardev-obj-y'. =20 -Likewise, tests that are executed by "make check-unit" are grouped into +Likewise, tests that are executed by `make check-unit` are grouped into a variable check-unit-y, like this: =20 check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) @@ -355,8 +346,8 @@ On Windows this expands to =20 check-unit-n +=3D tests/vmstate.exe =20 -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 +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 @@ -397,47 +388,37 @@ The following key files are statically defined in the= source tree, with the rules needed to build QEMU. Their behaviour is influenced by a number of dynamically created files listed later. =20 -- Makefile - -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. Makefile takes care of recursively building submodules -directly via a non-recursive set of rules. - -- Makefile.objs - -Defines *-obj-y files corresponding to=20 - -- */meson.build - -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. - -- rules.mak - -This file provides the generic helper rules for invoking build tools, in -particular the compiler and linker. - -- tests/Makefile.include - -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 -entire build system. Care needs to be taken when writing rules for tests -to ensure they only apply to the unit test execution / build. - -- tests/docker/Makefile.include - -Rules for Docker 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. - -- tests/vm/Makefile.include - -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. +`Makefile` + 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. Makefile takes care of recursively building submodules + directly via a non-recursive set of rules. + +`*/meson.build` + The meson.build file in the root directory is the main entry point for t= he + 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. + +`rules.mak` + This file provides the generic helper rules for invoking build tools, in + particular the compiler and linker. + +`tests/Makefile.include` + 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 + entire build system. Care needs to be taken when writing rules for tests + to ensure they only apply to the unit test execution / build. + +`tests/docker/Makefile.include` + Rules for Docker 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. + +`tests/vm/Makefile.include` + 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,79 +431,70 @@ Makefile. =20 Built by configure: =20 -- config-host.mak - -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 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. +`config-host.mak` + 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 and meson.build in order to + tailor the build output. =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... + 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 -- $TARGET-NAME/config-target.mak + 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 -TARGET-NAME is the name of a system or userspace emulator, for example, -x86_64-softmmu denotes the system emulator for the x86_64 architecture. -This file contains the variables which need to vary on a per-target -basis. For example, it will indicate whether KVM or Xen are enabled for -the target and any other potential custom libraries needed for linking -the target. +`$TARGET-NAME/config-target.mak` + TARGET-NAME is the name of a system or userspace emulator, for example, + x86_64-softmmu denotes the system emulator for the x86_64 architecture. + This file contains the variables which need to vary on a per-target + basis. For example, it will indicate whether KVM or Xen are enabled for + the target and any other potential custom libraries needed for linking + the target. =20 =20 Built by Meson: =20 -- ${TARGET-NAME}-config-devices.mak - -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. - -- config-host.h -- $TARGET-NAME/config-target.h -- $TARGET-NAME/config-devices.h +`${TARGET-NAME}-config-devices.mak` + 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 -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. +`config-host.h`, `$TARGET-NAME/config-target.h`, `$TARGET-NAME/config-devi= ces.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. =20 -- build.ninja +`build.ninja` + The build rules. =20 =20 Built by Makefile: =20 -- Makefile.ninja: +`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 -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. - -- Makefile.mtest: - -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. +`Makefile.mtest` + 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -- help +------------------- =20 +`help` Print a help message for the most common build targets. =20 -- print-VAR - +`print-VAR` Print the value of the variable VAR. Useful for debugging the build system. diff --git a/docs/devel/index.rst b/docs/devel/index.rst index ae6eac7c9c..04773ce076 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -13,6 +13,7 @@ Contents: .. toctree:: :maxdepth: 2 =20 + build-system kconfig loads-stores memory diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index ae17017504..c87d141417 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -205,14 +205,14 @@ test('QAPI schema regression tests', python, args: fi= les('test-qapi.py', schemas diff =3D find_program('diff') =20 qapi_doc =3D custom_target('QAPI doc', - output: ['doc-good-qapi-commands.c', 'doc-good-qa= pi-commands.h', + output: ['doc-good-qapi-doc.texi', + 'doc-good-qapi-commands.c', 'doc-good-qa= pi-commands.h', 'doc-good-qapi-emit-events.c', 'doc-good= -qapi-emit-events.h', 'doc-good-qapi-events.c', 'doc-good-qapi= -events.h', 'doc-good-qapi-init-commands.c', 'doc-go= od-qapi-init-commands.h', 'doc-good-qapi-introspect.c', 'doc-good-= qapi-introspect.h', 'doc-good-qapi-types.c', 'doc-good-qapi-= types.h', - 'doc-good-qapi-visit.c', 'doc-good-qapi-= visit.h', - 'doc-good-qapi-doc.texi' ], + 'doc-good-qapi-visit.c', 'doc-good-qapi-= visit.h' ], input: files('doc-good.json'), command: [ qapi_gen, '-o', meson.current_build_di= r(), '-p', 'doc-good-', '@INPUT0@' ], --=20 2.26.2