From patchwork Thu Dec 12 12:50:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Bl6pHj62"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYdR34Ksz9sPf for ; Thu, 12 Dec 2019 23:53:47 +1100 (AEDT) Received: from localhost ([::1]:58846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyR-0002bJ-KZ for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:53:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55120) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxl-0002Yz-Sh for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxk-0005Xh-Tb for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:01 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42362) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxk-0005W5-MU for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:00 -0500 Received: by mail-wr1-x432.google.com with SMTP id q6so2580858wro.9 for ; Thu, 12 Dec 2019 04:53:00 -0800 (PST) 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=UJRw/6pTHwg669MDPUQSE4YZuxiWLe8OTKSvZ9cB834=; b=Bl6pHj62C154FAn8yUHrU+tf6VBj9MsVCs9UDgm7DNU72lHYXrPCfp+u2GX9ss57VL PdShZdG13EdszCG0aAssaOcOBMqnMf/BJTZQT/RGuDvSKXjUqlU3j8UZb+S83HRe81aX F7+UpjDxtfef4uEcGdFHuE0fE8/dnsG0Qkcy4JvpUUZwDNF70rh3300dxdUjty6sL314 P93oUzBSwMohrsP7digMCu+JxuyQ4+XZhKye0KlisQZIcP5ykYGUIEAPL3zMPyppc2xN xFUkruB4Dpyi93MLJr37nlhY+/ntz6HH7rZ5BGK+rRxkhaq8fxzkYwP9dVY9zuuJSuAP hXeA== 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=UJRw/6pTHwg669MDPUQSE4YZuxiWLe8OTKSvZ9cB834=; b=BUsvD1uZMRfybtcC7d8TqYjdeWNNqOSQ0Ncb5Lx12hIOxeAaxq2aWFKMBZxs4ft9ID yd+MNpVvEEwkmBgxmQkPkCW1Pe46BahOPZiKxKjk65IdPNN3u3oLmQSlgHkflMN4/YAK FFtbfpln9DSFDaL5D7QneSbYII0kEY1x5QB1FBv4V/27z7TLOVz9yMYgM7HuwN8rfUHH SxLfgTL+BMc+fnBKCSXPMCXdhxNqUnMexJS8BBH3+c5citaElOjawmS2EoyMeQjKFzqC rKuj8UnIofbLAbBMnlLUQR80w7WAr7Ep6I2E7RBsWQvaEnDupVGOW9UESt6CPMPAJQLn wBCQ== X-Gm-Message-State: APjAAAU9a1ObQE/T4cUa3kd0aupWpfOh/Mjh3RA0UacfC3FkC5ZfQNEu K6nut+uCpZL8ENAkYvC+UCYvqQAZ X-Google-Smtp-Source: APXvYqwejByHMZ9YhntEjizwraJccYaaiLfwwIlsZkvB6TmnNbLCZzJd9VI/OjKop6cnLyoalMKBLw== X-Received: by 2002:adf:dfd2:: with SMTP id q18mr6163190wrn.152.1576155179330; Thu, 12 Dec 2019 04:52:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.52.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:52:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 001/132] build-sys hack: ensure target directory is there Date: Thu, 12 Dec 2019 13:50:45 +0100 Message-Id: <1576155176-2464-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André 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é Lureau --- rules.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/rules.mak b/rules.mak index 967295d..e19ad19 100644 --- a/rules.mak +++ b/rules.mak @@ -66,6 +66,7 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \ $(filter-out %.o %.mo,$1)) %.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)$@") From patchwork Thu Dec 12 12:50:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AEUUq2eQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYhn6pdYz9sPf for ; Thu, 12 Dec 2019 23:56:41 +1100 (AEDT) Received: from localhost ([::1]:58890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO1G-0006do-Rb for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:56:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55524) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxn-0002bK-T6 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxm-0005bh-QC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:03 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxm-0005Zo-Ij for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:02 -0500 Received: by mail-wm1-x335.google.com with SMTP id p17so2374008wmi.3 for ; Thu, 12 Dec 2019 04:53:02 -0800 (PST) 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=lAA1rauPYw3IdpUqrU8014lOsyjgeqIfQTPWD16bhyU=; b=AEUUq2eQC1y04DVlwqhtHbH5q85fKMba2+z67LVO//TenswBIQehzV4XVBgS9ih+Ee xYfHjIpojqS0qt9TGiYT+FJE5ZN5HwRyS85mPFxVjQ7u0f30Ejuf1u+LaYqf3388h5aa XTnLkh7dcvsScL6ogtIK8LHOWuFGZNOh/p/NnYf6BbrqX1KHDKww1YzAtszbyEmaD33H iKMBAr52EDuWhf0wycCmOWGbz5n9gZy6bHHnscIgxQCBxaXlyyoGuz0LoirYqF+jwJGB aYLRg6ailW/htf4KIpxJoH0C67iq8sM8X4nFbaWwqHfiCe9QnnlmfQHo5pBfvzdO5Wl/ rKTg== 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=lAA1rauPYw3IdpUqrU8014lOsyjgeqIfQTPWD16bhyU=; b=npmMyHGRilSYOSHnVzotNvH0UY3bcTExZSHj+NlaxS4xlRB9BxoESub9UDp3p5T0Ay q2Yy1c/CbOenwFQFY66Z813xhO2sv1FAVBnolhnN2K6Q2ZlzArKsA35wi78pazWPZDhX f5OD/7/RVvxhrrST+F6KSy+UFQe262a4LZDZgO5UEVUIlKJDg8j3EVejKgtpkSDQAavB aWp6ZN55QbYa5Bwz79Poc2oxiu9aqVjPSDJ6zysoz/ZHufEed0l0p+X42Hu4xDIiMgwk v5wUAEI1E96c9g0ZKlS5l/91Gv008LmfV/6/lMTQGFHaWswgO85mvU0/do3SLMiaDlh6 GHlQ== X-Gm-Message-State: APjAAAUBhD2Xzww/HXeHfrIBZP/6VjICQZYqEa3Gr3XZ8s/v1s9gLHcr LPTlGd/7Im5LLyjF+MwT+dV8UBl5 X-Google-Smtp-Source: APXvYqzVi6EPtHjIiN2lriJmXybAtb1AQ180AnLTEHmQRDtlZ/ywPdVo1iHIWUDhnSvo8SkAfzGewA== X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr6455917wmi.104.1576155181268; Thu, 12 Dec 2019 04:53:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 003/132] configure: expand path variables for meson configure Date: Thu, 12 Dec 2019 13:50:47 +0100 Message-Id: <1576155176-2464-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- configure | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 9745b87..a444bc3 100755 --- a/configure +++ b/configure @@ -404,16 +404,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" -mandir="\${prefix}/share/man" -datadir="\${prefix}/share" firmwarepath="\${prefix}/share/qemu-firmware" -qemu_docdir="\${prefix}/share/doc/qemu" -bindir="\${prefix}/bin" -libdir="\${prefix}/lib" -libexecdir="\${prefix}/libexec" -includedir="\${prefix}/include" -sysconfdir="\${prefix}/etc" -local_statedir="\${prefix}/var" confsuffix="/qemu" slirp="" oss_lib="" @@ -926,12 +917,6 @@ if test "$mingw32" = "yes" ; then LIBS="-liberty $LIBS" fi prefix="c:/Program Files/QEMU" - mandir="\${prefix}" - datadir="\${prefix}" - qemu_docdir="\${prefix}" - bindir="\${prefix}" - sysconfdir="\${prefix}" - local_statedir= confsuffix="" libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga" fi @@ -1529,6 +1514,26 @@ for opt do esac done +libdir="${libdir:-$prefix/lib}" +libexecdir="${libexecdir:-$prefix/libexec}" +includedir="${includedir:-$prefix/include}" + +if test "$mingw32" = "yes" ; then + mandir="$prefix" + datadir="$prefix" + qemu_docdir="$prefix" + bindir="$prefix" + sysconfdir="$prefix" + local_statedir= +else + mandir="${mandir:-$prefix/share/man}" + datadir="${datadir:-$prefix/share}" + qemu_docdir="${qemu_docdir:-$prefix/share/doc/qemu}" + bindir="${bindir:-$prefix/bin}" + sysconfdir="${sysconfdir:-$prefix/etc}" + local_statedir="${local_statedir:-$prefix/var}" +fi + case "$cpu" in ppc) CPU_CFLAGS="-m32" From patchwork Thu Dec 12 12:50:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r0HOF4R3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYvq414Gz9sPf for ; Fri, 13 Dec 2019 00:06:15 +1100 (AEDT) Received: from localhost ([::1]:59000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOAW-0000Ov-Q9 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:06:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56436) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxs-0002j7-Ms for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxo-0005g1-PT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:08 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55131) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxo-0005dV-BC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:04 -0500 Received: by mail-wm1-x342.google.com with SMTP id b11so2234343wmj.4 for ; Thu, 12 Dec 2019 04:53:04 -0800 (PST) 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; bh=mn+hxne73zFvUmD2msXChxqqwB5Ndt2kUDUr0Qv6Y78=; b=r0HOF4R3veh2F9VgCbkcfRVBRy6WSkTWtZfQTwEfPcJqFZZA7GKxAifDDGOcC8U0kc waz/nyk40JYfUmbOr9cgIcIbYyUggWDRGhVyaLa7ebUp9gjX1pSX4f/+mie1vanDvgH6 G5fUt/VKrrk3PWh1gpajc0tnTxu6bja7v1kPs7c3mIIPxNFjxuN28zfCTsluEsppiyw/ dUDO60zDK9x0YKtNv/rP/bMlUIlriUlxJNNK/kntvppKOXUnr2Iyok4zEKCVUpH6/NI5 OW1K5VrLkUId5x+aMXTGX1hOTqxdtbsNfRJeC7qlnNrZMDalL5uPnIF7t4kjbsHtKlUr DJgg== 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; bh=mn+hxne73zFvUmD2msXChxqqwB5Ndt2kUDUr0Qv6Y78=; b=QhruK70XdvCUvvo0F4T53QM2XWeJE9SLK7/wlyt8XhVqmoAHpif3iqRYW68i9A40Ex DX666CknE6+a01cGtS6V1QoGKyZvMFNpUlcFImxEaSFWAZg13YFnter8tXvp6A7a8L2B J/PcxaJ+tXHqN8bD3F+YwEh20h5U5Q9dT8IgXdk/vaPadK+di5QA4x3PkSxaJ6VLaDvp bBVVUABAxcXgyzUKxyQReT9VC5+mLuDqXXpCkTSRX3dYYzZOhnu+6VKohxXSV3E/PW1p WK7/hnkjxE8ipH79ZD8RJJF3peRTAqqH29msEUq/lGtB6XH+O6uJwBoWPSR13yHP5B0A NJJQ== X-Gm-Message-State: APjAAAVMGFHP8oZYT79drTaxbSSIz6MjGU1kSYdmarvtpc6a7FnViKuf /b1EFWruRpAuUCKGAv+P6kjj1W2J X-Google-Smtp-Source: APXvYqynUx8oSi6yaXKSvNOL+YINkAyPz0UwFFaNYgp8ctFsSWafQutbip0NkU1/rfZzS0aKjnipaA== X-Received: by 2002:a05:600c:1007:: with SMTP id c7mr6785252wmc.158.1576155182361; Thu, 12 Dec 2019 04:53:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 004/132] configure: integrate Meson in the build system Date: Thu, 12 Dec 2019 13:50:48 +0100 Message-Id: <1576155176-2464-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Meson build system is integrated in the existing configure/make steps by invoking Meson from the configure script and converting Meson's build.ninja rules to an included Makefile. Signed-off-by: Paolo Bonzini --- Makefile | 9 + configure | 30 ++ meson.build | 19 + scripts/ninjatool.py | 1004 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1062 insertions(+) create mode 100644 meson.build create mode 100755 scripts/ninjatool.py diff --git a/Makefile b/Makefile index e327df4..44daed6 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,15 @@ git-submodule-update: endif endif +export NINJA=./ninjatool +Makefile.ninja: build.ninja ninjatool + ./ninjatool -t ninja2make --clean --omit dist uninstall < $< > $@ +-include Makefile.ninja + +ninjatool: ninjatool.stamp +ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py + $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@ + .git-submodule-status: git-submodule-update config-host.mak # Check that we're not trying to do an out-of-tree build from diff --git a/configure b/configure index a444bc3..3e3eb3d 100755 --- a/configure +++ b/configure @@ -489,6 +489,7 @@ libxml2="" debug_mutex="no" libpmem="" default_devices="yes" +meson=meson supported_cpu="no" supported_os="no" @@ -952,6 +953,8 @@ for opt do ;; --python=*) python="$optarg" ;; + --meson=*) meson="$optarg" + ;; --gcov=*) gcov_tool="$optarg" ;; --smbd=*) smbd="$optarg" @@ -1658,6 +1661,7 @@ Advanced options (experts only): --make=MAKE use specified make [$make] --install=INSTALL use specified install [$install] --python=PYTHON use specified python [$python] + --meson=MESON use specified meson [$meson] --smbd=SMBD use specified smbd [$smbd] --with-git=GIT use specified git [$git] --static enable static build [$static] @@ -1823,6 +1827,12 @@ then error_exit "Python not found. Use --python=/path/to/python" fi +if ! has "$meson" +then + error_exit "Meson not found. Use --meson=/path/to/meson" +fi +meson=$(command -v $meson) + # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then @@ -7266,6 +7276,7 @@ echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak echo "PYTHON_VERSION=$python_version" >> $config_host_mak +echo "MESON=$meson" >> $config_host_mak echo "CC=$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=$iasl" >> $config_host_mak @@ -7841,6 +7852,25 @@ echo "# Automatically generated by configure - do not modify" > "$iotests_common echo >> "$iotests_common_env" echo "export PYTHON='$python'" >> "$iotests_common_env" +rm -rf meson-private meson-info meson-logs +NINJA=$PWD/ninjatool $python $meson setup \ + --prefix "$prefix" \ + --libdir "$libdir" \ + --libexecdir "$libexecdir" \ + --bindir "$bindir" \ + --includedir "$includedir" \ + --datadir "$datadir" \ + --mandir "$mandir" \ + --sysconfdir "$sysconfdir" \ + --localstatedir "$local_statedir" \ + $(test "$strip_opt" = yes && echo --strip) \ + --buildtype $(if test "$debug" = yes; then echo debug; else echo debugoptimized; fi) \ + "$PWD" "$source_path" + +if test "$?" -ne 0 ; then + error_exit "meson setup failed" +fi + # Save the configure command line for later reuse. cat <config.status #!/bin/sh diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..5491a6a --- /dev/null +++ b/meson.build @@ -0,0 +1,19 @@ +project('qemu', ['c', 'cpp'], meson_version: '>=0.52.999') + +kconfig = import('unstable-kconfig') +config_host = kconfig.load(meson.current_build_dir() / 'config-host.mak') + +add_project_arguments(config_host['CFLAGS'].split(), + language: ['c', 'objc']) +add_project_arguments(config_host['QEMU_CFLAGS'].split(), + language: 'c') +add_project_link_arguments(config_host['LDFLAGS'].split(), + language: ['c', 'cpp', 'objc']) +add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), + language: ['c', 'cpp', 'objc']) +add_project_arguments(config_host['QEMU_INCLUDES'].split(), + language: 'c') + +configure_file(input: files('scripts/ninjatool.py'), + output: 'ninjatool', + configuration: config_host) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py new file mode 100755 index 0000000..a80b62f --- /dev/null +++ b/scripts/ninjatool.py @@ -0,0 +1,1004 @@ +#! /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=$0 ;; + *) me=$(command -v "$0") ;; +esac +python="@PYTHON@" +case $python in + @*) python=python3 ;; +esac +exec $python "$me" "$@" +exit 1 +''' + + +from collections import namedtuple, defaultdict +import sys +import os +import re +import json +import argparse + + +class InvalidArgumentError(Exception): + pass + + +# ---- lexer and parser ---- + +BUILD = 1 +POOL = 2 +RULE = 3 +DEFAULT = 4 +EQUALS = 5 +COLON = 6 +PIPE = 7 +PIPE2 = 8 +IDENT = 9 +INCLUDE = 10 +INDENT = 11 +EOL = 12 + + +class LexerError(Exception): + pass + + +class ParseError(Exception): + pass + + +class NinjaParserEvents(object): + def __init__(self, parser): + self.parser = parser + + def literal_token(self, word, in_path=False): + return word.replace('$', '$$') + + def variable_expansion_token(self, varname): + return '${%s}' % varname + + def tokens_to_arg(self, tokens): + return ''.join(tokens or []) + + 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): + PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" + STRING_RE = r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?" + TOPLEVEL_RE = r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*" + IDENT_RE = r"[a-zA-Z0-9_.-]+$" + + InputFile = namedtuple('InputFile', 'filename iter lineno') + + def __init__(self, filename, input): + self.stack = [] + self.lineno = None + self.match_keyword = True + self.push(filename, input) + + def __iter__(self): + return self + + def __next__(self): + while len(self.stack): + try: + return next(self.stack[-1].iter) + except StopIteration: + self.pop() + raise StopIteration + + def push(self, filename, input): + entered = self.InputFile(filename=filename or 'stdin', + iter=self._tokens(input), + lineno=self.lineno) + self.stack.append(entered) + self.lineno = 0 + if filename is not None: + os.chdir(os.path.dirname(filename) or '.') + + def pop(self): + left = self.stack.pop() + self.lineno = left.lineno + if len(self.stack): + os.chdir(os.path.dirname(self.stack[-1].filename) or '.') + + def next_line(self, input): + line = next(input).rstrip() + self.lineno += 1 + while len(line) and line[-1] == '$': + line = line[0:-1] + next(input).strip() + self.lineno += 1 + return line + + def print_token(self, tok): + if tok == EOL: + return "end of line" + if tok == BUILD: + return '"build"' + if tok == POOL: + return '"pool"' + if tok == RULE: + return '"rule"' + if tok == DEFAULT: + return '"default"' + if tok == EQUALS: + return '"="' + if tok == COLON: + return '":"' + if tok == PIPE: + return '"|"' + if tok == PIPE2: + return '"||"' + if tok == INCLUDE: + return '"include"' + if tok == IDENT: + return 'identifier' + return '"%s"' % tok + + def error(self, msg): + raise LexerError("%s:%d: %s" % (self.stack[-1].filename, self.lineno, msg)) + + def parse_error(self, msg): + raise ParseError("%s:%d: %s" % (self.stack[-1].filename, self.lineno, msg)) + + def expected(self, expected, tok): + msg = "found %s, expected " % (self.print_token(tok), ) + for i, exp_tok in enumerate(expected): + if i > 0: + msg = msg + (' or ' if i == len(expected) - 1 else ', ') + msg = msg + self.print_token(exp_tok) + self.parse_error(msg) + + def find_tokens(self, regex, line): + # group 1 is used to distinguish expected input from bad characters + # group 2, which is really group 1 in regex, is returned + for m in re.finditer("(" + regex + ")|.", line): + if not m.group(1): + self.error("unexpected '%s'" % (m.group(0), )) + if m.group(2): + yield m.span(), m.group(2) + + def _variable_tokens(self, value): + for span, match in self.find_tokens(self.STRING_RE, value): + yield match + + def _tokens(self, input): + while True: + try: + line = self.next_line(input) + except StopIteration: + return + for span, match in self.find_tokens(self.TOPLEVEL_RE, line): + if match == ':': + yield COLON + continue + if match == '|': + yield PIPE + continue + if match == '||': + yield PIPE2 + continue + if match[0] == ' ': + yield INDENT + continue + if match[0] == '=': + value = line[span[0] + 1:].lstrip() + yield EQUALS + yield from self._variable_tokens(value) + break + if match[0] == '#': + break + + # identifier + if self.match_keyword: + if match == 'build': + yield BUILD + continue + if match == 'pool': + yield POOL + continue + if match == 'rule': + yield RULE + continue + if match == 'default': + yield DEFAULT + continue + if match == 'include': + filename = line[span[0] + 8:].strip() + self.push(filename, open(filename, 'r')) + break + if match == 'subninja': + self.error('subninja is not supported') + yield match + yield EOL + + def read_ident(self): + """Read an identifier, where the only allowed characters are + letter, numbers, dash, period and underscore.""" + self.match_keyword = False + token = self.__next__() + self.match_keyword = True + if isinstance(token, str) and not re.match(self.IDENT_RE, token): + self.parse_error('variable expansion not allowed') + return token + + def read_path(self): + """Read a space-delimited path or a non-alphanumeric token, and + return a generator that produces either the token alone, or + the components of the path (identifiers and variable expansions).""" + self.match_keyword = False + token = self.__next__() + self.match_keyword = True + if isinstance(token, str): + yield from self._variable_tokens(token) + else: + yield token + + def parse(self, events): + global_var = True + + def advance(): + try: + return next(self) + except StopIteration: + return None + + def look_for(*expected): + tok = advance() + if tok in expected: + return tok + self.expected(expected, tok) + + def look_for_ident(*expected): + try: + tok = self.read_ident() + except StopIteration: + tok = None + if isinstance(tok, str) or tok in expected: + return tok + self.expected(expected + (IDENT,), tok) + + def parse_assignment_rhs(gen, expected, in_path): + value = [] + for tok in gen: + if not isinstance(tok, str): + if tok in expected: + break + self.expected(expected + (IDENT,), tok) + if tok[0] != '$': + value.append(events.literal_token(tok, in_path)) + elif tok == '$ ' or tok == '$$' or tok == '$:': + value.append(events.literal_token(tok[1], in_path)) + else: + var = tok[2:-1] if tok[1] == '{' else tok[1:] + value.append(events.variable_expansion_token(var)) + else: + # gen must have raised StopIteration, return None + # for consistency with advance() + tok = None + value = value if len(value) else None + return value, tok + + def look_for_path(*expected): + # paths in build rules are parsed one space-separated token + # at a time and expanded + gen = self.read_path() + value, tok = parse_assignment_rhs(gen, expected, True) + return value, tok + + def parse_assignment(tok): + assert isinstance(tok, str) + look_for(EQUALS) + name = tok + value, tok = parse_assignment_rhs(self, (EOL,), False) + assert tok == EOL + events.variable(name, events.tokens_to_arg(value)) + + def parse_build(): + # parse outputs + out = [] + iout = [] + while True: + value, tok = look_for_path(COLON, PIPE) + if value is None: + break + out.append(events.tokens_to_arg(value)) + if tok == PIPE: + while True: + value, tok = look_for_path(COLON) + if value is None: + break + iout.append(events.tokens_to_arg(value)) + + # parse rule + assert tok == COLON + rule = look_for_ident() + + # parse inputs and dependencies + in_ = [] + iin = [] + orderdep = [] + while True: + value, tok = look_for_path(PIPE, PIPE2, EOL) + if value is None: + break + in_.append(events.tokens_to_arg(value)) + if tok == PIPE: + while True: + value, tok = look_for_path(PIPE2, EOL) + if value is None: + break + iin.append(events.tokens_to_arg(value)) + if tok == PIPE2: + while True: + value, tok = look_for_path(EOL) + if value is None: + break + orderdep.append(events.tokens_to_arg(value)) + assert tok == EOL + events.begin_build(out, iout, rule, in_, iin, orderdep) + nonlocal global_var + global_var = False + + def parse_pool(): + # pool declarations are ignored. Just gobble all the variables + ident = look_for_ident() + look_for(EOL) + events.begin_pool(ident) + nonlocal global_var + global_var = False + + def parse_rule(): + ident = look_for_ident() + look_for(EOL) + events.begin_rule(ident) + nonlocal global_var + global_var = False + + def parse_default(): + idents = [] + while True: + ident = look_for_ident(EOL) + if ident == EOL: + break + idents.append(ident) + events.default(idents) + + def parse_declaration(tok): + if tok == EOL: + return + + nonlocal global_var + if tok == INDENT: + if global_var: + self.parse_error('indented line outside rule or edge') + tok = look_for_ident(EOL) + if tok == EOL: + return + parse_assignment(tok) + return + + if not global_var: + events.end_scope() + global_var = True + if not tok: + return + if tok == POOL: + parse_pool() + elif tok == BUILD: + parse_build() + elif tok == RULE: + parse_rule() + elif tok == DEFAULT: + parse_default() + elif isinstance(tok, str): + parse_assignment(tok) + else: + self.expected((POOL, BUILD, RULE, INCLUDE, DEFAULT, IDENT), tok) + + events.begin_file() + while True: + tok = advance() + parse_declaration(tok) + if not tok: + break + events.end_file() + + +# ---- variable handling ---- + +def expand(x, rule_vars=None, build_vars=None, global_vars=None): + if x is None: + return None + changed = True + while changed: + changed = False + matches = list(re.finditer(r'\$\$|\$\{([^}]*)\}', x)) + if not matches: + break + + # Reverse the match so that expanding later matches does not + # invalidate m.span() for earlier ones. Do not reduce $$ to $ + # until all variables are dealt with. + matches.reverse() + for m in matches: + if not m.group(1): + continue + changed = True + name = m.group(1) + if build_vars and name in build_vars: + value = build_vars[name] + elif rule_vars and name in rule_vars: + value = rule_vars[name] + elif name in global_vars: + value = global_vars[name] + else: + value = '' + start, end = m.span() + x = x[:start] + value + x[end:] + return x.replace('$$', '$') + + +class Scope(object): + def __init__(self, events): + self.events = 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_vars): + super().__init__(events) + self.rule = rule + self.out = [events.expand_and_normalize(x) for x in out] + self.in_ = [events.expand_and_normalize(x) for x in in_] + self.iin = [events.expand_and_normalize(x) for x in iin] + self.orderdep = [events.expand_and_normalize(x) for x in orderdep] + self.iout = [events.expand_and_normalize(x) for x in iout] + self.rule_vars = rule_vars + self.build_vars = 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.in_, + 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 = value.replace('$', '$$') + self.build_vars[key] = 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 = name + self.vars_dict = vars_dict + self.generator = False + + def on_left_scope(self): + self.events.end_rule(self, self.name) + + def on_variable(self, key, value): + self.vars_dict[key] = value + if key == 'generator': + self.generator = True + + +class NinjaParserEventsWithVars(NinjaParserEvents): + def __init__(self, parser): + super().__init__(parser) + self.rule_vars = defaultdict(lambda: dict()) + self.global_vars = dict() + self.scope = None + + def variable(self, name, value): + if self.scope: + self.scope.on_variable(name, value) + else: + self.global_vars[name] = self.expand(value) + + def begin_build(self, out, iout, rule, in_, iin, orderdep): + if rule != 'phony' and rule not in self.rule_vars: + self.parser.parse_error("undefined rule '%s'" % rule) + + self.scope = BuildScope(self, out, iout, rule, in_, iin, orderdep, self.rule_vars[rule]) + + def begin_pool(self, name): + # pool declarations are ignored. Just gobble all the variables + self.scope = Scope(self) + + def begin_rule(self, name): + if name in self.rule_vars: + self.parser.parse_error("duplicate rule '%s'" % name) + self.scope = RuleScope(self, name, self.rule_vars[name]) + + def end_scope(self): + self.scope.on_left_scope() + self.scope = None + + # utility functions: + + def expand(self, x, rule_vars=None, build_vars=None): + return expand(x, rule_vars, build_vars, self.global_vars) + + def expand_and_normalize(self, x): + return os.path.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 = argparse.ArgumentParser(description='Rewrite input build.ninja to stdout.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output = output + self.indent = '' + self.had_vars = False + + def literal_token(self, word, in_path=False): + word = word.replace('$', '$$') + if in_path: + word = word.replace(' ', '$ ').replace(':', '$:') + return word + + def print(self, *args, **kwargs): + if len(args): + self.output.write(self.indent) + print(*args, **kwargs, file=self.output) + + def variable(self, name, value): + self.print('%s = %s' % (name, value)) + self.had_vars = True + + def begin_scope(self): + self.indent = ' ' + self.had_vars = False + + def end_scope(self): + if self.had_vars: + self.print() + self.indent = '' + self.had_vars = 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, implicit, order_only): + all_outputs = list(outputs) + all_inputs = 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 = argparse.ArgumentParser(description='Emit compile_commands.json.') + ARGS.add_argument('rules', nargs='*', + help='The ninja rules to emit compilation commands for.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output = output + self.rules = args.rules + self.sep = '' + + def begin_file(self): + self.output.write('[') + self.directory = os.getcwd() + + def print_entry(self, **entry): + entry['directory'] = self.directory + self.output.write(self.sep + json.dumps(entry)) + self.sep = ',\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 = Scope(self) + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + self.print_entry(command=scope.expand('${command}'), file=in_[0]) + + def end_file(self): + self.output.write(']\n') + + +# ---- clean output files ---- + +class Clean(NinjaParserEventsWithVars): + ARGS = argparse.ArgumentParser(description='Remove output build files.') + ARGS.add_argument('-g', dest='generator', action='store_true', + help='clean generated files too') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.dry_run = args.dry_run + self.verbose = args.verbose or args.dry_run + self.generator = args.generator + + def begin_file(self): + print('Cleaning... ', end=(None if self.verbose else ''), flush=True) + self.cnt = 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 += 1 + print('Would remove ' + f) + continue + else: + try: + os.unlink(f) + self.cnt += 1 + if self.verbose: + print('Removed ' + f) + except FileNotFoundError: + pass + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + if rule == 'phony': + return + if not self.generator and scope.expand('${generator}'): + return + self.do_clean(*out, *iout) + depfile = scope.expand('${depfile}') + if depfile: + self.do_clean(depfile) + + +# ---- convert build.ninja to makefile ---- + +class Ninja2Make(NinjaParserEventsWithVars): + ARGS = argparse.ArgumentParser(description='Convert build.ninja to a Makefile.') + ARGS.add_argument('--clean', dest='emit_clean', action='store_true', + help='Emit clean/distclean rules.') + ARGS.add_argument('--doublecolon', action='store_true', + help='Emit double-colon rules for phony targets.') + ARGS.add_argument('--omit', metavar='TARGET', nargs='+', + help='Targets to omit.') + + def __init__(self, output, parser, args): + super().__init__(parser) + self.output = output + + self.emit_clean = args.emit_clean + self.doublecolon = args.doublecolon + self.omit = 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 = list() + self.build_vars = defaultdict(lambda: dict()) + self.rule_targets = defaultdict(lambda: list()) + self.num_stamp = defaultdict(lambda: 0) + self.all_outs = set() + self.all_ins = set() + self.all_phony = set() + self.seen_default = False + + def print(self, *args, **kwargs): + print(*args, **kwargs, file=self.output) + + def literal_token(self, word, in_path=False): + if in_path and ' ' in word: + self.parser.parse_error('Make does not support spaces in filenames') + return word.replace('$', '$$') + + def print_phony(self, outs, ins): + targets = ' '.join(outs).replace('$', '$$') + deps = ' '.join(ins).replace('$', '$$') + deps = 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 shows.') + self.print(r'ninja-default:') + self.print(r'.PHONY: ninja-default') + if self.emit_clean: + self.print(r'ninja-clean:: ninja-clean-start; $(if $V,,@)rm -f ${ninja-depfiles}') + self.print(r'ninja-clean-start:; $(if $V,,@echo Cleaning...)') + self.print(r'ninja-distclean:: clean') + self.print(r'.PHONY: ninja-clean ninja-clean-start ninja-distclean') + self.print_phony(['clean'], ['ninja-clean']) + self.print_phony(['distclean'], ['ninja-distclean']) + self.print(r'vpath') + self.print(r'NULL :=') + self.print(r'SPACE := ${NULL} #') + self.print(r'MAKEFLAGS += -rR') + self.print(r'define NEWLINE') + self.print(r'') + self.print(r'endef') + self.print(r'.var.in_newline = $(subst $(SPACE),$(NEWLINE),${.var.in})') + self.print(r"ninja-command = $(if $V,,$(if ${.var.description},@printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.command}") + self.print(r"ninja-command-restat = $(if $V,,$(if ${.var.description},@printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.command} && if test -f $(firstword ${.var.out}); then printf '%s\n' ${.var.out} > $@; fi") + + def mangle_vars_for_make(self, x): + matches = list(re.finditer(r'\$\$|\$\{([^}]*)\}', x)) + + # Reverse the match so that expanding later matches does not + # invalidate m.span() for earlier ones. + matches.reverse() + for m in matches: + if not m.group(1): + continue + value = '${.var.' + m.group(1) + '}' + start, end = m.span() + x = x[:start] + value + x[end:] + return x + + def end_file(self): + def natural_sort_key(s, _nsre=re.compile('([0-9]+)')): + return [int(text) if text.isdigit() else text.lower() + for text in _nsre.split(s)] + + self.print() + self.print('ninja-outputdirs :=') + for rule in self.rule_vars: + if rule == 'phony': + continue + self.print('ninja-targets-%s := %s' % (rule, ' '.join(self.rule_targets[rule]))) + for name, value in self.rule_vars[rule].items(): + self.print('$(ninja-targets-%s): .var.%s = %s' % (rule, name, self.mangle_vars_for_make(value))) + self.print('ninja-outputdirs += $(sort $(dir ${ninja-targets-%s}))' % rule) + self.print() + self.print('dummy := $(shell mkdir -p . $(sort $(ninja-outputdirs)))') + self.print('ninja-depfiles :=' + ' '.join(self.depfiles)) + 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 := %s' % (targets, name, value)) + self.print() + if not self.seen_default: + default_targets = sorted(self.all_outs - self.all_ins, key=natural_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 = sorted(self.all_phony - self.all_ins, key=natural_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] = self.expand(value) + self.print('.var.%s := %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 = Scope(self) + return + + super().begin_build(out, iout, rule, in_, iin, orderdep) + self.current_targets = ' '.join(self.scope.out + self.scope.iout).replace('$', '$$') + + def end_build(self, scope, out, iout, rule, in_, iin, orderdep): + self.rule_targets[rule] += self.scope.out + self.rule_targets[rule] += 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 = self.current_targets + self.current_targets = None + if rule == 'phony': + # Phony rules treat order-only dependencies as normal deps + self.print_phony(out + iout, in_ + iin + orderdep) + return + + inputs = ' '.join(in_ + iin).replace('$', '$$') + orderonly = ' '.join(orderdep).replace('$', '$$') + restat = 'restat' in self.scope.build_vars or 'restat' in self.rule_vars[rule] + if restat: + if len(out) == 1: + stamp = out[0] + '.stamp' + else: + stamp = '%s%d.stamp' %(rule, self.num_stamp[rule]) + self.num_stamp[rule] += 1 + self.print('%s: %s' % (targets, stamp)) + self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, inputs, orderonly)) + self.rule_targets[rule].append(stamp) + self.build_vars[stamp] = self.scope.build_vars + else: + self.print('%s: %s | %s; ${ninja-command}' % (targets, inputs, orderonly)) + self.build_vars[targets] = self.scope.build_vars + + depfile = scope.expand('${depfile}') + if depfile: + self.depfiles.append(depfile) + + def end_rule(self, scope, name): + if self.emit_clean: + # Note that the generator pseudo-variable could also be 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. + self.print('ninja-%s:: ; $(if $V,,@)rm -f ${ninja-targets-%s}' % ( + 'distclean' if scope.generator else 'clean', + name)) + + def default(self, targets): + self.print("ninja-default: " + ' '.join(targets)) + self.seen_default = 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='TOOL', nargs=None, **kwargs): + if nargs is not None: + raise ValueError("nargs not allowed") + super().__init__(option_strings, dest, required=True, choices=choices, + metavar=metavar, **kwargs) + + def __call__(self, parser, namespace, value, option_string): + tool = self.choices[value] + setattr(namespace, self.dest, tool) + tool.ARGS.prog = '%s %s %s' % (parser.prog, option_string, value) + + +class ToolHelpAction(argparse.Action): + def __init__(self, option_strings, dest, nargs=None, **kwargs): + if nargs is not None: + raise ValueError("nargs not allowed") + super().__init__(option_strings, dest, nargs=0, **kwargs) + + def __call__(self, parser, namespace, values, option_string=None): + if namespace.tool: + namespace.tool.ARGS.print_help() + else: + parser.print_help() + parser.exit() + + +tools = { + 'test': Writer, + 'ninja2make': Ninja2Make, + 'compdb': Compdb, + 'clean': Clean, +} + +parser = argparse.ArgumentParser(description='Process and transform build.ninja files.', + add_help=False) +parser.add_argument('-C', metavar='DIR', dest='dir', default='.', + help='change to DIR before doing anything else') +parser.add_argument('-f', metavar='FILE', dest='file', default='build.ninja', + help='specify input build file [default=build.ninja]') +parser.add_argument('-n', dest='dry_run', action='store_true', + help='do not actually do anything') +parser.add_argument('-v', dest='verbose', action='store_true', + help='be more verbose') + +parser.add_argument('-t', dest='tool', choices=tools, action=ToolAction, + help='choose the tool to run') +parser.add_argument('-h', '--help', action=ToolHelpAction, + help='show this help message and exit') + +if len(sys.argv) >= 2 and sys.argv[1] == '--version': + print('1.8') + sys.exit(0) + +args, tool_args = parser.parse_known_args() +args.tool.ARGS.parse_args(tool_args, args) + +os.chdir(args.dir) +with open(args.file, 'r') as f: + parser = NinjaParser(args.file, f) + try: + events = args.tool(sys.stdout, parser, args) + except InvalidArgumentError as e: + parser.error(str(e)) + parser.parse(events) From patchwork Thu Dec 12 12:50:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KkMIC2af"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYdZ6HzJz9s4Y for ; Thu, 12 Dec 2019 23:53:54 +1100 (AEDT) Received: from localhost ([::1]:58856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNya-0002iz-8F for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55896) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxp-0002ed-SB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxo-0005gA-QV for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:05 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxo-0005dv-K2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:04 -0500 Received: by mail-wr1-x431.google.com with SMTP id w15so2623900wru.4 for ; Thu, 12 Dec 2019 04:53:04 -0800 (PST) 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=PH7UeOYv3AaEAyoiruUKVOCR4GfXDd27Kf2Yko972zU=; b=KkMIC2afPP7er6EMMZVmh7Mm86Qtdyw8GEd/41txIwD7nn9x/dB1QUeGqWGbHp+MLN s7gp7Jatu7QKuQNt2ZffEYzL7F/Wr8Pi71AtVx7T+juYAhsADEvF3V5npmyglKEc4Xuh cL9XSclfrpql+S9GJhjKFLcagHReZlMa8A9E7YPtM630FBkSeiZ6R4RXcK/+XdL9pCVy yqzq0ketLYYWjaEu00Hd0X5FSeklMjUcMFsDvNiJZBdUuQlKAW4EOXnGGx4Ivm47GC3o +yqmBudMf8uf65XUjUcxShzHM5qzlpCPir0KefHrVtabxTrLevk6G3SG/Xl3igHD1qR2 GxzQ== 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=PH7UeOYv3AaEAyoiruUKVOCR4GfXDd27Kf2Yko972zU=; b=TpAV7HRQOeotKG7dFf9NyCt+yssM+pvJDRgGQPNCj80/msiqFpSis0/xGSju8Oc/X4 LmYehGgT97SxGSqtXZbmHaOrdj7trTfpPtBan+jbONSvg1/QboHY5PsyYUT8IbbVg0QO Y1ip2kHjhBcRMR9dkkjTthJg+10MYhNyBoWfNVdRF1o7gxiyVSCxK646gbvw+pzovNVf wxa5D1dWn8jrAQymH9brPOMf7umzBPadmC/YMcG55czY+PSrBIqr8Rj/S9nBZnPBA/xR U3afetDonVinOJtR27qqCQR4oj1OBYtwkPnzwjidf1s02Q60xnfO9nTciQOYPwg/wbKk JW2w== X-Gm-Message-State: APjAAAXd6fyEB4OLXKTjylpWzJqbCyFtfh+fE0854oL6R79rVLTZfOBK aXH5NBEqVPlb3+hK/Ng7nG7yAqps X-Google-Smtp-Source: APXvYqzQu8+Il+Ac4szdLi8B0eAEAuG3hk8OVneswrjBIe5KT8NhmTsfpdJJRvVrAvC7t/ZYfqVdiA== X-Received: by 2002:adf:e591:: with SMTP id l17mr5699975wrm.139.1576155183211; Thu, 12 Dec 2019 04:53:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 005/132] configure: generate Meson cross file Date: Thu, 12 Dec 2019 13:50:49 +0100 Message-Id: <1576155176-2464-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- configure | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/configure b/configure index 3e3eb3d..2f3e231 100755 --- a/configure +++ b/configure @@ -7852,6 +7852,46 @@ echo "# Automatically generated by configure - do not modify" > "$iotests_common echo >> "$iotests_common_env" echo "export PYTHON='$python'" >> "$iotests_common_env" +cross="config-meson.cross" +cross_arg= + +if test -n "$cross_prefix"; then + echo "# Automatically generated by configure - do not modify" > $cross + echo "[binaries]" >> $cross + echo "c = '$cc'" >> $cross + echo "cpp = '$cxx'" >> $cross + echo "ar = '$ar'" >> $cross + echo "nm = '$nm'" >> $cross + echo "pkgconfig = '$pkg_config_exe'" >> $cross + echo "ranlib = '$ranlib'" >> $cross + echo "strip = '$strip'" >> $cross + echo "windres = '$windres'" >> $cross + + echo "[properties]" >> $cross + echo "root = '$prefix'" >> $cross + + echo "[host_machine]" >> $cross +if test "$mingw32" = "yes" ; then + echo "system = 'windows'" >> $cross +fi +case "$ARCH" in + i386|x86_64) + echo "cpu_family = 'x86'" >> $cross + ;; + *) + echo "cpu_family = '$ARCH'" >> $cross + ;; +esac + echo "cpu = '$cpu'" >> $cross +if test "$bigendian" = "yes" ; then + echo "endian = 'big'" >> $cross +else + echo "endian = 'little'" >> $cross +fi + + cross_arg="--cross-file=$cross" +fi + rm -rf meson-private meson-info meson-logs NINJA=$PWD/ninjatool $python $meson setup \ --prefix "$prefix" \ @@ -7865,6 +7905,7 @@ NINJA=$PWD/ninjatool $python $meson setup \ --localstatedir "$local_statedir" \ $(test "$strip_opt" = yes && echo --strip) \ --buildtype $(if test "$debug" = yes; then echo debug; else echo debugoptimized; fi) \ + $cross_arg \ "$PWD" "$source_path" if test "$?" -ne 0 ; then From patchwork Thu Dec 12 12:50:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="upUIWPI9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYmD0n07z9s4Y for ; Thu, 12 Dec 2019 23:59:40 +1100 (AEDT) Received: from localhost ([::1]:58924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO49-0001iO-Dy for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:59:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56166) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxr-0002gq-88 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxp-0005hx-RO for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:07 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxp-0005gM-Jf for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:05 -0500 Received: by mail-wr1-x42e.google.com with SMTP id q6so2581135wro.9 for ; Thu, 12 Dec 2019 04:53:05 -0800 (PST) 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=V9NM3FbIChOvvJW2t/FWXrIIPwk25T+7dF1biBLa1ws=; b=upUIWPI9kOWOIA3rUJmV7BUl7gJ30asVYi26sQWcv/rJhDxCsO9DOSOw/ZTcijJaYL TrP8DhvJe3w3rK9bEWRpXFxlywdb38Eum6Kiu0FPPZsF1PrdIszh9B2njtceQDmdXejy 8tMhM90eN71+xF2wDIz7AoGy6pFdk3ZWZuvRZK1AhlPWvAIE/MvtdgrvDUZ+RNER3Fyu BacAnIuYoN+bBdu+6kYCLsaAtGRekBc753wQp2mKLmVWJc0F2CGj4+j1IJVINPEQjEdx 3yJZLevQYvqJKs7amv7tKeV2sj9reI9hz2qC0ygPOo/dIbB6aoqVygsN+CQYwrYvo6BA BurQ== 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=V9NM3FbIChOvvJW2t/FWXrIIPwk25T+7dF1biBLa1ws=; b=mdD5ibbK4eF8uoiAeF0JuYJXNkBgkHMDwCqM67SC2NpL7aoi4jZAhYCdKRpg94pZ3y JscMhfJcJy2nWiGbBbpbxlb5G+1oEC0QR4fp2WCrlHZa8caoXr2jG4E/nPL1FV4N+UaF AazBSHHcRPzz4aEbv+ZoXmZ96ljB9p84i9+0JH31JL+zhptdI4e7yCj1hDZ+EflHjxUq LX1FvQDJ5wxhwHwXMnDkNFF6BTGK/zHVgbRrfUDPIyyAnqD9lJazVZ962IATAi1mb549 3Kibt9aH/xCsnrtBXKLSEfES+fRw2CH7TZW1xrkrwBXY/yNHrzip8zX/lC9Ppls/oMdR 3NbA== X-Gm-Message-State: APjAAAV8+Vlf/rRbl/RtQJWvVG4kreL4IK3YnCMKTA+rlzbMvr875N23 /prdduorZ9PucgQDEOHXPR2JNLQu X-Google-Smtp-Source: APXvYqxa2iToLqHwd09nBgILHNzp2+uKvRIzv3VJcmRTEkaH46jbwB4H6IeIa0j4yILYhHdaAwY/hQ== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5993041wrt.208.1576155184325; Thu, 12 Dec 2019 04:53:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 006/132] build-sys: add meson submodule Date: Thu, 12 Dec 2019 13:50:50 +0100 Message-Id: <1576155176-2464-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- .gitmodules | 3 +++ configure | 45 +++++++++++++++++++++++++++++++++++++++++---- meson | 1 + scripts/archive-source.sh | 3 ++- 4 files changed, 47 insertions(+), 5 deletions(-) create mode 160000 meson diff --git a/.gitmodules b/.gitmodules index c5c4741..67f4ed8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "roms/opensbi"] path = roms/opensbi url = https://git.qemu.org/git/opensbi.git +[submodule "meson"] + path = meson + url = https://github.com/mesonbuild/meson/ diff --git a/configure b/configure index 2f3e231..0eb3d70 100755 --- a/configure +++ b/configure @@ -171,6 +171,25 @@ path_of() { return 1 } +version_ge () { + local_ver1=`echo $1 | tr . ' '` + local_ver2=`echo $2 | tr . ' '` + while true; do + set x $local_ver1 + local_first=${2-0} + # shift 2 does nothing if there are less than 2 arguments + shift; shift + local_ver1=$* + set x $local_ver2 + # the second argument finished, the first must be greater or equal + test $# = 1 && return 0 + test $local_first -lt $2 && return 1 + test $local_first -gt $2 && return 0 + shift; shift + local_ver2=$* + done +} + have_backend () { echo "$trace_backends" | grep "$1" >/dev/null } @@ -489,7 +508,6 @@ libxml2="" debug_mutex="no" libpmem="" default_devices="yes" -meson=meson supported_cpu="no" supported_os="no" @@ -1827,9 +1845,28 @@ then error_exit "Python not found. Use --python=/path/to/python" fi -if ! has "$meson" -then - error_exit "Meson not found. Use --meson=/path/to/meson" +if test -z "$meson" ; then + if has meson && version_ge "$(meson --version)" 0.53.0; then + meson=meson + elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then + meson=git + elif test -e "${source_path}/meson/meson.py" ; then + meson=internal + fi +fi + +case "$meson" in + git | internal) + if test "$meson" = git; then + git_submodules="${git_submodules} meson" + (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update meson) + fi + meson="${source_path}/meson/meson.py" + ;; +esac + +if ! has "$meson" ; then + error_exit "Meson not found. Use --meson=/path/to/meson|git|internal" fi meson=$(command -v $meson) diff --git a/meson b/meson new file mode 160000 index 0000000..5031f49 --- /dev/null +++ b/meson @@ -0,0 +1 @@ +Subproject commit 5031f4981d4fcf6eb0bc950669a0a77a7df22939 diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index fb5d6b3..c6169db 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,8 @@ sub_file="${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="dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" +submodules="dtc slirp meson ui/keycodemapdb" +submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit="" function cleanup() { From patchwork Thu Dec 12 12:50:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j6g1EUEj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYrJ1MVDz9sP6 for ; Fri, 13 Dec 2019 00:03:12 +1100 (AEDT) Received: from localhost ([::1]:58976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO7Z-0005SO-4t for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:03:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56266) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxr-0002hl-QS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxq-0005k9-OG for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:07 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37436) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxq-0005iA-HN for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:06 -0500 Received: by mail-wm1-x333.google.com with SMTP id f129so2382306wmf.2 for ; Thu, 12 Dec 2019 04:53:06 -0800 (PST) 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=5YKl/o+m9GbbKn5dSPHFmGa3ModS1EkXzWqXYztB4ug=; b=j6g1EUEjaNfxayYVz9Jva5wqgy/QfZ7PvA9ndjOtI8f9SFI1MMDaHGiwAjiTosC0dk O1QfalBPlTuRQ7CvpJAx1PGLvkzBs/htlWUS6b6uHbiICpEc9Er7+Yjs8H1E44Kh7fML jzPsZDVyxKboE7KhFqd+/6TXNqxnHI+39axR6Ds9YVXGW+eZSYry8gk8lmki/SzgafF7 DOrjKBdTb5jzb5kZ1X5BgNQH4rqbjp1IAEEuT/bjjK76geeqOnJdSR5yya8tCAVlm7rE HrckiWq42u2dEkQPxpxFr4UAnfPmeF8eSRupW3zm/Ijz50MAQuO2/Vqe/j6DNwgHGhNH F1zg== 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=5YKl/o+m9GbbKn5dSPHFmGa3ModS1EkXzWqXYztB4ug=; b=uOTr9sczhNsh/fAGQnPrQN/6qqLNWtO7fIEwrU8KWkVnMYszepuM6EtkRzWoXPWT4k Lh6X9qdAgUzPjNOf075nbjHblyk1tY8I/Td8FYKJRKP00xTWRrWM4xKmhTe6FKjcUN9p 3FDFAZfJJ8/so73/X3H5w9mEVYTaTjM0dtjWeLFSaFyTfF07KbK36RixjdW3N10aW/5b ZPKu/pg31T4HMlikALS8H8PW6HnmnQUGJnW7CVHUpewR89vA5kTG4KHrV0ivSRq0345T 9U0GdQ0TQneM/1F+DGbge9/bo8SwdiUN+NIo7JGBYRDi32swb6T7T3Q1AxsbvJ99Vv8v u7Ww== X-Gm-Message-State: APjAAAVqRjuoQK8b15WJQYzAyfLF0Gb5/6nyldqxEsWxNVAL4SVjVAwe s3+unVxgWaWfuqRxFx0VumNpDOYO X-Google-Smtp-Source: APXvYqw0nLEfQupoh9Ri7KceYGuXe14KPiycUmMGx0F0Rd0noxoK3d4XVBEs/V0QW02zO9GgwhfmvA== X-Received: by 2002:a7b:c218:: with SMTP id x24mr6606036wmi.149.1576155185278; Thu, 12 Dec 2019 04:53:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 007/132] meson: enable pie Date: Thu, 12 Dec 2019 13:50:51 +0100 Message-Id: <1576155176-2464-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 0eb3d70..80055f1 100755 --- a/configure +++ b/configure @@ -2075,7 +2075,6 @@ int main(void) { return tls_var; } EOF if compile_prog "-fPIE -DPIE" "-pie"; then QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" - LDFLAGS="-pie $LDFLAGS" pie="yes" if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS" @@ -7942,6 +7941,7 @@ NINJA=$PWD/ninjatool $python $meson setup \ --localstatedir "$local_statedir" \ $(test "$strip_opt" = yes && echo --strip) \ --buildtype $(if test "$debug" = yes; then echo debug; else echo debugoptimized; fi) \ + -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \ $cross_arg \ "$PWD" "$source_path" From patchwork Thu Dec 12 12:50:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hvj3jjVf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYhr3x0vz9s4Y for ; Thu, 12 Dec 2019 23:56:44 +1100 (AEDT) Received: from localhost ([::1]:58892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO1K-0006l2-0b for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:56:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56540) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxt-0002jz-9R for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxr-0005mE-M8 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:09 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:40408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxr-0005kI-Dm for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:07 -0500 Received: by mail-wm1-x329.google.com with SMTP id t14so2369687wmi.5 for ; Thu, 12 Dec 2019 04:53:07 -0800 (PST) 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=AGFv06tZwmNRYT44YFhPZ2AJ7Xz8YvGe/TQO//kFRjg=; b=hvj3jjVfyVy/wl2i1qvtEa5JxMOLSx+iXOJNMwXCY8oeuc2AuADbqJE8M6nWgfaD49 +/ajttiyJEJZ2rsZNISsG2eeu1o2kps7vjONy7IyflPZiB0zvHg+Inj87v2aNo4wC6Cn Hj43ksAkSD+qq6us20LFLvYXhTIWlzwNKd37u63YmvBOaUYAq3McBRJIBJiwAgvvG1lR lmOa6K0zJ6MI4DGdus8yE7kzrNTZS7uc/BDkLfjqkhrBCqXe2tPol8s76+h1dg6AB6zt YPuk3rS8USwGEDFjQxAX4w96ImqhUcc9PZCexbAp3g8bT6NKX08zeLEGK3fJau++uesF qlZg== 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=AGFv06tZwmNRYT44YFhPZ2AJ7Xz8YvGe/TQO//kFRjg=; b=pDJNA7fXBaSXrKCQIs7tBpAKiyxb6hM5GgHqHnmXi5oXNKDPEVQpmQLBf7l8Hg0xHx UNl8jM/GmP7o9MbIcZFYQ/ZjsSZ/oE/opaXsyaZvcNUjyoITR3Q6WC4F8E2DT5XrhBzi /dj3fntXlq3rCEX/XIINJpL+7xdtVl2W+tOsTzyvtTE7BzGYsquVY0Dpu3tZVdHeqQRm GdVtP9P/4kfsFhGEijlouFBJ8G1ceOlBrxqwSTf8QSJTZJH9I0A1dZRIa1OL1hgnhD7i WkSJ0NgKtDb8qhTxfMMMzBX5WYR6im35ncLSogqfC90My6K3EaaJ/RqOgjdx5oKFeBy9 kvEA== X-Gm-Message-State: APjAAAXl0esisQzmlcMzpPIP55X592CZgeVOlVN7i6pNUjLhTDwv6dp1 Q9lfEyO4ZBpxH5FrBB6saW9DLVG1 X-Google-Smtp-Source: APXvYqwWS+fNLnAeu/nmt3Fe4Y84d++/rAe9RG/C4YIl7/pS1U9Fkklwmg7UN1bgAm42ui7eJbWkpA== X-Received: by 2002:a7b:ce19:: with SMTP id m25mr6117748wmc.83.1576155186106; Thu, 12 Dec 2019 04:53:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 008/132] meson: use coverage option Date: Thu, 12 Dec 2019 13:50:52 +0100 Message-Id: <1576155176-2464-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 14 -------------- Makefile.target | 16 ---------------- configure | 10 ++-------- docs/devel/testing.rst | 7 +++---- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 44daed6..292da1f 100644 --- a/Makefile +++ b/Makefile @@ -661,14 +661,6 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") -ifdef CONFIG_GCOV -.PHONY: clean-coverage -clean-coverage: - $(call quiet-command, \ - find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \ - "CLEAN", "coverage files") -endif - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h @@ -1150,9 +1142,6 @@ endif echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the config' -ifdef CONFIG_GCOV - @echo ' clean-coverage - Remove coverage files' -endif @echo ' distclean - Remove all generated files' @echo ' dist - Build a distributable tarball' @echo '' @@ -1164,9 +1153,6 @@ endif @echo 'Documentation targets:' @echo ' html info pdf txt' @echo ' - Build documentation in specified format' -ifdef CONFIG_GCOV - @echo ' coverage-report - Create code coverage report' -endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/Makefile.target b/Makefile.target index 532e4ab..f4b44af 100644 --- a/Makefile.target +++ b/Makefile.target @@ -238,19 +238,3 @@ endif generated-files-y += 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 80055f1..5112683 100755 --- a/configure +++ b/configure @@ -417,7 +417,6 @@ tcg_interpreter="no" bigendian="no" mingw32="no" gcov="no" -gcov_tool="gcov" EXESUF="" DSOSUF=".so" LDFLAGS_SHARED="-shared" @@ -973,8 +972,6 @@ for opt do ;; --meson=*) meson="$optarg" ;; - --gcov=*) gcov_tool="$optarg" - ;; --smbd=*) smbd="$optarg" ;; --extra-cflags=*) @@ -1720,7 +1717,6 @@ Advanced options (experts only): --with-coroutine=BACKEND coroutine backend. Supported options: ucontext, sigaltstack, windows --enable-gcov enable test coverage analysis with gcov - --gcov=GCOV use specified gcov [$gcov_tool] --disable-blobs disable installing provided firmware blobs --with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent --with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb) @@ -5967,8 +5963,7 @@ esac write_c_skeleton if test "$gcov" = "yes" ; then - CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" - LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" + : elif test "$fortify_source" = "yes" ; then CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" elif test "$debug" = "no"; then @@ -6434,7 +6429,6 @@ 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" @@ -7359,7 +7353,6 @@ echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak echo "POD2MAN=$POD2MAN" >> $config_host_mak if test "$gcov" = "yes" ; then echo "CONFIG_GCOV=y" >> $config_host_mak - echo "GCOV=$gcov_tool" >> $config_host_mak fi if test "$libudev" != "no"; then @@ -7942,6 +7935,7 @@ NINJA=$PWD/ninjatool $python $meson setup \ $(test "$strip_opt" = yes && echo --strip) \ --buildtype $(if test "$debug" = yes; then echo debug; else echo debugoptimized; fi) \ -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \ + -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \ $cross_arg \ "$PWD" "$source_path" diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index bf75675..c81ed35 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -163,13 +163,12 @@ instrumenting the tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. Then run ``make check`` as usual. 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. 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``. Further analysis can be conducted by running the ``gcov`` command directly on the various .gcda output files. Please read the ``gcov`` From patchwork Thu Dec 12 12:50:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qOZbbRXr"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYt55Jqpz9s4Y for ; Fri, 13 Dec 2019 00:04:45 +1100 (AEDT) Received: from localhost ([::1]:58982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO94-0006r6-P1 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:04:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58320) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy3-0002zD-7V for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxu-0005s9-PB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:18 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxu-0005py-7s for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:10 -0500 Received: by mail-wm1-x334.google.com with SMTP id p9so2246491wmc.2 for ; Thu, 12 Dec 2019 04:53:10 -0800 (PST) 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; bh=GaOZdgw6eB4TDQUscAG/JJNky2YD1YyNEQ4e9fXgYaQ=; b=qOZbbRXrr9pyMnmKV391ZoGn6FjxgBzHNX9KiT0esXou3iC3F9P7VmVpQAv/RY8FBs pQLitqsaOskirQ0WG0VFG2VDvJAjO17JnZZiJO7I83ROWtEp/1xzv63AgJGdOV4FmV3y 9u59YznFZt9O9NL1z4WQVV101UgzP14+9zI32Bub1aJbGALBLA/v3Nwc6C6OvfSaKpEt 5KWUECZ1DrtQk1QfnleB/wzgYIvgmFJH7C3RmDVLZzHWAQIeYmN13Sv2AfRMaCb5ECXf w8oGOpA5oorIabOXZ9N5AnMmaePcLqH7yaDyUf0/L4k1JUDu93usvBnVMH68u6hZphN0 dFuA== 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; bh=GaOZdgw6eB4TDQUscAG/JJNky2YD1YyNEQ4e9fXgYaQ=; b=KVRMmCs3wzye5Nmo/sQmyX5LgRQbFZSOGiOSwmqB4+SoweFeZV+pp9u5AYqNGMuKPO k4LB/AO5rQb2cKIbFG+9P++0zWoFXaVXNJUBjZYyYao21c9LwGwuWuH80UxckUgLtAyj oDTXshS5Mmayw4VoAtrcMIBvm7nfzwz2reWbTEweAlInqIDvLZfrEvsxqsYRH/P9AoT2 iOc8mAj+tPWNe8i0pVy43Ap6wslw8O/MEs02QtfZx4/OKtGU7HYcTYkPAr2YX/uDqKCO 5581qtI69DEj2Fthpbt4l2XizdWvn4WvpxubGL+Ucv+QcEjQov6mSuW3I2DSHMG0WD99 NT0w== X-Gm-Message-State: APjAAAVzYUAjjeE1EJNo1+s7c8jB3aIIt6vg5ifW6hKv11Ea+sEM/Qtl AC5sy6Cr/mk1kfV2AwajpYm8jWFz X-Google-Smtp-Source: APXvYqwUicu3u0X+rhcrgQsU2M30dU4VdtoViAOQYSRFf5TPYuo+S3V5ssHmPIfxLiaZD7CPACC1qA== X-Received: by 2002:a1c:48c1:: with SMTP id v184mr6701700wma.5.1576155187201; Thu, 12 Dec 2019 04:53:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 009/132] libqemuutil: convert to meson Date: Thu, 12 Dec 2019 13:50:53 +0100 Message-Id: <1576155176-2464-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Overall the look of the meson.build code is quite good, however 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)/$( --- Makefile | 182 ++++++------------------------ Makefile.objs | 93 +-------------- Makefile.target | 8 +- accel/kvm/trace.h | 1 + accel/tcg/trace.h | 1 + audio/trace.h | 1 + authz/trace.h | 1 + balloon.c | 2 +- block/trace.h | 1 + chardev/trace.h | 1 + configure | 8 ++ crypto/Makefile.objs | 5 - crypto/meson.build | 9 ++ crypto/trace.h | 1 + dma-helpers.c | 2 +- docs/devel/tracing.txt | 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/display/trace.h | 1 + hw/dma/trace.h | 1 + hw/gpio/trace.h | 1 + hw/hppa/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/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/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/exec/cpu_ldst_template.h | 2 +- include/exec/cpu_ldst_useronly_template.h | 2 +- io/trace.h | 1 + ioport.c | 2 +- job-qmp.c | 2 +- job.c | 2 +- linux-user/trace.h | 1 + memory.c | 2 +- meson.build | 161 ++++++++++++++++++++++++++ migration/trace.h | 1 + monitor/trace.h | 1 + nbd/trace.h | 1 + net/trace.h | 1 + qapi/Makefile.objs | 21 ---- qapi/meson.build | 89 +++++++++++++++ qapi/trace.h | 1 + qobject/Makefile.objs | 3 - qobject/meson.build | 3 + qom/trace.h | 1 + rules.mak | 2 +- scripts/qapi-gen.py | 2 +- scripts/tracetool.py | 2 +- scripts/tracetool/backend/dtrace.py | 2 +- scripts/tracetool/backend/ust.py | 6 +- 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 + stubs/Makefile.objs | 43 ------- stubs/meson.build | 45 ++++++++ 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/Makefile.objs | 51 --------- trace/control-target.c | 2 +- trace/control.c | 2 +- trace/meson.build | 82 ++++++++++++++ ui/trace.h | 1 + util/Makefile.objs | 57 ---------- util/meson.build | 57 ++++++++++ util/trace.h | 1 + vl.c | 2 +- 109 files changed, 585 insertions(+), 454 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 block/trace.h create mode 100644 chardev/trace.h create mode 100644 crypto/meson.build 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/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/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/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/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/meson.build create mode 100644 qapi/trace.h delete mode 100644 qobject/Makefile.objs create mode 100644 qobject/meson.build create mode 100644 qom/trace.h mode change 100644 => 100755 scripts/tracetool/backend/dtrace.py create mode 100644 scsi/trace.h delete mode 100644 stubs/Makefile.objs create mode 100644 stubs/meson.build 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 trace/meson.build create mode 100644 ui/trace.h delete mode 100644 util/Makefile.objs create mode 100644 util/meson.build create mode 100644 util/trace.h diff --git a/Makefile b/Makefile index 292da1f..6f97ae9 100644 --- a/Makefile +++ b/Makefile @@ -112,158 +112,60 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO generated-files-y = qemu-version.h config-host.h qemu-options.def -GENERATED_QAPI_FILES = qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c -GENERATED_QAPI_FILES += qapi/qapi-types.h qapi/qapi-types.c -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.h) -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.c) -GENERATED_QAPI_FILES += qapi/qapi-builtin-visit.h qapi/qapi-builtin-visit.c -GENERATED_QAPI_FILES += qapi/qapi-visit.h qapi/qapi-visit.c -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.h) -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.c) -GENERATED_QAPI_FILES += qapi/qapi-commands.h qapi/qapi-commands.c -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.h) -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.c) -GENERATED_QAPI_FILES += qapi/qapi-emit-events.h qapi/qapi-emit-events.c -GENERATED_QAPI_FILES += qapi/qapi-events.h qapi/qapi-events.c -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.h) -GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.c) -GENERATED_QAPI_FILES += qapi/qapi-introspect.c qapi/qapi-introspect.h -GENERATED_QAPI_FILES += qapi/qapi-doc.texi - -generated-files-y += $(GENERATED_QAPI_FILES) - generated-files-y += trace/generated-tcg-tracers.h generated-files-y += trace/generated-helpers-wrappers.h generated-files-y += trace/generated-helpers.h generated-files-y += trace/generated-helpers.c -generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.h -generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.c - generated-files-y += module_block.h -TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h) -TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c) -TRACE_DTRACE = -ifdef CONFIG_TRACE_DTRACE -TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h) -TRACE_DTRACE += trace-dtrace-root.dtrace $(trace-events-subdirs:%=%/trace-dtrace.dtrace) -endif -ifdef CONFIG_TRACE_UST -TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h) -endif - -generated-files-y += $(TRACE_HEADERS) -generated-files-y += $(TRACE_SOURCES) -generated-files-y += $(BUILD_DIR)/trace-events-all generated-files-y += .git-submodule-status -trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') - tracetool-y = $(SRC_PATH)/scripts/tracetool.py tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") -%/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 - $(call quiet-command,$(TRACETOOL) \ - --group=$(call trace-group-name,$@) \ - --format=h \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -%/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 - $(call quiet-command,$(TRACETOOL) \ - --group=$(call trace-group-name,$@) \ - --format=c \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -%/trace-ust.h: %/trace-ust.h-timestamp - @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=$(call trace-group-name,$@) \ - --format=ust-events-h \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -%/trace-dtrace.dtrace: %/trace-dtrace.dtrace-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace-dtrace.dtrace-timestamp: $(SRC_PATH)/%/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=$(call trace-group-name,$@) \ - --format=d \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -%/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-root.h: trace-root.h-timestamp +trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak +trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) + @mkdir -p $(dir $@) $(call quiet-command,$(TRACETOOL) \ --group=root \ - --format=h \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") + --format=tcg-helper-wrapper-h \ + --backend=$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") -trace-root.c: trace-root.c-timestamp +trace/generated-helpers.h: trace/generated-helpers.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_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=root \ - --format=c \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") + --format=tcg-helper-h \ + --backend=$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") -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) $(BUILD_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=root \ - --format=ust-events-h \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -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_DIR)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=all \ - --format=ust-events-h \ - --backends=$(TRACE_BACKENDS) \ - $(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)") + --format=tcg-helper-c \ + --backend=$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") -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_DIR)/config-host.mak - $(call quiet-command,$(TRACETOOL) \ - --group=all \ - --format=ust-events-c \ - --backends=$(TRACE_BACKENDS) \ - $(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)") +trace/generated-helpers.o: trace/generated-helpers.c -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=root \ - --format=d \ - --backends=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(@:%-timestamp=%)") - -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=tcg-h \ + --backend=$(TRACE_BACKENDS) \ + $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv @@ -409,10 +311,8 @@ include $(SRC_PATH)/Makefile.objs endif dummy := $(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 \ @@ -430,8 +330,7 @@ dummy := $(call unnest-vars,, \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m \ - trace-obj-y) + common-obj-m) include $(SRC_PATH)/tests/Makefile.include @@ -531,8 +430,7 @@ Makefile: $(version-obj-y) ###################################################################### # Build libraries -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) ###################################################################### @@ -587,16 +485,6 @@ qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-p "GEN","$(@:%-timestamp=%)") @>$@ -qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json \ - $(QAPI_MODULES:%=$(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=%)") - @>$@ - QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qapi-commands.h) $(qga-obj-y): $(QGALIB_GEN) @@ -634,21 +522,21 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_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 $(COMMON_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, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a libqemustub.a +vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) $(COMMON_LDADDS) $(call LINK, $^) ifdef CONFIG_VHOST_USER_INPUT ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a libqemuutil.a +vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) # build by default, do not install @@ -900,7 +788,9 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/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=$$d/ -C $$d $@ || exit 1 ; \ + done .PHONY: ctags ctags: @@ -1112,10 +1002,6 @@ Makefile: $(generated-files-y) endif endif -.SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \ - $(TRACE_SOURCES) $(TRACE_SOURCES:%=%-timestamp) \ - $(TRACE_DTRACE) $(TRACE_DTRACE:%=%-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 aaf0cd5..f820829 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,8 +1,5 @@ ####################################################################### -# Common libraries for tools and emulators -stub-obj-y = stubs/ -util-obj-y = crypto/ util/ qobject/ qapi/ - +# chardev-obj-y is code used by both qemu system emulation and some tests chardev-obj-y = chardev/ ####################################################################### @@ -81,10 +78,6 @@ qemu-seccomp.o-libs := $(SECCOMP_LIBS) common-obj-$(CONFIG_FDT) += device_tree.o -###################################################################### -# qapi - -common-obj-y += qapi/ endif ####################################################################### @@ -126,87 +119,3 @@ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ ###################################################################### -trace-events-subdirs = -trace-events-subdirs += accel/kvm -trace-events-subdirs += accel/tcg -trace-events-subdirs += crypto -trace-events-subdirs += monitor -ifeq ($(CONFIG_USER_ONLY),y) -trace-events-subdirs += linux-user -endif -ifeq ($(CONFIG_BLOCK),y) -trace-events-subdirs += authz -trace-events-subdirs += block -trace-events-subdirs += io -trace-events-subdirs += nbd -trace-events-subdirs += scsi -endif -ifeq ($(CONFIG_SOFTMMU),y) -trace-events-subdirs += chardev -trace-events-subdirs += audio -trace-events-subdirs += hw/9pfs -trace-events-subdirs += hw/acpi -trace-events-subdirs += hw/alpha -trace-events-subdirs += hw/arm -trace-events-subdirs += hw/audio -trace-events-subdirs += hw/block -trace-events-subdirs += hw/block/dataplane -trace-events-subdirs += hw/char -trace-events-subdirs += hw/dma -trace-events-subdirs += hw/hppa -trace-events-subdirs += hw/i2c -trace-events-subdirs += hw/i386 -trace-events-subdirs += hw/i386/xen -trace-events-subdirs += hw/ide -trace-events-subdirs += hw/input -trace-events-subdirs += hw/intc -trace-events-subdirs += hw/isa -trace-events-subdirs += hw/mem -trace-events-subdirs += hw/mips -trace-events-subdirs += hw/misc -trace-events-subdirs += hw/misc/macio -trace-events-subdirs += hw/net -trace-events-subdirs += hw/nvram -trace-events-subdirs += hw/pci -trace-events-subdirs += hw/pci-host -trace-events-subdirs += hw/ppc -trace-events-subdirs += hw/rdma -trace-events-subdirs += hw/rdma/vmw -trace-events-subdirs += hw/s390x -trace-events-subdirs += hw/scsi -trace-events-subdirs += hw/sd -trace-events-subdirs += hw/sparc -trace-events-subdirs += hw/sparc64 -trace-events-subdirs += hw/timer -trace-events-subdirs += hw/tpm -trace-events-subdirs += hw/usb -trace-events-subdirs += hw/vfio -trace-events-subdirs += hw/virtio -trace-events-subdirs += hw/watchdog -trace-events-subdirs += hw/xen -trace-events-subdirs += hw/gpio -trace-events-subdirs += hw/riscv -trace-events-subdirs += migration -trace-events-subdirs += net -trace-events-subdirs += ui -endif -trace-events-subdirs += hw/display -trace-events-subdirs += qapi -trace-events-subdirs += qom -trace-events-subdirs += target/arm -trace-events-subdirs += target/hppa -trace-events-subdirs += target/i386 -trace-events-subdirs += target/mips -trace-events-subdirs += target/ppc -trace-events-subdirs += target/riscv -trace-events-subdirs += target/s390x -trace-events-subdirs += target/sparc -trace-events-subdirs += util - -trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events) - -trace-obj-y = trace-root.o -trace-obj-y += $(trace-events-subdirs:%=%/trace.o) -trace-obj-$(CONFIG_TRACE_UST) += trace-ust-all.o -trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace-root.o -trace-obj-$(CONFIG_TRACE_DTRACE) += $(trace-events-subdirs:%=%/trace-dtrace.o) diff --git a/Makefile.target b/Makefile.target index f4b44af..c5af974 100644 --- a/Makefile.target +++ b/Makefile.target @@ -57,7 +57,7 @@ endif tracetool-y = $(SRC_PATH)/scripts/tracetool.py tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") -$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) $(call quiet-command,$(TRACETOOL) \ --group=all \ --format=stap \ @@ -67,7 +67,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y) --target-type=$(TARGET_TYPE) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed") -$(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=all \ --format=stap \ @@ -77,7 +77,7 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) --target-type=$(TARGET_TYPE) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp") -$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) +$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) $(call quiet-command,$(TRACETOOL) \ --group=all \ --format=simpletrace-stap \ @@ -85,7 +85,7 @@ $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \ $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp") -$(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=all \ --format=log-stap \ diff --git a/accel/kvm/trace.h b/accel/kvm/trace.h new file mode 100644 index 0000000..67c935a --- /dev/null +++ b/accel/kvm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_kvm.h" diff --git a/accel/tcg/trace.h b/accel/tcg/trace.h new file mode 100644 index 0000000..db61fad --- /dev/null +++ b/accel/tcg/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_tcg.h" diff --git a/audio/trace.h b/audio/trace.h new file mode 100644 index 0000000..4072a11 --- /dev/null +++ b/audio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-audio.h" diff --git a/authz/trace.h b/authz/trace.h new file mode 100644 index 0000000..3176c12 --- /dev/null +++ b/authz/trace.h @@ -0,0 +1 @@ +#include "trace/trace-authz.h" diff --git a/balloon.c b/balloon.c index f104b42..db44eb7 100644 --- a/balloon.c +++ b/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/block/trace.h b/block/trace.h new file mode 100644 index 0000000..3a436e6 --- /dev/null +++ b/block/trace.h @@ -0,0 +1 @@ +#include "trace/trace-block.h" diff --git a/chardev/trace.h b/chardev/trace.h new file mode 100644 index 0000000..eb4f902 --- /dev/null +++ b/chardev/trace.h @@ -0,0 +1 @@ +#include "trace/trace-chardev.h" diff --git a/configure b/configure index 5112683..c27d06f 100755 --- a/configure +++ b/configure @@ -6806,6 +6806,8 @@ fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak if test "$gnutls" = "yes" ; then echo "CONFIG_GNUTLS=y" >> $config_host_mak + echo "GNUTLS_CFLAGS=$gnutls_cflags" >> $config_host_mak + echo "GNUTLS_LIBS=$gnutls_libs" >> $config_host_mak fi if test "$gcrypt" = "yes" ; then echo "CONFIG_GCRYPT=y" >> $config_host_mak @@ -6816,6 +6818,8 @@ fi if test "$nettle" = "yes" ; then echo "CONFIG_NETTLE=y" >> $config_host_mak echo "CONFIG_NETTLE_VERSION_MAJOR=${nettle_version%%.*}" >> $config_host_mak + echo "NETTLE_CFLAGS=$nettle_cflags" >> $config_host_mak + echo "NETTLE_LIBS=$nettle_libs" >> $config_host_mak fi if test "$tasn1" = "yes" ; then echo "CONFIG_TASN1=y" >> $config_host_mak @@ -7155,6 +7159,8 @@ if have_backend "log"; then fi if have_backend "ust"; then echo "CONFIG_TRACE_UST=y" >> $config_host_mak + echo "LTTNG_UST_LIBS=$lttng_ust_libs" >> $config_host_mak + echo "URCU_BP_LIBS=$urcu_bp_libs" >> $config_host_mak fi if have_backend "dtrace"; then echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak @@ -7329,6 +7335,8 @@ echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak +echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak +echo "GLIB_LIBS=$glib_libs" >> $config_host_mak if test "$sparse" = "yes" ; then echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak echo "CPP := REAL_CC=\"\$(CPP)\" cgcc" >> $config_host_mak diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index d1d6283..3587f41 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -32,8 +32,3 @@ crypto-obj-y += xts.o crypto-obj-y += block.o crypto-obj-y += block-qcow.o crypto-obj-y += block-luks.o - -util-obj-$(CONFIG_GCRYPT) += random-gcrypt.o -util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) += random-gnutls.o -util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,y)) += random-platform.o -util-obj-y += aes.o init.o diff --git a/crypto/meson.build b/crypto/meson.build new file mode 100644 index 0000000..7250ffc --- /dev/null +++ b/crypto/meson.build @@ -0,0 +1,9 @@ +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) +else + util_ss.add(files('random-platform.c')) +endif diff --git a/crypto/trace.h b/crypto/trace.h new file mode 100644 index 0000000..a9af0f3 --- /dev/null +++ b/crypto/trace.h @@ -0,0 +1 @@ +#include "trace/trace-crypto.h" diff --git a/dma-helpers.c b/dma-helpers.c index d3871dc..578304d 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" diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index 76e492a..f7f13f9 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -60,7 +60,7 @@ general. It is strongly preferred that all events be declared directly in the sub-directory that uses them. The only exception is where there are some 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 between a trace.h in the current directory, vs the top level directory. === Using trace events === diff --git a/exec.c b/exec.c index 1df966d..107ae75 100644 --- a/exec.c +++ b/exec.c @@ -49,7 +49,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" #ifdef CONFIG_FALLOCATE_PUNCH_HOLE #include diff --git a/gdbstub.c b/gdbstub.c index b92ba59..be65d25 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -30,7 +30,7 @@ #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/module.h" -#include "trace-root.h" +#include "trace/trace-root.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" #else diff --git a/hw/9pfs/trace.h b/hw/9pfs/trace.h new file mode 100644 index 0000000..6104fe2 --- /dev/null +++ b/hw/9pfs/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_9pfs.h" diff --git a/hw/acpi/trace.h b/hw/acpi/trace.h new file mode 100644 index 0000000..a7f7da7 --- /dev/null +++ b/hw/acpi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_acpi.h" diff --git a/hw/alpha/trace.h b/hw/alpha/trace.h new file mode 100644 index 0000000..20fe698 --- /dev/null +++ b/hw/alpha/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_alpha.h" diff --git a/hw/arm/trace.h b/hw/arm/trace.h new file mode 100644 index 0000000..91337aa --- /dev/null +++ b/hw/arm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_arm.h" diff --git a/hw/audio/trace.h b/hw/audio/trace.h new file mode 100644 index 0000000..5c7516a --- /dev/null +++ b/hw/audio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_audio.h" diff --git a/hw/block/dataplane/trace.h b/hw/block/dataplane/trace.h new file mode 100644 index 0000000..240cc59 --- /dev/null +++ b/hw/block/dataplane/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_block_dataplane.h" diff --git a/hw/block/trace.h b/hw/block/trace.h new file mode 100644 index 0000000..cde210a --- /dev/null +++ b/hw/block/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_block.h" diff --git a/hw/char/trace.h b/hw/char/trace.h new file mode 100644 index 0000000..c2df66a --- /dev/null +++ b/hw/char/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_char.h" diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 0035845..bbc115a 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" CPUInterruptHandler cpu_interrupt_handler; diff --git a/hw/display/trace.h b/hw/display/trace.h new file mode 100644 index 0000000..4ed0e91 --- /dev/null +++ b/hw/display/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_display.h" diff --git a/hw/dma/trace.h b/hw/dma/trace.h new file mode 100644 index 0000000..4bcb28b --- /dev/null +++ b/hw/dma/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_dma.h" diff --git a/hw/gpio/trace.h b/hw/gpio/trace.h new file mode 100644 index 0000000..8b13907 --- /dev/null +++ b/hw/gpio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_gpio.h" diff --git a/hw/hppa/trace.h b/hw/hppa/trace.h new file mode 100644 index 0000000..4e8b52d --- /dev/null +++ b/hw/hppa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_hppa.h" diff --git a/hw/i2c/trace.h b/hw/i2c/trace.h new file mode 100644 index 0000000..4843a8d --- /dev/null +++ b/hw/i2c/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i2c.h" diff --git a/hw/i386/trace.h b/hw/i386/trace.h new file mode 100644 index 0000000..37a9f67 --- /dev/null +++ b/hw/i386/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i386.h" diff --git a/hw/i386/xen/trace.h b/hw/i386/xen/trace.h new file mode 100644 index 0000000..a02bf75 --- /dev/null +++ b/hw/i386/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_i386_xen.h" diff --git a/hw/ide/trace.h b/hw/ide/trace.h new file mode 100644 index 0000000..e060e0a --- /dev/null +++ b/hw/ide/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_ide.h" diff --git a/hw/input/trace.h b/hw/input/trace.h new file mode 100644 index 0000000..d1cc5d9 --- /dev/null +++ b/hw/input/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_input.h" diff --git a/hw/intc/trace.h b/hw/intc/trace.h new file mode 100644 index 0000000..02394ae --- /dev/null +++ b/hw/intc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_intc.h" diff --git a/hw/isa/trace.h b/hw/isa/trace.h new file mode 100644 index 0000000..501205c --- /dev/null +++ b/hw/isa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_isa.h" diff --git a/hw/mem/trace.h b/hw/mem/trace.h new file mode 100644 index 0000000..2f2c945 --- /dev/null +++ b/hw/mem/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_mem.h" diff --git a/hw/mips/trace.h b/hw/mips/trace.h new file mode 100644 index 0000000..8d1fd7c --- /dev/null +++ b/hw/mips/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_mips.h" diff --git a/hw/misc/macio/trace.h b/hw/misc/macio/trace.h new file mode 100644 index 0000000..34a3cf1 --- /dev/null +++ b/hw/misc/macio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_misc_macio.h" diff --git a/hw/misc/trace.h b/hw/misc/trace.h new file mode 100644 index 0000000..1ab6923 --- /dev/null +++ b/hw/misc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_misc.h" diff --git a/hw/net/trace.h b/hw/net/trace.h new file mode 100644 index 0000000..93249af --- /dev/null +++ b/hw/net/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_net.h" diff --git a/hw/nvram/trace.h b/hw/nvram/trace.h new file mode 100644 index 0000000..88fa900 --- /dev/null +++ b/hw/nvram/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_nvram.h" diff --git a/hw/pci-host/trace.h b/hw/pci-host/trace.h new file mode 100644 index 0000000..93ec814 --- /dev/null +++ b/hw/pci-host/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_pci_host.h" diff --git a/hw/pci/trace.h b/hw/pci/trace.h new file mode 100644 index 0000000..3dd773e --- /dev/null +++ b/hw/pci/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_pci.h" diff --git a/hw/ppc/trace.h b/hw/ppc/trace.h new file mode 100644 index 0000000..87c4198 --- /dev/null +++ b/hw/ppc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_ppc.h" diff --git a/hw/rdma/trace.h b/hw/rdma/trace.h new file mode 100644 index 0000000..b3fa8eb --- /dev/null +++ b/hw/rdma/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_rdma.h" diff --git a/hw/rdma/vmw/trace.h b/hw/rdma/vmw/trace.h new file mode 100644 index 0000000..3ebc9fb --- /dev/null +++ b/hw/rdma/vmw/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_rdma_vmw.h" diff --git a/hw/riscv/trace.h b/hw/riscv/trace.h new file mode 100644 index 0000000..8c0e3ca --- /dev/null +++ b/hw/riscv/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_riscv.h" diff --git a/hw/s390x/trace.h b/hw/s390x/trace.h new file mode 100644 index 0000000..d6568b3 --- /dev/null +++ b/hw/s390x/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_s390x.h" diff --git a/hw/scsi/trace.h b/hw/scsi/trace.h new file mode 100644 index 0000000..4ce2673 --- /dev/null +++ b/hw/scsi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_scsi.h" diff --git a/hw/sd/trace.h b/hw/sd/trace.h new file mode 100644 index 0000000..f3d0c58 --- /dev/null +++ b/hw/sd/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sd.h" diff --git a/hw/sparc/trace.h b/hw/sparc/trace.h new file mode 100644 index 0000000..625d60c --- /dev/null +++ b/hw/sparc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sparc.h" diff --git a/hw/sparc64/trace.h b/hw/sparc64/trace.h new file mode 100644 index 0000000..b6ef6e6 --- /dev/null +++ b/hw/sparc64/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_sparc64.h" diff --git a/hw/timer/trace.h b/hw/timer/trace.h new file mode 100644 index 0000000..5f72c44 --- /dev/null +++ b/hw/timer/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_timer.h" diff --git a/hw/tpm/trace.h b/hw/tpm/trace.h new file mode 100644 index 0000000..9827c12 --- /dev/null +++ b/hw/tpm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_tpm.h" diff --git a/hw/usb/trace.h b/hw/usb/trace.h new file mode 100644 index 0000000..f3962f2 --- /dev/null +++ b/hw/usb/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_usb.h" diff --git a/hw/vfio/trace.h b/hw/vfio/trace.h new file mode 100644 index 0000000..5a343aa --- /dev/null +++ b/hw/vfio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_vfio.h" diff --git a/hw/virtio/trace.h b/hw/virtio/trace.h new file mode 100644 index 0000000..5d70970 --- /dev/null +++ b/hw/virtio/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_virtio.h" diff --git a/hw/watchdog/trace.h b/hw/watchdog/trace.h new file mode 100644 index 0000000..5d84957 --- /dev/null +++ b/hw/watchdog/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_watchdog.h" diff --git a/hw/xen/trace.h b/hw/xen/trace.h new file mode 100644 index 0000000..adba31a --- /dev/null +++ b/hw/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_xen.h" diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_template.h index af7e0b4..b45b4b9 100644 --- a/include/exec/cpu_ldst_template.h +++ b/include/exec/cpu_ldst_template.h @@ -25,7 +25,7 @@ */ #if !defined(SOFTMMU_CODE_ACCESS) -#include "trace-root.h" +#include "trace/trace-root.h" #endif #include "trace/mem.h" diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_ldst_useronly_template.h index 2378f29..3680021 100644 --- a/include/exec/cpu_ldst_useronly_template.h +++ b/include/exec/cpu_ldst_useronly_template.h @@ -24,7 +24,7 @@ */ #if !defined(CODE_ACCESS) -#include "trace-root.h" +#include "trace/trace-root.h" #endif #include "trace/mem.h" diff --git a/io/trace.h b/io/trace.h new file mode 100644 index 0000000..92d63a5 --- /dev/null +++ b/io/trace.h @@ -0,0 +1 @@ +#include "trace/trace-io.h" diff --git a/ioport.c b/ioport.c index 04e360e..a799697 100644 --- a/ioport.c +++ b/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" diff --git a/job-qmp.c b/job-qmp.c index fbfed25..b4243b3 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" /* Get a job using its ID and acquire its AioContext */ static Job *find_job(const char *id, AioContext **aio_context, Error **errp) diff --git a/job.c b/job.c index 28dd48f..b3090b2 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" static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs); diff --git a/linux-user/trace.h b/linux-user/trace.h new file mode 100644 index 0000000..05518e4 --- /dev/null +++ b/linux-user/trace.h @@ -0,0 +1 @@ +#include "trace/trace-linux_user.h" diff --git a/memory.c b/memory.c index 7fd93b1..7793826 100644 --- a/memory.c +++ b/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" #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/meson.build b/meson.build index 5491a6a..18b8710 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,8 @@ project('qemu', ['c', 'cpp'], meson_version: '>=0.52.999') +cc = meson.get_compiler('c') kconfig = import('unstable-kconfig') +ss = import('sourceset') config_host = kconfig.load(meson.current_build_dir() / 'config-host.mak') add_project_arguments(config_host['CFLAGS'].split(), @@ -17,3 +19,162 @@ add_project_arguments(config_host['QEMU_INCLUDES'].split(), configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', configuration: config_host) + +m = cc.find_library('m', required: false) +util = cc.find_library('util', required: false) +socket = [] +if host_machine.system() == 'windows' + socket = cc.find_library('ws2_32') +endif +glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(), + link_args: config_host['GLIB_LIBS'].split()) +lttng = declare_dependency() +if 'CONFIG_TRACE_UST' in config_host + lttng = declare_dependency(link_args: config_host['LTTNG_UST_LIBS'].split()) +endif +urcubp = declare_dependency() +if 'CONFIG_TRACE_UST' in config_host + urcubp = declare_dependency(link_args: config_host['URCU_BP_LIBS'].split()) +endif +nettle = declare_dependency() +if 'CONFIG_NETTLE' in config_host + nettle = declare_dependency(compile_args: config_host['NETTLE_CFLAGS'].split(), + link_args: config_host['NETTLE_LIBS'].split()) +endif +gnutls = declare_dependency() +if 'CONFIG_GNUTLS' in config_host + gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(), + link_args: config_host['GNUTLS_LIBS'].split()) +endif + +target_dirs = config_host['TARGET_DIRS'].split() +have_user = false +have_system = false +foreach target : target_dirs + have_user = have_user or target.endswith('-user') + have_system = have_system or target.endswith('-softmmu') +endforeach +have_tools = 'CONFIG_TOOLS' in config_host +have_block = have_system or have_tools + +# Generators + +qapi_gen = find_program('scripts/qapi-gen.py') +qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py', + meson.source_root() / 'scripts/qapi/introspect.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' ] + +# Collect sourcesets. + +util_ss = ss.source_set() +stub_ss = ss.source_set() +trace_ss = ss.source_set() + +# TODO: add each directory to the subdirs from its own meson.build, once +# we have those +trace_events_subdirs = [ + 'accel/kvm', + 'accel/tcg', + 'crypto', + 'monitor', +] +if have_user + trace_events_subdirs += [ 'linux-user' ] +endif +if have_block + trace_events_subdirs += [ + 'authz', + 'block', + 'io', + 'nbd', + 'scsi', + ] +endif +if have_system + trace_events_subdirs += [ + 'chardev', + 'audio', + 'hw/9pfs', + 'hw/acpi', + 'hw/alpha', + 'hw/arm', + 'hw/audio', + 'hw/block', + 'hw/block/dataplane', + 'hw/char', + 'hw/dma', + 'hw/hppa', + '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/s390x', + 'hw/scsi', + 'hw/sd', + 'hw/sparc', + 'hw/sparc64', + '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 += [ + 'hw/display', + 'qapi', + 'qom', + 'target/arm', + 'target/hppa', + 'target/i386', + 'target/mips', + 'target/ppc', + 'target/riscv', + 'target/s390x', + 'target/sparc', + 'util', +] + +genh = [] +subdir('qapi') +subdir('qobject') +subdir('stubs') +subdir('trace') +subdir('util') +subdir('crypto') + +# Build targets from sourcesets + +stub_ss = stub_ss.apply(config_host, strict: false) + +util_ss.add_all(trace_ss) +util_ss = util_ss.apply(config_host, strict: false) +libqemuutil = static_library('qemuutil', + sources: util_ss.sources() + stub_ss.sources() + genh, + dependencies: [util_ss.dependencies(), m, glib, socket]) +qemuutil = declare_dependency(link_with: libqemuutil) diff --git a/migration/trace.h b/migration/trace.h new file mode 100644 index 0000000..e1a0f4f --- /dev/null +++ b/migration/trace.h @@ -0,0 +1 @@ +#include "trace/trace-migration.h" diff --git a/monitor/trace.h b/monitor/trace.h new file mode 100644 index 0000000..f216e31 --- /dev/null +++ b/monitor/trace.h @@ -0,0 +1 @@ +#include "trace/trace-monitor.h" diff --git a/nbd/trace.h b/nbd/trace.h new file mode 100644 index 0000000..233d08f --- /dev/null +++ b/nbd/trace.h @@ -0,0 +1 @@ +#include "trace/trace-nbd.h" diff --git a/net/trace.h b/net/trace.h new file mode 100644 index 0000000..18d42c2 --- /dev/null +++ b/net/trace.h @@ -0,0 +1 @@ +#include "trace/trace-net.h" diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index dd3f5e6..10ca4f6 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -1,25 +1,4 @@ -util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qobject-input-visitor.o -util-obj-y += qobject-output-visitor.o qmp-registry.o qmp-dispatch.o -util-obj-y += string-input-visitor.o string-output-visitor.o -util-obj-y += opts-visitor.o qapi-clone-visitor.o -util-obj-y += qmp-event.o -util-obj-y += qapi-util.o - -QAPI_COMMON_MODULES = audio authz block-core block char common crypto -QAPI_COMMON_MODULES += dump error introspect job machine migration misc net -QAPI_COMMON_MODULES += qdev qom rdma rocker run-state sockets tpm -QAPI_COMMON_MODULES += trace transaction ui QAPI_TARGET_MODULES = machine-target misc-target -QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) - -util-obj-y += qapi-builtin-types.o -util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-types-%.o) -util-obj-y += qapi-builtin-visit.o -util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-visit-%.o) -util-obj-y += qapi-emit-events.o -util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-events-%.o) - -common-obj-y = $(QAPI_COMMON_MODULES:%=qapi-commands-%.o) obj-y = qapi-introspect.o obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o) diff --git a/qapi/meson.build b/qapi/meson.build new file mode 100644 index 0000000..8431f26 --- /dev/null +++ b/qapi/meson.build @@ -0,0 +1,89 @@ +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_common_modules = [ + 'audio', + 'authz', + 'block-core', + 'block', + 'char', + 'common', + 'crypto', + 'dump', + 'error', + 'introspect', + 'job', + 'machine', + 'migration', + 'misc', + 'net', + 'qdev', + 'qom', + 'rdma', + 'rocker', + 'run-state', + 'sockets', + 'tpm', + 'trace', + 'transaction', + 'ui', +] + +qapi_target_modules = [ 'machine-target', 'misc-target' ] + +qapi_util_outputs = [ + 'qapi-builtin-types.c', 'qapi-builtin-visit.c', + 'qapi-emit-events.c' +] +qapi_all_outputs = qapi_util_outputs +qapi_inputs = [] +foreach module : qapi_common_modules + qapi_target_modules + qapi_module_outputs = [ + '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-commands-@0@.c'.format(module), + 'qapi-commands-@0@.h'.format(module), + 'qapi-events-@0@.c'.format(module), + 'qapi-events-@0@.h'.format(module), + ] + qapi_inputs += [ files(module + '.json') ] + qapi_all_outputs += qapi_module_outputs + if qapi_common_modules.contains(module) + qapi_util_outputs += qapi_module_outputs + endif +endforeach + +qapi_all_outputs += [ + 'qapi-introspect.c', 'qapi-introspect.h', + 'qapi-doc.texi' +] + +qapi_files = custom_target('QAPI files', + output: qapi_all_outputs, + input: [ files('qapi-schema.json') ], + command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ], + depend_files: [ qapi_inputs, qapi_gen_depends ]) + +# qapi_util_outputs must be at the beginning of qapi_all_outputs. +i = 0 +foreach output : qapi_util_outputs + util_ss.add(qapi_files[i]) + if qapi_util_outputs[i].endswith('.h') + genh += qapi_files[i] + endif + i = i + 1 +endforeach diff --git a/qapi/trace.h b/qapi/trace.h new file mode 100644 index 0000000..5c3fb67 --- /dev/null +++ b/qapi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-qapi.h" diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs deleted file mode 100644 index 7b12c9c..0000000 --- a/qobject/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o -util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o -util-obj-y += block-qdict.o diff --git a/qobject/meson.build b/qobject/meson.build new file mode 100644 index 0000000..bb63c06 --- /dev/null +++ b/qobject/meson.build @@ -0,0 +1,3 @@ +util_ss.add(files('qnull.c', 'qnum.c', 'qstring.c', 'qdict.c', 'qlist.c', 'qbool.c', + 'qlit.c', 'qjson.c', 'qobject.c', 'json-lexer.c', 'json-streamer.c', 'json-parser.c', + 'block-qdict.c')) diff --git a/qom/trace.h b/qom/trace.h new file mode 100644 index 0000000..f2895e6 --- /dev/null +++ b/qom/trace.h @@ -0,0 +1 @@ +#include "trace/trace-qom.h" diff --git a/rules.mak b/rules.mak index e19ad19..fa9960c 100644 --- a/rules.mak +++ b/rules.mak @@ -32,7 +32,7 @@ QEMU_DGFLAGS += -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 = -iquote $(BUILD_DIR)/$(@D) -iquote $(@D) +QEMU_LOCAL_INCLUDES = -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -iquote $(@D) WL_U := -Wl,-u, find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2))) diff --git a/scripts/qapi-gen.py b/scripts/qapi-gen.py index 3d98ca2..c15daac 100755 --- a/scripts/qapi-gen.py +++ b/scripts/qapi-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # QAPI generator # # This work is licensed under the terms of the GNU GPL, version 2 or later. diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 3beaa66..264cc9e 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py old mode 100644 new mode 100755 index c2f3a4e..35b3c15 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -39,7 +39,7 @@ def generate_h_begin(events, group): if group == "root": header = "trace-dtrace-root.h" else: - header = "trace-dtrace.h" + header = "trace-dtrace-%s.h" % group out('#include "%s"' % header, '') diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py index 280cb7c..ba37b9f 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -20,11 +20,7 @@ PUBLIC = True def generate_h_begin(events, group): - if group == "root": - header = "trace-ust-root.h" - else: - header = "trace-ust.h" - + header = 'trace-ust-' + group + '.h' out('#include ', '#include "%s"' % header, '', diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 3120796..bd04798 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -20,10 +20,7 @@ def generate(events, backend, group): active_events = [e for e in events if "disable" not in e.properties] - if group == "root": - header = "trace-root.h" - else: - header = "trace.h" + header = "trace-" + group + ".h" out('/* This file is autogenerated by tracetool, do not edit. */', '', diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py index 1651cc3..21a2905 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -29,7 +29,7 @@ def vcpu_transform_args(args): def generate(events, backend, group): if group == "root": - header = "trace-root.h" + header = "trace/trace-root.h" else: header = "trace.h" diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py index 1b3522a..1a14a29 100644 --- a/scripts/tracetool/format/tcg_helper_c.py +++ b/scripts/tracetool/format/tcg_helper_c.py @@ -42,7 +42,7 @@ def vcpu_transform_args(args, mode): def generate(events, backend, group): if group == "root": - header = "trace-root.h" + header = "trace/trace-root.h" else: header = "trace.h" diff --git a/scsi/trace.h b/scsi/trace.h new file mode 100644 index 0000000..3e4d89a --- /dev/null +++ b/scsi/trace.h @@ -0,0 +1 @@ +#include "trace/trace-scsi.h" diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs deleted file mode 100644 index 9c7393b..0000000 --- a/stubs/Makefile.objs +++ /dev/null @@ -1,43 +0,0 @@ -stub-obj-y += bdrv-next-monitor-owned.o -stub-obj-y += blk-commit-all.o -stub-obj-y += blockdev-close-all-bdrv-states.o -stub-obj-y += clock-warp.o -stub-obj-y += cpu-get-clock.o -stub-obj-y += cpu-get-icount.o -stub-obj-y += dump.o -stub-obj-y += error-printf.o -stub-obj-y += fdset.o -stub-obj-y += gdbstub.o -stub-obj-y += get-vm-name.o -stub-obj-y += iothread.o -stub-obj-y += iothread-lock.o -stub-obj-y += is-daemonized.o -stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o -stub-obj-y += machine-init-done.o -stub-obj-y += migr-blocker.o -stub-obj-y += change-state-handler.o -stub-obj-y += monitor.o -stub-obj-y += notify-event.o -stub-obj-y += qtest.o -stub-obj-y += replay.o -stub-obj-y += runstate-check.o -stub-obj-y += set-fd-handler.o -stub-obj-y += sysbus.o -stub-obj-y += tpm.o -stub-obj-y += trace-control.o -stub-obj-y += uuid.o -stub-obj-y += vm-stop.o -stub-obj-y += vmstate.o -stub-obj-y += fd-register.o -stub-obj-y += qmp_memory_device.o -stub-obj-y += target-monitor-defs.o -stub-obj-y += target-get-monitor-def.o -stub-obj-y += pc_madt_cpu_entry.o -stub-obj-y += vmgenid.o -stub-obj-y += xen-common.o -stub-obj-y += xen-hvm.o -stub-obj-y += pci-host-piix.o -stub-obj-y += ram-block.o -stub-obj-y += ramfb.o -stub-obj-y += fw_cfg.o -stub-obj-$(CONFIG_SOFTMMU) += semihost.o diff --git a/stubs/meson.build b/stubs/meson.build new file mode 100644 index 0000000..388b556 --- /dev/null +++ b/stubs/meson.build @@ -0,0 +1,45 @@ +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('clock-warp.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('fdset.c')) +stub_ss.add(files('gdbstub.c')) +stub_ss.add(files('get-vm-name.c')) +stub_ss.add(files('iothread.c')) +stub_ss.add(files('iothread-lock.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('change-state-handler.c')) +stub_ss.add(files('monitor.c')) +stub_ss.add(files('notify-event.c')) +stub_ss.add(files('qtest.c')) +stub_ss.add(files('replay.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('tpm.c')) +stub_ss.add(files('trace-control.c')) +stub_ss.add(files('uuid.c')) +stub_ss.add(files('vm-stop.c')) +stub_ss.add(files('vmstate.c')) +stub_ss.add(files('fd-register.c')) +stub_ss.add(files('qmp_memory_device.c')) +stub_ss.add(files('target-monitor-defs.c')) +stub_ss.add(files('target-get-monitor-def.c')) +stub_ss.add(files('pc_madt_cpu_entry.c')) +stub_ss.add(files('vmgenid.c')) +stub_ss.add(files('xen-common.c')) +stub_ss.add(files('xen-hvm.c')) +stub_ss.add(files('pci-host-piix.c')) +stub_ss.add(files('ram-block.c')) +stub_ss.add(files('ramfb.c')) +stub_ss.add(files('fw_cfg.c')) +if have_system + stub_ss.add(files('semihost.c')) +endif diff --git a/target/arm/trace.h b/target/arm/trace.h new file mode 100644 index 0000000..60372d8 --- /dev/null +++ b/target/arm/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_arm.h" diff --git a/target/hppa/trace.h b/target/hppa/trace.h new file mode 100644 index 0000000..810cc09 --- /dev/null +++ b/target/hppa/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_hppa.h" diff --git a/target/i386/trace.h b/target/i386/trace.h new file mode 100644 index 0000000..781e8ec --- /dev/null +++ b/target/i386/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_i386.h" diff --git a/target/mips/trace.h b/target/mips/trace.h new file mode 100644 index 0000000..f25b88c --- /dev/null +++ b/target/mips/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_mips.h" diff --git a/target/ppc/trace.h b/target/ppc/trace.h new file mode 100644 index 0000000..a9e8962 --- /dev/null +++ b/target/ppc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_ppc.h" diff --git a/target/riscv/trace.h b/target/riscv/trace.h new file mode 100644 index 0000000..03a89fc --- /dev/null +++ b/target/riscv/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_riscv.h" diff --git a/target/s390x/trace.h b/target/s390x/trace.h new file mode 100644 index 0000000..d7d59d4 --- /dev/null +++ b/target/s390x/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_s390x.h" diff --git a/target/sparc/trace.h b/target/sparc/trace.h new file mode 100644 index 0000000..3b2f5a8 --- /dev/null +++ b/target/sparc/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_sparc.h" diff --git a/trace/Makefile.objs b/trace/Makefile.objs index c544509..a429474 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -1,59 +1,8 @@ # -*- mode: makefile -*- -$(BUILD_DIR)/trace-events-all: $(trace-events-files) - $(call quiet-command,cat $^ > $@) - ################################################## # Translation level -$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp - @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=root \ - --format=tcg-helper-wrapper-h \ - --backend=$(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=root \ - --format=tcg-helper-h \ - --backend=$(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=root \ - --format=tcg-helper-c \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -$(obj)/generated-helpers.o: $(obj)/generated-helpers.c - obj-y += 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=root \ - --format=tcg-h \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - - -###################################################################### -# Backend code - -util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o -util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o -util-obj-y += control.o obj-y += control-target.o -util-obj-y += qmp.o diff --git a/trace/control-target.c b/trace/control-target.c index ceb55c7..e293eee 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/control.h" diff --git a/trace/control.c b/trace/control.c index 43fb786..16d66ef 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" int trace_events_enabled_count; diff --git a/trace/meson.build b/trace/meson.build new file mode 100644 index 0000000..d0e5d17 --- /dev/null +++ b/trace/meson.build @@ -0,0 +1,82 @@ +# common options +tracetool = [ + find_program('scripts/tracetool.py'), + '--backend=' + config_host['TRACE_BACKENDS'] +] + +trace_events_files = [] +foreach dir : [ '.' ] + trace_events_subdirs + trace_events_file = meson.source_root() / dir / 'trace-events' + trace_events_files += [ trace_events_file ] + group_name = dir == '.' ? 'root' : dir.underscorify() + group = '--group=' + group_name + fmt = '@0@-' + group_name + '.@1@' + + trace_h = custom_target(fmt.format('trace', 'h'), + output: fmt.format('trace', 'h'), + input: trace_events_file, + command: [ tracetool, group, '--format=h', '@INPUT@' ], + capture: true) + genh += trace_h + trace_c = custom_target(fmt.format('trace', 'c'), + output: fmt.format('trace', 'c'), + input: trace_events_file, + command: [ tracetool, group, '--format=c', '@INPUT@' ], + capture: true) + if 'CONFIG_TRACE_UST' in config_host + trace_ust_h = custom_target(fmt.format('trace-ust', 'h'), + output: fmt.format('trace-ust', 'h'), + input: trace_events_file, + command: [ tracetool, group, '--format=ust-events-h', '@INPUT@' ], + capture: true) + trace_ss.add(trace_ust_h, lttng, urcubp) + genh += trace_ust_h + endif + trace_ss.add(trace_h, trace_c) + if 'CONFIG_TRACE_DTRACE' in config_host + trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'), + output: fmt.format('trace-dtrace', 'dtrace'), + input: trace_events_file, + command: [ tracetool, group, '--format=d', '@INPUT@' ], + capture: true) + trace_dtrace_h = 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 = 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 += 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 = custom_target('trace-ust-all.h', + output: 'trace-ust-all.h', + input: trace_events_files, + command: [ tracetool, '--group=all', '--format=ust-events-h', '@INPUT@' ], + capture: true) + trace_ust_all_c = custom_target('trace-ust-all.c', + output: 'trace-ust-all.c', + input: trace_events_files, + command: [ tracetool, '--group=all', '--format=ust-events-c', '@INPUT@' ], + capture: true) + trace_ss.add(trace_ust_all_h, trace_ust_all_c) + genh += 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/ui/trace.h b/ui/trace.h new file mode 100644 index 0000000..a89d769 --- /dev/null +++ b/ui/trace.h @@ -0,0 +1 @@ +#include "trace/trace-ui.h" diff --git a/util/Makefile.objs b/util/Makefile.objs deleted file mode 100644 index ce928b1..0000000 --- a/util/Makefile.objs +++ /dev/null @@ -1,57 +0,0 @@ -util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-y += bufferiszero.o -util-obj-y += lockcnt.o -util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o -util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o -util-obj-$(CONFIG_POSIX) += aio-posix.o -util-obj-$(CONFIG_POSIX) += compatfd.o -util-obj-$(CONFIG_POSIX) += event_notifier-posix.o -util-obj-$(CONFIG_POSIX) += mmap-alloc.o -util-obj-$(CONFIG_POSIX) += oslib-posix.o -util-obj-$(CONFIG_POSIX) += qemu-openpty.o -util-obj-$(CONFIG_POSIX) += qemu-thread-posix.o -util-obj-$(CONFIG_POSIX) += memfd.o -util-obj-$(CONFIG_WIN32) += aio-win32.o -util-obj-$(CONFIG_WIN32) += event_notifier-win32.o -util-obj-$(CONFIG_WIN32) += oslib-win32.o -util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o -util-obj-y += envlist.o path.o module.o -util-obj-y += host-utils.o -util-obj-y += bitmap.o bitops.o hbitmap.o -util-obj-y += fifo8.o -util-obj-y += cacheinfo.o -util-obj-y += error.o qemu-error.o -util-obj-y += qemu-print.o -util-obj-y += id.o -util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o -util-obj-y += qemu-option.o qemu-progress.o -util-obj-y += keyval.o -util-obj-y += hexdump.o -util-obj-y += crc32c.o -util-obj-y += uuid.o -util-obj-y += throttle.o -util-obj-y += getauxval.o -util-obj-y += readline.o -util-obj-y += rcu.o -util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o -util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y += qemu-coroutine-sleep.o -util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y += buffer.o -util-obj-y += timed-average.o -util-obj-y += base64.o -util-obj-y += log.o -util-obj-y += pagesize.o -util-obj-y += qdist.o -util-obj-y += qht.o -util-obj-y += qsp.o -util-obj-y += range.o -util-obj-y += stats64.o -util-obj-y += systemd.o -util-obj-y += iova-tree.o -util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o -util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o -util-obj-$(CONFIG_LINUX) += vfio-helpers.o -util-obj-$(CONFIG_POSIX) += drm.o -util-obj-y += guest-random.o diff --git a/util/meson.build b/util/meson.build new file mode 100644 index 0000000..9eaa41c --- /dev/null +++ b/util/meson.build @@ -0,0 +1,57 @@ +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', 'qemu-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('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(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('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', 'notify.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-coroutine-io.c')) +util_ss.add(files('qemu-coroutine-sleep.c')) +util_ss.add(files('coroutine-@0@.c'.format(config_host['CONFIG_COROUTINE_BACKEND']))) +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')) diff --git a/util/trace.h b/util/trace.h new file mode 100644 index 0000000..86ff7a3 --- /dev/null +++ b/util/trace.h @@ -0,0 +1 @@ +#include "trace/trace-util.h" diff --git a/vl.c b/vl.c index 630f5c5..8c8a591 100644 --- a/vl.c +++ b/vl.c @@ -108,7 +108,7 @@ int main(int argc, char **argv) #include "disas/disas.h" -#include "trace-root.h" +#include "trace/trace-root.h" #include "trace/control.h" #include "qemu/queue.h" #include "sysemu/arch_init.h" From patchwork Thu Dec 12 12:50:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oMxFN5Do"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYmG1cpgz9sP6 for ; Thu, 12 Dec 2019 23:59:42 +1100 (AEDT) Received: from localhost ([::1]:58930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO4B-0001o6-Dv for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:59:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56857) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxv-0002me-5L for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxt-0005pn-Hr for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:10 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxt-0005nv-AT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:09 -0500 Received: by mail-wm1-x32f.google.com with SMTP id d73so2250531wmd.1 for ; Thu, 12 Dec 2019 04:53:09 -0800 (PST) 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=ROYx5+0XLUpLftchu3ejkBE7YKh7Fs75vJaZPNs0XI4=; b=oMxFN5DoGuNkWSwudV9KnJ/a+q8SevyKjZeLYlj7iSxDf/f73te09SjnGi4L7+i0hn T+nfqIELd3Zh3GWbvVKVllVUaRITTAbA55LxXKl1NgpSWjyhQXToT4V8LWv9brEWIkZ3 oQglKGAqPLIf71zVjlRzvuyXo4/052w1rmxh61moRXntkLnKil7eHesM3J0tG5hndPEe q1Rfv0E7/gd9Pm7HOE4U87T5MNbOwwtpRfQCpdEqyq2PhZ0zknsfDuRrklltxCvSiOxs I3EdGaK0RAYFlGXaLnSwGTb3iYYQK/8VHkUQGfjazMQ1yG+zln4uJy+7q+wZeOJpSnqq C9VA== 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=ROYx5+0XLUpLftchu3ejkBE7YKh7Fs75vJaZPNs0XI4=; b=Sv7SBPDixxWLbOcerH/xmhGqbTyMbT287mpQA61kjf5+FSnrmSrZZjfJvboJF8ZuKg hDc2xATuUuB/itZ9ydXVbjEU3b6VI/XlsJJzzrd3skyimoqiaDGP3TDvUxlGwJcvvQPd U+4XhTZKmzECmurqgo9Rc9OEQPWKUvpmpsCMs0s7vJmKaHtPjtbZ83/iCSKaxBjEtg1r VA5nB/hl7pRfMnHSJQJmOu6NAIY51AJ2TCPKK38+XS8Qa2Q0uDR1fQ5QGrk2fZHeCqCR w6T001+0I2jkeQI2MY7KEElzq572fzejJUktema/vBmoH1SZRtmQ3dxxipQlggMF+ZK2 Dx1Q== X-Gm-Message-State: APjAAAU7K2gU5ZFCTmLQ8Gco0IWhcfWgeQzo9NHi6n/S8hyNd2nOrxun kTkiVuMuEL3+daDmCx+p3FRprgT5 X-Google-Smtp-Source: APXvYqxmJBwFJ/1XxolnbCqUcsh9VIuwWgcva0iVFRiI8Z15DSTE2oWWNQn475HZvOMHeTs0FTdUtQ== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr6826855wmh.30.1576155187982; Thu, 12 Dec 2019 04:53:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 010/132] meson: add remaining generated tcg trace helpers Date: Thu, 12 Dec 2019 13:50:54 +0100 Message-Id: <1576155176-2464-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André 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 6f97ae9..97f9ffd 100644 --- a/Makefile +++ b/Makefile @@ -112,61 +112,10 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO generated-files-y = qemu-version.h config-host.h qemu-options.def -generated-files-y += trace/generated-tcg-tracers.h - -generated-files-y += trace/generated-helpers-wrappers.h -generated-files-y += trace/generated-helpers.h -generated-files-y += trace/generated-helpers.c - generated-files-y += module_block.h generated-files-y += .git-submodule-status -tracetool-y = $(SRC_PATH)/scripts/tracetool.py -tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") - -trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=root \ - --format=tcg-helper-wrapper-h \ - --backend=$(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=root \ - --format=tcg-helper-h \ - --backend=$(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=root \ - --format=tcg-helper-c \ - --backend=$(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=root \ - --format=tcg-h \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv diff --git a/trace/meson.build b/trace/meson.build index d0e5d17..8ea8db7 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -61,6 +61,20 @@ custom_target('trace-events-all', install: true, install_dir: config_host['qemu_datadir']) +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=root', '--format=@0@'.format(d[1]), '@INPUT@' ], + build_by_default: true, # to be removed when added to a target + capture: true) +endforeach + if 'CONFIG_TRACE_UST' in config_host trace_ust_all_h = custom_target('trace-ust-all.h', output: 'trace-ust-all.h', From patchwork Thu Dec 12 12:50:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lbnXp0qb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYrJ2bwgz9sPK for ; Fri, 13 Dec 2019 00:03:12 +1100 (AEDT) Received: from localhost ([::1]:58978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO7Z-0005Vv-AR for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:03:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56993) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxv-0002no-Pp for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxu-0005rc-Ix for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:11 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:39014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxu-0005qO-C3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:10 -0500 Received: by mail-wm1-x334.google.com with SMTP id d5so2374013wmb.4 for ; Thu, 12 Dec 2019 04:53:10 -0800 (PST) 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=QXKe1oNgve+OXaCcf1sLHSgFBHpdluWz0a0oY/3Sum0=; b=lbnXp0qbFTeOQcCKczI5GT52V/VV5PatZmnn08ucUOHZPEJYIK2TlN9PWRgjfB/pnk ojgG1LO/wCjxTbfq2V503SuqRGHRDIZX7ofrW2CAvkihodgD0nPf4oLjMsQjwhDbTuLJ WyJMz41APvAimjQFSHoOa/Un++zkVC8AbxMCkWik8CbiphdzEJBZduJubcBGOAT0A5Od mcBjhdtdLx565uUTc1z+BmuByzQTh+Q94f/h/5F61+uuSn9KaN127buKKusA21qWEanI Yvya72eGorJUsA5JY1Mkh9RHt6FBPwclhCrkE1haH5Y4kvnGxc726enZA+xPRl7WW4C2 mBaA== 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=QXKe1oNgve+OXaCcf1sLHSgFBHpdluWz0a0oY/3Sum0=; b=s1xgNaIyxlIIxUi+W8Uj2mJqt7+R+diafuWofTkN8VRl9k+bYetjyJe8PZJnvhI0FU ppgfy9CyxyZgzLNFQvFR/YJBkI2h69FOhFE1Utbl98CiMc2KmSBxLTjeJVxhbh5J4+iR CVjVYwuEW0FAfNxMGS9UpZOWJi67YmVenCBoPcQZnftU4jDN22B5mT5Utx1p0FLRr+9U iQYH4/9Y0oHX/IIttbukK2kXUitR4ofpVDC6uSiI48+ofvOP6e+ax6KfSnhwjYrlmxj+ FWjpLyoGW/ratoZawxTqPhTc8KRUNppfyx8Ekx7ke7VCq7zkLNwzCasrQ5A2+DQbC99R icnQ== X-Gm-Message-State: APjAAAWRKMVN4OWEJ5eMXy8TMhjCLyQLz+9fn8dQDx3YZXaqJEIN+AgE nu25Day3LEclZJXoSWRvhv80StzC X-Google-Smtp-Source: APXvYqxXXktcZ2rVyffo5iUym+ZCdqxTag7Ywwyw3dKkgjNLoJ19f/pg39Ah+glLoiyViup6A7imWQ== X-Received: by 2002:a05:600c:2409:: with SMTP id 9mr6038404wmp.109.1576155189003; Thu, 12 Dec 2019 04:53:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 011/132] meson: add version.o Date: Thu, 12 Dec 2019 13:50:55 +0100 Message-Id: <1576155176-2464-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 18b8710..ba4d891 100644 --- a/meson.build +++ b/meson.build @@ -23,8 +23,14 @@ configure_file(input: files('scripts/ninjatool.py'), m = cc.find_library('m', required: false) util = cc.find_library('util', required: false) socket = [] +version_res = [] if host_machine.system() == 'windows' socket = cc.find_library('ws2_32') + + win = import('windows') + version_res = win.compile_resources('version.rc', + depend_files: files('pc-bios/qemu-nsis.ico'), + include_directories: include_directories('.')) endif glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(), link_args: config_host['GLIB_LIBS'].split()) @@ -177,4 +183,5 @@ util_ss = util_ss.apply(config_host, strict: false) libqemuutil = static_library('qemuutil', sources: util_ss.sources() + stub_ss.sources() + genh, dependencies: [util_ss.dependencies(), m, glib, socket]) -qemuutil = declare_dependency(link_with: libqemuutil) +qemuutil = declare_dependency(link_with: libqemuutil, + sources: version_res) From patchwork Thu Dec 12 12:50:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MyFyFQoe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYg62k5Nz9sP6 for ; Thu, 12 Dec 2019 23:55:14 +1100 (AEDT) Received: from localhost ([::1]:58864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzr-0004V1-GL for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:55:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxx-0002po-2O for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxv-0005tq-JJ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39303) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxv-0005sH-Bu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:11 -0500 Received: by mail-wr1-x441.google.com with SMTP id y11so2611783wrt.6 for ; Thu, 12 Dec 2019 04:53:11 -0800 (PST) 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; bh=rBx/jhpeemEhVPmqdIJ1QkUAPiG8kXc9Er3XvzBvw64=; b=MyFyFQoeNLQAflpSFNNljxQWJKLf+3N9PodvOu1G5c79X5Isst/TAUaqF2xERpsERo EytZteKBUAEQC8Ghwoox0pEgWZHbYmwLH6ftSI/C7jw1Fz/AgnvGaDlsCVjMdiTUFF1O aJAnmkp+3FK427HEUGkjWPARpMeQaHiYMS1cmmZaAg0etVjXAtx1WgNQ4vBKduGn3GmH h+qVyQ5anwpaSJH/H4+ltFtW0w6Rkb8qIqoSoSUOTotc7gm7VcqmB2s2h/SvpO+V+/dq jo7UwJKsuypt7GFK0nWW5rJDHRxqYtL3dUXOSJnezk7dsvHKNBPYbKTzgZz01+XGNd4H Q5uQ== 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; bh=rBx/jhpeemEhVPmqdIJ1QkUAPiG8kXc9Er3XvzBvw64=; b=sQn3uOlsIptu0jRiK4FLyaZ8IyMElNaui6FD2N3frckLuE9QVSGo3TRrX37t+ZuC/u jjwkbQsBVTgrP1HPY7a0f8RwAOwWyg27c3I40CdOqtNTKo1DpHKWakrATuSm4G3OjGni sk1dj+TISuN7sX5STLZY3u6jZBwWpGvtrCS6s0mZEmdbXQL+t55+CMrAeLcF5Jzl1B18 zuOCD8Y/KZdpW4Kds9539Sl+IysW5Lzly3DuBTXW1vb+8MFv2VyOXvvBvJNWdDRai3sy xtJKUk0vDOthFKTk4xyogprASqUuceq0jpAO3vd/40cX4iqs6uIQA3BBU8GDYcVXE5bX E0nQ== X-Gm-Message-State: APjAAAXXBDaBAaIrZt/PhaG/nYPZAVDEgk1WX7guZUl9IKPSkgoOF1ku iKcZ2yT9gPIES3i79tCYaSQVWaai X-Google-Smtp-Source: APXvYqxGqjRrdNy+8RPukoOb8AIp8XsrBKufHHqRfDggHuXygpzxDvpY6Ay0fHB0xNSy3KumidkCsg== X-Received: by 2002:adf:f288:: with SMTP id k8mr6535645wro.301.1576155190018; Thu, 12 Dec 2019 04:53:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 012/132] contrib/libvhost-user: convert to Meson Date: Thu, 12 Dec 2019 13:50:56 +0100 Message-Id: <1576155176-2464-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since libqemuutil.a has been converted to Meson, the conversion is straightforward. Signed-off-by: Paolo Bonzini --- Makefile | 14 ++++---------- Makefile.objs | 1 - contrib/libvhost-user/Makefile.objs | 1 - contrib/libvhost-user/meson.build | 2 ++ meson.build | 8 ++++++++ 5 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 contrib/libvhost-user/Makefile.objs create mode 100644 contrib/libvhost-user/meson.build diff --git a/Makefile b/Makefile index 97f9ffd..27e9ea3 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,6 @@ dummy := $(call unnest-vars,, \ ivshmem-client-obj-y \ ivshmem-server-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 \ @@ -377,11 +376,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h Makefile: $(version-obj-y) ###################################################################### -# Build libraries - -libvhost-user.a: $(libvhost-user-obj-y) - -###################################################################### COMMON_LDADDS = libqemuutil.a @@ -471,21 +465,21 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_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 $(COMMON_LDADDS) +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-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/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) $(COMMON_LDADDS) +vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) ifdef CONFIG_VHOST_USER_INPUT ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COMMON_LDADDS) +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 diff --git a/Makefile.objs b/Makefile.objs index f820829..3142dbb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,7 +109,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -libvhost-user-obj-y = contrib/libvhost-user/ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs deleted file mode 100644 index ef3778e..0000000 --- a/contrib/libvhost-user/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meson.build new file mode 100644 index 0000000..03ba2af --- /dev/null +++ b/contrib/libvhost-user/meson.build @@ -0,0 +1,2 @@ +libvhost_user = static_library('vhost-user', + [files('libvhost-user.c', 'libvhost-user-glib.c')]) diff --git a/meson.build b/meson.build index ba4d891..6b9636d 100644 --- a/meson.build +++ b/meson.build @@ -185,3 +185,11 @@ libqemuutil = static_library('qemuutil', dependencies: [util_ss.dependencies(), m, glib, socket]) qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) + +# Other build targets + +if have_tools + if 'CONFIG_VHOST_USER' in config_host + subdir('contrib/libvhost-user') + endif +endif From patchwork Thu Dec 12 12:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rYibp1iq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYkG3mvpz9sP6 for ; Thu, 12 Dec 2019 23:57:58 +1100 (AEDT) Received: from localhost ([::1]:58898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO2W-00088X-6K for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:57:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57418) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxy-0002rQ-4P for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxw-0005wF-U1 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:13 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxw-0005uW-MY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: by mail-wr1-x443.google.com with SMTP id t2so2643568wrr.1 for ; Thu, 12 Dec 2019 04:53:12 -0800 (PST) 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; bh=/vMZP16atX8dkxZHpqjBZSlvs6YBh8+nwakOK3x617U=; b=rYibp1iqvle/0P6GazFC+nz8t6Xn2R3s1XRO307rAUiI1MHRI9oJa6HflmzHZaq6ED K/MGs9lgst4DHhC+rMIR7ZbXt9F0hnJ7PocdWGf5AHmOIRT0/0OZ/ybRPe39f2v7oDRn zZ3x4CVPw7DNX6rftX1EIvcLTapYlPaOpUKh+5zSYMQYlEOnAoxOM8BudIKoRVTklGk4 1KnRwiYgBou+xHsuKvV2I5uz0qPfHIKUElNQurL6MUkYsOYWb6Me7JTAn4PsOATCDfgp NGvQtEHii88JwSOvN/R7JC5tRPOaD//v8o7EBhvw0e504DJxaZzIpei6ZLM7iR1UM79F 7wWQ== 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; bh=/vMZP16atX8dkxZHpqjBZSlvs6YBh8+nwakOK3x617U=; b=HWD0j/CBB4C2U2j3Mfyf0jY2d89SVSeYlJV/MplH5n91h26EZ/8uOsydVu6Zw+IWh7 oAGHizJzlu7RWgYmbmtkXwGzKGXRhO5YcygN4/IF1P19x6ohSsTtf1FyEhrisVu8gJPn UsaVQb/P32Wgh8fkb2sBKv4MSYsV4Rn7yOKimEVS6mAwWHN6lRCU7EmIa/y57S5AwDCR EDGClvTlzbMcZQrkUYKfXbGoGBqZGPZAOlGJsHgxS7rwbW2lIOSlZHSMiUDjFuRjbVbe 9P6MC7Gv8u91vmxRGHcAPTOcHPrtWBbIf9i3Fb4h+7quU9gif+93MoDGOpfS0dHc9vD0 x26A== X-Gm-Message-State: APjAAAUPXtZBt/aB09f15i+mXpIATrK7pq3hm+Xbpb4LlVQc5e8hcrCl r6OoEqUxkYHixBCWbNOKRQJmMomG X-Google-Smtp-Source: APXvYqzOjRJGFXsUMcY4UqsB3UlMixnoMbb4Pe4HHkK1cIG5wvOo5yzE04ocdIaF5/muXv2Fq8L+ag== X-Received: by 2002:a05:6000:cf:: with SMTP id q15mr6062128wrx.393.1576155191152; Thu, 12 Dec 2019 04:53:11 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 013/132] contrib/vhost-user-blk: convert to Meson Date: Thu, 12 Dec 2019 13:50:57 +0100 Message-Id: <1576155176-2464-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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/meson.build | 3 +++ meson.build | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 contrib/vhost-user-blk/meson.build diff --git a/Makefile b/Makefile index 27e9ea3..f15c097 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,6 @@ dummy := $(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 \ @@ -467,8 +466,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) endif vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index 3142dbb..ba422dd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -112,7 +112,6 @@ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ -vhost-user-blk-obj-y = contrib/vhost-user-blk/ rdmacm-mux-obj-y = contrib/rdmacm-mux/ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-blk/meson.build b/contrib/vhost-user-blk/meson.build new file mode 100644 index 0000000..3856a9a --- /dev/null +++ b/contrib/vhost-user-blk/meson.build @@ -0,0 +1,3 @@ +executable('vhost-user-blk', files('vhost-user-blk.c'), + link_with: libvhost_user, + dependencies: qemuutil) diff --git a/meson.build b/meson.build index 6b9636d..4f2fc33 100644 --- a/meson.build +++ b/meson.build @@ -191,5 +191,6 @@ qemuutil = 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 From patchwork Thu Dec 12 12:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ePExnukR"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYmF4WX5z9s4Y for ; Thu, 12 Dec 2019 23:59:41 +1100 (AEDT) Received: from localhost ([::1]:58932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO4A-0001p6-SK for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 07:59:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57593) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxz-0002sw-37 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxx-0005y9-So for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:14 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxx-0005wf-Lq for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:13 -0500 Received: by mail-wr1-x442.google.com with SMTP id y11so2611913wrt.6 for ; Thu, 12 Dec 2019 04:53:13 -0800 (PST) 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; bh=Ms4rgwqzwz2bjSXIt0fRvL5jyMoo90zVMU5D17dr7RM=; b=ePExnukRvuDRQTWBu+5WeKGpZOytzaeDBT9PDtwcp2sCWdO3dprGtt6Zucza1d6A5K 9CVQCKxX1fP0Zjd6GidnfQMGQNt4wKEpdGNtjoes9Z3jepMCYgjapc8Yi0dpmyq5pGon 8+6K/bz0hkcW/Byx9Wqyhlco3eAF/VIpDDWW+b3Amxes3xtNNy/vpDBCN7J70h7ag0tE RGkO1F9cnPgDBO34lb7GTwEHJQ0LF+aemn0/PiXmcj8HsS98aUTJlW5ew/TwJYn98Bvz 5SW1q5zze1EbJmgW4bsVmdLT+Vb2fdHmTKJxITNUj3OTT3Vv6C/zRfE2b5CbzDxtSZbt g67g== 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; bh=Ms4rgwqzwz2bjSXIt0fRvL5jyMoo90zVMU5D17dr7RM=; b=eDS1gueL/1/bzJN2VQn1Q0L9dQS4wpF6VcrQPTqThE8tUZ9PZoq8AXcs0eS7i9SQcw gwui/Snz1ydJK7Dg8EeMOPvfo8CZkcOLxYQXLuZ4e2PuePhusU7tWMstupxtqWRuI2fB MWl8ULvRjRb1BozYU0gIFteo4YONG662YEGmAJPb3tTLz3TPjzZfprQHZNE7M4rJDiPY at9C5k4PSbtYnSxGJSVUCoLk2NPGiKfQGfjButYh/h3y0vuRmQ4x4wM6BBci8QmKdUN3 uAutABvwSien2ov0TPGeimqgpi8vkXFG8Grmj+YcfDgipaUauxwnsT+18Uc+C85ZYv+W urCQ== X-Gm-Message-State: APjAAAUO1/s4plz1T1JwRYmuFtoiaNrOAnHP1MFfyX/bi7KWNcVIvFTS lh81Lhmtl47Gk/TD/VYKOcn+feed X-Google-Smtp-Source: APXvYqxI0BcajM5RvVZkT9WlT6FmeaGUcfXD/pcbuHiqrgm+UUSO8BKe7JpCy9yAHr4XbzLjh1Gyvw== X-Received: by 2002:adf:fc03:: with SMTP id i3mr6323606wrr.306.1576155192423; Thu, 12 Dec 2019 04:53:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 014/132] contrib/vhost-user-scsi: convert to Meson Date: Thu, 12 Dec 2019 13:50:58 +0100 Message-Id: <1576155176-2464-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 5 +++++ meson.build | 6 ++++++ 5 files changed, 11 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 f15c097..3971171 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,6 @@ dummy := $(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 \ @@ -464,8 +463,6 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_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/libvhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index ba422dd..30804f0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,9 +109,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) -vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) -vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ rdmacm-mux-obj-y = contrib/rdmacm-mux/ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-scsi/Makefile.objs b/contrib/vhost-user-scsi/Makefile.objs deleted file mode 100644 index e83a38a..0000000 --- a/contrib/vhost-user-scsi/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-scsi-obj-y = vhost-user-scsi.o diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build new file mode 100644 index 0000000..0bdd5a5 --- /dev/null +++ b/contrib/vhost-user-scsi/meson.build @@ -0,0 +1,5 @@ +if 'CONFIG_LIBISCSI' in config_host + executable('vhost-user-scsi', files('vhost-user-scsi.c'), + link_with: libvhost_user, + dependencies: [qemuutil, libiscsi]) +endif diff --git a/meson.build b/meson.build index 4f2fc33..7ad5458 100644 --- a/meson.build +++ b/meson.build @@ -52,6 +52,11 @@ if 'CONFIG_GNUTLS' in config_host gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(), link_args: config_host['GNUTLS_LIBS'].split()) endif +libiscsi = declare_dependency() +if 'CONFIG_LIBISCSI' in config_host + libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), + link_args: config_host['LIBISCSI_LIBS'].split()) +endif target_dirs = config_host['TARGET_DIRS'].split() have_user = false @@ -192,5 +197,6 @@ 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 From patchwork Thu Dec 12 12:50:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xu+uZMze"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYz93S6nz9s4Y for ; Fri, 13 Dec 2019 00:09:09 +1100 (AEDT) Received: from localhost ([::1]:59040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifODK-000472-R7 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:09:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57757) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy0-0002uY-14 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxy-0005zq-Pc for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:15 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41960) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxy-0005yO-IQ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:14 -0500 Received: by mail-wr1-x444.google.com with SMTP id c9so2601377wrw.8 for ; Thu, 12 Dec 2019 04:53:14 -0800 (PST) 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; bh=1wrzZ1Ksb/mG5EXFgTH7MXPQmgtd/c+05f2V5IPErPI=; b=Xu+uZMze83nWUu2uLsJ22stgVhkKTM5HIKTQVG/ccDr4aPqFHph0i4d9e+DQ/5QGMO /K6Y/2MQXhROqjlqYYdLRi1g0ksa7icHLRKVBJNNJEtEp72B3bKHihwN9bx9AeIy7d7r swtJbFVo4GsGn3+dyubX1tiyeZYSgfbN/Z8yUlQ6/H+8HN/CIJszS/EJ6AefMl4LmNNo yCflbLOlXSEM+G5Unn8iHzCpu3iKYO3qXo3AfwHJhSyI1VasH+JiwizpRtXEo+maJ4oJ V/x6H5WERjOUZVK9/xzs/5PxV/bzHEjgQQW8pzbmpVmPef1ssUULpQ6q66ug68ZCopQy GkhQ== 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; bh=1wrzZ1Ksb/mG5EXFgTH7MXPQmgtd/c+05f2V5IPErPI=; b=PxERzqgBFyGHQLLexuRNk8agPQrlj8IxSCc/J4lhogVg1oZIc7r8bqX1rX8oBseOO3 oDFHJuNR6G765lHyxZaEn8RkwLW209Vr7iQcp/EzvLusf68V8j/t1kG1YzcSaIFK84JE Pu8CynAe9P27L/cMZXGoxOLLdufD91PHqQ6jEurcPTttBwRRSdxqtzlo3hds4ccnmPoJ ZTzXZfQICmETiXFcqMxU4TqiJZgtq2iSAKLGSiDD+dzszq4Zl4m3gfENUiamgDV/sO6+ tBsUMO3Tb5XPYZQCEZGvvVoJyZDaWTDlCEIyA67k+1sSIYUnQA/STC3HM3XmHyMH+q8Q nVyg== X-Gm-Message-State: APjAAAUUE+pIAEuH38FQsoTbi9bGuYnxvX4DnMUhwKsxVgdeiwiwyk0t iWWhv4LKPF380min+MURboOvDY15 X-Google-Smtp-Source: APXvYqxWvsTg/VCv7XiLZ3b+xEoatUN5r0mrG6reC7fK2yvgDtgKFbgHBHikbCFPRJOzToxV4n9b4g== X-Received: by 2002:adf:ffc7:: with SMTP id x7mr6128883wrs.159.1576155193398; Thu, 12 Dec 2019 04:53:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 015/132] contrib/rdmacm-mux: convert to Meson Date: Thu, 12 Dec 2019 13:50:59 +0100 Message-Id: <1576155176-2464-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 6 ++++++ meson.build | 2 ++ 5 files changed, 8 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 3971171..5845a50 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,6 @@ dummy := $(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 \ @@ -464,10 +463,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -rdmacm-mux$(EXESUF): LIBS += "-libumad" -rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) - vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) diff --git a/Makefile.objs b/Makefile.objs index 30804f0..f2e8864 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,7 +109,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -rdmacm-mux-obj-y = contrib/rdmacm-mux/ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs deleted file mode 100644 index 3df744a..0000000 --- a/contrib/rdmacm-mux/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -ifdef CONFIG_PVRDMA -rdmacm-mux-obj-y = main.o -endif diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build new file mode 100644 index 0000000..29a9ced --- /dev/null +++ b/contrib/rdmacm-mux/meson.build @@ -0,0 +1,6 @@ +if 'CONFIG_PVRDMA' in config_host + # if not found, CONFIG_PVRDMA should not be set + libumad = cc.find_library('ibumad', required: true) + executable('rdmacm-mux', files('main.c'), + dependencies: [glib, libumad]) +endif diff --git a/meson.build b/meson.build index 7ad5458..119fcd4 100644 --- a/meson.build +++ b/meson.build @@ -194,6 +194,8 @@ qemuutil = declare_dependency(link_with: libqemuutil, # Other build targets if have_tools + subdir('contrib/rdmacm-mux') + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') From patchwork Thu Dec 12 12:51:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YqnZxR+B"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYvq22Vmz9s4Y for ; Fri, 13 Dec 2019 00:06:15 +1100 (AEDT) Received: from localhost ([::1]:59004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOAW-0000VF-Ng for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:06:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57949) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy1-0002w1-1p for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxz-00061c-N7 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:16 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxz-0005zu-G4 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:15 -0500 Received: by mail-wr1-x434.google.com with SMTP id c14so2605893wrn.7 for ; Thu, 12 Dec 2019 04:53:15 -0800 (PST) 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=nrT9Ux8tVmOPoPyFcJzKXYTYdTxa8xjOI37YxzzLgC8=; b=YqnZxR+Bi0Sv7NLpCtfpJWfZaLDnEJFbOBjFuyNK1h/BaGGLC3Tv1g690sLGISQ9kj 6vx1+31DK4fmaSr+mLjGXgw+wj/qzG09erf037CKE1iZGkqglJkI9UxhR3r2YXpNitL3 hu0Zw2PwN7/FxGT0eFEnCIwpe8BqAr+04BoZGyYNFUlrVAAvmlzSEVumx3cUWYPV9Pb9 cf0FX4ucl3fHvVa7qp1uU+ON10gyknVA+2eiQqCXz0u6Tz1+z52mVBB6/V5+9Bwyfxo1 QlxIgO/D3HrnyYLP1s7RK1uABV1UfUSOoz9K6M1UBDirzSf/VkQdBT/1OwmUZMzrrGkb M0Gg== 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=nrT9Ux8tVmOPoPyFcJzKXYTYdTxa8xjOI37YxzzLgC8=; b=O5CxYM93d7Ao6CRkqBceZ4uVBogYwd1Zp91rKHfAuWJwtAKor+Btfu5ragdlSzdaRJ 4KI1zx0PVGBbTX5wNhYIpc22ed/08JjYwybVP36P7Bi2zJvuAjNAOsy7LqJydnyndIK2 pErQKea68yQxQGlh18b6APTh0eE7+dRYIe7lOzkiQVt5gB9B7ow6dbpUJa3LF9NGFIfN d88JTAnGUO1Bc3eQ9R4LdTZhERvvSKEkw1D6syDW1O2aDidNkS7jnRwU7VTy3AVYaU09 j70hcKAECnfFltZQKxraHF/E50BnUq7xTK4PGDlPX+Lm0kj7jBnH5ZEpzTy3zyyaEJaG afWw== X-Gm-Message-State: APjAAAUcXLvmDfLvN1N0ZempuW5qLgZBECO2j2V3fl4DfS+b+N6X7SKs KuH6fkigrI2VteNvSu9ZkueKQvMh X-Google-Smtp-Source: APXvYqx8xp3bWqVb7RIhNKnDBx6U53nWhtEWnPTKP+gPikmxKN4NBEHJb/8j3wfofJ2jedqIDF8VkQ== X-Received: by 2002:adf:f802:: with SMTP id s2mr6201558wrp.201.1576155194239; Thu, 12 Dec 2019 04:53:14 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 016/132] contrib/vhost-user-input: convert to meson Date: Thu, 12 Dec 2019 13:51:00 +0100 Message-Id: <1576155176-2464-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 11 ----------- Makefile.objs | 1 - contrib/vhost-user-input/Makefile.objs | 1 - contrib/vhost-user-input/meson.build | 3 +++ meson.build | 1 + 5 files changed, 4 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 5845a50..9528391 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,6 @@ dummy := $(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 \ @@ -466,16 +465,6 @@ endif vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) -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 f2e8864..c7f7637 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,7 +109,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ ###################################################################### diff --git a/contrib/vhost-user-input/Makefile.objs b/contrib/vhost-user-input/Makefile.objs deleted file mode 100644 index b1fad90..0000000 --- a/contrib/vhost-user-input/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-input-obj-y = main.o diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-input/meson.build new file mode 100644 index 0000000..6f79679 --- /dev/null +++ b/contrib/vhost-user-input/meson.build @@ -0,0 +1,3 @@ +executable('vhost-user-input', files('main.c'), + link_with: libvhost_user, + dependencies: qemuutil) diff --git a/meson.build b/meson.build index 119fcd4..e38c8a9 100644 --- a/meson.build +++ b/meson.build @@ -199,6 +199,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 From patchwork Thu Dec 12 12:51:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z9ttNJs9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYyx0C3pz9s4Y for ; Fri, 13 Dec 2019 00:08:57 +1100 (AEDT) Received: from localhost ([::1]:59034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOD8-0003tK-KD for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:08:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy2-0002xk-0K for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy0-00063b-KM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:17 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43661) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy0-00061j-Cy for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:16 -0500 Received: by mail-wr1-x430.google.com with SMTP id d16so2587767wre.10 for ; Thu, 12 Dec 2019 04:53:16 -0800 (PST) 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=IF5qsvUc74XpoVnD59p+tpu+W3LvjPJ8O9RYhUgLrSw=; b=Z9ttNJs967bIEorw8CUKzOYM/V77H5O439fvdf4uWyNEwGuaMA0Ddxo4ZCSREsBziV 1LMFBIH5aSkkdgdb3dOB/JqzfrvOEU/XteUP/KmC2Nu4tMH+x9g00MIQ/1jxYxnOBHM8 UJ2DxytGe7l6U2DdPKFOBa5ANych8F+20SDob3rIoVUibSX9MmnQsasy+iXfSHQpvRpK BFvNAS3X4ll+Dqw4O3jy5Pp1DMb7p5NQum9aaJcGf4ZSJ9N9G2Mb9Fkz7DV3uvhyUZBV cbL0NrTnLEEx8J4RN7wizD8RZ2TZ5AyJjmGqk9+F/FEs17s1s2Ab7Udktxr6+/Tu9MYm GVwA== 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=IF5qsvUc74XpoVnD59p+tpu+W3LvjPJ8O9RYhUgLrSw=; b=m4AXP71lNoTdw6b+6LA/mycPV7Vy9UygVU5Bi1Vdi2JQhuLKCTLEkh2iPIC2kvmBpT lHWNsAQug0cUROy4+DzobGzOe9bXAmJhs4tFzMcFZLwWDh1iif97psL827jdPxraemQA mE/Shzm78Z6npRZtQ8RAT53r+8bNy/wQ1/OMJ6Vs2yxreB+iESuYPYjNdHYVvm9niQ1s FpQJipJyCbFX98cMgoOIj6vj+bE/qH7E94USaj6uKi3M5n4UrOfIWzuzfReuNEOTFvxH MQeM0PvTEZcYr/SWd7srmezD9mv9EqI73GNe/83rP+XVGm3qTOByDBurM3L3dV3CCu1q 0LNg== X-Gm-Message-State: APjAAAVekL+FhGHL3TKg2wQ89+P0OIyDp8DkxLpd462FXlVKsQc8BFn5 bArQCzUrrmhs/omC/RSQ5bcRxsMq X-Google-Smtp-Source: APXvYqy9sbAimR3AcS2Ca17G252wUn1EjdJdnqkPB+4onCYRcOxDeGTBv7BgnRQM7lZeznqHP3a4OQ== X-Received: by 2002:adf:d848:: with SMTP id k8mr5979763wrl.328.1576155195103; Thu, 12 Dec 2019 04:53:15 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 017/132] contrib/vhost-user-gpu: convert to meson Date: Thu, 12 Dec 2019 13:51:01 +0100 Message-Id: <1576155176-2464-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 1 - contrib/vhost-user-gpu/Makefile.objs | 10 ---------- contrib/vhost-user-gpu/meson.build | 5 +++++ meson.build | 15 +++++++++++++++ 5 files changed, 20 insertions(+), 16 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 9528391..bf24c51 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,6 @@ HELPERS-y = HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) -HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif @@ -266,7 +265,6 @@ dummy := $(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 \ @@ -462,9 +460,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-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))), \ diff --git a/Makefile.objs b/Makefile.objs index c7f7637..cae0f1d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,6 +109,5 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ ###################################################################### diff --git a/contrib/vhost-user-gpu/Makefile.objs b/contrib/vhost-user-gpu/Makefile.objs deleted file mode 100644 index 6170c91..0000000 --- a/contrib/vhost-user-gpu/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -vhost-user-gpu-obj-y = main.o virgl.o vugbm.o - -main.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS) -main.o-libs := $(PIXMAN_LIBS) - -virgl.o-cflags := $(VIRGL_CFLAGS) $(GBM_CFLAGS) -virgl.o-libs := $(VIRGL_LIBS) - -vugbm.o-cflags := $(GBM_CFLAGS) -vugbm.o-libs := $(GBM_LIBS) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build new file mode 100644 index 0000000..8778aa7 --- /dev/null +++ b/contrib/vhost-user-gpu/meson.build @@ -0,0 +1,5 @@ +if 'CONFIG_VIRGL' in config_host and 'CONFIG_GBM' in config_host + executable('vhost-user-gpu', files('main.c', 'virgl.c', 'vugbm.c'), + link_with: libvhost_user, + dependencies: [qemuutil, pixman, gbm, virgl]) +endif diff --git a/meson.build b/meson.build index e38c8a9..b0f3622 100644 --- a/meson.build +++ b/meson.build @@ -52,11 +52,23 @@ if 'CONFIG_GNUTLS' in config_host gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(), link_args: config_host['GNUTLS_LIBS'].split()) endif +pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(), + link_args: config_host['PIXMAN_LIBS'].split()) libiscsi = declare_dependency() if 'CONFIG_LIBISCSI' in config_host libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), link_args: config_host['LIBISCSI_LIBS'].split()) endif +gbm = declare_dependency() +if 'CONFIG_GBM' in config_host + gbm = declare_dependency(compile_args: config_host['GBM_CFLAGS'].split(), + link_args: config_host['GBM_LIBS'].split()) +endif +virgl = declare_dependency() +if 'CONFIG_VIRGL' in config_host + virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(), + link_args: config_host['VIRGL_LIBS'].split()) +endif target_dirs = config_host['TARGET_DIRS'].split() have_user = false @@ -199,6 +211,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 From patchwork Thu Dec 12 12:51:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e1i3W34x"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYp035lSz9s4Y for ; Fri, 13 Dec 2019 00:01:12 +1100 (AEDT) Received: from localhost ([::1]:58940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO5d-0003Bt-5E for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:01:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58309) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy3-0002z6-0B for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy1-000656-HD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:18 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy1-00063j-9g for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:17 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y17so2619327wrh.5 for ; Thu, 12 Dec 2019 04:53:17 -0800 (PST) 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=0NYMHi2w3AJtsFgwdAsi8gZ85gux6X8ozW51ZPtCtxA=; b=e1i3W34x4XDuLiSB9FJr6lRMBBfHtLNmHH7GvwHAdLcSeGlU4+A87P+9bLl5zVfNjc HSjVgGqTGlFbDSJUmXPhwLd0uWYlwSx3JeGiizI1vLwL98feKqF4gL+sx2LOaouyCP/4 h28zy6lTo19bcspWPIOAUqHZM9nZfLEcbC/wsvL/EBzV5Nl7HO2MVR3vsmVIwMdZCXlR n0nLGjctk4s2l4a8D5PK1GcIt3pYNKFMoj3e6I6bbkraHy+ExcLg9RQ/lt80FLelkiaN HSkpPeu+K648qkz/tSgH7JdG9jGqrQyu2AxYL1qRtC0lAEzDnsFmaj9GO26G/WKd3aZE PDMw== 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=0NYMHi2w3AJtsFgwdAsi8gZ85gux6X8ozW51ZPtCtxA=; b=UkHA21HHY06BZZHFXhRysE5ZrkMAmfgsELZizOPxqOQBfQjKzR/97kSuzuiCxNYKnq st0fqGeXpuMr7rfaUi4auyOocUQP0bRoDgCZXqbcZQQf+lX9MskNWy14GYQ1Nh30D9GY f4zksrET8eD7Aa3+Px3Z4D8gw1Ukt/LbEvrfjEmMqzGNYNtXYhv6/h6nVOExZIDdBl2R QxcjMQGV2BJLk/Vw+4Kz7LPBoa73y8Nll9w8G/T4r24uoCK4Cjq8nk6bjmZQk29Uv3sk uFsLIofP8wD/sD6fS7rtlmNz2diG8bXw7aKxj0iG2eVP9bbHZLYhS3pgmH8sDfA5R5lt I/ig== X-Gm-Message-State: APjAAAWEbB+3JrAoTlX30UmYijmQ4peoyfLiCSG41o4v3V/OIdGAiuBD ec0ReGmAJ5O20sUfrtMveeaVdXDY X-Google-Smtp-Source: APXvYqzGL2nZHskZvfD7qg/CqNJtfVf6E4vU3KVl2k5rBbq2GBfD8l1RuUxXSJXCnTUfvnptKM39fQ== X-Received: by 2002:adf:90e7:: with SMTP id i94mr5993891wri.47.1576155196042; Thu, 12 Dec 2019 04:53:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 018/132] contrib/ivshmem: convert to meson Date: Thu, 12 Dec 2019 13:51:02 +0100 Message-Id: <1576155176-2464-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 9 --------- Makefile.objs | 2 -- configure | 3 --- contrib/ivshmem-client/Makefile.objs | 1 - contrib/ivshmem-client/meson.build | 3 +++ contrib/ivshmem-server/Makefile.objs | 1 - contrib/ivshmem-server/meson.build | 3 +++ meson.build | 6 ++++++ 8 files changed, 12 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 bf24c51..d697aab 100644 --- a/Makefile +++ b/Makefile @@ -263,8 +263,6 @@ dummy := $(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 \ @@ -453,13 +451,6 @@ endif elf2dmp$(EXESUF): $(elf2dmp-obj-y) $(call LINK, $^) -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 cae0f1d..919961f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -107,7 +107,5 @@ qga-vss-dll-obj-y = qga/ ###################################################################### # contrib elf2dmp-obj-y = contrib/elf2dmp/ -ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ -ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ ###################################################################### diff --git a/configure b/configure index c27d06f..d59c831 100755 --- a/configure +++ b/configure @@ -6065,9 +6065,6 @@ if test "$want_tools" = "yes" ; then if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" fi - if [ "$ivshmem" = "yes" ]; then - tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" - fi if [ "$curl" = "yes" ]; then tools="elf2dmp\$(EXESUF) $tools" fi diff --git a/contrib/ivshmem-client/Makefile.objs b/contrib/ivshmem-client/Makefile.objs deleted file mode 100644 index bfab2d2..0000000 --- a/contrib/ivshmem-client/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-client-obj-y = ivshmem-client.o main.o diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/meson.build new file mode 100644 index 0000000..92ad844 --- /dev/null +++ b/contrib/ivshmem-client/meson.build @@ -0,0 +1,3 @@ +executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), + dependencies: glib, + install: true) diff --git a/contrib/ivshmem-server/Makefile.objs b/contrib/ivshmem-server/Makefile.objs deleted file mode 100644 index c060dd3..0000000 --- a/contrib/ivshmem-server/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-server-obj-y = ivshmem-server.o main.o diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build new file mode 100644 index 0000000..6dbe240 --- /dev/null +++ b/contrib/ivshmem-server/meson.build @@ -0,0 +1,3 @@ +executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), + dependencies: [qemuutil, rt], + install: true) diff --git a/meson.build b/meson.build index b0f3622..e2eee80 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,7 @@ if 'CONFIG_GNUTLS' in config_host endif pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(), link_args: config_host['PIXMAN_LIBS'].split()) +rt = cc.find_library('rt', required: false) libiscsi = declare_dependency() if 'CONFIG_LIBISCSI' in config_host libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), @@ -217,4 +218,9 @@ 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 From patchwork Thu Dec 12 12:51:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sLhc4rIm"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ2n2cYNz9s4Y for ; Fri, 13 Dec 2019 00:12:17 +1100 (AEDT) Received: from localhost ([::1]:59072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOGM-0007Z2-OP for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:12:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy3-00030a-Sj for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy2-00066k-FI for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:19 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36275) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy2-00065B-8G for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:18 -0500 Received: by mail-wr1-x436.google.com with SMTP id z3so2631951wru.3 for ; Thu, 12 Dec 2019 04:53:18 -0800 (PST) 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=+4vOKydhbkSE6dPJsSB3/rLuVb5akkwee9HULvmXiDY=; b=sLhc4rImU8yaGMn6Ttqan4T8QlulRqsUcn4+wmy6fc0xeFdxOeqHHdGEl6Z18Ac8OY vU9q10zHaKYNFGbvk9IS+pEkaS6iKXx9qK++jVSjBfLMo8oskJo54NMoQ5hOX5/22ERY 3fY8Yvo0ZX6meDc40ZVF1788MpY42eMC7w0NmY2t5rdFuJkuYUpplW3D97UC/cyt8hUw BgIeHs5e/sm7+mnwjpLJ8iPwRiOKWOiZ2lxFpR9glf8Wzl4BlrRaa6t+AcrSUkPdR/bu rR4RgwJL9PRMcR07cG/Vp/PZY/bQL10t4Qp8qHl0eg/y6j7YcgjzOvFnVb42alsYdwmO a/nQ== 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=+4vOKydhbkSE6dPJsSB3/rLuVb5akkwee9HULvmXiDY=; b=f7Jyvh4J2GrDkJtGE/PvaYozUNE4SoLyfGXHtGJbj5t8nojgpvchvtaF04ni79e8km sLzxpIZPkidZQnzMrAK6ObnZMfjRQCCMmoDffAC5l2MkOH5TW4TFScDOQIBuajZmNIUJ IpzP4LSgrcrrQg2UKHANOTkJ0E0fSHgeDdxeliotQriOrobzggw6TBV5+256bMXmYWyJ cKHMHCbN3avpSCErdb4MaD6DdTyuxIzltqcilXozsVRWJeZGncz16aJXapilaIuQl9Pu N+AEA+QlIcjY/d+CKLXQ0iG72R8g7RV0Y++511YDXGlJE0MDV0cIV/CvGa31uE/JoArN QKrw== X-Gm-Message-State: APjAAAWjryvgEw8/VSclYyNKsq1rScLc2U1lgqf+ZOJeInWn1Zh9HNIM +lbJCERihMOwIbAbXmtnf8MqSbLr X-Google-Smtp-Source: APXvYqwSMH4Dv1WKtaG8o3JHzlAKkH1In/WwYJUPRU/JKSKcb4fMvTvEMM+jxuyHRA0QpEk39y6x/w== X-Received: by 2002:a5d:6ca1:: with SMTP id a1mr5999858wra.36.1576155196983; Thu, 12 Dec 2019 04:53:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 019/132] contrib/elf2dmp: convert to meson Date: Thu, 12 Dec 2019 13:51:03 +0100 Message-Id: <1576155176-2464-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 4 ---- Makefile.objs | 6 ------ configure | 3 --- contrib/elf2dmp/Makefile.objs | 4 ---- contrib/elf2dmp/meson.build | 4 ++++ meson.build | 6 ++++++ 6 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 contrib/elf2dmp/Makefile.objs create mode 100644 contrib/elf2dmp/meson.build diff --git a/Makefile b/Makefile index d697aab..6f2141f 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,6 @@ dummy := $(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 \ @@ -448,9 +447,6 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif -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 919961f..e91cdb9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -103,9 +103,3 @@ util-obj-y += trace/ # extracted into a QAPI schema module, or perhaps a separate schema. qga-obj-y = qga/ qga-vss-dll-obj-y = qga/ - -###################################################################### -# contrib -elf2dmp-obj-y = contrib/elf2dmp/ - -###################################################################### diff --git a/configure b/configure index d59c831..b38da39 100755 --- a/configure +++ b/configure @@ -6065,9 +6065,6 @@ if test "$want_tools" = "yes" ; then if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" fi - if [ "$curl" = "yes" ]; then - tools="elf2dmp\$(EXESUF) $tools" - fi fi if test "$softmmu" = yes ; then if test "$linux" = yes; then diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs deleted file mode 100644 index 1505716..0000000 --- a/contrib/elf2dmp/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -elf2dmp-obj-y = main.o addrspace.o download.o pdb.o qemu_elf.o - -download.o-cflags := $(CURL_CFLAGS) -download.o-libs := $(CURL_LIBS) diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build new file mode 100644 index 0000000..b9e5199 --- /dev/null +++ b/contrib/elf2dmp/meson.build @@ -0,0 +1,4 @@ +if 'CONFIG_CURL' in config_host + executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'), + dependencies: [glib, curl]) +endif diff --git a/meson.build b/meson.build index e2eee80..25c3db9 100644 --- a/meson.build +++ b/meson.build @@ -70,6 +70,11 @@ if 'CONFIG_VIRGL' in config_host virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(), link_args: config_host['VIRGL_LIBS'].split()) endif +curl = declare_dependency() +if 'CONFIG_CURL' in config_host + curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(), + link_args: config_host['CURL_LIBS'].split()) +endif target_dirs = config_host['TARGET_DIRS'].split() have_user = false @@ -208,6 +213,7 @@ qemuutil = declare_dependency(link_with: libqemuutil, if have_tools subdir('contrib/rdmacm-mux') + subdir('contrib/elf2dmp') if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') From patchwork Thu Dec 12 12:51:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EQVWl8sx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYrH47dyz9s4Y for ; Fri, 13 Dec 2019 00:03:11 +1100 (AEDT) Received: from localhost ([::1]:58974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO7Y-0005QN-SS for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:03:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy6-00033v-0W for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy3-00069M-Q1 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:21 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy3-00067l-GF for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:19 -0500 Received: by mail-wr1-x42e.google.com with SMTP id q10so2580107wrm.11 for ; Thu, 12 Dec 2019 04:53:19 -0800 (PST) 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=h2WmlWx3TeSk0rWNd7ZO7z25+/tVsJHnbWq8wdQ78Ho=; b=EQVWl8sxOJQPqjWydrB0WUQBAyJa5SSUv9km4MgiTocNzll6i9rA2ZAOOStXK8o2KH tc+iDE9FKePeLryNv2CNnLM7rUxmd4YpUhb7BVtGtQ6GS0fPVTdBOSmI4k7gAmCSLk/a O+IS4KzFpg7eV3EY/PLIqxW3y+QE9YKkc6NY9vaf0BvaUMVGYV4UmgdpNRBonk4zwKyV BlHfLBzvkF7ZGtHJ+TBBtCKhnrXIYsMtsE+IRmoNOTo1Z4gQRL4blCAjV9O3zOpO0YDb R/NR9n6egR4a64/nvurlqYEHxPNohQjcAQXs5trspwuk9ASYVgeWqZbnQnTqTVu0VwAJ pFjA== 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=h2WmlWx3TeSk0rWNd7ZO7z25+/tVsJHnbWq8wdQ78Ho=; b=jfvS4fJzaJSE59WfT93qGBMhHmlci4Gyyze0gR4IngCGIBS/HieHc/iEALdMnlWqVr hLWPdUSNul38P3oLFsyMDqX6Tnmx/M6ciPQsibgSbahQx+pGLV7RIk02RuTGCxyFsmac qbBLjbLAZ9rav/vjjLfxCvbYG2KHbvTBYrafTr0wM2vfXmNY6iPfdjKY7S9A0OYRvu/I q+x5eY0vt4ycLS/BRmmxiCa0pjTlNrFfSCv9beVHbpS7pgKK86xie0kKZegspxKh06eH ezpLXu7GFRM5YIOBqEeRACZtVXWx899T+9Q1cxbsD2L2A2qolo5SPXc6Qf4I+uvR+4eE FZOg== X-Gm-Message-State: APjAAAXr9nXm3bTuXl30QWC7V8UTu4KnNl9JGjkI2gZyXSqGSPk1+W+y kwr2NGtFmkHM/4GxCL1Qr1FEcbh4 X-Google-Smtp-Source: APXvYqxKU8ymnOTCaG/pSxg83lOx5K+rGlav2WpVTcsT6kQWzqlY9fsx6IhjDeIHOhfW21kzooK1Wg== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5994213wrt.208.1576155198112; Thu, 12 Dec 2019 04:53:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 020/132] meson: convert qemu-ga Date: Thu, 12 Dec 2019 13:51:04 +0100 Message-Id: <1576155176-2464-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 44 ++++++-------------------------------------- Makefile.objs | 1 - configure | 9 ++++----- meson.build | 8 ++++++++ qga/Makefile.objs | 8 -------- qga/installer/qemu-ga.wxs | 2 +- qga/meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 4 ++-- tests/test-qga.c | 8 ++++---- 9 files changed, 68 insertions(+), 59 deletions(-) create mode 100644 qga/meson.build diff --git a/Makefile b/Makefile index 6f2141f..a78d5e0 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,6 @@ endif dummy := $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ - qga-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -393,44 +392,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","$@") -qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated - qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS) -qapi-py = $(SRC_PATH)/scripts/qapi/commands.py \ -$(SRC_PATH)/scripts/qapi/events.py \ -$(SRC_PATH)/scripts/qapi/introspect.py \ -$(SRC_PATH)/scripts/qapi/types.py \ -$(SRC_PATH)/scripts/qapi/visit.py \ -$(SRC_PATH)/scripts/qapi/common.py \ -$(SRC_PATH)/scripts/qapi/doc.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-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=%)") - @>$@ - -QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qapi-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=qemu-ga-$(ARCH).msi msi: $(QEMU_GA_MSI) -$(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER) +$(QEMU_GA_MSI): qga/qemu-ga.exe $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI): config-host.mak @@ -443,8 +413,8 @@ msi: endif 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 module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak @@ -471,8 +441,6 @@ clean: recurse-clean 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 -rf qga/qapi-generated rm -f config-all-devices.mak VERSION ?= $(shell cat VERSION) @@ -600,7 +568,7 @@ endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1" endif -ifneq (,$(findstring qemu-ga,$(TOOLS))) +ifeq ($(CONFIG_GUEST_AGENT),y) $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" @@ -617,7 +585,7 @@ install-datadir: install-localstatedir: ifdef CONFIG_POSIX -ifneq (,$(findstring qemu-ga,$(TOOLS))) +ifeq ($(CONFIG_GUEST_AGENT),y) $(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run endif endif @@ -790,7 +758,7 @@ qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ -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 $< $@ qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi diff --git a/Makefile.objs b/Makefile.objs index e91cdb9..736bdaa 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -101,5 +101,4 @@ util-obj-y += trace/ # 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 = qga/ qga-vss-dll-obj-y = qga/ diff --git a/configure b/configure index b38da39..4ed65db 100755 --- a/configure +++ b/configure @@ -3664,7 +3664,6 @@ for i in $glib_modules; do glib_libs=$($pkg_config --libs $i) QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" LIBS="$glib_libs $LIBS" - libs_qga="$glib_libs $libs_qga" else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi @@ -4795,7 +4794,6 @@ if compile_prog "" "" ; then : elif compile_prog "" "-lm" ; then LIBS="-lm $LIBS" - libs_qga="-lm $libs_qga" else error_exit "libm check failed" fi @@ -4820,7 +4818,6 @@ if compile_prog "" "" ; then # we need pthread for static linking. use previous pthread test result elif compile_prog "" "$pthread_lib -lrt" ; then LIBS="$LIBS -lrt" - libs_qga="$libs_qga -lrt" fi # Check whether we need to link libutil for openpty() @@ -6107,7 +6104,6 @@ if [ "$guest_agent" != "no" ]; then if [ "$softmmu" = no -a "$want_tools" = no ] ; then guest_agent=no elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then - tools="qemu-ga\$(EXESUF) $tools" guest_agent=yes elif [ "$guest_agent" != yes ]; then guest_agent=no @@ -6583,6 +6579,9 @@ fi if test "$want_tools" = "yes" ; then echo "CONFIG_TOOLS=y" >> $config_host_mak fi +if test "$guest_agent" = "yes" ; then + echo "CONFIG_GUEST_AGENT=y" >> $config_host_mak +fi if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak @@ -7349,7 +7348,7 @@ echo "PTHREAD_LIB=$PTHREAD_LIB" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak echo "DSOSUF=$DSOSUF" >> $config_host_mak echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak -echo "LIBS_QGA+=$libs_qga" >> $config_host_mak +echo "LIBS_QGA=$libs_qga" >> $config_host_mak echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak echo "POD2MAN=$POD2MAN" >> $config_host_mak diff --git a/meson.build b/meson.build index 25c3db9..f65ad9d 100644 --- a/meson.build +++ b/meson.build @@ -75,6 +75,10 @@ if 'CONFIG_CURL' in config_host curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(), link_args: config_host['CURL_LIBS'].split()) endif +libudev = declare_dependency() +if 'CONFIG_LIBUDEV' in config_host + libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split()) +endif target_dirs = config_host['TARGET_DIRS'].split() have_user = false @@ -211,6 +215,10 @@ qemuutil = declare_dependency(link_with: libqemuutil, # Other build targets +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 80e6bb3..9ecf249 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -1,9 +1 @@ -commands-posix.o-libs := $(LIBUDEV_LIBS) -qga-obj-y = commands.o guest-agent-command-state.o main.o -qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o -qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o -qga-obj-$(CONFIG_WIN32) += vss-win32.o -qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o -qga-obj-y += qapi-generated/qga-qapi-commands.o - qga-vss-dll-obj-$(CONFIG_QGA_VSS) += vss-win32/ diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 64bf90b..ca2ac86 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -66,7 +66,7 @@ - + test_dir, "sock", NULL); cwd = g_get_current_dir(); - cmd = g_strdup_printf("%s%cqemu-ga -m unix-listen -t %s -p %s %s %s", - cwd, G_DIR_SEPARATOR, + cmd = 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 ?: ""); @@ -705,8 +705,8 @@ static void test_qga_config(gconstpointer data) GKeyFile *kf; cwd = g_get_current_dir(); - cmd = g_strdup_printf("%s%cqemu-ga -D", - cwd, G_DIR_SEPARATOR); + cmd = 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); From patchwork Thu Dec 12 12:51:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RYq9PWa+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ2y5XVhz9sPK for ; Fri, 13 Dec 2019 00:12:26 +1100 (AEDT) Received: from localhost ([::1]:59076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOGW-0007ke-3R for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:12:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58989) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy6-00034f-Ek for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy4-0006BR-Rd for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:22 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:39014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy4-00069g-J1 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:20 -0500 Received: by mail-wm1-x332.google.com with SMTP id d5so2374588wmb.4 for ; Thu, 12 Dec 2019 04:53:20 -0800 (PST) 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=Ckq3xlyA0Y/TEyi6tdKF2WSmdCjFLbYMhdQ4Hgb8BiA=; b=RYq9PWa+gNxE9Dbr6CdIGcAKkCwawFY5ISYwq76pvTfjR636083CiKnp9/YeepIIlr 6P0lyHx2OOKCIzv0xsNKgFaOH5/VWSgbT+xJFwBttK+QNxEfPcu7VpbgLSll1V4Nf01i qTSzQbS0yBS0QC12uwZy5xri9e3KSZvWln0uucpXmQRcnBVZwOd2kzfkTymFOGrv7loR k3ER0R44hO2mttDjrVEmrzSbTo6Kdo6hpWB2JDfykiUfOFur+xqEybNoCLO1ei7M6pnL MPQeMYMh3MF9qlw7q8dORgjmuOZ7XbUl5+DmWWtoTmRSMoLZ408XPvkdDfRI4Zj4kTUZ ID1A== 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=Ckq3xlyA0Y/TEyi6tdKF2WSmdCjFLbYMhdQ4Hgb8BiA=; b=QAHnqYj09/ouQRxS1/tITIdfiMccqyipBPfPzCg6cw3qycoaB8TBRpj+msdedABZE5 TJj++ngKYvnL9Y80aX9apLmqfwUeDnAnsFvJsiepAgS6jkAyENXV2rJLCnLAFlSZMcwp rz9cjv2r51una+IlJGdJl45pp21aejr5j/Q8cuhQAMOwSFsNHqj5ZGeVeF6cfWqqDKAI e9FgYAdOOOmsWhrW/WQMaPMVvDKbNbXmIUtYlHqJ7efHnxLC0a8rP56W1SKKzO1EBk6Y JjT8bBgnmT0pI9QAMI9yVqWO/uvcCz3dLViryDYruz3kkx7rzVbgT7wg4LKsSM4YOK4m rGjA== X-Gm-Message-State: APjAAAUZgoe/PlAAw6RXbFPAG962pkPhT+h9rmIayHsrTqLLi2pNrVz5 8B02ivRhefuFSmmxHLkNfJcUEP0P X-Google-Smtp-Source: APXvYqyNYBwi6vqcgBn3R7wcyB4OmeaK3tkCOFcIAoAjt83uSIIQIiaSV7QijADW9dI4gvCZlKJt1Q== X-Received: by 2002:a05:600c:a:: with SMTP id g10mr6349562wmc.69.1576155199234; Thu, 12 Dec 2019 04:53:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 021/132] meson: convert vss-win32 Date: Thu, 12 Dec 2019 13:51:05 +0100 Message-Id: <1576155176-2464-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 8 -------- meson.build | 4 +++- qga/Makefile.objs | 1 - qga/meson.build | 6 ++++++ qga/vss-win32/Makefile.objs | 23 ----------------------- qga/vss-win32/meson.build | 28 ++++++++++++++++++++++++++++ 7 files changed, 37 insertions(+), 34 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 a78d5e0..4f20bf7 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,6 @@ endif dummy := $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ - qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ crypto-obj-y \ diff --git a/Makefile.objs b/Makefile.objs index 736bdaa..38e3604 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -94,11 +94,3 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o ###################################################################### # tracing util-obj-y += trace/ - -###################################################################### -# 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 = qga/ diff --git a/meson.build b/meson.build index f65ad9d..7e772c1 100644 --- a/meson.build +++ b/meson.build @@ -9,12 +9,14 @@ add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: 'c') +add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), + language: 'cpp') add_project_link_arguments(config_host['LDFLAGS'].split(), language: ['c', 'cpp', 'objc']) add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), language: ['c', 'cpp', 'objc']) add_project_arguments(config_host['QEMU_INCLUDES'].split(), - language: 'c') + language: ['c', 'cpp']) configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', diff --git a/qga/Makefile.objs b/qga/Makefile.objs deleted file mode 100644 index 9ecf249..0000000 --- a/qga/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -qga-vss-dll-obj-$(CONFIG_QGA_VSS) += vss-win32/ diff --git a/qga/meson.build b/qga/meson.build index 116102b..f0ec8cf 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -41,3 +41,9 @@ qga_ss = qga_ss.apply(config_host, strict: false) qga = executable('qemu-ga', qga_ss.sources(), link_args: config_host['LIBS_QGA'].split(), dependencies: [qemuutil, libudev]) + +if host_machine.system() == '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 fd3ba18..0000000 --- a/qga/vss-win32/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -# rules to build qga-vss.dll - -qga-vss-dll-obj-y += requester.o provider.o install.o - -obj-qga-vss-dll-obj-y = $(addprefix $(obj)/, $(qga-vss-dll-obj-y)) -$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS := $(filter-out -fstack-protector-all -fstack-protector-strong, $(QEMU_CXXFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor - -$(obj)/qga-vss.dll: LDFLAGS = -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/vss-win32/qga-vss.def $(CXXFLAGS) $(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=$(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","$(TARGET_DIR)$@") -endif diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build new file mode 100644 index 0000000..a7c865f --- /dev/null +++ b/qga/vss-win32/meson.build @@ -0,0 +1,28 @@ +if add_languages('cpp', required: false) + glib_static = dependency('glib-2.0', static: true) + link_args = 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-virtual-dtor', '-Wno-non-virtual-dtor'], + link_args: link_args, + vs_module_defs: 'qga-vss.def', + dependencies: glib_static) +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 = find_program('midl', required: false) +if midl.found() + gen_tlb = 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 = custom_target('gen-tlb', + input: 'qga-vss.tlb', + output: 'qga-vss.tlb', + command: ['cp', '@INPUT@', '@OUTPUT@']) +endif From patchwork Thu Dec 12 12:51:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EZldoJaX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ9G3rZZz9sPK for ; Fri, 13 Dec 2019 00:17:54 +1100 (AEDT) Received: from localhost ([::1]:59142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOLn-00067N-RB for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:17:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59138) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy8-00035s-8Z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy5-0006DF-QY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:23 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy5-0006BZ-IW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:21 -0500 Received: by mail-wr1-x431.google.com with SMTP id d16so2588057wre.10 for ; Thu, 12 Dec 2019 04:53:21 -0800 (PST) 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=bcmVb7Mje1ZL+Y95A04ro5C6kr06ir0SgoJ9qeN6MxI=; b=EZldoJaXud6IzCjmvTJcIAuLde7cPdO/I8szhhoxJ/KrQElHPOHPY8b14oPo8mv5Ug LLdqy1/9RuS6lYzGKz/lFO5JFUP0MP/F8yvfoxi0mqNMNzltkR3Zz0EQKXGhusODgK3t kIdI1O35ZvGiYm8pZP5Tmz4CB3ZlfXYK66jhTVyw9mFmuaZFbn65z4SEuhm73raBxDIQ rWdYNF3JZKfcgLIXRr7Yse7LZdaOo46M71y9+BQOhegU3lm1gvWsltsQ8Pp32oUedFzr mdyNDj/i1sGpYLiF2iB8uHhkhymHPUO/5L+uHEjJ9R3MmR6CbPZETdLITTiTYTaJkPsv aYFQ== 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=bcmVb7Mje1ZL+Y95A04ro5C6kr06ir0SgoJ9qeN6MxI=; b=A/DBST8iZ3MnEAVZlZrctQ4c1W/tlwKMGM31IREARFl6K+2wBlAaFWF57NgaWfh27I z2LktrbnetN450Vq/mu6iva4p4hNOksVmyc9ttFCag5Txv3r9O9kyan4A7UgsSVCIxrx KycRfE6mpmN3VetlM1FT5bbgNg5+OxKiLRV5MO5IqfVk1wKOWf07ZWygiyyQ6A9ndw1m 8B0Fi3PsqMQKwpMW9P15NqcpS6gqmMU1rtU9+uDW+79XHTJwjPTvxHH2IoFqNORHqEs8 4RXbJ7MaIvQ2eGowyS1Nz/PmTvSnFk4Y124libt43g0HtGVpdQvlFXK9BeEjtbDkJPUM U6jQ== X-Gm-Message-State: APjAAAXtjoP0yFqrzZZv80dcToC6qFlQ1v/sAQvx8WhLfLEPing/YuuV F1ch7v2Hpm3uaUXwYZLLAkowT4R9 X-Google-Smtp-Source: APXvYqzuXxo73lub0/SJYS+1megy59pIpXLg3j5KsbJp8+N4Ojx0IaUnBkivAmwlcsjPikagUgRQnQ== X-Received: by 2002:adf:a141:: with SMTP id r1mr6256141wrr.285.1576155200323; Thu, 12 Dec 2019 04:53:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 022/132] meson: add msi generation Date: Thu, 12 Dec 2019 13:51:06 +0100 Message-Id: <1576155176-2464-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 18 ------------------ qga/meson.build | 25 +++++++++++++++++++++++++ qga/vss-win32/meson.build | 2 +- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 4f20bf7..328b3c3 100644 --- a/Makefile +++ b/Makefile @@ -394,23 +394,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS) -ifdef QEMU_GA_MSI_ENABLED -QEMU_GA_MSI=qemu-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="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \ - wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<,"WIXL","$@") -else -msi: - @echo "MSI build not configured or dependency resolution failed (reconfigure 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) @@ -425,7 +408,6 @@ clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-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 f0ec8cf..e0e5344 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -45,5 +45,30 @@ qga = executable('qemu-ga', qga_ss.sources(), if host_machine.system() == 'windows' if 'CONFIG_QGA_VSS' in config_host subdir('vss-win32') + else + gen_tlb = [] + endif + + wixl = find_program('wixl', required: false) + if wixl.found() + deps = [gen_tlb, qga] + if 'QEMU_GA_MSI_WITH_VSS' in config_host + deps += qga_vss + endif + qga_msi = 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=' + config_host['QEMU_GA_VERSION'], + 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'], + 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'], + 'BUILD_DIR=' + 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'].split(), + ]) + alias_target('msi', qga_msi) endif endif diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index a7c865f..147a680 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -2,7 +2,7 @@ if add_languages('cpp', required: false) glib_static = dependency('glib-2.0', static: true) link_args = 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 = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'], name_prefix: '', cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'], link_args: link_args, From patchwork Thu Dec 12 12:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XVHMAmhd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ5v6rv2z9s4Y for ; Fri, 13 Dec 2019 00:14:59 +1100 (AEDT) Received: from localhost ([::1]:59101 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOIz-0002aX-A9 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:14:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59367) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy8-00037m-GB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy7-0006Fu-1m for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:24 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33619) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy6-0006E3-Pf for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:22 -0500 Received: by mail-wr1-x435.google.com with SMTP id b6so2659121wrq.0 for ; Thu, 12 Dec 2019 04:53:22 -0800 (PST) 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=HXR0svkyY3DtengHr9Una6kU9oDOnxpx+/sr/xfZFfM=; b=XVHMAmhdkBkblMMFlb157dveyCNuYEr9KhrnLNszlVx/7OzqlKqwm144LVYIIPoUXu bHPuPYeXdFAoFYwk0RwBb15Zt6XNBqvIXnAdFOqVat1LBjFmX8GQ5mvWGPx7NhBVea8b iZWqmQZdze/7SYL8glnxNBu7TVtjhu6HVTRqUznTXDbGgntKz3Iz9lFGZPJDx1cnZOiY a/ejM0NQR6hARkhh2NP7SgJuTiyhkZTMM62b050JLDEfIgmvYYgBegAuf1+uMSaxrKAZ NoBzXmN0BaRScr2lAhZe2Ty0hWoAQUitp9qbvVEXZ2AWM9Li/2udTvKFFdjeSvjmHjzX HtMA== 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=HXR0svkyY3DtengHr9Una6kU9oDOnxpx+/sr/xfZFfM=; b=fqaL+uRAb1oX+YvCCeY3yaPNzO5TKIcJkNaYY/g8TRUd4bq6h9HtqfGV9Lw6Sk/RS5 ENpdV93d+OeiCq6yu4bPur8bHf/Cm5bukqrbMqVG/jw0/8Sujs8KLvhSOPN+sNQ9P+Nv Epo//hQ9czwkOQUK657MRRpoArj7U7sO4u6KuZJxexf0JsaR9YITitOJu4v6Lh7N4MIc xZG0IU7Jf/O0kQXmD73eANr1wcGNVmzTmkHYfb8pT2mEMjBZZAFk53jSQll1oiZ/iv1C bm31gjh1agRXMOS6jb8uBT4Qh7LCaAfEAA4FZLjO9FksdyBpsgTGE7EoYp24Kq5qm9tm /SzQ== X-Gm-Message-State: APjAAAXOV8mWuImFBuqCsksyVSbhKluW9jJ4qqWNgp3aN+CrJF3xWvOa Iuz8SgsRPmXCeBr7w5tFMK9ogxnO X-Google-Smtp-Source: APXvYqwj+CIKZDwlp/uEKyMSItUN2MO8kdJtusCOimeoXlHiBdqk+AKBnZ1soo9nMQ1GgiOu70HCtQ== X-Received: by 2002:a5d:4b8f:: with SMTP id b15mr6560367wrt.100.1576155201288; Thu, 12 Dec 2019 04:53:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 023/132] meson: add qemu-bridge-helper Date: Thu, 12 Dec 2019 13:51:07 +0100 Message-Id: <1576155176-2464-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 4 ---- configure | 1 + meson.build | 12 +++++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 328b3c3..d153186 100644 --- a/Makefile +++ b/Makefile @@ -173,8 +173,6 @@ LIBS+=-lz $(LIBS_TOOLS) vhost-user-json-y = HELPERS-y = -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) - ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif @@ -374,8 +372,6 @@ qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io 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-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) - 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) diff --git a/configure b/configure index 4ed65db..9615d63 100755 --- a/configure +++ b/configure @@ -6603,6 +6603,7 @@ if test "$l2tpv3" = "yes" ; then fi if test "$cap_ng" = "yes" ; then echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak + echo "LIBCAP_NG_LIBS=$cap_libs" >> $config_host_mak fi echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do diff --git a/meson.build b/meson.build index 7e772c1..854b1cb 100644 --- a/meson.build +++ b/meson.build @@ -56,6 +56,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(), link_args: config_host['PIXMAN_LIBS'].split()) +libcap_ng = declare_dependency() +if 'CONFIG_LIBCAP_NG' in config_host + libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) +endif rt = cc.find_library('rt', required: false) libiscsi = declare_dependency() if 'CONFIG_LIBISCSI' in config_host @@ -216,7 +220,6 @@ qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) # Other build targets - if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif @@ -235,6 +238,13 @@ if have_tools subdir('contrib/vhost-user-scsi') endif + if host_machine.system() == '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') From patchwork Thu Dec 12 12:51:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oEYvPCvV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ6868D9z9s4Y for ; Fri, 13 Dec 2019 00:15:12 +1100 (AEDT) Received: from localhost ([::1]:59104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOJC-0002ny-FD for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy9-000390-7B for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy7-0006HG-Pi for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:25 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy7-0006FV-HS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:23 -0500 Received: by mail-wr1-x443.google.com with SMTP id b6so2659160wrq.0 for ; Thu, 12 Dec 2019 04:53:23 -0800 (PST) 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=Zcm+dNIQfsuLlzTia26mC9LJPo0t1Xzlic84x4r+w0g=; b=oEYvPCvVE8ljiT9/yFJBQ8y2expcIlzQsSCZ2Ia8hLIKXP6nkuf6WfocLehB7IPZJV DCZqsQF4kKGIX1E1pAbPs3L2NmhWKrhCa+oXS4T+c2nrwEkgJ8/Ayo19q/FnppASjw7P CjOxoBJNrEoCmZTUyFdPoJTsTGmgK8ZYG81D/ezHspfgcL/tOLSwX6nISo7ymMxAQjGM 5LvgjNEBGRPCIJAggPrM6jsEUUf5j19M33fx1ejeRSt27nsaAdexoD9w77gFZwOxKR10 T30YSFUX3y/k3HvBzNmNlHOC/fKC4brbX4m3rD8VNLijnPG5tchprglP59n0nugN2PUe qLNQ== 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=Zcm+dNIQfsuLlzTia26mC9LJPo0t1Xzlic84x4r+w0g=; b=FLiawNnZl+7zrvlCpocHAYB4c/dMPxXVhSvJPMeRxcX1BCSRnMxFkeW8mM+nZ1x+I0 NkbAYVb3JHMRBRs4qNv+rSdRsGQ0HIaYV2uj/1kDSa65zZbziYXTIPpKZK9dAMhuMChI my6IoCcf1tjxIqG/4tg9K4UAKFg/r/KXBGFGH+CiSkGlijyU7pyOFDWLqZ49jl0ZB2Pv M3G6QMqkCce7Dbhryb+unHVwdT3Od1EC6TX6kWxdPdNP8BR7Fk7EY/deP+iPK5XeWyRv JsmpvlPgsae1P+ttRW5S1EsZCRcCOZ1B7GYKtWVqYH8polsg+IcGud2EVHxXad/e7prI 9Vag== X-Gm-Message-State: APjAAAU8wmsMjB/iOSwfkQG6ecqEb2GUDmEzyeMa/CsoajxsN6QH0078 6fF3n1bOPsaCr5Unt1aUHym7LZu3 X-Google-Smtp-Source: APXvYqwsSoMA2sIWOQcrwmRpotHSo4tMRRSb5l9tgAIaXHt1OEMedrKLaBGiOVIJXwdqUtquclivgQ== X-Received: by 2002:adf:f288:: with SMTP id k8mr6536769wro.301.1576155202277; Thu, 12 Dec 2019 04:53:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 024/132] meson: add qemu-keymap Date: Thu, 12 Dec 2019 13:51:08 +0100 Message-Id: <1576155176-2464-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- configure | 24 ------------------------ meson.build | 6 ++++++ 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index d153186..fe4df0d 100644 --- a/Makefile +++ b/Makefile @@ -372,8 +372,6 @@ qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io 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-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS) - 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-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) @@ -387,9 +385,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","$@") -qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS) -qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS) - ifneq ($(EXESUF),) .PHONY: qga/qemu-ga qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) diff --git a/configure b/configure index 9615d63..d05c0de 100755 --- a/configure +++ b/configure @@ -385,7 +385,6 @@ vde="" vnc_sasl="" vnc_jpeg="" vnc_png="" -xkbcommon="" xen="" xen_ctrl_version="" xen_pci_passthrough="" @@ -3292,22 +3291,6 @@ EOF fi ########################################## -# xkbcommon probe -if test "$xkbcommon" != "no" ; then - if $pkg_config xkbcommon --exists; then - xkbcommon_cflags=$($pkg_config xkbcommon --cflags) - xkbcommon_libs=$($pkg_config xkbcommon --libs) - xkbcommon=yes - else - if test "$xkbcommon" = "yes" ; then - feature_not_found "xkbcommon" "Install libxkbcommon-devel" - fi - xkbcommon=no - fi -fi - - -########################################## # xfsctl() probe, used for file-posix.c if test "$xfs" != "no" ; then cat > $TMPC << EOF @@ -6093,9 +6076,6 @@ if test "$softmmu" = yes ; then fi mpath=no fi - if test "$xkbcommon" = "yes"; then - tools="qemu-keymap\$(EXESUF) $tools" - fi fi # Probe for guest agent support/options @@ -6640,10 +6620,6 @@ fi if test "$vnc_png" = "yes" ; then echo "CONFIG_VNC_PNG=y" >> $config_host_mak fi -if test "$xkbcommon" = "yes" ; then - echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak - echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak -fi if test "$xfs" = "yes" ; then echo "CONFIG_XFS=y" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 854b1cb..14a8a9a 100644 --- a/meson.build +++ b/meson.build @@ -60,6 +60,7 @@ libcap_ng = declare_dependency() if 'CONFIG_LIBCAP_NG' in config_host libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) endif +xkbcommon = dependency('xkbcommon', required: false) rt = cc.find_library('rt', required: false) libiscsi = declare_dependency() if 'CONFIG_LIBISCSI' in config_host @@ -228,6 +229,11 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') + if xkbcommon.found() + 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') From patchwork Thu Dec 12 12:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p28New7z"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZCs5qlfz9sPK for ; Fri, 13 Dec 2019 00:20:09 +1100 (AEDT) Received: from localhost ([::1]:59166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifONz-00017z-95 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:20:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59637) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy9-0003A6-Vw for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy8-0006JE-Pc for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:25 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy8-0006HZ-Ib for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:24 -0500 Received: by mail-wm1-x330.google.com with SMTP id d5so2374822wmb.4 for ; Thu, 12 Dec 2019 04:53:24 -0800 (PST) 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=s/XxOv3v8yWIEINkNyhklSprKPX+gu5M/S5mfVQYviU=; b=p28New7zU64hcnMnqpVn1jvz1Ag1iuA9FnWsTEnYaN3NdeaM2+ZfdYoUaicJ2YcXhS B9tYIBkqnnYEBG1olqgPQHRhb0gAAmbe43gf5KOiHK1Peh/mQmXa57FVC2tjw0Iun0rM Tdb3NUBo4kvNKlnVhBrT6At3UZrA9LCOTjECYodXzSQCauYOdfllVggGj9/Z4K5fqr8P ERSyMtdv1MtGmgy/Ox4iEWPm+ISoIKnx1o3WU1LJTKupqMWK400UivmdTlnv4IEA9RG2 FMOByAuPtb8gg4JO6cldvsAChY4duSUqCj+66p2ds4P2kMz/KFb62zeK6XX0NjANYp7w QWEQ== 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=s/XxOv3v8yWIEINkNyhklSprKPX+gu5M/S5mfVQYviU=; b=Rua9oUiazKAMR9/UHDz9pWQqASmqCPJPY87/HJ543M93YICc+/tbapQXh0sFwGRSsI L6qE6ZvP7cPyXg9ttxuUVg0v5bAhOSwl1n+vgmK/FZ8rObJi/gK9ggf/VVxZeXJebx/T L1irem8qfTxCcS8ng8oPmsc1BbEom4zukvfPfhEEN4H4aYd2h2oq+Y5RAnziT7D/Hn9W dZPjPlT/3GgGKRRhYmcyOD9ySLJgN9s3qjPAlV8DWnSPyMx7Mp/Vd/R87NC7mixWTFNf 8gqEfTetCjbg1+fvsv+zyZSZs1YsiPT9Yt44YLcXxl+chvQuLtLZKnGPIdfo3LYk+8w6 txhA== X-Gm-Message-State: APjAAAUJWZN+anwRRgN7mLbvEA13XHBB8KLExxcOpA5Uyq5OgejUZnFf tnuEKGeRnNH4ZP0yHR8Aea0HYbgm X-Google-Smtp-Source: APXvYqzxu9sKAou26SXbhfTWJZ3eFaqHnZSdMXFSTWjKCRMt+twbaxu4bBBF0DA4MgpyWmGIxsSwnw== X-Received: by 2002:a1c:e909:: with SMTP id q9mr6758500wmc.30.1576155203343; Thu, 12 Dec 2019 04:53:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 025/132] meson: add qemu-edid Date: Thu, 12 Dec 2019 13:51:09 +0100 Message-Id: <1576155176-2464-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 2 -- configure | 2 +- meson.build | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fe4df0d..6a888b0 100644 --- a/Makefile +++ b/Makefile @@ -372,8 +372,6 @@ qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io 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-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) - fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap diff --git a/configure b/configure index d05c0de..0b294bb 100755 --- a/configure +++ b/configure @@ -6041,7 +6041,7 @@ fi tools="" if test "$want_tools" = "yes" ; then - tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) qemu-edid\$(EXESUF) $tools" + tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" fi diff --git a/meson.build b/meson.build index 14a8a9a..e5b0e31 100644 --- a/meson.build +++ b/meson.build @@ -234,6 +234,9 @@ if have_tools dependencies: [qemuutil, xkbcommon], install: true) endif + executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'), + dependencies: qemuutil) + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') From patchwork Thu Dec 12 12:51:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f/gEKCk/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ9S21c9z9s4Y for ; Fri, 13 Dec 2019 00:18:04 +1100 (AEDT) Received: from localhost ([::1]:59148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOLx-0006OG-PW for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:18:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59827) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyA-0003Bb-UN for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy9-0006Kq-Jw for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:26 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:40421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy9-0006J9-B9 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:25 -0500 Received: by mail-wm1-x334.google.com with SMTP id t14so2370700wmi.5 for ; Thu, 12 Dec 2019 04:53:25 -0800 (PST) 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=xSwt9wbl5F36WhAyO5q9Z+UABxMxg8aLFFIonQFV0ZI=; b=f/gEKCk/XUaOSVmfmoV0SzT0dGhPIm6K4QJWBLAQJqvirUvI/6zb/eVfSsdiGcuZE8 RxeUNnE5FND13W9sZqL7YJZQVn9x9xzqcp7cLr+BZfbPGqHx4x8mQPMK3BEHFt/F8BML fJwbV6nVuVJSKybPTAFI10TaiqBBv1YSzzF8UxoUYViD3kFUiLI5RAflnI1I0kSXv9f2 mOcIfCHpvn/3ZEvikwB0ixqlJZ1//OY4MpmEOcBsNi2PPgmR5f+TdaDE13ajVWAVmI+O C+ukl54otyAMjpUGhf2hz7i9VZpO2zbxc5YlYWkjVGlYW4Cne13eZ3dmzIxIEobUUvob ZHDQ== 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=xSwt9wbl5F36WhAyO5q9Z+UABxMxg8aLFFIonQFV0ZI=; b=t0Bbci1FUMM9qin8A3DwMDSrBEyznIDOcPlbaCqnL2YI2NRXKzPRdlrUe9g2aJoREK PIK2nZyN82OFbEAetbBWkVXzOYU5JfKW06zwjZW3bxAfqhFZTBysBSazSf6HLwbFIB1M kp5GBeWUtlGxHnH6Q/v+c5GTkEtwBhdWGFaeChpa+8hLNcI7DYyPjiqtXhi7lrM5ODAS CoCx/kmp6hBxgyJB7/gxrdFDji7xcqiFAmnnGQFTiGDOZsx7y11kduas6UjXhIfQfvXT LUC9w2+7MuPcJNnfLs4rJ8yqX6k4xH8Jaui9GPrxxdFsRK29nsTyBmT8qJ+VGvB+WmOR TH+Q== X-Gm-Message-State: APjAAAW97CpIRbp6o/d0RDxtuJRDsXIGayquPNuc/vPCoPJTaz9reviC Pfdih17JR+a0rZRwkrBzOQUB4YOl X-Google-Smtp-Source: APXvYqwq1rWduoMDzxs2tDeA/WdQtc6xWxSpF3ILrUq2A2zDZVjLoOlbjoX8RbDNFLZzLPxcHzllZA== X-Received: by 2002:a1c:48c1:: with SMTP id v184mr6703342wma.5.1576155204141; Thu, 12 Dec 2019 04:53:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 026/132] meson: add virtfs-proxy-helper Date: Thu, 12 Dec 2019 13:51:10 +0100 Message-Id: <1576155176-2464-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 3 --- configure | 6 ++++-- fsdev/meson.build | 4 ++++ meson.build | 6 ++++++ 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 fsdev/meson.build diff --git a/Makefile b/Makefile index 6a888b0..9110115 100644 --- a/Makefile +++ b/Makefile @@ -372,9 +372,6 @@ qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io 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) -fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) -fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap - scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist diff --git a/configure b/configure index 0b294bb..ca91a76 100755 --- a/configure +++ b/configure @@ -3969,6 +3969,7 @@ fi ########################################## # attr probe +libattr_libs= if test "$attr" != "no" ; then cat > $TMPC < @@ -3985,7 +3986,8 @@ EOF # Older distros have , and need -lattr: elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then attr=yes - LIBS="-lattr $LIBS" + libattr_libs="-lattr" + LIBS="$libattr_libs $LIBS" libattr=yes else if test "$attr" = "yes" ; then @@ -6050,7 +6052,6 @@ if test "$softmmu" = yes ; then if test "$linux" = yes; then if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then virtfs=yes - tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" else if test "$virtfs" = yes; then error_exit "VirtFS requires libcap devel and libattr devel" @@ -6833,6 +6834,7 @@ if test "$linux_aio" = "yes" ; then fi if test "$attr" = "yes" ; then echo "CONFIG_ATTR=y" >> $config_host_mak + echo "LIBATTR_LIBS=$libattr_libs" >> $config_host_mak fi if test "$libattr" = "yes" ; then echo "CONFIG_LIBATTR=y" >> $config_host_mak diff --git a/fsdev/meson.build b/fsdev/meson.build new file mode 100644 index 0000000..eee8507 --- /dev/null +++ b/fsdev/meson.build @@ -0,0 +1,4 @@ +if have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host + executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'), + dependencies: [qemuutil, libattr, libcap_ng]) +endif diff --git a/meson.build b/meson.build index e5b0e31..b53c2dc 100644 --- a/meson.build +++ b/meson.build @@ -56,6 +56,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(), link_args: config_host['PIXMAN_LIBS'].split()) +libattr = declare_dependency() +if 'CONFIG_ATTR' in config_host + libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split()) +endif libcap_ng = declare_dependency() if 'CONFIG_LIBCAP_NG' in config_host libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) @@ -220,6 +224,8 @@ libqemuutil = static_library('qemuutil', qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) +subdir('fsdev') + # Other build targets if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') From patchwork Thu Dec 12 12:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aeZdfFUe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYxK1hBvz9sPc for ; Fri, 13 Dec 2019 00:07:33 +1100 (AEDT) Received: from localhost ([::1]:59028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOBm-0002Ol-JP for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:07:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60010) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyB-0003DB-UM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyA-0006My-J4 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:27 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:37435) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyA-0006L2-B3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:26 -0500 Received: by mail-wm1-x32e.google.com with SMTP id f129so2383371wmf.2 for ; Thu, 12 Dec 2019 04:53:26 -0800 (PST) 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=g0Za0/5ts6UEf1IGGG8fGTwyEDqYKTDtKmkQ6EBfNWw=; b=aeZdfFUe7OxJt+koW/79QA2hya2LXE/Sztk4bu2Mvs5O9iqhFbKns5hmxCCcbFHLvv ueKFS5Yd8aBeVjYSTNhfrtK1TjmVX69+/cv66vb56nBHT//H9E+NiwfuQCzyfsN+w+OW w+cl8dFtEk/o2dcqHZ4DmUujJCuUkkNC2TBZj0nwuvwnXJnP94PZBSWaN7YeaL3BiwNL pHuM5N/qBxNRcRF9CXskDFotuelmJRWajj8Ug54sod7C0VJUi6ZcwMxXpuVQyrGqLDjy NJ2JE++eSJcQl/4l2jor2Zx/QP28q55uRBMC/HMynuDH9cArMOlrcG2z0uJAm4ZwqBYg eF6A== 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=g0Za0/5ts6UEf1IGGG8fGTwyEDqYKTDtKmkQ6EBfNWw=; b=BtKADrRvrnoEUNNb+92GsRx9+eOMglro9spKMRX0kAYLRYCM1FVrPT6Su+RcA7XTta Rlm7Q4c2PKk0HBIr+1GtGmIC5xIodM933eR5nyEx9Aa5gdiiF21oaitl0z4hzBUljULN AyItPji7HqAHWyRKSgca5LxtR8KfhOWiEA3WYZ6RdwtXb5pIeJvdEzao/6AvFHWpH4Qj yOBNSJYE9aiV1fdLNB+OjwezEsfc+GkNnrCT7nm53CxCH565w7e1G7Y/SJHXpgkYHgey znkXRjNjii7ljfo++xjoWNiDtpk4hN67iahW4NsuId8xcHvDvLVdUd6KH6KuMGzWn0R0 9qvw== X-Gm-Message-State: APjAAAVMkRw+qsRpr8pZE0ZeNO4ZPv6+hcBbhleCMU8mPBeTjMss1VnX Rgu3Qlzre5dGXOFAsdkLNvrhrxpH X-Google-Smtp-Source: APXvYqwZnBgipFLkD4UrraBax1CpB73ymi+qa55yrB1StGpErhrkNELeiRVengz4WcI9Fk12uV8GxQ== X-Received: by 2002:a1c:9903:: with SMTP id b3mr6256518wme.139.1576155205069; Thu, 12 Dec 2019 04:53:25 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 027/132] meson: keymap-gen Date: Thu, 12 Dec 2019 13:51:11 +0100 Message-Id: <1576155176-2464-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André 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 9110115..d4ebbbf 100644 --- a/Makefile +++ b/Makefile @@ -116,44 +116,6 @@ generated-files-y += module_block.h generated-files-y += .git-submodule-status -KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen -KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv - -KEYCODEMAP_FILES = \ - 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 \ - $(NULL) - -generated-files-$(CONFIG_SOFTMMU) += $(KEYCODEMAP_FILES) - -ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile.objs - $(call quiet-command,\ - stem=$* && src=$${stem%-to-*} dst=$${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 = $(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 b53c2dc..8a4a90b 100644 --- a/meson.build +++ b/meson.build @@ -211,6 +211,7 @@ subdir('stubs') subdir('trace') subdir('util') subdir('crypto') +subdir('ui') # Build targets from sourcesets diff --git a/ui/meson.build b/ui/meson.build new file mode 100644 index 0000000..cad9763 --- /dev/null +++ b/ui/meson.build @@ -0,0 +1,34 @@ +keymap_gen = find_program('keycodemapdb/tools/keymap-gen') + +keymaps = [ + ['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'], +] + +foreach e : keymaps + output = 'input-keymap-@0@-to-@1@.c'.format(e[0], e[1]) + 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: [keymap_gen, + '--lang', 'glib2', + '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]), + 'code-map', '@INPUT0@', e[0], e[1]]) +endforeach From patchwork Thu Dec 12 12:51:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pIrysAju"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZD64yK5z9sPf for ; Fri, 13 Dec 2019 00:20:22 +1100 (AEDT) Received: from localhost ([::1]:59172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOOC-0001RD-3k for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:20:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60186) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyC-0003Ec-Sr for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyB-0006Ov-I1 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:28 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:34218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyB-0006Mj-AT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:27 -0500 Received: by mail-wr1-x430.google.com with SMTP id t2so2644323wrr.1 for ; Thu, 12 Dec 2019 04:53:27 -0800 (PST) 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=docWwRVWyAXD0RYJhQjYDMkeooVSkVTl6PNsvmqf6gQ=; b=pIrysAjuEh2Vl38wspdZzy7pWHqKdwbkuOlNlxWfWKPAj43DX6A+TkVDuPnkvrpwH8 eIPzCscbMZo0PoizRrAqCppDECs30wQluKvSTZEbjH4De3WjUrB9+Srz8uIo11c8Rgy/ hI7mSBX++lBTvVBi8iTZOk88etuKBLMRqUfisMuBMvK89yfohQPuyKtPaR8d5k1BeTaF oAOEo3qQyvdI3vdBkR+1Vfl6lH7//ih7ELEbAw1MBA53rW70/9n2v8qeIbvZOoxzpcDK mB5BPxsOnWCJpgLtskZ3ZzbxykHvRBQLU0Wy+0efIosJSBUP+Brgr3CFhohKSK0MjdNu tjOA== 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=docWwRVWyAXD0RYJhQjYDMkeooVSkVTl6PNsvmqf6gQ=; b=jhV6ibGARtcg0O3S2DId1S8AqzJwLcvAcpgSaQ06KTLRQ5mO8B9LM+89mTw8zdehBR u2ovqt/2EndETnz21233Be/b15Y2BV+2ANF8n3J1UXpQbSXXaUuEZb+9/NtR9TTAfCah UmXnk3XEw/Jd3BisD7nT1+BvB+/Ub25FQ0n2nDHvKhrlDiissnnffe7L3q0c8SzCMMjr Pq4bVzhtlWOZA1t4o7CWm0HO6nj4Uw+0eav0C+qHoNoMgUUlW0aq6xRrUHWdj6pzH3O8 2ixLLCm06LzbgrEAd0PLVU2FoQe/7EFc4iMq0eITYcuRt7LjBMc7Uy9GJPRP9w7JHnRz uXWA== X-Gm-Message-State: APjAAAXuLHXZmjb7SkniFXp0akdsoD7WZ5CfEqwWO4hos34YB6FkL987 hGDhvPivCtcELIeIAnCwz/Q6y5ye X-Google-Smtp-Source: APXvYqwzyCH9poxfALlN14mXhB2j3etl7QN1xS7lVcYUGtHqSseCF2fzrDKO15nfGf4Wql3EtaI0mQ== X-Received: by 2002:adf:ea0f:: with SMTP id q15mr6017558wrm.324.1576155205914; Thu, 12 Dec 2019 04:53:25 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 028/132] meson: generate qemu-version.h Date: Thu, 12 Dec 2019 13:51:12 +0100 Message-Id: <1576155176-2464-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 27 +-------------------------- meson.build | 10 ++++++++++ scripts/qemu-version.sh | 25 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 26 deletions(-) create mode 100755 scripts/qemu-version.sh diff --git a/Makefile b/Makefile index d4ebbbf..5d0be7b 100644 --- a/Makefile +++ b/Makefile @@ -96,21 +96,7 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) -# Create QEMU_PKGVERSION and FULL_VERSION strings -# If PKGVERSION is set, use that; otherwise get version and -dirty status from git -QEMU_PKGVERSION := $(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 := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSION)) - -generated-files-y = qemu-version.h config-host.h qemu-options.def +generated-files-y = config-host.h qemu-options.def generated-files-y += module_block.h @@ -233,17 +219,6 @@ include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules $(vhost-user-json-y) -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 8a4a90b..6d4bf27 100644 --- a/meson.build +++ b/meson.build @@ -18,6 +18,16 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: ['c', 'cpp']) +qemu_version_cmd = [find_program('scripts/qemu-version.sh'), + meson.current_source_dir(), + config_host['PKGVERSION'], config_host['VERSION']] +qemu_version = custom_target('QEMU version', + output: 'qemu-version.h', + command: qemu_version_cmd, + capture: true, + build_by_default: true, + build_always_stale: true) + configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', configuration: config_host) diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh new file mode 100755 index 0000000..4847385 --- /dev/null +++ b/scripts/qemu-version.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +set -eu + +dir="$1" +pkgversion="$2" +version="$3" + +if [ -z "$pkgversion"]; then + cd "$dir" + if [ -e .git ]; then + pkgversion=$(git describe --match 'v*' --dirty | echo "") + fi +fi + +if [ -n "$pkgversion" ]; then + fullversion="$version ($pkgversion)" +else + fullversion="$version" +fi + +cat < X-Patchwork-Id: 1208433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ksdp0Gvp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYwr2P6pz9s4Y for ; Fri, 13 Dec 2019 00:07:08 +1100 (AEDT) Received: from localhost ([::1]:59020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOBN-0001q7-Kv for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:07:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60328) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyD-0003Fe-KG for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyC-0006QK-9G for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:29 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyC-0006Oo-1m for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:28 -0500 Received: by mail-wr1-x434.google.com with SMTP id j42so2572706wrj.12 for ; Thu, 12 Dec 2019 04:53:27 -0800 (PST) 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=g4zEzo5NcSs7ChSRMHLU2CYO2jCxB5nfA8k+ievYaHo=; b=Ksdp0GvpDI6cpUu9Bq17GXw82sqGwnAaKNxuahEUX9oife2gT+YcEA2XTnDJAhYQF9 aDoydGNOp+2uSYpMQ1u/X/sF7MSp7lafJAFoz/70EN5Q002yG461ebUG6/qc6WQ7KQxq IYi2f1iEny8lklr3rZKxqw4dWIO956Xj2OR4Jssg3NbPw7SNnpCWUPnk/jY/XdjEjt1R o5HMAIF2uBs/cADO+X0KzBmsHbxRsFsLRPuMcoYdNRUbJFzphsOrpCDwL/Abp9K/R0nq 66SDvqzOEvjOSDpFv9O5W+/A4TjbahLJVkC460B+tONOD0RA5yougZV0uG6ag2hUiJrl tSrA== 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=g4zEzo5NcSs7ChSRMHLU2CYO2jCxB5nfA8k+ievYaHo=; b=RFHY036iy6apznt7VjjOxv5i6dredIDLWHbX2GWtAEVR6r17SmMM1e7Hd/Cep/fXwQ phiabszjNbgW6Z1BkPQkyr+peI8g09QcAsnitsjX7c2ePyTYDRSJsggDfjgy7nDH8w88 dVRFKoJ22RYUD+6ifpYfjsLYLVQu/KM/s06saJHqUnv6hDireWQ0kQ3TO3sM+2/X58+n iQjvUIOddbaXG/B4DmeQ61zbg2wsZzDgcwzMNI65pBI90BjhGjryIzLxkRUO9N4fM2cC hnhbFd2pPsLEHTHuU3fYtcDBCPlerkVQf1AAivUmTUjbfu99A8cHTed0ZMWREVYzKTn2 ETtQ== X-Gm-Message-State: APjAAAUDNf6xg2FiFFxsnnavW5kf8B76WifGteHz6tNU+Fp1g5ZIZyWU omOOHrbYT0NvQ9odzdnPpB87/fv0 X-Google-Smtp-Source: APXvYqxMUzRDYfGUxp3ZeYHXramC3JssWC7Lntu8Vo/SBtU+E3413qPUDXS3zXUz96zyoCb0wKFAlg== X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr6524706wrx.304.1576155206901; Thu, 12 Dec 2019 04:53:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 029/132] meson: generate shader headers Date: Thu, 12 Dec 2019 13:51:13 +0100 Message-Id: <1576155176-2464-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 18 ------------------ meson.build | 1 + ui/meson.build | 2 ++ ui/shader/meson.build | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 ui/shader/meson.build diff --git a/Makefile b/Makefile index 5d0be7b..472962d 100644 --- a/Makefile +++ b/Makefile @@ -582,24 +582,6 @@ cscope: find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PATH)/cscope.files" cscope -b -i"$(SRC_PATH)/cscope.files" -# opengl shader programs -ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclude.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/shaderinclude.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=makeinfo MAKEINFOINCLUDES= -I docs -I $( X-Patchwork-Id: 1208438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nHf21q0z"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ1q58F1z9sPn for ; Fri, 13 Dec 2019 00:11:26 +1100 (AEDT) Received: from localhost ([::1]:59054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOFS-0005vE-NP for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:11:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60588) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyE-0003Hx-S2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyD-0006TC-EY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyD-0006RG-68 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:29 -0500 Received: by mail-wm1-x334.google.com with SMTP id p9so2247547wmc.2 for ; Thu, 12 Dec 2019 04:53:29 -0800 (PST) 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=TtsZenLOjhtMivOafiVAH9+nVf02IjMWlP1Q3QoXfuk=; b=nHf21q0zmfdIQhkCw2bBgaSNZo62OAAiyFfGpLVYmAbw8JYPxrhrROnCsqBUx4ngTl /to9W5ZihlV2OB98MoTwl7Zp561yefMVAjZv3pTvTEZsVUEGddmdYSDJrM1n0hcfGp2q psYkO4LfuDcCGFS7dOXCjl35UxzCKPDhxK5znxvPSCmw4QlcTSZTDHXoiYbyXBtwe5/y MY++Xm1+cZ6MA2bN5x1cq8dhBLW0Wi1amBT5F8/+gGo08T0NhaeVNQAZs4yMD/UoGTMo qhxWb7CIb1WAAfyIUts1G3yuXlr5AXxfQiKBXF8CPXnfyZet+nQFg9YllboIf5bv0Sra 0u8A== 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=TtsZenLOjhtMivOafiVAH9+nVf02IjMWlP1Q3QoXfuk=; b=jRqytIgl5T3Ikdq3Kn6KWjTwognJcq652wWw3/8sZ/Ixs1AffU1wXUe8Sm23tvYeay ITvZKDHeyTSiSgz2c/dJynVvEtUv6Xkx6CI3ynHy9bAfW59X6PFDki2tmFNnAOLLWOpa HhEVk30y3mbEWOUH5fy00UtMSjJRl04IZA/Dfor8PKHFUB7vGI5CyYYKC2jk6s19dG/i /mX6nmsah90HUHAMi8YFq8/eircY4lM+mmLPA9F4Cw/ac6ShJmgpibFaiX3FzohP1poe NRBp4UQCUyuK7bNsEbzfby4wYXRnsEGUTjkyARRwQs6toyhajY1MZajh8irf15hFT75+ kz6A== X-Gm-Message-State: APjAAAWyfBt2HymagS98dME+Zcjz9ojfU84H+FWaBgqDmynRMw9bNYJD Y5jLm6B61jFNWrqlL5dfvVwGF1Yo X-Google-Smtp-Source: APXvYqyiwxpt1/Rb4ybO43wK0oxur81PBbpMUjnEAV6lfPAM9+ACXkbOzBZ5CVgxHrQ30guYuYCm/g== X-Received: by 2002:a1c:1d16:: with SMTP id d22mr6696540wmd.158.1576155207966; Thu, 12 Dec 2019 04:53:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 030/132] meson: generate hxtool files Date: Thu, 12 Dec 2019 13:51:14 +0100 Message-Id: <1576155176-2464-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 19 +------------------ Makefile.target | 6 ------ meson.build | 35 +++++++++++++++++++++++++++++++++++ scripts/hxtool | 2 +- 4 files changed, 37 insertions(+), 25 deletions(-) mode change 100644 => 100755 scripts/hxtool diff --git a/Makefile b/Makefile index 472962d..7588467 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ include $(SRC_PATH)/rules.mak # lor is defined in rules.mak CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) -generated-files-y = config-host.h qemu-options.def +generated-files-y = config-host.h generated-files-y += module_block.h @@ -221,8 +221,6 @@ all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all mo 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","$@") TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) @@ -314,9 +312,6 @@ ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist 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","$@") - ifneq ($(EXESUF),) .PHONY: qga/qemu-ga qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) @@ -629,18 +624,6 @@ $(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) $(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs) $(call build-manual,specs) -qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - -qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - -qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - -qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ diff --git a/Makefile.target b/Makefile.target index c5af974..1f19d68 100644 --- a/Makefile.target +++ b/Makefile.target @@ -210,12 +210,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)$@") -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 447a32c..de5a26e 100644 --- a/meson.build +++ b/meson.build @@ -113,6 +113,7 @@ have_block = have_system or have_tools # Generators +hxtool = find_program('scripts/hxtool') shaderinclude = find_program('scripts/shaderinclude.pl') qapi_gen = find_program('scripts/qapi-gen.py') qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py', @@ -123,6 +124,40 @@ qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py', meson.source_root() / 'scripts/qapi/doc.py', meson.source_root() / 'scripts/qapi-gen.py' ] +hxdep = [] +hx_headers = [ + ['qemu-options.hx', 'qemu-options.def'], + ['qemu-img-cmds.hx', 'qemu-img-cmds.h'], +] +if have_system + hx_headers += [ + ['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 target + command: [hxtool, '-h', '@INPUT0@']) +endforeach + +foreach d : [ + ['qemu-options.hx', 'qemu-options.texi'], + ['hmp-commands.hx', 'qemu-monitor.texi'], + ['hmp-commands-info.hx', 'qemu-monitor-info.texi'], + ['qemu-img-cmds.hx', 'qemu-img-cmds.texi'], +] + custom_target(d[1], + input: files(d[0]), + output: d[1], + capture: true, + build_by_default: true, # to be removed when added to a target + command: [hxtool, '-t', '@INPUT0@']) +endforeach + # Collect sourcesets. util_ss = ss.source_set() diff --git a/scripts/hxtool b/scripts/hxtool old mode 100644 new mode 100755 index 7d7c428..27cbab5 --- a/scripts/hxtool +++ b/scripts/hxtool @@ -64,6 +64,6 @@ case "$1" in "-h") hxtoh ;; "-t") hxtotexi ;; *) exit 1 ;; -esac +esac < "$2" exit 0 From patchwork Thu Dec 12 12:51:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n469trpL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ0M0gWmz9s4Y for ; Fri, 13 Dec 2019 00:10:11 +1100 (AEDT) Received: from localhost ([::1]:59046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOEK-0005L1-Dq for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:10:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60686) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyF-0003Im-Hu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyE-0006UO-6N for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:31 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyD-0006T4-Vx for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: by mail-wm1-x335.google.com with SMTP id n9so2244661wmd.3 for ; Thu, 12 Dec 2019 04:53:29 -0800 (PST) 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=o0zqfdZ8p5g/pfdlVwgBoMj3GcdSJMfztzyAKgF38iE=; b=n469trpLtiVxcZfHiZo3wgL4eoEOwvEPTdTWFmb+v0n5WXWR4UfjCtRW/9P+kB+l4P DQiBWclHgnxLHgTFbaJTACRhqtLeNSsjiBANYdt/CIS8uMkJu4L5TMq6hK25cgwtKDJR mQiA/nfALyJEKQlckAiNvkfTxj9aZCaIe8QAWlsdqP7+tODM28phO7liZctoy9D6ByHo QleYFJ5TRnJPHq7DSVTdKNuuia9c+qdD4NGpbVmrvobLgjERAzFu4Y/f0qvi5kZdg6PZ 9HTGKOwbasb8kP/8lk5spUcrmepS7yZ9g+Xu3u8AymUX2Kl2COozEuT9Q8jBgxTAXXjJ ipJQ== 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=o0zqfdZ8p5g/pfdlVwgBoMj3GcdSJMfztzyAKgF38iE=; b=Hcr0DfVD4TF4HCk9abo0diST8PHiDrTZhgJgGHAFpWLxq7+yxeuGNiO09a6xFS6buo OBnHCl5ImcunPys0g9zpPt03Id+IaJ670/qjEbZOcQs0Hj+49nCaXbi9Pk5oFV88A5W/ Cmr4suKHlJz7PAZ140hHGywaNCCF9O7E9xNFRrzTVHVINzPjP2UQd47dcaV6tOTNSSqC YQs1vU/2smlhI+QfGKxI//a7LqoxbquaBZKqlP/Ce6Q7Te2BrQM4e64PSTyhmtTqB0lg GwMZjS6ADN568FxjGj0SQDvIWBngj1qrENF96XE4EjWzbk2QQw2HB8LpEiyCkyo/P4tP 00Jg== X-Gm-Message-State: APjAAAW/JKKTJBcdNoBSE+5F5zs0F4DKqqiBfbgrj58bnaC6E3YSODlg /0dY/tAfQqZfYYDGqTut2F6jioHw X-Google-Smtp-Source: APXvYqw6SNzzN++v1Il9p61CAVIoov3uVoVy3Ec04r6CSTIIPog0oDYI/8Ii9cGIBpWEa4KisXIJEg== X-Received: by 2002:a05:600c:2290:: with SMTP id 16mr6817055wmf.93.1576155208811; Thu, 12 Dec 2019 04:53:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 031/132] meson: configure 50-qemu-gpu.json Date: Thu, 12 Dec 2019 13:51:15 +0100 Message-Id: <1576155176-2464-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 7 +------ contrib/vhost-user-gpu/meson.build | 5 +++++ rules.mak | 7 ------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 7588467..0a6615c 100644 --- a/Makefile +++ b/Makefile @@ -118,13 +118,8 @@ $(call set-vpath, $(SRC_PATH)) LIBS+=-lz $(LIBS_TOOLS) -vhost-user-json-y = HELPERS-y = -ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) -vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json -endif - ifdef BUILD_DOCS DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 @@ -217,7 +212,7 @@ dummy := $(call unnest-vars,, \ include $(SRC_PATH)/tests/Makefile.include -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 config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build index 8778aa7..7303b6d 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -2,4 +2,9 @@ if 'CONFIG_VIRGL' in config_host and 'CONFIG_GBM' in config_host executable('vhost-user-gpu', files('main.c', 'virgl.c', 'vugbm.c'), link_with: libvhost_user, dependencies: [qemuutil, pixman, gbm, virgl]) + + 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/rules.mak b/rules.mak index fa9960c..5289184 100644 --- a/rules.mak +++ b/rules.mak @@ -393,10 +393,3 @@ TEXI2MAN = $(call quiet-command, \ $(call TEXI2MAN) %.8: $(call TEXI2MAN) - -GEN_SUBST = $(call quiet-command, \ - sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \ - "GEN","$@") - -%.json: %.json.in - $(call GEN_SUBST) From patchwork Thu Dec 12 12:51:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uIaz2ieI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZGt3LXqz9sPK for ; Fri, 13 Dec 2019 00:22:46 +1100 (AEDT) Received: from localhost ([::1]:59216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOQV-0004xj-Mq for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:22:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60872) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyG-0003ML-9j for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyF-0006Wa-4Z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:32 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyE-0006Ul-T4 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:31 -0500 Received: by mail-wr1-x442.google.com with SMTP id t2so2644495wrr.1 for ; Thu, 12 Dec 2019 04:53:30 -0800 (PST) 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=09ICg9D+Dn1VQ8tTw8DePRqwSVhY2gWWE2lvsGgxM/A=; b=uIaz2ieIEnBqcrjVllovt/9qWH9KD2xjr98j8JEm3fzVJgjIqJZGONyOG3ugCqOzkC d0h72eAezo+tsnnoV/JI1CUXUV8b31/5ygT7WbSKVCywdM+5nXNirEajZ0THFQW4P5sQ 9HOIvUJO9oeyl/OpvxUGr3jZtP27FXKts4u7qFWQ7yiQsD/uWCjiSloOoDUc18KvXvFL 0+JqUhqqgh1WU/Gb6ulhhVP09+mygqrT2HwxQPhaz7r7oRREPKA1fboFqxOuNDvnkRHt 3vNeTR7/666Spnebvom1ab+aK1ZLeG0cZzsLonFAN3Pe+2IKCZ7oSwrOudC7os86CoeZ 7F1g== 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=09ICg9D+Dn1VQ8tTw8DePRqwSVhY2gWWE2lvsGgxM/A=; b=O0IputYuR5wInPGU7oMqEcY29w37NtYwmpvWZoQA1Db1+PQok3ovMu93ZR3MDReZft cnyU/AKWUIoHC+sSmmk0G5Qp0MxpM32I/sVlGg6DDLfW4FX99Fy/NAjF95zFmFdvxU9I uGOj/UMEcOzEUTBkeljg29xST8w/bO3PHR5RKtZ05ySEutw1CnBDAcOoh9OBbEOFIYER V3eO4wiT8lfUBboxIKv37dnEdyUJrILxm/BAlAsbyWQ7Ps/ud7zrqa9+qN6AT7tmgsLM uXgyZ3PdeuWR25PcbpWeA+0pYj5Ndj5xL01JjgIA3E+KRrtP+zOChUB7KaPhNU++2BZ9 I3ig== X-Gm-Message-State: APjAAAWq9gHqmOuhTP1F4mLy01UoaWa84AG+8Az6j7t6cY5DXbfZKirT bE9+SAxIb6O24H/nFOwItWDv1xNh X-Google-Smtp-Source: APXvYqzLe44TG31SEJ6wxMi9v0jCtYgOjapmwA5l86ZyMYWIk/xYPQzQ8Mr93j8orO+psQDnmXQOWQ== X-Received: by 2002:a5d:690e:: with SMTP id t14mr6102272wru.65.1576155209765; Thu, 12 Dec 2019 04:53:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 032/132] meson: uncompress edk2 bios Date: Thu, 12 Dec 2019 13:51:16 +0100 Message-Id: <1576155176-2464-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- Makefile | 4 ---- meson.build | 2 ++ pc-bios/meson.build | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 pc-bios/meson.build diff --git a/Makefile b/Makefile index 0a6615c..b880265 100644 --- a/Makefile +++ b/Makefile @@ -103,9 +103,6 @@ generated-files-y += module_block.h generated-files-y += .git-submodule-status edk2-decompressed = $(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: ; @@ -226,7 +223,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 -$(SOFTMMU_ALL_RULES): $(edk2-decompressed) .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that diff --git a/meson.build b/meson.build index de5a26e..00c0767 100644 --- a/meson.build +++ b/meson.build @@ -312,3 +312,5 @@ if have_tools subdir('contrib/ivshmem-server') endif endif + +subdir('pc-bios') diff --git a/pc-bios/meson.build b/pc-bios/meson.build new file mode 100644 index 0000000..5524b95 --- /dev/null +++ b/pc-bios/meson.build @@ -0,0 +1,21 @@ +bzip2 = find_program('bzip2') + +fds = [ + '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, + build_by_default: true, + command: [ bzip2, '-dc', '@INPUT0@' ]) +endforeach From patchwork Thu Dec 12 12:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uAIVzBZL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ4c4vhpz9s4Y for ; Fri, 13 Dec 2019 00:13:52 +1100 (AEDT) Received: from localhost ([::1]:59094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOHu-00017S-5R for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:13:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyH-0003Nx-Eb for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyG-0006Zu-3B for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:33 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyF-0006X7-Qw for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:32 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y11so2612920wrt.6 for ; Thu, 12 Dec 2019 04:53:31 -0800 (PST) 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=Bxsd7cj1t1IS27BdAUrkJJ/4ZajGVGqHzwhI7jGnNf0=; b=uAIVzBZLzlF70bo9em0ieC8sc5toqa+mD/sXh/cKdxoieVhINn1uovhUC30H8NHG9+ vepKIhlhI2hHGfa8Bok1edNlKChTVGZ7iw6lySuSIK7DhMU5Gji0SZei3qTYKgPxrMql oQb140psvjHwohlGGfiPLrt877JKQklUsJFZoK1w/MKKDVI6eatd9YWTDdyBdz2WTHPn mYJwu16zTKoAZDDjjFHWW94FRcvwYLDsAwoEUyV7/2Sj4wT1l9dHPi62Qe9Jqtksidgp HcXrRT+pt+N4sPKFueCDSgoxoJQ048BucRGFp6iOXo2/RUXmVPjpzlmCQt0XqWmi4kz8 1OFQ== 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=Bxsd7cj1t1IS27BdAUrkJJ/4ZajGVGqHzwhI7jGnNf0=; b=ccicDJk8le6bBXY1r4xr0nZGS1kw+jV+FwYWXzbEgTjdMm2vjAe9b7vJGJm0CfMS1w G6HVr7HB1QFbeDqdEduyexTRjkFBSgZBwDTD+YVtNXBiVGfQym4qSM+csGshg4h0QpLX qxyxxmv7Agsyo0FoMWZX7nQa1L92R8pYRf0Sy1s/bRRzlPk+JmLN3xcI+ouscSf9ndaf ViZJ3L9Gq/6KHEzBcrLvkP6UBOtbwy9Ut2Jado71e8UTpkI8nf67Dca+IZDxRLeJvhF8 B82eirwllMbRL3QPkXlY9xG4vyRjnmUL7zsVDYTZnjsY64ce+cRKo0jnnHXqlq3L2UKg d/rA== X-Gm-Message-State: APjAAAWTDRlXCcgPDesUSNkdCIYKIfTm2Rw1qWGYccgcEntYEgT00+TU z0F8axLQlGj//jBtGKp/JY7KULpp X-Google-Smtp-Source: APXvYqzvPJCqG/Gxinm+XDjZpeEBehFj+5csNVj/Td1sjPtT22lzkJSNc0rqnbJ8BVO5J6M4MTxxxA== X-Received: by 2002:adf:f885:: with SMTP id u5mr6283471wrp.359.1576155210602; Thu, 12 Dec 2019 04:53:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 033/132] build-sys hack: link with whole .fa archives Date: Thu, 12 Dec 2019 13:51:17 +0100 Message-Id: <1576155176-2464-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André 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é 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 5289184..a10a972 100644 --- a/rules.mak +++ b/rules.mak @@ -39,6 +39,13 @@ find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2))) defined-symbols = $(call find-symbols,$1,awk '$$2!="U"{print $$1}') undefined-symbols = $(call find-symbols,$1,awk '$$2=="U"{print $$1}') +WL := -Wl, +ifdef CONFIG_DARWIN +whole-archive = $(WL)-force_load,$1 +else +whole-archive = $(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 = $(call find-symbols,$1,awk '$$2=="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 = $(filter-out %.a %.mo,$1) \ +process-archive-undefs = $(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) extract-libs = $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs))) expand-objs = $(strip $(sort $(filter %.o,$1)) \ @@ -122,7 +130,7 @@ LD_REL := $(CC) -nostdlib $(LD_REL_FLAGS) modules: %$(EXESUF): %.o - $(call LINK,$(filter %.o %.a %.mo, $^)) + $(call LINK,$(filter %.o %.a %.mo %.fa, $^)) %.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 := $(filter-out %/,$($v)))) endef From patchwork Thu Dec 12 12:51:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ic6HpTyC"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ840GtQz9s4Y for ; Fri, 13 Dec 2019 00:16:51 +1100 (AEDT) Received: from localhost ([::1]:59136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOKm-0004hF-9G for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:16:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33085) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyI-0003Pr-MY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyH-0006by-A3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:34 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyH-0006aE-06 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:33 -0500 Received: by mail-wm1-x341.google.com with SMTP id d5so2375341wmb.4 for ; Thu, 12 Dec 2019 04:53:32 -0800 (PST) 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=MxvLUkJt3psVnzx/R00RwMG5IpoZlvCgNl7VnjVean0=; b=Ic6HpTyC1Bk6kr8kQmV4dx+nM0zlipYk0YTp2IsCiqopS1X7wCBNMk71rePq3+KOUX huEXCIplAVGgHtVkjKZaq5cI+UU+DWBBNhbStjhNMulZfv73KMHkSxfDzylqdXzdmy3z O7LMojzOGZEh8Ahu+ITi4pAxMo9V7P176CJYmzDOi/co5r3WFEkJlBy6lIvhIFBInAeQ 4fJaQhgFrcIYcH2fcLKTFOQ/YFwsXqRdFvz7EVXtFb+ZdKdFA7fzIOCURig12t0RRRKk ojbdU/1cL9UoITunshiAFOCWNoImCVkHvuvdr1jGQ0bfAXnluabrzBxnPtXxcqcN+2k8 riNg== 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=MxvLUkJt3psVnzx/R00RwMG5IpoZlvCgNl7VnjVean0=; b=g3tGYYYWN31oLFiu6/8hGHfaSXTCog70bywpZ/zqCvm1fTxm1pmX81sNkiFVtgi/qX imEl9rHs9K+o8YgJH2A7O60jrRG87RHHeJcu9ZYQsOvB75cyS2CgS4idtIVfa+i7hYqr apzHjOcfLKL5HoFOnwBb4pgc8NvzHcHWVdCFPkmrTuZmt3g+5D3w8yAKZPYO6n2CFjzi XrBUFOfl65/hqw5VrhbWO/x4PPkkey7F5H4cAUhUtauiRr0iyxSgbXTGoMohhIP62F9o KtwJBk0yIMGlIV7Vxj8Eqk1Hw0u0ju/7ohJSYYSehgLI7ig+cHy7fAa41twSosbbSOkx 19Yw== X-Gm-Message-State: APjAAAXT7tYLU5d0dxNzXIoGSLEI4bytJkGVhT1evy5scXMVkXIBvt85 OfmPxfLoZDB0PyusTIKJdobJBFRx X-Google-Smtp-Source: APXvYqw1V5BSuY3riTm1jvtDjLVXpvBxk29SJpLis1bF71S9hO87+22zxXOmMtW2Vm9McRDmimUZAg== X-Received: by 2002:a05:600c:257:: with SMTP id 23mr6427935wmj.123.1576155211637; Thu, 12 Dec 2019 04:53:31 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 034/132] meson: convert qom directory to Meson Date: Thu, 12 Dec 2019 13:51:18 +0100 Message-Id: <1576155176-2464-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 2 +- Makefile.objs | 4 ++-- Makefile.target | 3 ++- meson.build | 1 + qom/Makefile.objs | 3 --- qom/meson.build | 15 +++++++++++++++ tests/Makefile.include | 2 +- 7 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 qom/meson.build diff --git a/Makefile b/Makefile index b880265..9e9b2cf 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,6 @@ dummy := $(call unnest-vars,, \ block-obj-y \ block-obj-m \ crypto-obj-y \ - qom-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) @@ -222,6 +221,7 @@ $(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 .PHONY: $(TARGET_DIRS_RULES) diff --git a/Makefile.objs b/Makefile.objs index 38e3604..b695319 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -24,9 +24,9 @@ block-obj-m = block/ crypto-obj-y = crypto/ ####################################################################### -# qom-obj-y is code used by both qemu system emulation and qemu-img +# libraries built entirely from meson -qom-obj-y = qom/ +qom-obj-y = qom/libqom.fa ####################################################################### # io-obj-y is code used by both qemu system emulation and qemu-img diff --git a/Makefile.target b/Makefile.target index 1f19d68..df3b14a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -176,13 +176,14 @@ dummy := $(call unnest-vars,,obj-y) all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs +dummy := $(call fix-paths,../,, \ + qom-obj-y) dummy := $(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 00c0767..36094fe 100644 --- a/meson.build +++ b/meson.build @@ -271,6 +271,7 @@ libqemuutil = static_library('qemuutil', qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) +subdir('qom') subdir('fsdev') # Other build targets diff --git a/qom/Makefile.objs b/qom/Makefile.objs index f9d7735..fc1248e 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,4 +1 @@ -qom-obj-y = object.o container.o qom-qobject.o -qom-obj-y += object_interfaces.o - common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o diff --git a/qom/meson.build b/qom/meson.build new file mode 100644 index 0000000..3c41ed3 --- /dev/null +++ b/qom/meson.build @@ -0,0 +1,15 @@ +qom_ss = ss.source_set() +qom_ss.add(files( + 'container.c', + 'object.c', + 'object_interfaces.c', + 'qom-qobject.c', +)) + +qom_ss = qom_ss.apply(config_host, strict: false) +libqom = static_library('qom', qom_ss.sources(), + dependencies: [qom_ss.dependencies()], + link_with: [libqemuutil], + name_suffix: 'fa') + +qom = declare_dependency(link_whole: libqom) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9fd6a48..659f087 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -498,7 +498,7 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tests # Deps that are common to various different sets of tests below test-util-obj-y = libqemuutil.a -test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y) +test-qom-obj-y = qom/libqom.fa $(test-util-obj-y) test-qapi-obj-y = tests/test-qapi-types.o \ tests/include/test-qapi-types-sub-module.o \ tests/test-qapi-types-sub-sub-module.o \ From patchwork Thu Dec 12 12:51:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208450 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A6vGaU0a"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZBm5qwvz9s4Y for ; Fri, 13 Dec 2019 00:19:12 +1100 (AEDT) Received: from localhost ([::1]:59158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifON4-0008FQ-9Y for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:19:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33232) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyJ-0003RB-Fd for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyI-0006dm-1M for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:35 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyH-0006bs-QD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:33 -0500 Received: by mail-wr1-x444.google.com with SMTP id q6so2582748wro.9 for ; Thu, 12 Dec 2019 04:53:33 -0800 (PST) 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=B5rFER0Twiseid0Ne5IXMB6XuEkYuqlRZvYswOTpzXY=; b=A6vGaU0a0SxiJDQics8YOWuSvqRdILwyfteVt974BZ/OYwUWZNE/tEyqC7LkZIgkbc RkEW4WLb2BOxZpdJrRS7nPOYAYcodF2IMm/PjKa2dNt3F3oT/fK5iTps/YsG4mvXjJDU t29GeVOWRkU0wH2WilqAorrpVS9z2XL9wyihLymYMzgRgd50jI24CI1a/nnHhuiYPtvT BmzxwnT1KodMLM6QVRl3+hCRNscgCl9+TNhQcotDB8tlwihf/5J68g12K5WQmSUBxuvq DK6rqrUbQir4U0VLCD/b3+NUwtfGkkpSJpt+vptsjeMqxoOrXhwWJ17xX1CNeIST03u0 bvYQ== 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=B5rFER0Twiseid0Ne5IXMB6XuEkYuqlRZvYswOTpzXY=; b=uoFqQqdsk4ZzA3ajNj6KT5dp2SEFUNieOUTie5VYojuDXByDJa9YmU+eUMgKuyhBjK EVsBaPHu0XOyc+iQUqhMIjCtP/bylVrtYv9psYBo003HCBW+UdaWx19eX+OowkQmBhJK XTAfCyjE5oXatThcrE3XTV95x52IAR7TT50GjITV1NrgeOSkECgfu8PYzlxtOUloTo2L DDcRSy+OPcXrMxgxpPrXE2+/0iQ+wAu0axcPjwDwsDFzjgJRcJ/QsghoRSVshbbHJNBj KthFHLK+lzx45LbPCcUteof0QBIs4IdO+8WIKdwReL6K8niFOFC7o2pcS0/lRxWDZReh smww== X-Gm-Message-State: APjAAAVojGkcfOap7kM+Krd66n1iUOv7/Efk5h7wKd2nAWtY+v5+isTc /sSJ5rVGikL8JywhPCt7mqo39+Z/ X-Google-Smtp-Source: APXvYqwVncLt2onOpGUgN1qgMcVDUbLU2HuwhX/FK2B+WIkO1njdtfxPpbsPn8JG7xKgr/igAjij8w== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5995319wrt.208.1576155212589; Thu, 12 Dec 2019 04:53:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 035/132] meson: convert authz directory to Meson Date: Thu, 12 Dec 2019 13:51:19 +0100 Message-Id: <1576155176-2464-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 8 +++----- Makefile.target | 2 +- authz/Makefile.objs | 7 ------- authz/meson.build | 20 ++++++++++++++++++++ meson.build | 5 +++++ 6 files changed, 29 insertions(+), 14 deletions(-) delete mode 100644 authz/Makefile.objs create mode 100644 authz/meson.build diff --git a/Makefile b/Makefile index 9e9b2cf..4da605e 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,6 @@ include $(SRC_PATH)/Makefile.objs endif dummy := $(call unnest-vars,, \ - authz-obj-y \ chardev-obj-y \ block-obj-y \ block-obj-m \ diff --git a/Makefile.objs b/Makefile.objs index b695319..9201eca 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -3,11 +3,6 @@ chardev-obj-y = chardev/ ####################################################################### -# authz-obj-y is code used by both qemu system emulation and qemu-img - -authz-obj-y = authz/ - -####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = nbd/ @@ -26,6 +21,9 @@ crypto-obj-y = crypto/ ####################################################################### # libraries built entirely from meson +authz-obj-y = authz/libauthz.fa +authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam) + qom-obj-y = qom/libqom.fa ####################################################################### diff --git a/Makefile.target b/Makefile.target index df3b14a..d243e52 100644 --- a/Makefile.target +++ b/Makefile.target @@ -177,9 +177,9 @@ all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs dummy := $(call fix-paths,../,, \ + authz-obj-y \ qom-obj-y) dummy := $(call unnest-vars,.., \ - authz-obj-y \ block-obj-y \ block-obj-m \ chardev-obj-y \ diff --git a/authz/Makefile.objs b/authz/Makefile.objs deleted file mode 100644 index ed7b273..0000000 --- a/authz/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -authz-obj-y += base.o -authz-obj-y += simple.o -authz-obj-y += list.o -authz-obj-y += listfile.o -authz-obj-$(CONFIG_AUTH_PAM) += pamacct.o - -pamacct.o-libs = -lpam diff --git a/authz/meson.build b/authz/meson.build new file mode 100644 index 0000000..a3de3d0 --- /dev/null +++ b/authz/meson.build @@ -0,0 +1,20 @@ +authz_ss = 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 = authz_ss.apply(config_host, strict: false) +libauthz = static_library('authz', authz_ss.sources(), + dependencies: [qom, authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz = declare_dependency(link_whole: libauthz) + +softmmu_ss.add(authz) diff --git a/meson.build b/meson.build index 36094fe..9ae2699 100644 --- a/meson.build +++ b/meson.build @@ -66,6 +66,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(), link_args: config_host['PIXMAN_LIBS'].split()) +pam = declare_dependency() +if 'CONFIG_AUTH_PAM' in config_host + pam = cc.find_library('pam') +endif libattr = declare_dependency() if 'CONFIG_ATTR' in config_host libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split()) @@ -272,6 +276,7 @@ qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) subdir('qom') +subdir('authz') subdir('fsdev') # Other build targets From patchwork Thu Dec 12 12:51:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W+xCY67z"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ4326rVz9sPK for ; Fri, 13 Dec 2019 00:13:23 +1100 (AEDT) Received: from localhost ([::1]:59086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOHQ-0000Xi-LU for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:13:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33409) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyK-0003SX-Aq for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyI-0006fl-Ui for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:36 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46471) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyI-0006dx-ML for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:34 -0500 Received: by mail-wr1-x430.google.com with SMTP id z7so2568152wrl.13 for ; Thu, 12 Dec 2019 04:53:34 -0800 (PST) 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=A5otGqkyi8y7l7sbXLP+BCvpARxLg62OQnpw8ufGbb0=; b=W+xCY67zPwj7iA723++cTKN84pUSMVt1UXR76AyghXlQya3c6Om7B5JnldmNFjRh+7 QIM2UVoeYkOHSJhWmbY5wwkj9Jy+ByufbnTkEkNvjM35N7PTyQQQczv57tfZScJT1nLu BACoHAAcZ/DsiuZnNRV6mBnxZ3SG4IMPzGUemKaUacK1qcsalftBYXfxiCKE9TPJqtdi fEuG2BB5bfo0PIhrA5dq07ClaKdiYpxIicsfveUCUiZFDjYiSTJOUT9qwcKb5P+kkNRX mpkbdUmfWlMbO9WG5Lq2DZz1I9pE2YAztHMNBe7teIgpP42wwWtTDllUeP/Z+VMwwIxa AzMw== 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=A5otGqkyi8y7l7sbXLP+BCvpARxLg62OQnpw8ufGbb0=; b=XgtRCuO8mAeISKc94ijADa0pCjhb67CAGVsDDSa9omagFNoaFWj3kbpCbQuHDOfGKf GPapH86XsbdVEdJ5wvTIcLfG+0uaC8muJ082XDL84JUDj5ktjORudiS9JhmconRThlRm 6M213LbfCFqJXVR/chCNHTFnh6IlVHqGo5QYFtvQRVIqWdJV13rpdLh/Ln6xpkOp1gOi FojjT4tW9+VFDz87KFRiGpecNHLykBAbEoLhHPpj96CYCtGk+8Es7mfFikoRlxfhcxHu 0Tl7dl1/d9qU84hAXBu4R1fnjItvlK71CXhMX6rSd+UZJREF//DWhLMkm1K/xixN2yPn zuxg== X-Gm-Message-State: APjAAAUrWHnu8rf0CmQaENPIqW1pgdKQRlvoekNA5hFd/jhCM8JHG/Mw zHS72qWf7hfx28mp52e0qPU9BhIr X-Google-Smtp-Source: APXvYqw6PA5Vsv6HA7wIjLR3QgIqDq1KSM9+nPX3/ghJ3j0JrNsys1wGyJATimKqpekhRZQ8OXZCvg== X-Received: by 2002:a5d:494f:: with SMTP id r15mr6441261wrs.143.1576155213411; Thu, 12 Dec 2019 04:53:33 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 036/132] meson: convert crypto directory to Meson Date: Thu, 12 Dec 2019 13:51:20 +0100 Message-Id: <1576155176-2464-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 7 ++----- Makefile.target | 2 +- crypto/Makefile.objs | 34 ---------------------------------- crypto/meson.build | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ meson.build | 4 ++-- qom/meson.build | 2 +- 7 files changed, 55 insertions(+), 44 deletions(-) delete mode 100644 crypto/Makefile.objs diff --git a/Makefile b/Makefile index 4da605e..d070335 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,6 @@ dummy := $(call unnest-vars,, \ chardev-obj-y \ block-obj-y \ block-obj-m \ - crypto-obj-y \ io-obj-y \ common-obj-y \ common-obj-m) diff --git a/Makefile.objs b/Makefile.objs index 9201eca..a5dd228 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -14,16 +14,13 @@ block-obj-$(CONFIG_REPLICATION) += replication.o block-obj-m = block/ ####################################################################### -# crypto-obj-y is code used by both qemu system emulation and qemu-img - -crypto-obj-y = crypto/ - -####################################################################### # libraries built entirely from meson authz-obj-y = authz/libauthz.fa authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam) +crypto-obj-y = crypto/libcrypto.fa + qom-obj-y = qom/libqom.fa ####################################################################### diff --git a/Makefile.target b/Makefile.target index d243e52..d8a6491 100644 --- a/Makefile.target +++ b/Makefile.target @@ -178,12 +178,12 @@ all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs dummy := $(call fix-paths,../,, \ authz-obj-y \ + crypto-obj-y \ qom-obj-y) dummy := $(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 3587f41..0000000 --- a/crypto/Makefile.objs +++ /dev/null @@ -1,34 +0,0 @@ -crypto-obj-y = init.o -crypto-obj-y += hash.o -crypto-obj-$(CONFIG_NETTLE) += hash-nettle.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += hash-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += hash-glib.o -crypto-obj-y += hmac.o -crypto-obj-$(CONFIG_NETTLE) += hmac-nettle.o -crypto-obj-$(CONFIG_GCRYPT_HMAC) += hmac-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT_HMAC),n,y)) += hmac-glib.o -crypto-obj-y += aes.o -crypto-obj-y += desrfb.o -crypto-obj-y += cipher.o -crypto-obj-$(CONFIG_AF_ALG) += afalg.o -crypto-obj-$(CONFIG_AF_ALG) += cipher-afalg.o -crypto-obj-$(CONFIG_AF_ALG) += hash-afalg.o -crypto-obj-y += tlscreds.o -crypto-obj-y += tlscredsanon.o -crypto-obj-y += tlscredspsk.o -crypto-obj-y += tlscredsx509.o -crypto-obj-y += tlssession.o -crypto-obj-y += secret.o -crypto-obj-y += pbkdf.o -crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += pbkdf-stub.o -crypto-obj-y += ivgen.o -crypto-obj-y += ivgen-essiv.o -crypto-obj-y += ivgen-plain.o -crypto-obj-y += ivgen-plain64.o -crypto-obj-y += afsplit.o -crypto-obj-y += xts.o -crypto-obj-y += block.o -crypto-obj-y += block-qcow.o -crypto-obj-y += block-luks.o diff --git a/crypto/meson.build b/crypto/meson.build index 7250ffc..1310195 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,3 +1,52 @@ +crypto_ss = 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.c', + 'tlscreds.c', + 'tlscredsanon.c', + 'tlscredspsk.c', + 'tlscredsx509.c', + 'tlssession.c', + 'xts.c', +)) +crypto_ss.add(authz) + +if 'CONFIG_GCRYPT' in config_host + wo_nettle = files('hash-gcrypt.c', 'pbkdf-gcrypt.c') +else + wo_nettle = files('hash-glib.c', 'pbkdf-stub.c') +endif +if 'CONFIG_GCRYPT_HMAC' not in config_host + wo_nettle += files('hmac-glib.c') +endif +crypto_ss.add(when: [nettle, 'CONFIG_NETTLE'], + if_true: files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettle.c'), + if_false: wo_nettle) + +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-afalg.c', 'hash-afalg.c')) + +crypto_ss = crypto_ss.apply(config_host, strict: false) +libcrypto = static_library('crypto', crypto_ss.sources(), + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto = declare_dependency(link_whole: libcrypto) + 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 9ae2699..e8bd526 100644 --- a/meson.build +++ b/meson.build @@ -260,6 +260,8 @@ subdir('qobject') subdir('stubs') subdir('trace') subdir('util') +subdir('qom') +subdir('authz') subdir('crypto') subdir('ui') @@ -275,8 +277,6 @@ libqemuutil = static_library('qemuutil', qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) -subdir('qom') -subdir('authz') subdir('fsdev') # Other build targets diff --git a/qom/meson.build b/qom/meson.build index 3c41ed3..4af044d 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -1,4 +1,5 @@ qom_ss = 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 = qom_ss.apply(config_host, strict: false) libqom = static_library('qom', qom_ss.sources(), dependencies: [qom_ss.dependencies()], - link_with: [libqemuutil], name_suffix: 'fa') qom = declare_dependency(link_whole: libqom) From patchwork Thu Dec 12 12:51:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D1lVWJW1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZFg74cQz9s4Y for ; Fri, 13 Dec 2019 00:21:39 +1100 (AEDT) Received: from localhost ([::1]:59194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOPQ-0003FW-PM for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:21:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyL-0003U0-By for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyJ-0006hj-T5 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:37 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyJ-0006g3-L3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:35 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t2so2644748wrr.1 for ; Thu, 12 Dec 2019 04:53:35 -0800 (PST) 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=jNzhakuXNcL2ED9Y1t+KNZMGJfF6taioPx2OOiXLQc8=; b=D1lVWJW1SGxPX70tQ0TQa87CK++QYLMw3WNPF2c3U8aM8NFOD/VZyoqE3Ymy2zkgig BQ6NgOoEsfJ+YDWSN6JA9K6oK9wZ5nwT4pn7+akFf4RKYL1ENtcJROPnCmoOOoM6NwDw /BE6VlvPCXrNz1X+c2BC3xAuBKZsGciqErAT1+f24IQKErzDipdwt4bw0uJxoKP9+7B9 qacRzPrPY8OxNB2BWmCFCAL/RCayG8YV9ugSqRgvQJ5iF85hby29pIGmB52hxd0Pynr7 06b0n/t4lWRGCNFpH4E0NMp159Tl/Z/Mq4ybnuEl+UgefqnaMbMtV+58/soTKvKsSBh2 Lt9Q== 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=jNzhakuXNcL2ED9Y1t+KNZMGJfF6taioPx2OOiXLQc8=; b=BFIJZMV1qbSiUYMMGCGB2EEh2CK7Ax2upYs0JVaJisAUo4ukXWjMPRTb/MDFwB0wjC xtkmbV+bT4v1S1LabEAyO/o602O3xVUBTGu06JXcusujTXOUPCYJ5rPe6NSObfnku7L+ If8i1fdG4P2FxA9p6i0RqUVd7sJH0lDFwx+mnCYz7pArDa+v/VzfuaeJGwlP3Qyv3Cz9 1AEAKIteIqJJGhU1lC4rZ3Fk2ubwfCmHszoynrXGn36ttqdSfyhVhHVggb4ISz20zZJt 2icoUKnUHtNamQlUyviNmg/9fFeHdgscgHbUFzNksrfxIOD6Gi3ZONit4R/+6zktuohu jT5Q== X-Gm-Message-State: APjAAAWiK16TZ5w8e+B9EUVbzvpCtaivod3C4Hi/2Hck5vXk2MBqq3/W Ctus5dNfrL9fU8Nuucg8nbGU+PUK X-Google-Smtp-Source: APXvYqxa/czJrp+Ssu02hNnEJToTz76wK1OlZo+YpGb4xQtFBQ6FQxCT0qcbid/+89vSxxgFeLXYLg== X-Received: by 2002:adf:ea0f:: with SMTP id q15mr6018155wrm.324.1576155214463; Thu, 12 Dec 2019 04:53:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 037/132] meson: convert io directory to Meson Date: Thu, 12 Dec 2019 13:51:21 +0100 Message-Id: <1576155176-2464-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 7 ++----- Makefile.target | 2 +- io/Makefile.objs | 12 ------------ io/meson.build | 25 +++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 io/Makefile.objs create mode 100644 io/meson.build diff --git a/Makefile b/Makefile index d070335..77ac1ea 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,6 @@ dummy := $(call unnest-vars,, \ chardev-obj-y \ block-obj-y \ block-obj-m \ - io-obj-y \ common-obj-y \ common-obj-m) diff --git a/Makefile.objs b/Makefile.objs index a5dd228..75d4355c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -21,12 +21,9 @@ authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam) crypto-obj-y = crypto/libcrypto.fa -qom-obj-y = qom/libqom.fa - -####################################################################### -# io-obj-y is code used by both qemu system emulation and qemu-img +io-obj-y = io/libio.fa -io-obj-y = io/ +qom-obj-y = qom/libqom.fa ###################################################################### # Target independent part of system emulation. The long term path is to diff --git a/Makefile.target b/Makefile.target index d8a6491..f912ba0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -179,12 +179,12 @@ include $(SRC_PATH)/Makefile.objs dummy := $(call fix-paths,../,, \ authz-obj-y \ crypto-obj-y \ + io-obj-y \ qom-obj-y) dummy := $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ chardev-obj-y \ - io-obj-y \ common-obj-y \ common-obj-m) all-obj-y += $(common-obj-y) diff --git a/io/Makefile.objs b/io/Makefile.objs deleted file mode 100644 index 9a20fce..0000000 --- a/io/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -io-obj-y = channel.o -io-obj-y += channel-buffer.o -io-obj-y += channel-command.o -io-obj-y += channel-file.o -io-obj-y += channel-socket.o -io-obj-y += channel-tls.o -io-obj-y += channel-watch.o -io-obj-y += channel-websock.o -io-obj-y += channel-util.o -io-obj-y += dns-resolver.o -io-obj-y += net-listener.o -io-obj-y += task.o diff --git a/io/meson.build b/io/meson.build new file mode 100644 index 0000000..5737709 --- /dev/null +++ b/io/meson.build @@ -0,0 +1,25 @@ +io_ss = 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 = io_ss.apply(config_host, strict: false) +libio = static_library('io', io_ss.sources(), + dependencies: [crypto, qom, io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io = declare_dependency(link_whole: libio) diff --git a/meson.build b/meson.build index e8bd526..bdc2f3e 100644 --- a/meson.build +++ b/meson.build @@ -277,6 +277,7 @@ libqemuutil = static_library('qemuutil', qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) +subdir('io') subdir('fsdev') # Other build targets From patchwork Thu Dec 12 12:51:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oYZ3/z+i"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZKD1s58z9sPc for ; Fri, 13 Dec 2019 00:24:48 +1100 (AEDT) Received: from localhost ([::1]:59242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOST-00081V-E1 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:24:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34085) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyN-0003Y9-TF for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyL-0006kU-AL for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:39 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:42365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyK-0006ih-WC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:37 -0500 Received: by mail-wr1-x42f.google.com with SMTP id q6so2582936wro.9 for ; Thu, 12 Dec 2019 04:53:36 -0800 (PST) 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=pa3Lkx+CsIop0JEWRcLrRpLqD2Xhtkc5mBSulFY1kvo=; b=oYZ3/z+igD9irISKu4jBE0fxAVORV7BhmjL6j4YGV05oipVT5DAyKsVQMXWUAfIldW 0/k1ra99tkUkMrmvt3f+kDrOn1QOlhwgN6l5Ku3F4OvmbkzVgBuJXNyHRyRURHepJb0/ loe9xQu5rAxC/cWa7E5X5+cEdHBIeKbEjpmAkD+OeQqhfmzPYcN32ipw6ohT07ezcKzw btVahJgFg3LqZSfJgGb0hrFCap5KWiiECrJWuGmj0G77zst5f5KtmIkuKunDRPbFPZ3A dvLf1tHhKt3acDqAADdD3aOMJ8oMIupkPz+ItPhs8baTiIzSbY+uT2qi6f1SMYZnh9VK +RhA== 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=pa3Lkx+CsIop0JEWRcLrRpLqD2Xhtkc5mBSulFY1kvo=; b=HFY2iqR340MxXWK/oLG0IHCYmt+vIH5debhi/6IuFakCOdE91cLsSqG8/i+3JivdYh rpRhZruayAxoFNmVDNADe4UvHKP8zisffJRtZbeMp8tTfidp2RkLEbGzUk6K+mUfRD3z bP/zXI8NpAs2jyZXPsraM50FSAUZ6oAccavGAREqRQ/nZyeso2DmXsVXybLM6Sq4lkqc JeRgEjDwwYDxHlatyFc73cwoCLW/Ju3r/8+oP1xTZ/YqGIJgycZOpT2oyTd5f9FQOzJH K8YP+XOsDGzEhEAeqWr0Bjxd9Tz5lqwkX3RQi4OIGh+yE/+xUKh0dxnT9qFVNeMtbCnO s4SA== X-Gm-Message-State: APjAAAUSeG2QkO/6ZFLd9e742b3ITuBzAnIG3wYEOREEFrPoWTj6fHYo cge45oaEDwVf5jNsAkZd7opodECo X-Google-Smtp-Source: APXvYqyKCsvOP8exqX+8gFU44lQ3cBFs7d8yFYi2CqOibkftrtis5nRR9vq8CUJoMSEwjJz/srT/0g== X-Received: by 2002:adf:fe0e:: with SMTP id n14mr6189962wrr.116.1576155215326; Thu, 12 Dec 2019 04:53:35 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 038/132] meson: infrastructure for building emulators Date: Thu, 12 Dec 2019 13:51:22 +0100 Message-Id: <1576155176-2464-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- Makefile | 72 +++----------------- Makefile.target | 19 +++--- configure | 6 -- hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 2 +- include/qemu/osdep.h | 2 +- meson.build | 182 +++++++++++++++++++++++++++++++++++++++++++++++++- rules.mak | 8 --- scripts/create_config | 2 + scripts/grepy.sh | 3 + scripts/minikconf.py | 1 + 11 files changed, 207 insertions(+), 92 deletions(-) create mode 100755 scripts/grepy.sh mode change 100644 => 100755 scripts/minikconf.py diff --git a/Makefile b/Makefile index 77ac1ea..bae96ec 100644 --- a/Makefile +++ b/Makefile @@ -134,63 +134,6 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(filter %-softmmu, $(TARGET_DIRS))) -SUBDIR_DEVICES_MAK_DEP=$(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|^\([^=]*\)=\(.*\)$$|\1:=$$(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 = \ - $(CONFIG_MINIKCONF_MODE) \ - $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ - CONFIG_KVM=$(CONFIG_KVM) \ - CONFIG_SPICE=$(CONFIG_SPICE) \ - CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \ - CONFIG_TPM=$(CONFIG_TPM) \ - CONFIG_XEN=$(CONFIG_XEN) \ - CONFIG_OPENGL=$(CONFIG_OPENGL) \ - CONFIG_X11=$(CONFIG_X11) \ - CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \ - CONFIG_VIRTFS=$(CONFIG_VIRTFS) \ - CONFIG_LINUX=$(CONFIG_LINUX) \ - CONFIG_PVRDMA=$(CONFIG_PVRDMA) - -MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig -MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ - -$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(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) ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs @@ -207,10 +150,9 @@ include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules -config-host.h: config-host.h-timestamp -config-host.h-timestamp: config-host.mak - TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) +SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) $(SOFTMMU_ALL_RULES): $(authz-obj-y) @@ -221,10 +163,15 @@ $(SOFTMMU_ALL_RULES): $(io-obj-y) $(SOFTMMU_ALL_RULES): $(qom-obj-y) $(SOFTMMU_ALL_RULES): config-all-devices.mak +# meson: this is sub-optimal but going away after conversion +TARGET_DEPS = $(patsubst %,%-config-target.h, $(TARGET_DIRS)) +TARGET_DEPS += $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TARGET_DIRS))) +TARGET_DEPS += $(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="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt @@ -356,8 +303,7 @@ endef distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi 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-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps diff --git a/Makefile.target b/Makefile.target index f912ba0..74e8295 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,8 +6,10 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak +FULL_TARGET_NAME=$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-user) + ifdef CONFIG_SOFTMMU -include config-devices.mak +include ../$(FULL_TARGET_NAME)-config-devices.mak endif $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) @@ -18,6 +20,9 @@ QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_ QEMU_CFLAGS+=-iquote $(SRC_PATH)/include +QEMU_CFLAGS += -DCONFIG_TARGET=\"../$(FULL_TARGET_NAME)-config-target.h\" +QEMU_CFLAGS += -DCONFIG_DEVICES=\"../$(FULL_TARGET_NAME)-config-devices.h\" + ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=qemu-$(TARGET_NAME) @@ -36,15 +41,10 @@ QEMU_PROG_BUILD = $(QEMU_PROG) endif endif +LIBQEMU = ../libqemu-$(FULL_TARGET_NAME).fa PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= -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 @@ -103,6 +103,7 @@ all: $(PROGS) stap # Dummy command so that make thinks it has done something @true +obj-y += $(LIBQEMU) obj-y += trace/ ######################################################### @@ -168,7 +169,6 @@ obj-y += hw/$(TARGET_BASE_ARCH)/ endif generated-files-y += hmp-commands.h hmp-commands-info.h -generated-files-y += config-devices.h endif # CONFIG_SOFTMMU @@ -195,7 +195,7 @@ all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) ifdef CONFIG_SOFTMMU -$(QEMU_PROG_BUILD): config-devices.mak +$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak endif COMMON_LDADDS = ../libqemuutil.a @@ -231,5 +231,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp" endif -generated-files-y += config-target.h Makefile: $(generated-files-y) diff --git a/configure b/configure index ca91a76..d65b79e 100755 --- a/configure +++ b/configure @@ -7582,18 +7582,12 @@ fi if supported_xen_target $target; then echo "CONFIG_XEN=y" >> $config_target_mak - echo "$target/config-devices.mak: CONFIG_XEN=y" >> $config_host_mak if test "$xen_pci_passthrough" = yes; then echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" fi -else - echo "$target/config-devices.mak: CONFIG_XEN=n" >> $config_host_mak fi if supported_kvm_target $target; then echo "CONFIG_KVM=y" >> $config_target_mak - echo "$target/config-devices.mak: CONFIG_KVM=y" >> $config_host_mak -else - echo "$target/config-devices.mak: CONFIG_KVM=n" >> $config_host_mak fi if supported_hax_target $target; then echo "CONFIG_HAX=y" >> $config_target_mak diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c14ed86..87aef3c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -86,7 +86,7 @@ #include "hw/mem/memory-device.h" #include "sysemu/replay.h" #include "qapi/qmp/qerror.h" -#include "config-devices.h" +#include CONFIG_DEVICES /* debug PC/ISA interrupts */ //#define DEBUG_IRQ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2362675..46cfb16 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "config-devices.h" +#include CONFIG_DEVICES #include "qemu/units.h" #include "hw/loader.h" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index af2b91f..280fd40 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -29,7 +29,7 @@ #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 bdc2f3e..5949e6d 100644 --- a/meson.build +++ b/meson.build @@ -4,6 +4,7 @@ cc = meson.get_compiler('c') kconfig = import('unstable-kconfig') ss = import('sourceset') config_host = kconfig.load(meson.current_build_dir() / 'config-host.mak') +config_all_disas = kconfig.load(meson.current_build_dir() / 'config-all-disas.mak') add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) @@ -105,16 +106,96 @@ if 'CONFIG_LIBUDEV' in config_host libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split()) endif +create_config = find_program('scripts/create_config') +minikconf = find_program('scripts/minikconf.py') target_dirs = config_host['TARGET_DIRS'].split() have_user = false have_system = false +target_devices_kconfs = [] +target_devices_h = {} +target_config = {} +kconfig_external_symbols = [ + '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 = have_user or target.endswith('-user') - have_system = have_system or target.endswith('-softmmu') + config_target = kconfig.load(meson.current_build_dir() / target / 'config-target.mak') + config_host + + if target.endswith('-softmmu') + have_system = true + + base_kconfig = [] + foreach sym : kconfig_external_symbols + if sym in config_target + base_kconfig += '@0@=y'.format(sym) + endif + endforeach + + config_devices_mak = target + '-config-devices.mak' + config_devices_mak = configure_file( + input: ['default-configs' / target + '.mak', 'Kconfig.host', 'hw/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 = custom_target( + target + '-config-devices.h', + input: config_devices_mak, + output: target + '-config-devices.h', + capture: true, + command: [create_config, '@INPUT@']) + target_devices_kconfs += config_devices_mak + target_devices_h += {target: config_devices_h} + config_target += kconfig.load(config_devices_mak) + endif + target_config += {target: config_target} endforeach have_tools = 'CONFIG_TOOLS' in config_host have_block = have_system or have_tools +grepy = 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. + +config_all = {} +if have_system + config_all_devices_inputs = [] + config_all_devices = configure_file( + output: 'config-all-devices.mak', + input: target_devices_kconfs, + capture: true, + command: [grepy, '@INPUT@'], + ) + config_all += kconfig.load(config_all_devices) +endif +config_all += config_host +config_all += config_all_disas +config_all += { + 'CONFIG_XEN': config_host.has_key('CONFIG_XEN_BACKEND'), + 'CONFIG_SOFTMMU': have_system, + 'CONFIG_USER_ONLY': have_user, + 'CONFIG_ALL': true, +} + # Generators hxtool = find_program('scripts/hxtool') @@ -128,6 +209,12 @@ qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py', meson.source_root() / 'scripts/qapi/doc.py', meson.source_root() / 'scripts/qapi-gen.py' ] +config_host_h = custom_target('config-host.h', + input: meson.current_build_dir() / 'config-host.mak', + output: 'config-host.h', + capture: true, + command: [create_config, '@INPUT@']) + hxdep = [] hx_headers = [ ['qemu-options.hx', 'qemu-options.def'], @@ -167,6 +254,16 @@ endforeach util_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() +common_ss = ss.source_set() +softmmu_ss = ss.source_set() +user_ss = ss.source_set() +bsd_user_ss = ss.source_set() +linux_user_ss = ss.source_set() +specific_ss = ss.source_set() + +hw_arch = {} +target_arch = {} +target_softmmu_arch = {} # TODO: add each directory to the subdirs from its own meson.build, once # we have those @@ -254,7 +351,7 @@ trace_events_subdirs += [ 'util', ] -genh = [] +genh = [config_host_h] subdir('qapi') subdir('qobject') subdir('stubs') @@ -280,6 +377,87 @@ qemuutil = declare_dependency(link_with: libqemuutil, subdir('io') subdir('fsdev') +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 = common_ss.apply(config_all, strict: false) +common_all = static_library('common', + sources: common_all.sources(), + dependencies: common_all.dependencies(), + name_suffix: 'fa') + +foreach target : target_dirs + config_target = target_config[target] + target_name = config_target['TARGET_NAME'] + arch = config_target['TARGET_BASE_ARCH'] + arch_srcs = [] + arch_deps = [] + + target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] + if host_machine.system() == 'linux' + target_inc += include_directories('linux-headers') + endif + if target.endswith('-softmmu') + qemu_target_name = 'qemu-system-' + target_name + target_type='system' + t = target_softmmu_arch[arch].apply(config_target, strict: false) + arch_srcs += t.sources() + arch_deps += t.dependencies() + + if target_name == 'sparc64' + hw = hw_arch['sparc64'].apply(config_target, strict: false) + else + hw = hw_arch[arch].apply(config_target, strict: false) + endif + arch_srcs += hw.sources() + arch_srcs += target_devices_h[target] + arch_deps += hw.dependencies() + else + target_type='user' + qemu_target_name = 'qemu-' + target_name + if 'CONFIG_LINUX_USER' in config_target + base_dir = 'linux-user' + else + base_dir = 'bsd-user' + endif + target_inc += include_directories( + base_dir, + base_dir / config_target['TARGET_ABI_DIR'], + ) + if 'CONFIG_LINUX_USER' in config_target + dir = base_dir / config_target['TARGET_ABI_DIR'] + target_inc += include_directories(base_dir / 'host' / config_target['ARCH']) + arch_srcs += files(dir / 'signal.c', dir / 'cpu_loop.c') + endif + endif + + t = target_arch[arch].apply(config_target, strict: false) + arch_srcs += t.sources() + arch_deps += t.dependencies() + + target_common = common_ss.apply(config_target, strict: false) + objects = common_all.extract_objects(target_common.sources()) + deps = target_common.dependencies() + + # TODO: Change to generator once obj-y goes away + config_target_h = 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 = specific_ss.apply(config_target, strict: false) + static_library('qemu-' + target, + sources: target_specific.sources() + arch_srcs + [config_target_h], + dependencies: target_specific.dependencies() + arch_deps + deps, + objects: objects, + include_directories: target_inc, + c_args: ['-DNEED_CPU_H', + '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), + '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(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 a10a972..9dd3b7e 100644 --- a/rules.mak +++ b/rules.mak @@ -203,14 +203,6 @@ notempty = $(if $1,y,n) # Generate files with tracetool TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py -# Generate timestamp files for .h include files - -config-%.h: config-%.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ - -config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config - $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@,"GEN","$(TARGET_DIR)config-$*.h") - .PHONY: clean-timestamp clean-timestamp: rm -f *.timestamp diff --git a/scripts/create_config b/scripts/create_config index 6d8f08b..bc82661 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -1,5 +1,7 @@ #!/bin/sh +test $# -gt 0 && exec < $1 + echo "/* Automatically generated by create_config - do not modify */" while read line; do diff --git a/scripts/grepy.sh b/scripts/grepy.sh new file mode 100755 index 0000000..33c74c6 --- /dev/null +++ b/scripts/grepy.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +grep --no-filename '=y$' "$@" | sort -u diff --git a/scripts/minikconf.py b/scripts/minikconf.py old mode 100644 new mode 100755 index febd9a4..e4cbd57 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # # Mini-Kconfig parser # From patchwork Thu Dec 12 12:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N1IIyDpg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZGZ3K8dz9s4Y for ; Fri, 13 Dec 2019 00:22:30 +1100 (AEDT) Received: from localhost ([::1]:59210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOQF-0004ZZ-PK for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyN-0003Xx-PE for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyM-0006nR-Hm for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:39 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyM-0006lR-78 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:38 -0500 Received: by mail-wr1-x42f.google.com with SMTP id c9so2602770wrw.8 for ; Thu, 12 Dec 2019 04:53:38 -0800 (PST) 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=a83lx+Izf0EpmHILVXQryQUbXeFpne4U3rXNLiSgql8=; b=N1IIyDpgZ8J1ZZXRVeDpjQQdcdXTRwZc18708EC8wptmHb+tGV69ghepCt45v8Ig7b zYB2M6WV44TiPnuEhVsFH9rXWtqvwK9sGwz4Ra3ZdhJgxUSjRE+wxCyJkwMSVigTPLK0 c4S8PS9SkgT2ZaNoexIae1PeWNdyaIuP2e8mGlo+tQEWhRTtRm2+Z7biHR/4xv5u7nhP Eq2XYhE6Cf8ne8tk0CoZD6lBIaIwPCFq6RuQt4bt4vKBc3zXTLImvs9qXaXSXu4EJKOL FVwJmAsEZCbhHIFKRAhoTPOWcPKF4GjuZryrP+9SbFdWi7FKGcjhTMpHi4wmvV4+O+Ls OgKQ== 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=a83lx+Izf0EpmHILVXQryQUbXeFpne4U3rXNLiSgql8=; b=S0GZLQLdZvHxg8jV/YmTZVFLwMmEi8prd6FW9QSiL/RWLJsNSkBTJ+84LVSKUk9nzH 6I0pK50JbRggar+tANVfImeK2iGrhDUoPZmMpAjKLs4AeDbqngKXMOyFIwKY4V5TOdBH 2dZiUmISptwyn64lY1H1X7piMUEF6ckStIQDUYA1fIfhDifCxg69rWOSK6xiA8MAZ7j6 VKeCsoZzYNyrsJTqTqAFzpPTwaYxgpSJNor2dKs/en+uBaOj6hpvSjsPJu/7HQQto7hY wpDIEIlmdV9hrQYcdIGsne4SjnuXz66soh1k7/uHF897dhBaik8Zovpndw9imagTA9dG 2XuQ== X-Gm-Message-State: APjAAAUvi14IfGUSMe8wqrschpDya7El9B9XsT8qcup9TvS27+lpaQWD WrBi2i7jbl5AQhM7pQE0XtYWr+6g X-Google-Smtp-Source: APXvYqwGaox0HWrQAI1DnqFmNc9810ximwx8jjKRKlY/MYdhs1qltpQqZ2u7Bw9rWmmvv4eLOHYFfA== X-Received: by 2002:a5d:4b8f:: with SMTP id b15mr6561594wrt.100.1576155217009; Thu, 12 Dec 2019 04:53:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 039/132] meson: add macos dependencies Date: Thu, 12 Dec 2019 13:51:23 +0100 Message-Id: <1576155176-2464-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André 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é Lureau --- meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5949e6d..8d5b28b 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ config_all_disas = kconfig.load(meson.current_build_dir() / 'config-all-disas.ma add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CFLAGS'].split(), - language: 'c') + language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), language: 'cpp') add_project_link_arguments(config_host['LDFLAGS'].split(), @@ -17,7 +17,7 @@ add_project_link_arguments(config_host['LDFLAGS'].split(), add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), language: ['c', 'cpp', 'objc']) add_project_arguments(config_host['QEMU_INCLUDES'].split(), - language: ['c', 'cpp']) + language: ['c', 'cpp', 'objc']) qemu_version_cmd = [find_program('scripts/qemu-version.sh'), meson.current_source_dir(), @@ -37,6 +37,10 @@ m = cc.find_library('m', required: false) util = cc.find_library('util', required: false) socket = [] version_res = [] +coref = [] +iokit = [] +cocoa = [] +hvf = [] if host_machine.system() == 'windows' socket = cc.find_library('ws2_32') @@ -44,6 +48,12 @@ if host_machine.system() == 'windows' version_res = win.compile_resources('version.rc', depend_files: files('pc-bios/qemu-nsis.ico'), include_directories: include_directories('.')) +elif host_machine.system() == 'darwin' + add_languages('objc', required: false) + coref = dependency('appleframeworks', modules: 'CoreFoundation') + iokit = dependency('appleframeworks', modules: 'IOKit') + cocoa = dependency('appleframeworks', modules: 'Cocoa') + hvf = dependency('appleframeworks', modules: 'Hypervisor') endif glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(), link_args: config_host['GLIB_LIBS'].split()) From patchwork Thu Dec 12 12:51:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qzBJGAnb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZJ81945z9s4Y for ; Fri, 13 Dec 2019 00:23:52 +1100 (AEDT) Received: from localhost ([::1]:59232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifORZ-0006mT-Bn for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:23:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34389) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyQ-0003bO-1O for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyN-0006pi-QF for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:41 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyN-0006o3-Ht for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:39 -0500 Received: by mail-wm1-x335.google.com with SMTP id b11so2236289wmj.4 for ; Thu, 12 Dec 2019 04:53:39 -0800 (PST) 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=4HAQ8wWS3VYmUYf9FPMsr6xrEJyr4/7OCIkvd9SDiw4=; b=qzBJGAnbksEuJi2L9k503S5RuesS2h6MMvBaqg+ssV+PrSfOSTlI13tsirpT1UKI7a s8/caukV1lfE8tkRg2JHkgSGLvB206rqpL7yKSlxJX8TjsgzDsvxQXPRfm8wI2HfBNY/ 0uf6gNzlIj2G5AhjJOjQgQb3KX2Xc/AB9+wXBqMdFs5FpFpJUmNVk21QcyRi6R4vIbn1 2cdrXfjgcxN1+5inLlKhsKHtdzKeZWo8y60lqoXgjEgbjQxsptHxCP/8dC8WX9uY2Rl9 hwMpOcKGVlMaJIDHlxk8DNfJ7tOqwgBCXeMgIjK+6xaD1zvvOGXquvngdJ9APSaedQcv jjDg== 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=4HAQ8wWS3VYmUYf9FPMsr6xrEJyr4/7OCIkvd9SDiw4=; b=IIDIhA+GQhEm17LoKxoZLIsbT7Hg7gDdeBPA37TfUX1cpk+wTiUe7XV8+zqxs7DUw8 w7VVGj6PcDgVLIEX5Bq9rCN50OwEoYSk57OCCTsKv7wWaU79FY4c1dy8y4ojG/FRBRGC RNDrgpzQAMHyAxTHcVy0UnF2srODXnOuvvOHbFRaHCIiiEdwqfsMZzTDsS/2bXiWsgRp JS/iIR9I5nQTryEDiWOT/Did+JdriRfcfrtvSH06yB4Koe8ZJAXUts0Gdhhzs3r5FKNk k0rCPEw8Qe4FKI7s1M+hZuKPkKqcT6qTJMLCHkRqnNDs6hbbuGcaDRsy/DnhWrQrRi9M VGGQ== X-Gm-Message-State: APjAAAVB55D1uQ700TNC2HabyAm3ZJ0GQM4iHirzENce8ZxzvrJzk6M+ rRXlws6Q4pOCxuqyuWajZ9usC/dU X-Google-Smtp-Source: APXvYqyTfnmYs6qD70TI1YSWxnoMHJzmrrgReLBoZ343IDfUxR0t7tDZ9+D4cZvYQfr5cpl05RxbAA== X-Received: by 2002:a7b:c935:: with SMTP id h21mr6275648wml.173.1576155218044; Thu, 12 Dec 2019 04:53:38 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 040/132] meson: add modules infrastructure Date: Thu, 12 Dec 2019 13:51:24 +0100 Message-Id: <1576155176-2464-41-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 10 +--------- Makefile.target | 6 ++++++ meson.build | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ rules.mak | 10 +++++----- scripts/undefsym.sh | 20 ++++++++++++++++++++ 5 files changed, 85 insertions(+), 14 deletions(-) create mode 100755 scripts/undefsym.sh diff --git a/Makefile b/Makefile index bae96ec..c8c402a 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ subdir-capstone: capstone/all subdir-slirp: slirp/all $(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) + $(qom-obj-y) block.syms qemu.syms ROM_DIRS = $(addprefix pc-bios/, $(ROMS)) ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) @@ -431,14 +431,6 @@ install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstated ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif -ifneq ($(CONFIG_MODULES),) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" - for s in $(modules-m:.mo=$(DSOSUF)); do \ - t="$(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 74e8295..a0eb332 100644 --- a/Makefile.target +++ b/Makefile.target @@ -161,6 +161,12 @@ obj-y += memory_mapping.o obj-y += migration/ram.o LIBS := $(libs_softmmu) $(LIBS) +# Temporary until emulators are linked by Meson +LIBS := $(LIBS) @../block.syms @../qemu.syms +ifneq ($(CONFIG_MODULES),y) +LIBS := $(LIBS) +endif + # Hardware support ifeq ($(TARGET_NAME), sparc64) obj-y += hw/sparc64/ diff --git a/meson.build b/meson.build index 8d5b28b..3c292c6 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,8 @@ ss = import('sourceset') config_host = kconfig.load(meson.current_build_dir() / 'config-host.mak') config_all_disas = kconfig.load(meson.current_build_dir() / 'config-all-disas.mak') +enable_modules = 'CONFIG_MODULES' in config_host + add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CFLAGS'].split(), @@ -264,6 +266,7 @@ endforeach util_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() +block_ss = ss.source_set() common_ss = ss.source_set() softmmu_ss = ss.source_set() user_ss = ss.source_set() @@ -271,6 +274,7 @@ bsd_user_ss = ss.source_set() linux_user_ss = ss.source_set() specific_ss = ss.source_set() +modules = {} hw_arch = {} target_arch = {} target_softmmu_arch = {} @@ -372,6 +376,12 @@ subdir('authz') subdir('crypto') subdir('ui') + +if enable_modules + libmodulecommon = static_library('module-common', files('module-common.c') + genh, pic: true, c_args: '-DBUILD_DSO') + modulecommon = declare_dependency(link_whole: libmodulecommon, compile_args: '-DBUILD_DSO') +endif + # Build targets from sourcesets stub_ss = stub_ss.apply(config_host, strict: false) @@ -387,6 +397,49 @@ qemuutil = declare_dependency(link_with: libqemuutil, subdir('io') subdir('fsdev') +mods = [] +block_mods = [] +softmmu_mods = [] +foreach d, list : modules + foreach m : list + if enable_modules and host_machine.system() != 'windows' + sl = static_library(d + '-' + m[0], m[1], dependencies: [m[2], modulecommon], pic: true) + if d == 'block' + block_mods += sl + else + softmmu_mods += sl + endif + mods += {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]} + else + if d == 'block' + block_ss.add(when: m[2], if_true: m[1]) + else + softmmu_ss.add(when: m[2], if_true: m[1]) + endif + endif + endforeach +endforeach + +nm = find_program('nm') +undefsym = find_program('scripts/undefsym.sh') +block_syms = custom_target('block.syms', output: 'block.syms', + input: [libqemuutil, block_mods], + capture: true, + command: [undefsym, nm, '@INPUT@']) +qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', + input: [libqemuutil, softmmu_mods], + capture: true, + command: [undefsym, nm, '@INPUT@']) + + +foreach m : mods + shared_module(m['dir'] + '-' + m['name'], + name_prefix: '', + link_whole: [m['lib']], + install: true, + install_dir: config_host['qemu_moddir']) +endforeach + common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) diff --git a/rules.mak b/rules.mak index 9dd3b7e..8571aec 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 = $(filter-out %.a %.fa %.mo,$1) \ +process-archive-undefs = $(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) -extract-libs = $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs))) +extract-libs = $(strip $(foreach o,$(filter-out %.mo %$(DSOSUF),$1),$($o-libs))) expand-objs = $(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)) %.o: %.c @mkdir -p $(dir $@) diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh new file mode 100755 index 0000000..d4871f0 --- /dev/null +++ b/scripts/undefsym.sh @@ -0,0 +1,20 @@ +#! /bin/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 them, +# 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=$1 +staticlib=$2 +shift 2 +# Find symbols defined in static libraries and undefined in shared modules +comm -12 \ + <( $NM -P -g $staticlib | awk '$2!="U"{print "-Wl,-u," $1}' | sort -u) \ + <( $NM -P -g "$@" | awk '$2=="U"{print "-Wl,-u," $1}' | sort -u) From patchwork Thu Dec 12 12:51:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vZ5Fjlr1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZKY3xJpz9sPK for ; Fri, 13 Dec 2019 00:25:05 +1100 (AEDT) Received: from localhost ([::1]:59250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOSk-0008Tu-9L for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:25:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyQ-0003bP-08 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyO-0006ql-8a for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:41 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyO-0006ot-1D for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:40 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y17so2620534wrh.5 for ; Thu, 12 Dec 2019 04:53:39 -0800 (PST) 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=pLbuKXWYLy4sq9L65tQenllcNQmXya4SSGFbhUfD1A8=; b=vZ5Fjlr1xnj+yD7AZ6kO42QbzN0/zovNHgJ53At7ms8RVWMebqRj5NoEZZuInqN50D LPpnipJDcWJ+dFHkdNEZOkcMTtgvKGrw8bJVkjx24mjNTSVzXF8lK6hKXsw44/V4lwXR t7Pd56+t5GYYdk7MxsL1BJN2S7pwFh0VRV8RykzRcl+sVfZtJZBtEGZFMo1Ltq0de3UP Y7qnl2iBi3Wul5tvoX+d5Mob3RGukam8vKpuN5BN1box2DDQSOXB6znHRa71n2ZVEX6U 86kUv3Kzg4ZeNBYPIa5GKQ0cXjCDR/uMN0a2seMNosn3UKVqcPjWZ7z8S+IzPMALWof4 SxOA== 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=pLbuKXWYLy4sq9L65tQenllcNQmXya4SSGFbhUfD1A8=; b=NF6vNLKcnyEV7bdDS1XvCbPq4DUtr0dAAlZsqdJ3iOz77j57z/s6SC2tNa4pIqgE77 n7+AQlxqcQQd8Utx03vrO5ILnyVGW9s3IEVyzxqUnx1Vy3yfrpaejwPi9r4Wd51915P0 47KECaKbo2+IAYkV1oKvnuakEKqMEyrwQU3tjGUsu9iVLbKHeLLmY3lu0+pL1GRP7nNx 3NUJHclHTHN43qjcUtk3e2ojNGeRin9+NkVulMsECgzZo9Junz70hbY0s5TTZk20M1rp lj3YU3FMchMFvZ+PJc1WL/SMmH3wti1X/ErlR53gcnayS+gbo9rfxPk2AuycYkpds603 E+jw== X-Gm-Message-State: APjAAAXhddz+tX2ez2EJ/EIgPb2fG6bRdJaJz8i8nVcHG7Qr6WDdttb/ zzmmeRzy66LgxHYcd/iY45VLl+AC X-Google-Smtp-Source: APXvYqw7YtPpAUid7B7ivj5WEHS78FjJHyojW/gxt2r1Vq9VktTNpDnXXRSyGbh6w6kRBsFKvq/SuQ== X-Received: by 2002:a5d:5704:: with SMTP id a4mr6168799wrv.198.1576155218843; Thu, 12 Dec 2019 04:53:38 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 041/132] meson: convert chardev directory to Meson (tools part) Date: Thu, 12 Dec 2019 13:51:25 +0100 Message-Id: <1576155176-2464-42-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 6 ++---- Makefile.target | 2 +- chardev/Makefile.objs | 19 ------------------- chardev/meson.build | 34 ++++++++++++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 chardev/meson.build diff --git a/Makefile b/Makefile index c8c402a..42077ae 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,6 @@ include $(SRC_PATH)/Makefile.objs endif dummy := $(call unnest-vars,, \ - chardev-obj-y \ block-obj-y \ block-obj-m \ common-obj-y \ diff --git a/Makefile.objs b/Makefile.objs index 75d4355c..39e1d41 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,8 +1,4 @@ ####################################################################### -# chardev-obj-y is code used by both qemu system emulation and some tests -chardev-obj-y = chardev/ - -####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = nbd/ @@ -19,6 +15,8 @@ block-obj-m = block/ authz-obj-y = authz/libauthz.fa authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam) +chardev-obj-y = chardev/libchardev.fa + crypto-obj-y = crypto/libcrypto.fa io-obj-y = io/libio.fa diff --git a/Makefile.target b/Makefile.target index a0eb332..95823da 100644 --- a/Makefile.target +++ b/Makefile.target @@ -184,13 +184,13 @@ all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs dummy := $(call fix-paths,../,, \ authz-obj-y \ + chardev-obj-y \ crypto-obj-y \ io-obj-y \ qom-obj-y) dummy := $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ - chardev-obj-y \ common-obj-y \ common-obj-m) all-obj-y += $(common-obj-y) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index d68e134..8049d82 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1,22 +1,3 @@ -chardev-obj-y += char.o -chardev-obj-$(CONFIG_WIN32) += char-console.o -chardev-obj-$(CONFIG_POSIX) += char-fd.o -chardev-obj-y += char-fe.o -chardev-obj-y += char-file.o -chardev-obj-y += char-io.o -chardev-obj-y += char-mux.o -chardev-obj-y += char-null.o -chardev-obj-$(CONFIG_POSIX) += char-parallel.o -chardev-obj-y += char-pipe.o -chardev-obj-$(CONFIG_POSIX) += char-pty.o -chardev-obj-y += char-ringbuf.o -chardev-obj-y += char-serial.o -chardev-obj-y += char-socket.o -chardev-obj-y += char-stdio.o -chardev-obj-y += char-udp.o -chardev-obj-$(CONFIG_WIN32) += char-win.o -chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o - common-obj-y += msmouse.o wctablet.o testdev.o common-obj-$(CONFIG_BRLAPI) += baum.o baum.o-cflags := $(SDL_CFLAGS) diff --git a/chardev/meson.build b/chardev/meson.build new file mode 100644 index 0000000..18850b3 --- /dev/null +++ b/chardev/meson.build @@ -0,0 +1,34 @@ +chardev_ss = 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 = chardev_ss.apply(config_host, strict: false) +libchardev = static_library('chardev', chardev_ss.sources(), + dependencies: [crypto, io, qom], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +chardev = declare_dependency(link_with: libchardev) diff --git a/meson.build b/meson.build index 3c292c6..b5aa6a2 100644 --- a/meson.build +++ b/meson.build @@ -395,6 +395,7 @@ qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) subdir('io') +subdir('chardev') subdir('fsdev') mods = [] From patchwork Thu Dec 12 12:51:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ssso5cba"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZQk61x0z9sPK for ; Fri, 13 Dec 2019 00:29:34 +1100 (AEDT) Received: from localhost ([::1]:59306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOX6-0006c3-9m for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:29:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyS-0003fB-BX for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyQ-0006sz-09 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:44 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyP-0006rI-Lg for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:41 -0500 Received: by mail-wm1-x32f.google.com with SMTP id a5so2258465wmb.0 for ; Thu, 12 Dec 2019 04:53:41 -0800 (PST) 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=mYe4xppyLjVYcXs3vvJ0AnJuoQAO+jYdDpByA8Rg4vU=; b=Ssso5cbaYryOUQC8EIGptx3ILIVOm4Lov0nOiR56S5Di9t+3VYjlRIhRQH9oBxz9G+ 17H/vu60325/0VfQTZmU42VlocPLD97q4tGplW7tDQ9+KkBdT7Jp0dzmIniNOWkNmRZ6 68s10Hq/Q/3lKxCWX8HaDRkOunfQlrn2DUYh9BpSMyeuLH0HF/iqcd6zbU8OtuHZad+9 a9bwyh7P1MZv0vVejd+XX/R3h+dsn7PrsfU2fPZGC1tDkXZB853JbkhMb5KZPbWGBMpY LJJmL7VG73w+ozssH/JvVhAqNqc/lqJ3B4f4fpy6aWQr8esZPC5jUAxwVimquHAHWmGG IV4w== 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=mYe4xppyLjVYcXs3vvJ0AnJuoQAO+jYdDpByA8Rg4vU=; b=aIGWCMfnXX7e4xr/+CQjUj20xdmqn3gVqrVuiurNoW5D2xnpe/XzR8/gMAlnla/dhc 6X9rQIwbrAoCru0kTHjGBll119hhD8nFVJKNM+kKOc3yIbGu5tpWTOgho4dv0NDmzmMU ktPdnv1v+GBVJM6Cv1KtBbNkXbscnczh6KPNbuN53B4UNR2O3wI5r8VHZTGNJLsY/jVD 8lka9F5pxv1J1XMq4V1/YCGp1y4eSS93vsAm4lI3eUiQMANJw3E1YBQ7w5Mi9GHZG4g9 pSWA408LGKkgzfpiQnpkY5jiyk6p7GJ4eIuiT4vkiwtRzTvz0YM5VZgaQBsvjDuTmdeO WZMg== X-Gm-Message-State: APjAAAXyUNNfb3NOCVq9neZEcs/Ek2SuLpSIAtaJDOA3Fmfimro5r2nl Tz5FAFwkbJEhx0hRKKNNYOdu2mLy X-Google-Smtp-Source: APXvYqyQ2/jgDZ1HUVbzTJTkdsYpTs1RKduaPPUPas/VJ+TlQG3d9lE/nGRQLNAGbUCkU3Iir0aAsw== X-Received: by 2002:a1c:1d16:: with SMTP id d22mr6697430wmd.158.1576155219762; Thu, 12 Dec 2019 04:53:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 042/132] meson: convert block Date: Thu, 12 Dec 2019 13:51:26 +0100 Message-Id: <1576155176-2464-43-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 9 ---- Makefile.objs | 30 +++++++++--- Makefile.target | 3 +- block.c | 2 +- block/Makefile.objs | 64 ------------------------- block/meson.build | 101 ++++++++++++++++++++++++++++++++++++++++ configure | 10 ++-- meson.build | 63 +++++++++++++++++++++++++ nbd/Makefile.objs | 1 - nbd/meson.build | 5 ++ rules.mak | 3 +- scripts/modules/module_block.py | 0 scsi/Makefile.objs | 4 -- scsi/meson.build | 4 ++ 14 files changed, 206 insertions(+), 93 deletions(-) create mode 100644 block/meson.build delete mode 100644 nbd/Makefile.objs create mode 100644 nbd/meson.build mode change 100644 => 100755 scripts/modules/module_block.py delete mode 100644 scsi/Makefile.objs create mode 100644 scsi/meson.build diff --git a/Makefile b/Makefile index 42077ae..cdd9d14 100644 --- a/Makefile +++ b/Makefile @@ -98,8 +98,6 @@ CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) generated-files-y = config-host.h -generated-files-y += module_block.h - generated-files-y += .git-submodule-status edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) @@ -140,8 +138,6 @@ include $(SRC_PATH)/Makefile.objs endif dummy := $(call unnest-vars,, \ - block-obj-y \ - block-obj-m \ common-obj-y \ common-obj-m) @@ -251,11 +247,6 @@ ifneq ($(EXESUF),) 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))), \ - "GEN","$@") - clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h diff --git a/Makefile.objs b/Makefile.objs index 39e1d41..56d0c60 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,13 +1,19 @@ ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img -block-obj-y = nbd/ -block-obj-y += block.o blockjob.o job.o -block-obj-y += block/ scsi/ -block-obj-y += qemu-io-cmds.o -block-obj-$(CONFIG_REPLICATION) += replication.o - -block-obj-m = block/ +block-obj-y += libblock.fa + +libblock.fa-libs = $(LIBNFS_LIBS) +libblock.fa-libs += $(LIBISCSI_LIBS) +libblock.fa-libs += $(CURL_LIBS) +libblock.fa-libs += $(RBD_LIBS) +libblock.fa-libs += $(GLUSTERFS_LIBS) +libblock.fa-libs += $(VXHS_LIBS) +libblock.fa-libs += $(LIBSSH_LIBS) +libblock.fa-libs += $(BZIP2_LIBS) +libblock.fa-libs += $(LZFSE_LIBS) +libblock.fa-libs += $(if $(CONFIG_LINUX_AIO),-laio) +libblock.fa-libs += $(LIBXML2_LIBS) ####################################################################### # libraries built entirely from meson @@ -43,6 +49,16 @@ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration/ +common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF) +common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF) +common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF) +common-obj-$(if $(CONFIG_LIBNFS),m) += block-nfs$(DSOSUF) +common-obj-$(if $(CONFIG_LIBSSH),m) += block-ssh$(DSOSUF) +common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF) + +common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) +common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) + common-obj-y += audio/ common-obj-m += audio/ common-obj-y += hw/ diff --git a/Makefile.target b/Makefile.target index 95823da..1cb7bc2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -184,13 +184,12 @@ all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs dummy := $(call fix-paths,../,, \ authz-obj-y \ + block-obj-y \ chardev-obj-y \ crypto-obj-y \ io-obj-y \ qom-obj-y) dummy := $(call unnest-vars,.., \ - block-obj-y \ - block-obj-m \ common-obj-y \ common-obj-m) all-obj-y += $(common-obj-y) diff --git a/block.c b/block.c index 874a29a..f69d6ef 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 index 35f3bca..83e87b3 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,65 +1 @@ -block-obj-y += raw-format.o vmdk.o vpc.o -block-obj-$(CONFIG_QCOW1) += qcow.o -block-obj-$(CONFIG_VDI) += vdi.o -block-obj-$(CONFIG_CLOOP) += cloop.o -block-obj-$(CONFIG_BOCHS) += bochs.o -block-obj-$(CONFIG_VVFAT) += vvfat.o -block-obj-$(CONFIG_DMG) += dmg.o - -block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o qcow2-threads.o -block-obj-$(CONFIG_QED) += qed.o qed-l2-cache.o qed-table.o qed-cluster.o -block-obj-$(CONFIG_QED) += qed-check.o -block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o -block-obj-y += quorum.o -block-obj-y += blkdebug.o blkverify.o blkreplay.o -block-obj-$(CONFIG_PARALLELS) += parallels.o -block-obj-y += blklogwrites.o -block-obj-y += block-backend.o snapshot.o qapi.o -block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o -block-obj-$(CONFIG_POSIX) += file-posix.o -block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o -block-obj-y += null.o mirror.o commit.o io.o create.o -block-obj-y += throttle-groups.o -block-obj-$(CONFIG_LINUX) += nvme.o - -block-obj-y += nbd.o -block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o -block-obj-$(CONFIG_LIBISCSI) += iscsi.o -block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o -block-obj-$(CONFIG_LIBNFS) += nfs.o -block-obj-$(CONFIG_CURL) += curl.o -block-obj-$(CONFIG_RBD) += rbd.o -block-obj-$(CONFIG_GLUSTERFS) += gluster.o -block-obj-$(CONFIG_VXHS) += vxhs.o -block-obj-$(CONFIG_LIBSSH) += ssh.o -block-obj-y += accounting.o dirty-bitmap.o -block-obj-y += write-threshold.o -block-obj-y += backup.o -block-obj-$(CONFIG_REPLICATION) += replication.o -block-obj-y += throttle.o copy-on-read.o - -block-obj-y += crypto.o - common-obj-y += stream.o - -nfs.o-libs := $(LIBNFS_LIBS) -iscsi.o-cflags := $(LIBISCSI_CFLAGS) -iscsi.o-libs := $(LIBISCSI_LIBS) -curl.o-cflags := $(CURL_CFLAGS) -curl.o-libs := $(CURL_LIBS) -rbd.o-cflags := $(RBD_CFLAGS) -rbd.o-libs := $(RBD_LIBS) -gluster.o-cflags := $(GLUSTERFS_CFLAGS) -gluster.o-libs := $(GLUSTERFS_LIBS) -vxhs.o-libs := $(VXHS_LIBS) -ssh.o-cflags := $(LIBSSH_CFLAGS) -ssh.o-libs := $(LIBSSH_LIBS) -block-obj-dmg-bz2-$(CONFIG_BZIP2) += dmg-bz2.o -block-obj-$(if $(CONFIG_DMG),m,n) += $(block-obj-dmg-bz2-y) -dmg-bz2.o-libs := $(BZIP2_LIBS) -block-obj-$(if $(CONFIG_LZFSE),m,n) += dmg-lzfse.o -dmg-lzfse.o-libs := $(LZFSE_LIBS) -qcow.o-libs := -lz -linux-aio.o-libs := -laio -parallels.o-cflags := $(LIBXML2_CFLAGS) -parallels.o-libs := $(LIBXML2_LIBS) diff --git a/block/meson.build b/block/meson.build new file mode 100644 index 0000000..a68689b --- /dev/null +++ b/block/meson.build @@ -0,0 +1,101 @@ +block_ss.add(genh) +block_ss.add(files( + 'accounting.c', + 'backup.c', + 'blkdebug.c', + 'blklogwrites.c', + 'blkreplay.c', + 'blkverify.c', + 'block-backend.c', + 'commit.c', + 'copy-on-read.c', + 'create.c', + 'crypto.c', + 'dirty-bitmap.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', +)) + +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('parallels.c')) +block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.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: [libaio, 'CONFIG_LINUX_AIO'], if_true: files('linux-aio.c')) +block_ss.add(when: [vxhs, 'CONFIG_VXHS'], if_true: files('vxhs.c')) + +block_modules = [] + +modsrc = [] +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 += files(m[3]) + endif + block_modules += [[m[1], files(m[3]), m[2]]] + endif +endforeach + +# those are not exactly regular block modules, so treat them apart +if 'CONFIG_DMG' in config_host + foreach m : [ + ['CONFIG_LZFSE', 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], + ['CONFIG_BZIP2', 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] + ] + if config_host.has_key(m[0]) + block_modules += [[m[1], files(m[3]), m[2]]] + endif + endforeach +endif + +module_block_py = find_program('scripts/modules/module_block.py') +module_block_h = custom_target('module_block.h', + output: 'module_block.h', + input: modsrc, + command: [module_block_py, '@OUTPUT0@', modsrc]) +block_ss.add(module_block_h) + +modules += {'block': block_modules} diff --git a/configure b/configure index d65b79e..7be08f3 100755 --- a/configure +++ b/configure @@ -3711,7 +3711,8 @@ if test "$zlib" != "no" ; then int main(void) { zlibVersion(); return 0; } EOF if compile_prog "" "-lz" ; then - LIBS="$LIBS -lz" + zlib_libs=-lz + LIBS="$LIBS $zlib_libs" else error_exit "zlib check failed" \ "Make sure to have the zlib libs and headers installed." @@ -6908,7 +6909,11 @@ fi if test "$posix_memalign" = "yes" ; then echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak fi - +if test "$zlib" != "no" ; then + echo "CONFIG_ZLIB=y" >> $config_host_mak + echo "ZLIB_CFLAGS=$zlib_cflags" >> $config_host_mak + echo "ZLIB_LIBS=$zlib_libs" >> $config_host_mak +fi if test "$spice" = "yes" ; then echo "CONFIG_SPICE=y" >> $config_host_mak fi @@ -7002,7 +7007,6 @@ if test "$qom_cast_debug" = "yes" ; then fi if test "$rbd" = "yes" ; then echo "CONFIG_RBD=m" >> $config_host_mak - echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak echo "RBD_LIBS=$rbd_libs" >> $config_host_mak fi diff --git a/meson.build b/meson.build index b5aa6a2..a46b671 100644 --- a/meson.build +++ b/meson.build @@ -83,6 +83,21 @@ pam = declare_dependency() if 'CONFIG_AUTH_PAM' in config_host pam = cc.find_library('pam') endif +libaio = cc.find_library('aio', required: false) +zlib = declare_dependency() +if 'CONFIG_ZLIB' in config_host + zlib = declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].split(), + link_args: config_host['ZLIB_LIBS'].split()) +endif +libxml2 = declare_dependency() +if 'CONFIG_LIBXML2' in config_host + libxml2 = declare_dependency(compile_args: config_host['LIBXML2_CFLAGS'].split(), + link_args: config_host['LIBXML2_LIBS'].split()) +endif +libnfs = declare_dependency() +if 'CONFIG_LIBNFS' in config_host + libnfs = declare_dependency(link_args: config_host['LIBNFS_LIBS'].split()) +endif libattr = declare_dependency() if 'CONFIG_ATTR' in config_host libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split()) @@ -117,6 +132,32 @@ libudev = declare_dependency() if 'CONFIG_LIBUDEV' in config_host libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split()) endif +rbd = declare_dependency() +if 'CONFIG_RBD' in config_host + rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split()) +endif +glusterfs = declare_dependency() +if 'CONFIG_GLUSTERFS' in config_host + glusterfs = declare_dependency(compile_args: config_host['GLUSTERFS_CFLAGS'].split(), + link_args: config_host['GLUSTERFS_LIBS'].split()) +endif +vxhs = declare_dependency() +if 'CONFIG_VXHS' in config_host + vxhs = declare_dependency(link_args: config_host['VXHS_LIBS'].split()) +endif +libssh = declare_dependency() +if 'CONFIG_LIBSSH' in config_host + libssh = declare_dependency(compile_args: config_host['LIBSSH_CFLAGS'].split(), + link_args: config_host['LIBSSH_LIBS'].split()) +endif +libbzip2 = declare_dependency() +if 'CONFIG_BZIP2' in config_host + libbzip2 = declare_dependency(link_args: config_host['BZIP2_LIBS'].split()) +endif +liblzfse = declare_dependency() +if 'CONFIG_LZFSE' in config_host + liblzfse = declare_dependency(link_args: config_host['LZFSE_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -398,6 +439,18 @@ subdir('io') subdir('chardev') subdir('fsdev') +block_ss.add(files( + 'block.c', + 'blockjob.c', + 'job.c', + 'qemu-io-cmds.c', +)) +block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c')) + +subdir('nbd') +subdir('scsi') +subdir('block') + mods = [] block_mods = [] softmmu_mods = [] @@ -432,6 +485,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) +block_ss = block_ss.apply(config_host, strict: false) +libblock = static_library('block', block_ss.sources(), + dependencies: [authz, crypto, io, block_ss.dependencies()], + link_depends: block_syms, + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +block = declare_dependency(link_whole: libblock, link_args: '@block.syms') foreach m : mods shared_module(m['dir'] + '-' + m['name'], @@ -441,6 +503,7 @@ foreach m : mods install_dir: config_host['qemu_moddir']) endforeach +softmmu_ss.add(block) common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) diff --git a/nbd/Makefile.objs b/nbd/Makefile.objs deleted file mode 100644 index eb3dd44..0000000 --- a/nbd/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -block-obj-y += server.o client.o common.o diff --git a/nbd/meson.build b/nbd/meson.build new file mode 100644 index 0000000..0c00a77 --- /dev/null +++ b/nbd/meson.build @@ -0,0 +1,5 @@ +block_ss.add(files( + 'client.c', + 'common.c', + 'server.c', +)) diff --git a/rules.mak b/rules.mak index 8571aec..162ecb5 100644 --- a/rules.mak +++ b/rules.mak @@ -374,8 +374,7 @@ define unnest-vars # Find all the .mo objects in variables and add dependency rules # according to .mo-objs. Report error if not set $(if $($o-objs), - $(eval $(o:%.mo=%$(DSOSUF)): module-common.o $($o-objs)), - $(error $o added in $v but $o-objs is not set))) + $(eval $(o:%.mo=%$(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/scripts/modules/module_block.py b/scripts/modules/module_block.py old mode 100644 new mode 100755 diff --git a/scsi/Makefile.objs b/scsi/Makefile.objs deleted file mode 100644 index bb8789c..0000000 --- a/scsi/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -block-obj-y += utils.o - -block-obj-$(CONFIG_LINUX) += pr-manager.o pr-manager-helper.o -block-obj-$(call lnot,$(CONFIG_LINUX)) += pr-manager-stub.o diff --git a/scsi/meson.build b/scsi/meson.build new file mode 100644 index 0000000..53f3a1f --- /dev/null +++ b/scsi/meson.build @@ -0,0 +1,4 @@ +block_ss.add(files('utils.c')) +block_ss.add(when: 'CONFIG_LINUX', + if_true: files('pr-manager.c', 'pr-manager-helper.c'), + if_false: files('pr-manager-stub.c')) From patchwork Thu Dec 12 12:51:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PYwLDjgb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZLv3CVpz9s4Y for ; Fri, 13 Dec 2019 00:26:15 +1100 (AEDT) Received: from localhost ([::1]:59272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOTs-0001r5-PS for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:26:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34731) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyR-0003eC-P8 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyQ-0006uD-Ja for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:43 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34216) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyQ-0006sK-At for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:42 -0500 Received: by mail-wr1-x42c.google.com with SMTP id t2so2645062wrr.1 for ; Thu, 12 Dec 2019 04:53:42 -0800 (PST) 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=AtwMOLvxXn85AOzw7ez1xNn8Y3y0JTmxG03ZrTDH7vU=; b=PYwLDjgbUYegUpgA0HKTrVR7svYP7IQS/u0m9yYSEBx9wRURIxfyBz+JtdiT1GYVw7 kaOMIGhRszTcHJlYD+rtAryf/Srk6TYeh4kXh8FgPv+gRXJMbvzvTXqCpyFcwJ497C67 cIA/KQ+5O5aaxXCCh6hsdzcqjXkWXjceSVPWbjVTVjOcmTIY6eay35izeptQraMJdsqo e2ka6ZgfZbzCcrkZ67ttrwPPJtS0DVJ2I0GSR+jL/bDg6GQfFIjTeFQFZpJMpLq2Q8Wi T3lPzVqUQXjVyORbSgv6Bla1beJPG5UIh1IWqFqt6xCZfdf8FRKlDkyCx5sVyAQl7GUK eCyQ== 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=AtwMOLvxXn85AOzw7ez1xNn8Y3y0JTmxG03ZrTDH7vU=; b=uFj45oEd4i4SGat/r3SxCfauuz2IdBYqO4EcfR6+fwjCazUD4GxbHRN6ga5O5wESEd jvbkfX5U34FzfOd8gTT7b0g/mHDBES/iaGqUrHuhqVIz53t6lwH5vEmJbpe6uGvkP/Du u6HowWeUim4+g2cMcC62/B6pE0QqZuLAhOs9j1UIgp/Ku8+4iu9MBqLkgg3y60iA8KiS 02ET/Q4GZNar/+FqwMDm+jtDYKRXcVPWQS73clfOFOMkmJ2lGRmoUHHLgsGEhjkraLWe QoLcxswnYZPqebVZYssreqPu31qttvW/fbB9nBZAvo+Uf5ZcWnTxpqWfxC/BjSKEdNbh Ii3A== X-Gm-Message-State: APjAAAUYV/cjkrJ6ZnNj33E4YI3Qk2EPsWi94p+Rh7iVWTNMMdL+Iyw5 S89qNfBlfGKDTdjUCYw3z8LsU/h5 X-Google-Smtp-Source: APXvYqyveVTDWjdy4dKQPwTt+nfHPni3TPBbxFgJj8MLqO2SnHo0ESDaQxJXnYr/EaK2GfwF/LuvWA== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5995838wrt.208.1576155221034; Thu, 12 Dec 2019 04:53:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 043/132] meson: qemu-{img,io,nbd} Date: Thu, 12 Dec 2019 13:51:27 +0100 Message-Id: <1576155176-2464-44-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 6 ------ configure | 6 ------ meson.build | 8 +++++++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index cdd9d14..764981d 100644 --- a/Makefile +++ b/Makefile @@ -231,12 +231,6 @@ Makefile: $(version-obj-y) COMMON_LDADDS = libqemuutil.a -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) - scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist diff --git a/configure b/configure index 7be08f3..964897c 100755 --- a/configure +++ b/configure @@ -6043,12 +6043,6 @@ if [ "$eventfd" = "yes" ]; then fi tools="" -if test "$want_tools" = "yes" ; then - tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" - if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then - tools="qemu-nbd\$(EXESUF) $tools" - fi -fi if test "$softmmu" = yes ; then if test "$linux" = yes; then if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then diff --git a/meson.build b/meson.build index a46b671..2b4b36d 100644 --- a/meson.build +++ b/meson.build @@ -280,7 +280,7 @@ if have_system ] endif foreach d : hx_headers - custom_target(d[1], + hxdep += custom_target(d[1], input: files(d[0]), output: d[1], capture: true, @@ -591,6 +591,12 @@ if 'CONFIG_GUEST_AGENT' in config_host endif if have_tools + executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [block, qemuutil], install: true) + if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or host_machine.system().endswith('bsd') + executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) + endif + executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) + subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') From patchwork Thu Dec 12 12:51:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kC3gYT/M"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZN20YPCz9s4Y for ; Fri, 13 Dec 2019 00:27:13 +1100 (AEDT) Received: from localhost ([::1]:59280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOUj-0003EY-H9 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:27:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34952) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyS-0003fz-VM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyR-0006wD-Ok for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:44 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyR-0006v5-I3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:43 -0500 Received: by mail-wm1-x32e.google.com with SMTP id p17so2391795wmb.0 for ; Thu, 12 Dec 2019 04:53:43 -0800 (PST) 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=iabFqhpo6A2KWaNIf0m+RVkEHbWOeO2cBAZeGreYgno=; b=kC3gYT/MhrM0FuUACXFAy4qHLEdaNmARNSKTmrq6CPRGsjbTIM3gdeXERD6SX6Hr5f gMNqhWIZvYrojAz4dmBJmVt3zU8O4s4c77+r3plOzevrtH/T5SaFIiuLsm53plyphsye j0eGaqDgMC2HkaexK4PoX/roQCeFClX27bPuxxW/XjhcQaSsP7/VtoEdvs0Ao5zfXvrC 27Vwzl7+drtKW06Ptm0JXTSEB2k/Oal0kJRZPHxTGBtlz7KESKfX/6vzAoueDLzB21ku FsVAacLeV3DzW0XzvoZuveib+Mv5xDez5IkKGCJPR9H5wK0r6PzrlP0W84Po8KZynFAv TLSA== 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=iabFqhpo6A2KWaNIf0m+RVkEHbWOeO2cBAZeGreYgno=; b=BgqnjdLbAB9ehwZQg+cPD8YKLl4HCEg/aUOZTtMBQQgmyae0W0QIHtcRaVrRPWcsR/ kFdILWp/x8uj3NaGYd+rQ0x765FD2dc+B2bkY9ymN/vNseOeMT5K/Rv4qgngjlQbXsxa CUcyGzwJQmhQSR6aUT201GApsEOAGqUqKZalCn1cAMjLLQFtL8Z7nNeAuc7pbiJ5Ye7E xerffhtpdzXYthzyJnSBGaL6H7El6LM8Ywda8jdr6/7jVcgpU3Pd4WJ0wFTIBdXE3Z+F 3O1a6Gw2P299lDgnRaUDfnfgOc8gBjGzPtEXm4jms89+oC6deVuC8G06jLtMhc1Am6A9 8meA== X-Gm-Message-State: APjAAAXy16ueGsaBgW3u6MArCzDgRzC45Bg3SPrLT/b5iWJe9id5uRVA 4JjCQo+V8FRSkAmHz4Tva9q6FHFI X-Google-Smtp-Source: APXvYqzG0QnvDhoH51BYWcZt7ISZfY4+vTEDfc6Yk7W6CSXBd38hDTlqa+xJFnd13t5kgUliuHPiNA== X-Received: by 2002:a7b:c004:: with SMTP id c4mr6315495wmb.45.1576155222404; Thu, 12 Dec 2019 04:53:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 044/132] meson: qemu-pr-helper Date: Thu, 12 Dec 2019 13:51:28 +0100 Message-Id: <1576155176-2464-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- configure | 1 - meson.build | 10 ++++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 764981d..0cbdc34 100644 --- a/Makefile +++ b/Makefile @@ -231,11 +231,6 @@ Makefile: $(version-obj-y) COMMON_LDADDS = libqemuutil.a -scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -ifdef CONFIG_MPATH -scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist -endif - ifneq ($(EXESUF),) .PHONY: qga/qemu-ga qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) diff --git a/configure b/configure index 964897c..4757e45 100755 --- a/configure +++ b/configure @@ -6061,7 +6061,6 @@ if test "$softmmu" = yes ; then fi mpath=no fi - tools="$tools scsi/qemu-pr-helper\$(EXESUF)" else if test "$virtfs" = yes; then error_exit "VirtFS is supported only on Linux" diff --git a/meson.build b/meson.build index 2b4b36d..b16ab72 100644 --- a/meson.build +++ b/meson.build @@ -108,6 +108,10 @@ if 'CONFIG_LIBCAP_NG' in config_host endif xkbcommon = dependency('xkbcommon', required: false) rt = cc.find_library('rt', required: false) +libmpathpersist = declare_dependency() +if config_host.has_key('CONFIG_MPATH') + libmpathpersist = cc.find_library('mpathpersist') +endif libiscsi = declare_dependency() if 'CONFIG_LIBISCSI' in config_host libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), @@ -586,6 +590,7 @@ foreach target : target_dirs endforeach # Other build targets + if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif @@ -623,6 +628,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/utils.c'), + dependencies: [authz, crypto, io, qom, qemuutil, + libcap_ng, libudev, libmpathpersist], + install: true) endif if 'CONFIG_IVSHMEM' in config_host From patchwork Thu Dec 12 12:51:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q3J/P87R"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZNL0pH0z9s4Y for ; Fri, 13 Dec 2019 00:27:30 +1100 (AEDT) Received: from localhost ([::1]:59288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOV5-0003hy-Gv for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:27:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyT-0003hR-Tk for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyS-0006xk-Hp for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:45 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38416) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyS-0006wK-Aj for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:44 -0500 Received: by mail-wr1-x434.google.com with SMTP id y17so2620744wrh.5 for ; Thu, 12 Dec 2019 04:53:44 -0800 (PST) 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; bh=ei8jF5qbLXtxjPutgGE6w3tCMlOPMMGLFJnXJVitOgM=; b=Q3J/P87RQrRQT0gwuP73e3d6gPpUVFWFPTVD7xYBqKslxJdKtovNRu/jMBDfG5WSF7 dlC+97cGJ3LiKpp41/XYqAXTpVLtOLpx3TcWEalezy5escQKBqTwzNfAYvez3QZmdA15 ut7LYqjX+ZCRMOIC1DUOcD7Drd4uWT4chqg7gaP/Bs1vKFqUV77emvZ7MMJzsl+uKpnt 7qt8UfFfx9KpEUFlPeWRL/Ok/kNhP/jQjZFZEFqPYsgk6D2IYnRG0sse8psi1CzFFCxe /qmeY+v/WRzb6oBxBzo4sXna3vQjKQcqVkJS9zUFYop2WLP3kWz1HD+rpp8TeH4HzRVN zHOw== 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; bh=ei8jF5qbLXtxjPutgGE6w3tCMlOPMMGLFJnXJVitOgM=; b=IfRPZYGI99ZgB3kNy1d+iuLOqdfy45C0iflTB7IHSRS92COWYwNjmoPY66N3rKZxbG lHoWEMvEgB/burqzl8kzq/Ya3d+QH2HoLeDA1zk9e6zHaQzIXMs/XUpH0wj1avddLE9C nFe4AvZuciK5TuoFjnVdeyi0dhQX/xMkPC0Na4mFIokekRRaeFjKCQzJAWrl8DVOexsq inQvNY1CoGnGMQSmW/+bDocZniw81rfi7Pcs+3uBMuLOvEJ/WCu40pwVAYHefLdy99bl BIvNXz3sqwVX6IaQKm00xMHMpiX9EZLgbEJt1Jm9UNvyAVQeYuEunVifYjDQZQU4eW78 DYVQ== X-Gm-Message-State: APjAAAXkXBdVfGxElAcEzS9xOiy27mFo8R1ulrvJGXyr92Fb2iAdy9mX JFSuzFj7Jesz3VNNuQbTuYESjVcN X-Google-Smtp-Source: APXvYqwFvqYOVlix7yxNuYba5MNm/+VTeLW1tOPDbJgqJl0JlkZ4VDBYgddM+cE2JSTv3PPeyoMXUw== X-Received: by 2002:a5d:6211:: with SMTP id y17mr6156062wru.344.1576155223173; Thu, 12 Dec 2019 04:53:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable Date: Thu, 12 Dec 2019 13:51:29 +0100 Message-Id: <1576155176-2464-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Everything involving tools is now done by meson. Signed-off-by: Paolo Bonzini --- Makefile | 12 ++---------- configure | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 0cbdc34..c4cfca9 100644 --- a/Makefile +++ b/Makefile @@ -113,8 +113,6 @@ $(call set-vpath, $(SRC_PATH)) LIBS+=-lz $(LIBS_TOOLS) -HELPERS-y = - ifdef BUILD_DOCS DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 @@ -143,7 +141,7 @@ dummy := $(call unnest-vars,, \ include $(SRC_PATH)/tests/Makefile.include -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) @@ -246,7 +244,7 @@ clean: recurse-clean ! -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 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 @@ -407,12 +405,6 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install -ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) -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 \ diff --git a/configure b/configure index 4757e45..658b062 100755 --- a/configure +++ b/configure @@ -6042,7 +6042,6 @@ if [ "$eventfd" = "yes" ]; then ivshmem=yes fi -tools="" if test "$softmmu" = yes ; then if test "$linux" = yes; then if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then @@ -7271,7 +7270,6 @@ else fi QEMU_INCLUDES="-iquote ${source_path}/tcg $QEMU_INCLUDES" -echo "TOOLS=$tools" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak From patchwork Thu Dec 12 12:51:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RP8wCAUD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZPj2f6zz9sPK for ; Fri, 13 Dec 2019 00:28:41 +1100 (AEDT) Received: from localhost ([::1]:59296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOWE-0005J0-V0 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:28:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35351) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyU-0003jA-Tb for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyT-0006zm-HP for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:46 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:40438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyT-0006yG-AT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:45 -0500 Received: by mail-wr1-x42f.google.com with SMTP id c14so2607415wrn.7 for ; Thu, 12 Dec 2019 04:53:45 -0800 (PST) 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=9eDDgoqkpWvForG2LVxwX8yK7HcFvrW/oDMlrRGAHTA=; b=RP8wCAUDaQ0h5YwEWp95SUzIc6KrO50v2jCGwb+GPtK6kK9uHqA0gfcIGG3JvhXxuc AVsjQ7EwAwAycsZsKWeydhhcdsrQdt72L0rMzvODymCFSyIyZnEjNWxVFLinuIR41zUz dxo3zfSVTT/dqIy80Fy2FVHCMfFaHtY23Qtc8bd8t0G1T77GmYxIPyb0j6lcsB/OKkSE WH2+f0pZjlo61jwqeZCbvtGFFHOqKNGSl3Ob7osi5T7THMxAoLoyoSFFq3fu9yfnBplN /U6WFV0XFQ9vyXJtGg8DDfn2giM+R2VNUyrTFrZUs74lQIXLEjpDx5ps2ShACsK0E39Y hbxw== 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=9eDDgoqkpWvForG2LVxwX8yK7HcFvrW/oDMlrRGAHTA=; b=LLMTTROLdKjt2RGGPX5LoSZV/bycKr8AVDuH1CLpE6HN7ai04L/SCZ+sc+bzok3FM4 DavJqrin5wpVWcGzS+e/MP1tNpmTSeckLE57zJ8DIL3x94+H4xYVdXI0UD0hmua+uruH W+1ia65o9vigDbQY1pqPfp5afDngZxW4QO4E230W7NbHFnT5uEbahl6CntG9kFoaecmv Fx+JzU7Dl0YDTr3KxrcxG2GFrOUepvFDjDpYkkZG1K79pBtuXYMLtvgACQ7izuaryHev VEaCjd+6WNz8FNYTNX+ylIJr+LznpEGBQFbeTcn1AX2GDN65C9W56OunXLoZFilvzjgb U8VQ== X-Gm-Message-State: APjAAAXMiwRb+QjmgpcEMic61uJW/lkLlYjpDpAA+438/hJb3ZLJyZPI DgHtogWk1bPoWA12Y4fMzg8awyjI X-Google-Smtp-Source: APXvYqwdU55za3qQbKOoyFsIFer/2zLFX7MYDt17W4dyYaliw0VfpmguCxpqRNOzr3CZoDHibRLljQ== X-Received: by 2002:adf:dfd2:: with SMTP id q18mr6166609wrn.152.1576155224122; Thu, 12 Dec 2019 04:53:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 046/132] meson: convert chardev directory to Meson (emulator part) Date: Thu, 12 Dec 2019 13:51:30 +0100 Message-Id: <1576155176-2464-47-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - Makefile.target | 2 ++ chardev/Makefile.objs | 6 ------ chardev/meson.build | 7 ++++++- configure | 2 ++ meson.build | 14 ++++++++++++++ 6 files changed, 24 insertions(+), 8 deletions(-) delete mode 100644 chardev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 56d0c60..8d14390 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -76,7 +76,6 @@ vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) common-obj-$(CONFIG_TPM) += tpm.o common-obj-y += backends/ -common-obj-y += chardev/ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS) diff --git a/Makefile.target b/Makefile.target index 1cb7bc2..702e6f8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -104,6 +104,7 @@ all: $(PROGS) stap @true obj-y += $(LIBQEMU) + obj-y += trace/ ######################################################### @@ -166,6 +167,7 @@ LIBS := $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS := $(LIBS) endif +LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs deleted file mode 100644 index 8049d82..0000000 --- a/chardev/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -common-obj-y += msmouse.o wctablet.o testdev.o -common-obj-$(CONFIG_BRLAPI) += baum.o -baum.o-cflags := $(SDL_CFLAGS) -baum.o-libs := $(BRLAPI_LIBS) - -common-obj-$(CONFIG_SPICE) += spice.o diff --git a/chardev/meson.build b/chardev/meson.build index 18850b3..c4a2bb0 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -31,4 +31,9 @@ libchardev = static_library('chardev', chardev_ss.sources(), name_suffix: 'fa', build_by_default: false) -chardev = declare_dependency(link_with: libchardev) +chardev = declare_dependency(link_whole: libchardev) + +softmmu_ss.add(files('msmouse.c', 'wctablet.c', 'testdev.c')) +softmmu_ss.add(when: ['CONFIG_SDL', 'CONFIG_BRLAPI', sdl, brlapi], if_true: files('baum.c')) +softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) +softmmu_ss.add(chardev) diff --git a/configure b/configure index 658b062..9d33df3 100755 --- a/configure +++ b/configure @@ -6908,6 +6908,8 @@ if test "$zlib" != "no" ; then fi if test "$spice" = "yes" ; then echo "CONFIG_SPICE=y" >> $config_host_mak + echo "SPICE_CFLAGS=$spice_cflags" >> $config_host_mak + echo "SPICE_LIBS=$spice_libs" >> $config_host_mak fi if test "$smartcard" = "yes" ; then diff --git a/meson.build b/meson.build index b16ab72..df16b58 100644 --- a/meson.build +++ b/meson.build @@ -107,6 +107,11 @@ if 'CONFIG_LIBCAP_NG' in config_host libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) endif xkbcommon = dependency('xkbcommon', required: false) +spice = declare_dependency() +if 'CONFIG_SPICE' in config_host + spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(), + link_args: config_host['SPICE_LIBS'].split()) +endif rt = cc.find_library('rt', required: false) libmpathpersist = declare_dependency() if config_host.has_key('CONFIG_MPATH') @@ -136,6 +141,15 @@ libudev = declare_dependency() if 'CONFIG_LIBUDEV' in config_host libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split()) endif +brlapi = declare_dependency() +if 'CONFIG_BRLAPI' in config_host + brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split()) +endif +sdl = declare_dependency() +if 'CONFIG_SDL' in config_host + sdl = declare_dependency(compile_args: config_host['SDL_CFLAGS'].split(), + link_args: config_host['SDL_LIBS'].split()) +endif rbd = declare_dependency() if 'CONFIG_RBD' in config_host rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split()) From patchwork Thu Dec 12 12:51:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bbCW1a05"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZ8W4l4Cz9sPc for ; Fri, 13 Dec 2019 00:17:15 +1100 (AEDT) Received: from localhost ([::1]:59138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOLA-0005KW-V7 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:17:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyW-0003lZ-Hq for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyU-00072E-Lr for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:48 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyU-00070d-DY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:46 -0500 Received: by mail-wr1-x433.google.com with SMTP id b6so2660299wrq.0 for ; Thu, 12 Dec 2019 04:53:46 -0800 (PST) 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=PDS3sRtQt9ex0lZCsWKH5I9q43dgFGB5z0KrGLDuW6I=; b=bbCW1a05pHvJnTpaXeRCcdgvaxIF03U+nM4O5mRstdSUqEYHM5cyzx0MsCtOfLLuyq TB3/NGHQUVEtudCc5PZZ4uCMkiRyEFyGF1GzXOi+klCpJ7t4ZUhsbZHsBHeUdGm2zYAY 2QnKJiKC7fF2Aa4cjQKOt3kzn5jFzY9qw1qvYBXehH10q7f+wQltB1Xk0QXyUAv0JQ8G DsPJGS8C0GfjzO4QmmMm/FS63IOoARwB7ogsUEjQhK3Ie8JqS+Wi3VaFaCxZ4CxKGbDI KM/HA2cwsMsjMKrK9Mh+IyRh9/t+rxK+rGRFaxAz/GAmcA/fVWAJv4DJjpwbhEulJeAT TVQA== 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=PDS3sRtQt9ex0lZCsWKH5I9q43dgFGB5z0KrGLDuW6I=; b=LGaigIznVkaoSFhE7VaVw9VEPrMOh7qeCs7NP0N84O8QpwsDWm3YzqDZ+a8c70td8k R+FDb5lbktCnWUyxdeh3f8P2Cap/ftgXxGV5DX9B3v3TtJY91BNpS9RyImCTUufLd3da YXYJidxozJx96vA6RQQrejjjSpFxIzcZz+I11FgLhz3TYNSFDmxwJAi4VrxNTc+stRFP Li+TeqUCe+AcbyFoCKI6CfDM0vKjVMuIWPQ8zz+9n1qpREcn/f/NntS3J+vnjvyIeq6R 61OfRTgX83lHQBjqmu09TSN8jm+YMc3OtHUCbtGCTVxxWJTv9ngqGeIuAyBcGqUf5Zpf 6B4g== X-Gm-Message-State: APjAAAWzHR2KnrSchnwqOMEy1kKamzF62BlVhujbkMT4IwlEV1yMTl29 ap/AUT4aUzYGZqP3Ozd8kWJtef+F X-Google-Smtp-Source: APXvYqyYAFPF1DGorRZtk3C8ONhVjL/YvxbTOpl79FrHSErzBn+FqUw4XlEKks/KXwYfWNk9f2RXiA== X-Received: by 2002:adf:fe43:: with SMTP id m3mr6369819wrs.213.1576155225014; Thu, 12 Dec 2019 04:53:45 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 047/132] meson: convert audio directory to Meson Date: Thu, 12 Dec 2019 13:51:31 +0100 Message-Id: <1576155176-2464-48-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 8 ++++++-- Makefile.target | 6 ++++-- audio/Makefile.objs | 31 ------------------------------- audio/meson.build | 30 ++++++++++++++++++++++++++++++ configure | 12 ++++++++++++ meson.build | 25 ++++++++++++++++++++++++- 6 files changed, 76 insertions(+), 36 deletions(-) delete mode 100644 audio/Makefile.objs create mode 100644 audio/meson.build diff --git a/Makefile.objs b/Makefile.objs index 8d14390..cea6f9a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -36,6 +36,7 @@ qom-obj-y = qom/libqom.fa ifeq ($(CONFIG_SOFTMMU),y) common-obj-y = blockdev.o blockdev-nbd.o block/ + common-obj-y += bootdevice.o iothread.o common-obj-y += dump/ common-obj-y += job-qmp.o @@ -49,6 +50,11 @@ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration/ +common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) +common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) +common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF) +common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF) + common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF) common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF) common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF) @@ -59,8 +65,6 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF) common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) -common-obj-y += audio/ -common-obj-m += audio/ common-obj-y += hw/ common-obj-y += replay/ diff --git a/Makefile.target b/Makefile.target index 702e6f8..65f1312 100644 --- a/Makefile.target +++ b/Makefile.target @@ -165,9 +165,11 @@ LIBS := $(libs_softmmu) $(LIBS) # Temporary until emulators are linked by Meson LIBS := $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) -LIBS := $(LIBS) +LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) endif LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) +LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) + # Hardware support ifeq ($(TARGET_NAME), sparc64) @@ -193,7 +195,7 @@ dummy := $(call fix-paths,../,, \ qom-obj-y) dummy := $(call unnest-vars,.., \ common-obj-y \ - common-obj-m) + common-obj-m) all-obj-y += $(common-obj-y) all-obj-y += $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) diff --git a/audio/Makefile.objs b/audio/Makefile.objs deleted file mode 100644 index dca87f6..0000000 --- a/audio/Makefile.objs +++ /dev/null @@ -1,31 +0,0 @@ -common-obj-y = audio.o audio_legacy.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SPICE) += spiceaudio.o -common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o -common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o -common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o -common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o -common-obj-y += wavcapture.o - -coreaudio.o-libs := $(COREAUDIO_LIBS) -dsoundaudio.o-libs := $(DSOUND_LIBS) - -# alsa module -common-obj-$(CONFIG_AUDIO_ALSA) += alsa.mo -alsa.mo-objs = alsaaudio.o -alsa.mo-libs := $(ALSA_LIBS) - -# oss module -common-obj-$(CONFIG_AUDIO_OSS) += oss.mo -oss.mo-objs = ossaudio.o -oss.mo-libs := $(OSS_LIBS) - -# pulseaudio module -common-obj-$(CONFIG_AUDIO_PA) += pa.mo -pa.mo-objs = paaudio.o -pa.mo-libs := $(PULSE_LIBS) - -# sdl module -common-obj-$(CONFIG_AUDIO_SDL) += sdl.mo -sdl.mo-objs = sdlaudio.o -sdl.mo-cflags := $(SDL_CFLAGS) -sdl.mo-libs := $(SDL_LIBS) diff --git a/audio/meson.build b/audio/meson.build new file mode 100644 index 0000000..e58a936 --- /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('dsoundaudio.c')) +softmmu_ss.add(when: ['CONFIG_AUDIO_PT_INT'], if_true: files('audio_pt_int.c')) +softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: files('audio_win_int.c')) + +audio_modules = [] +if 'CONFIG_AUDIO_ALSA' in config_host + audio_modules += [['alsa', files('alsaaudio.c'), alsa]] +endif +if 'CONFIG_AUDIO_OSS' in config_host + audio_modules += [['oss', files('ossaudio.c'), oss]] +endif +if 'CONFIG_AUDIO_PA' in config_host + audio_modules += [['pa', files('paaudio.c'), pulse]] +endif +if 'CONFIG_AUDIO_SDL' in config_host + audio_modules += [['sdl', files('sdlaudio.c'), sdl]] +endif + +modules += {'audio': audio_modules} diff --git a/configure b/configure index 9d33df3..0be0735 100755 --- a/configure +++ b/configure @@ -3396,6 +3396,8 @@ for drv in $audio_drv_list; do alsa | try-alsa) if $pkg_config alsa --exists; then alsa_libs=$($pkg_config alsa --libs) + alsa_cflags=$($pkg_config alsa --cflags) + alsa=yes if test "$drv" = "try-alsa"; then audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa/alsa/') fi @@ -3411,7 +3413,9 @@ for drv in $audio_drv_list; do pa | try-pa) if $pkg_config libpulse --exists; then + libpulse=yes pulse_libs=$($pkg_config libpulse --libs) + pulse_cflags=$($pkg_config libpulse --cflags) audio_pt_int="yes" if test "$drv" = "try-pa"; then audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/') @@ -6589,8 +6593,16 @@ for drv in $audio_drv_list; do echo "$def=y" >> $config_host_mak ;; esac done +if test "$alsa" = "yes" ; then + echo "CONFIG_ALSA=y" >> $config_host_mak +fi echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak +echo "ALSA_CFLAGS=$alsa_cflags" >> $config_host_mak +if test "$libpulse" = "yes" ; then + echo "CONFIG_LIBPULSE=y" >> $config_host_mak +fi echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak +echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak echo "OSS_LIBS=$oss_libs" >> $config_host_mak diff --git a/meson.build b/meson.build index df16b58..90a15ad 100644 --- a/meson.build +++ b/meson.build @@ -107,6 +107,16 @@ if 'CONFIG_LIBCAP_NG' in config_host libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) endif xkbcommon = dependency('xkbcommon', required: false) +pulse = declare_dependency() +if 'CONFIG_LIBPULSE' in config_host + pulse = declare_dependency(compile_args: config_host['PULSE_CFLAGS'].split(), + link_args: config_host['PULSE_LIBS'].split()) +endif +alsa = declare_dependency() +if 'CONFIG_ALSA' in config_host + alsa = declare_dependency(compile_args: config_host['ALSA_CFLAGS'].split(), + link_args: config_host['ALSA_LIBS'].split()) +endif spice = declare_dependency() if 'CONFIG_SPICE' in config_host spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(), @@ -176,6 +186,18 @@ liblzfse = declare_dependency() if 'CONFIG_LZFSE' in config_host liblzfse = declare_dependency(link_args: config_host['LZFSE_LIBS'].split()) endif +oss = declare_dependency() +if 'CONFIG_AUDIO_OSS' in config_host + oss = declare_dependency(link_args: config_host['OSS_LIBS'].split()) +endif +dsound = declare_dependency() +if 'CONFIG_AUDIO_DSOUND' in config_host + dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split()) +endif +coreaudio = declare_dependency() +if 'CONFIG_AUDIO_COREAUDIO' in config_host + coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -453,6 +475,7 @@ libqemuutil = static_library('qemuutil', qemuutil = declare_dependency(link_with: libqemuutil, sources: version_res) +subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') @@ -481,7 +504,7 @@ foreach d, list : modules else softmmu_mods += sl endif - mods += {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]} + mods += {'dir': d, 'name': m[0], 'lib': [sl, libmodulecommon], 'deps': m[2]} else if d == 'block' block_ss.add(when: m[2], if_true: m[1]) From patchwork Thu Dec 12 12:51:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KOFArsLO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZCJ0sK0z9sPK for ; Fri, 13 Dec 2019 00:19:40 +1100 (AEDT) Received: from localhost ([::1]:59162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifONV-0000Sn-Eu for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:19:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35988) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyY-0003o3-6I for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyW-00075T-0L for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:50 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyV-00073X-Nb for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:47 -0500 Received: by mail-wr1-x443.google.com with SMTP id d16so2589403wre.10 for ; Thu, 12 Dec 2019 04:53:47 -0800 (PST) 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=lVeh8PO8pVqZlHDbL8a5E5ENf9bW2CKnWUTvgh5HKS8=; b=KOFArsLOEL6Ai2FcLlwn6jazasZcgAn8rzhdEdv1SGExiF6xGrlSzJclKdbarCdkOt r8G07Fj7f6gNr/pYUD0aLWwfSHTIZ3x0dclDFlkHn25iXEIEJvDlsMNOJ0Gm/v6tTtnw itEPXzlwfzCRBYgHeiAoe7ZeYZT4rANxKvbzTa60GMLX7d34kYcGcL2ngNbtlTqffzZi kPVrGQfqY+uomKY1jJ3eRRFWFbK6I2CrWelZLyuUKUFz4wNno3EcMy+7/HhDd5iAB/WF /CZ8IH3EESsgMiYymbTXdbP9YzCL7OjxFx4b/nPKiwufwbpjY8xxFg1hFSF5VXJhgYse ebzA== 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=lVeh8PO8pVqZlHDbL8a5E5ENf9bW2CKnWUTvgh5HKS8=; b=J9Q7RtNIpTFDydmrNcqKHQ0vW3dSBmQEwMAB8/3mVdQy9fGCv8wmdBbNcEt/uQ3bUb wldyW8S7Vft/gi5B4q37tIw0bzM28mbvbzVArXw83PyQO7EPt9DoRrQGbEAEPz1Rl8c8 7QCDrQOWNyhifOrJtzHWJmwraDqlZAYhxs9q0MQi4AznJmIasprTYRF1Rkwj8clRkSP+ Qk4lliu5+6hKuIjVj0j4npqlnu4QXcXFbCPj37dsCjhrnnYl6hsj/dp7IxeVcFd6mUcx prYwrX+b2DUjHMB8kwi2VqfewCbRlNvM4xGWv2dIwK2wLE3QwaVJP2k/Ll4Nx8BTR7Bu SXig== X-Gm-Message-State: APjAAAUheD6W0ng/60tHSXC/mrI2b2zFsPnxl1MpNEWF9LXgHDlZINEU cVYaeKRUI3HjSQ5rIssaX6gQYGyt X-Google-Smtp-Source: APXvYqzVuS92cN8pkzV05XwcF8cmngdJ6X8VJH1DeJ+OUF0mrjTxLMv7F7+WCOTpENlSAJjkipvUPw== X-Received: by 2002:a5d:494b:: with SMTP id r11mr6272372wrs.184.1576155226166; Thu, 12 Dec 2019 04:53:46 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 048/132] meson: convert ui directory to Meson Date: Thu, 12 Dec 2019 13:51:32 +0100 Message-Id: <1576155176-2464-49-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 4 +-- Makefile.objs | 7 ++++-- Makefile.target | 7 +++--- configure | 6 +++++ meson.build | 50 +++++++++++++++++++++++++++++++++++++ ui/Makefile.objs | 69 --------------------------------------------------- ui/meson.build | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/shader.c | 6 ++--- 8 files changed, 143 insertions(+), 81 deletions(-) delete mode 100644 ui/Makefile.objs diff --git a/Makefile b/Makefile index c4cfca9..5bdd400 100644 --- a/Makefile +++ b/Makefile @@ -135,9 +135,7 @@ ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs endif -dummy := $(call unnest-vars,, \ - common-obj-y \ - common-obj-m) +dummy := $(call unnest-vars,, common-obj-y) include $(SRC_PATH)/tests/Makefile.include diff --git a/Makefile.objs b/Makefile.objs index cea6f9a..1319ba2 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -55,6 +55,11 @@ common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF) common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF) +common-obj-$(if $(CONFIG_CURSES),m) += ui-curses$(DSOSUF) +common-obj-$(if $(CONFIG_GTK),m) += ui-gtk$(DSOSUF) +common-obj-$(if $(CONFIG_SDL),m) += ui-sdl$(DSOSUF) +common-obj-$(if $(CONFIG_SPICE),m) += ui-spice-app$(DSOSUF) + common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF) common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF) common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF) @@ -69,8 +74,6 @@ common-obj-y += hw/ common-obj-y += replay/ -common-obj-y += ui/ -common-obj-m += ui/ common-obj-y += bt-host.o bt-vhci.o bt-host.o-cflags := $(BLUEZ_CFLAGS) diff --git a/Makefile.target b/Makefile.target index 65f1312..265b596 100644 --- a/Makefile.target +++ b/Makefile.target @@ -166,11 +166,11 @@ LIBS := $(libs_softmmu) $(LIBS) LIBS := $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) +LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS) endif -LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) +LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) - # Hardware support ifeq ($(TARGET_NAME), sparc64) obj-y += hw/sparc64/ @@ -194,8 +194,7 @@ dummy := $(call fix-paths,../,, \ io-obj-y \ qom-obj-y) dummy := $(call unnest-vars,.., \ - common-obj-y \ - common-obj-m) + common-obj-y) all-obj-y += $(common-obj-y) all-obj-y += $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) diff --git a/configure b/configure index 0be0735..a18fe24 100755 --- a/configure +++ b/configure @@ -6620,12 +6620,18 @@ fi if test "$vnc_sasl" = "yes" ; then echo "CONFIG_VNC_SASL=y" >> $config_host_mak fi +echo "SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak +echo "SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak if test "$vnc_jpeg" = "yes" ; then echo "CONFIG_VNC_JPEG=y" >> $config_host_mak fi +echo "JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak +echo "JPEG_LIBS=$vnc_jpeg_libs" >> $config_host_mak if test "$vnc_png" = "yes" ; then echo "CONFIG_VNC_PNG=y" >> $config_host_mak fi +echo "PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak +echo "PNG_LIBS=$vnc_png_libs" >> $config_host_mak if test "$xfs" = "yes" ; then echo "CONFIG_XFS=y" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 90a15ad..cb164e0 100644 --- a/meson.build +++ b/meson.build @@ -198,6 +198,56 @@ coreaudio = declare_dependency() if 'CONFIG_AUDIO_COREAUDIO' in config_host coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split()) endif +opengl = declare_dependency() +if 'CONFIG_OPENGL' in config_host + opengl = declare_dependency(link_args: config_host['OPENGL_LIBS'].split()) +else +endif +gtk = declare_dependency() +if 'CONFIG_GTK' in config_host + gtk = declare_dependency(compile_args: config_host['GTK_CFLAGS'].split(), + link_args: config_host['GTK_LIBS'].split()) +endif +vte = declare_dependency() +if 'CONFIG_VTE' in config_host + vte = declare_dependency(compile_args: config_host['VTE_CFLAGS'].split(), + link_args: config_host['VTE_LIBS'].split()) +endif +x11 = declare_dependency() +if 'CONFIG_X11' in config_host + x11 = declare_dependency(compile_args: config_host['X11_CFLAGS'].split(), + link_args: config_host['X11_LIBS'].split()) +endif +curses = declare_dependency() +if 'CONFIG_CURSES' in config_host + curses = declare_dependency(compile_args: config_host['CURSES_CFLAGS'].split(), + link_args: config_host['CURSES_LIBS'].split()) +endif +iconv = declare_dependency() +if 'CONFIG_ICONV' in config_host + iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(), + link_args: config_host['ICONV_LIBS'].split()) +endif +gio = declare_dependency() +if 'CONFIG_GIO' in config_host + gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(), + link_args: config_host['GIO_LIBS'].split()) +endif +png = declare_dependency() +if 'CONFIG_VNC_PNG' in config_host + png = declare_dependency(compile_args: config_host['PNG_CFLAGS'].split(), + link_args: config_host['PNG_LIBS'].split()) +endif +jpeg = declare_dependency() +if 'CONFIG_VNC_JPEG' in config_host + jpeg = declare_dependency(compile_args: config_host['JPEG_CFLAGS'].split(), + link_args: config_host['JPEG_LIBS'].split()) +endif +sasl = declare_dependency() +if 'CONFIG_VNC_SASL' in config_host + sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(), + link_args: config_host['SASL_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') diff --git a/ui/Makefile.objs b/ui/Makefile.objs deleted file mode 100644 index ba39080..0000000 --- a/ui/Makefile.objs +++ /dev/null @@ -1,69 +0,0 @@ -vnc-obj-y += vnc.o -vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o -vnc-obj-y += vnc-enc-tight.o vnc-palette.o -vnc-obj-y += vnc-enc-zrle.o -vnc-obj-y += vnc-auth-vencrypt.o -vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o -vnc-obj-y += vnc-ws.o -vnc-obj-y += vnc-jobs.o - -common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o -common-obj-y += input.o input-keymap.o input-legacy.o kbd-state.o -common-obj-$(CONFIG_LINUX) += input-linux.o -common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o -common-obj-$(CONFIG_COCOA) += cocoa.o -common-obj-$(CONFIG_VNC) += $(vnc-obj-y) -common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o - -# ui-sdl module -common-obj-$(CONFIG_SDL) += sdl.mo -sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o -ifeq ($(CONFIG_OPENGL),y) -sdl.mo-objs += sdl2-gl.o -endif -sdl.mo-cflags := $(SDL_CFLAGS) -sdl.mo-libs := $(SDL_LIBS) - -# ui-gtk module -common-obj-$(CONFIG_GTK) += gtk.mo -gtk.mo-objs := gtk.o -gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS) -ifeq ($(CONFIG_OPENGL),y) -gtk.mo-objs += gtk-egl.o -gtk.mo-libs += $(OPENGL_LIBS) -ifeq ($(CONFIG_GTK_GL),y) -gtk.mo-objs += gtk-gl-area.o -endif -endif - -ifeq ($(CONFIG_X11),y) -sdl.mo-objs += x_keymap.o -gtk.mo-objs += x_keymap.o -x_keymap.o-cflags := $(X11_CFLAGS) -x_keymap.o-libs := $(X11_LIBS) -endif - -common-obj-$(CONFIG_CURSES) += curses.mo -curses.mo-objs := curses.o -curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS) -curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS) - -ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) -common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo -endif -spice-app.mo-objs := spice-app.o -spice-app.mo-cflags := $(GIO_CFLAGS) -spice-app.mo-libs := $(GIO_LIBS) - -common-obj-$(CONFIG_OPENGL) += shader.o -common-obj-$(CONFIG_OPENGL) += console-gl.o -common-obj-$(CONFIG_OPENGL) += egl-helpers.o -common-obj-$(CONFIG_OPENGL) += egl-context.o -common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o - -shader.o-libs += $(OPENGL_LIBS) -console-gl.o-libs += $(OPENGL_LIBS) -egl-helpers.o-libs += $(OPENGL_LIBS) -egl-context.o-libs += $(OPENGL_LIBS) -egl-headless.o-libs += $(OPENGL_LIBS) diff --git a/ui/meson.build b/ui/meson.build index 8157754..0867cdc 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,76 @@ +softmmu_ss.add(files( + 'console.c', + 'cursor.c', + 'input-keymap.c', + 'input-legacy.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 = 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'), sasl]) +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 = [] + +if config_host.has_key('CONFIG_CURSES') + ui_modules += [['curses', files('curses.c'), [curses, iconv]]] +endif + +if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE') + gtk_ss = ss.source_set() + gtk_ss.add(gtk, vte, files('gtk.c')) + gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c')) + gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.c')) + gtk_ss = gtk_ss.apply(config_host, strict: false) + ui_modules += [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SDL') + sdl_ss = ss.source_set() + sdl_ss.add([sdl, pixman, glib], files( + 'sdl2-2d.c', + 'sdl2-input.c', + 'sdl2.c', + )) + sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c')) + sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + sdl_ss = sdl_ss.apply(config_host, strict: false) + ui_modules += [['sdl', sdl_ss.sources(), sdl_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO') + spice_ss = ss.source_set() + spice_ss.add(spice, gio, files('spice-app.c')) + spice_ss = spice_ss.apply(config_host, strict: false) + ui_modules += [['spice-app', spice_ss.sources(), spice_ss.dependencies()]] +endif + keymap_gen = find_program('keycodemapdb/tools/keymap-gen') keymaps = [ @@ -34,3 +107,5 @@ foreach e : keymaps endforeach subdir('shader') + +modules += {'ui': ui_modules} diff --git a/ui/shader.c b/ui/shader.c index d78829f..e8b8d32 100644 --- a/ui/shader.c +++ b/ui/shader.c @@ -27,9 +27,9 @@ #include "qemu/osdep.h" #include "ui/shader.h" -#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" struct QemuGLShader { GLint texture_blit_prog; From patchwork Thu Dec 12 12:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mrQ2qq7P"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZVj6dm1z9sPK for ; Fri, 13 Dec 2019 00:33:01 +1100 (AEDT) Received: from localhost ([::1]:59350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOaR-0001nM-0k for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:32:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35951) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyY-0003nj-05 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyW-00076v-GW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:49 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40444) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyW-000755-81 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:48 -0500 Received: by mail-wr1-x435.google.com with SMTP id c14so2607563wrn.7 for ; Thu, 12 Dec 2019 04:53:48 -0800 (PST) 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=w1/txV5t0S8rd0wKFy5mj47On35zo/mSGxOA86LohxE=; b=mrQ2qq7PGoCLzw7NTkVIhmAdYKBCFHnylM6srNq9OCfZq2k/3p3NR5igAY1MBFrKip OhFdWMC2mJ956HfUeNwo3+j2DXWYTzSJ7S/o8eUIUd3nbc2w2JiXZJfgH3xLeXFx70T8 LVeEaXGhXJaXtNilK2hukTHzLL/KKCGeSvRmvHycjTBk6KL+b+IYO8U5KOJK16WROkwB 99LibKb+nrSj3s2LD4qoYZfAz5b6p5GeWWbtGcQ+cL0lejDdJeo5wXIivC4+Ex9Ae7Ka lPtzWr5F5vzqlGqPVeBHvZz8n1Q7dsA8uR2cGuSvUewowOdEnKhWUv+yCiMvbR5tq9Px LlzQ== 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=w1/txV5t0S8rd0wKFy5mj47On35zo/mSGxOA86LohxE=; b=k1W45e7toolnS7o4YDNVyc/B6Xy3/uNMk9FWcqH0FmTxqfoJsiAt7B0Ye2awCaxiep B+YVIaflDt26wCzr2lAg+Yr8mormh0ZSDdNTNNdGDCeomxWjzY54Hd1nYpn5mqwJGJck JHM/da0w19j7mH78DGBhoiE8EB28yf3uHXvYvdSysnL1LQFpTSdsmh/a2XVsGYBZH0s4 yy6IeB25GonZu0T0yyaJ72O/AFcMN+oxb7RcqY+TOYsQKrPkA+lxZcoQCL347FN5m6Ag XDEs1MCcF97TxQvOTQh5R8Uy2rgpWabb8/Mbp7wKsi1xMdbw53vQHBe+Ph/wXPlafAO9 sdLA== X-Gm-Message-State: APjAAAVn9ezbiR1SMWoIWn0zv17W1/RDD0B8D+DTaz2xe3QR6Vx3vLPW NLS81GKXHMH3S+Mlsisjyg2fIwXj X-Google-Smtp-Source: APXvYqzGA9Rz2Wb/hdgJ3ZJge/5CBAg06nqkPIKwfYTID+Xss1soFpiRfmazDkBUeI7Moe1V8/+S+w== X-Received: by 2002:adf:fc03:: with SMTP id i3mr6326220wrr.306.1576155226982; Thu, 12 Dec 2019 04:53:46 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 049/132] meson: convert root directory to Meson Date: Thu, 12 Dec 2019 13:51:33 +0100 Message-Id: <1576155176-2464-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 29 ++--------------------------- Makefile.target | 2 +- configure | 3 +++ meson.build | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1319ba2..307e27c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,19 +35,11 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = blockdev.o blockdev-nbd.o block/ - -common-obj-y += bootdevice.o iothread.o +common-obj-y = block/ common-obj-y += dump/ -common-obj-y += job-qmp.o common-obj-y += monitor/ common-obj-y += net/ -common-obj-y += qdev-monitor.o device-hotplug.o -common-obj-$(CONFIG_WIN32) += os-win32.o -common-obj-$(CONFIG_POSIX) += os-posix.o - common-obj-$(CONFIG_LINUX) += fsdev/ - common-obj-y += migration/ common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) @@ -71,30 +63,13 @@ common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) common-obj-y += hw/ - common-obj-y += replay/ - -common-obj-y += bt-host.o bt-vhci.o -bt-host.o-cflags := $(BLUEZ_CFLAGS) - -common-obj-y += dma-helpers.o -common-obj-y += vl.o -vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) -common-obj-$(CONFIG_TPM) += tpm.o - common-obj-y += backends/ - -common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o -qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS) -qemu-seccomp.o-libs := $(SECCOMP_LIBS) - -common-obj-$(CONFIG_FDT) += device_tree.o - endif ####################################################################### # Target-independent parts used in system and user emulation -common-obj-y += cpus-common.o + common-obj-y += hw/ common-obj-y += qom/ common-obj-y += disas/ diff --git a/Makefile.target b/Makefile.target index 265b596..bad50ce 100644 --- a/Makefile.target +++ b/Makefile.target @@ -168,7 +168,7 @@ ifneq ($(CONFIG_MODULES),y) LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS) endif -LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) +LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS) LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) # Hardware support diff --git a/configure b/configure index a18fe24..c4b50a7 100755 --- a/configure +++ b/configure @@ -6771,6 +6771,7 @@ fi if test "$bluez" = "yes" ; then echo "CONFIG_BLUEZ=y" >> $config_host_mak echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak + echo "BLUEZ_LIBS=$bluez_libs" >> $config_host_mak fi if test "$gtk" = "yes" ; then echo "CONFIG_GTK=m" >> $config_host_mak @@ -6891,6 +6892,8 @@ if test "$preadv" = "yes" ; then fi if test "$fdt" != "no" ; then echo "CONFIG_FDT=y" >> $config_host_mak + echo "FDT_CFLAGS=$fdt_cflags" >> $config_host_mak + echo "FDT_LIBS=$fdt_ldflags $fdt_libs" >> $config_host_mak fi if test "$membarrier" = "yes" ; then echo "CONFIG_MEMBARRIER=y" >> $config_host_mak diff --git a/meson.build b/meson.build index cb164e0..cb60aac 100644 --- a/meson.build +++ b/meson.build @@ -37,6 +37,7 @@ configure_file(input: files('scripts/ninjatool.py'), m = cc.find_library('m', required: false) util = cc.find_library('util', required: false) +winmm = [] socket = [] version_res = [] coref = [] @@ -45,6 +46,7 @@ cocoa = [] hvf = [] if host_machine.system() == 'windows' socket = cc.find_library('ws2_32') + winmm = cc.find_library('winmm') win = import('windows') version_res = win.compile_resources('version.rc', @@ -248,6 +250,21 @@ if 'CONFIG_VNC_SASL' in config_host sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(), link_args: config_host['SASL_LIBS'].split()) endif +bluez = declare_dependency() +if 'CONFIG_BLUEZ' in config_host + bluez = declare_dependency(compile_args: config_host['BLUEZ_CFLAGS'].split(), + link_args: config_host['BLUEZ_LIBS'].split()) +endif +seccomp = declare_dependency() +if 'CONFIG_SECCOMP' in config_host + seccomp = declare_dependency(compile_args: config_host['SECCOMP_CFLAGS'].split(), + link_args: config_host['SECCOMP_LIBS'].split()) +endif +fdt = declare_dependency() +if 'CONFIG_FDT' in config_host + fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(), + link_args: config_host['FDT_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -542,6 +559,28 @@ subdir('nbd') subdir('scsi') subdir('block') +softmmu_ss.add(files( + 'blockdev-nbd.c', + 'blockdev.c', + 'bootdevice.c', + 'device-hotplug.c', + 'dma-helpers.c', + 'iothread.c', + 'job-qmp.c', + 'qdev-monitor.c', + 'vl.c', +), sdl) + +softmmu_ss.add(files('bt-host.c', 'bt-vhci.c'), bluez) + +softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c'), winmm]) +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c')) +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')) + mods = [] block_mods = [] softmmu_mods = [] From patchwork Thu Dec 12 12:51:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZxRRYJb2"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZR61WRkz9sPK for ; Fri, 13 Dec 2019 00:29:54 +1100 (AEDT) Received: from localhost ([::1]:59312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOXP-00077E-JH for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:29:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36092) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyY-0003ot-NO for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyX-00078w-Ds for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:50 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyX-00076r-6b for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:49 -0500 Received: by mail-wr1-x429.google.com with SMTP id b6so2660446wrq.0 for ; Thu, 12 Dec 2019 04:53:49 -0800 (PST) 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=gbod70QFVH0c994XIXE4cM47ECszyQsoWIS+2slZOD8=; b=ZxRRYJb2AM1p7UP6XB2wXAdj8ZsyDNAqOYzj+JAmA0Yvkee1PpNv+c9tx7w4wLpO72 2xNn0xmiBM4FYml3LSUshemre+qKnpMALjPf33kps/ag8bz4wgVz6K60uDyOz2y83Bo5 INIfwqtfgCNUN8JcMvpODvCLRFmUFUqaKuXTwAIxNy/abW7eV7AhX19ZpzTDz0JMHCeN osn4psps4hpB/DB4ztz2t7JJ+TNAQCWPzRjtpTKNTFJW3JRNfLfVYQeUKEfk3w6bYG0B T8wabGJiq66hfTlfFfwU18/n+kBp2SToWN/SzeyROGWYV6IH2qP5a2IiL9LMbb3kQwUX OwlA== 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=gbod70QFVH0c994XIXE4cM47ECszyQsoWIS+2slZOD8=; b=e9PitdW7/Ei0sSR6rZXAnyDe53XBnjzD4GKaJD7pLQPyZREybMJMf4nVm/rFElZSxX dSC0qT7x49GjVLnXQB9XJ1p6iTMmky3cpwxPidRAh9Q7YL8LKl7SY6G5LOlQ9hVRvNRu Yqa/2DV20/6iTRcsMS2ZFsQYa2Z6ZCtPk/IOM/PzxLPtCX9D6ODPI1QZTzX67kgXTIxz RiqfPx7G/v8sahMtNj/yJzeaMizRkYrGQy1CbT8QgrZUKfrJny2j8j2Z+Bz94MkHWVQA +aFW1OntHqRGGXdSBos/Wd+cjjdx6WBANAp81QL7d5sCsml4Nxe0MAc4DJwLZlBnOq8e BTRQ== X-Gm-Message-State: APjAAAWTvxn9FVAKoiJRSV7VHM9tNeXcS+0Bu1aPX4i1k95uGgRl8Ngo DKi8gwLXHyKlA37IRC7OaKrq6sud X-Google-Smtp-Source: APXvYqwO49zyVjEBRXSJc5nyC51fW9GbKh32D3zruMH+NfbyFG6isVXRjgX4D15XXhVdKmBYR3SwPg== X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr6526157wrx.304.1576155227922; Thu, 12 Dec 2019 04:53:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 050/132] meson: convert trace/ Date: Thu, 12 Dec 2019 13:51:34 +0100 Message-Id: <1576155176-2464-51-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.objs | 4 ---- trace/Makefile.objs | 8 -------- trace/meson.build | 5 ++++- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 trace/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 307e27c..e9ae889 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -77,7 +77,3 @@ common-obj-y += disas/ ###################################################################### # Resource file for Windows executables version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o - -###################################################################### -# tracing -util-obj-y += trace/ diff --git a/trace/Makefile.objs b/trace/Makefile.objs deleted file mode 100644 index a429474..0000000 --- a/trace/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: makefile -*- - - -################################################## -# Translation level - -obj-y += generated-helpers.o -obj-y += control-target.o diff --git a/trace/meson.build b/trace/meson.build index 8ea8db7..b113425 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -1,3 +1,5 @@ +specific_ss.add(files('control-target.c')) + # common options tracetool = [ find_program('scripts/tracetool.py'), @@ -67,12 +69,13 @@ foreach d : [ ['generated-helpers.h', 'tcg-helper-h'], ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], ] - custom_target(d[0], + gen = custom_target(d[0], output: d[0], input: meson.source_root() / 'trace-events', command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ], build_by_default: true, # to be removed when added to a target capture: true) + specific_ss.add(gen) endforeach if 'CONFIG_TRACE_UST' in config_host From patchwork Thu Dec 12 12:51:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kx7Duzrw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZTH6Zqdz9sPc for ; Fri, 13 Dec 2019 00:31:46 +1100 (AEDT) Received: from localhost ([::1]:59328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOZE-0000Kn-DO for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:31:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36224) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyZ-0003px-Ez for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyY-0007B5-9z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:51 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyY-00079M-1X for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:50 -0500 Received: by mail-wr1-x435.google.com with SMTP id y11so2613952wrt.6 for ; Thu, 12 Dec 2019 04:53:49 -0800 (PST) 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=I4kIdx5/B7vhPeGSC/yHPjfKMOrsksBPLKlOIGo7xQE=; b=Kx7Duzrw63cyTVzGjM9zxolW3DSi15Yg8QS5yAzeOK3kdbFZrgwfjIuAQVrL1/uhbU fP6OmUUIOUB9RGa8KwjMn4ErQZlyrTK1h7sjeTJ1rOYExDhtik7/8jloeHm6lh9inSjr 0CeGoF0mHqwBDJnSRGhqdEe3+XacgWAK+g7J5exKRmzRsJju0kFFxbB8uTbFIwZbh4BD NkCD9HBWGxI7wAacKt6tp7dIPSDdv5jGXtpeVB70T82QRjHyJPGg2ET5aFcU+sxroMdV A0kYKBE2T7ech3VHwZOLroI6+SpWnaRr1tDZD1wb5+ehzHneg/eGEyoatw4nPnjgN550 UjCA== 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=I4kIdx5/B7vhPeGSC/yHPjfKMOrsksBPLKlOIGo7xQE=; b=kr4YqYHaJDW9w455+ZOZDvekcUUadCqXJEpHjmGEdh+0FsfEofpqfGftfnMO9YY/sR DGZGZEpL7wRkYTrkUMMTDU/xyYVIsFSnRIPxrBQvK8hcZEelH8H78Vl/OdijJIFFCXsG n1RFJRu6+vU1GntE/HePmJtP6ZrK3VF4o49l5I0gD37PY91RfQK7GVZecim13+k9O5OZ gzqBmgJCLkS3OkQjplPBeiLEDnUK5x50TVVqNMQUGyykdBcZTxgL+EgjLZLxFmqkITbl gI4621TPl8SquYdOc1LZy6FcL8LW3PHbTsIc9Qx/tkGkUh43Nqix7hBqh4cjH6C0oSAi RksQ== X-Gm-Message-State: APjAAAVK7trojTZbeqtD/YLsuiyd0MNkdE221imj6MmhtvGJed5cCzhA 6SOlQSrh5+pQpqDld/21eA1DXta5 X-Google-Smtp-Source: APXvYqzujCYIz6pWqghF8eZxljM2HM9TFDW4pY74V+ZQ4IMg59TP7AokTf4Xc4mRKQkz1VMcxSbfDg== X-Received: by 2002:adf:f802:: with SMTP id s2mr6204146wrp.201.1576155228887; Thu, 12 Dec 2019 04:53:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 051/132] meson: convert qom/ Date: Thu, 12 Dec 2019 13:51:35 +0100 Message-Id: <1576155176-2464-52-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.objs | 1 - qom/Makefile.objs | 1 - qom/meson.build | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 qom/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index e9ae889..0bc9167 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -71,7 +71,6 @@ endif # Target-independent parts used in system and user emulation common-obj-y += hw/ -common-obj-y += qom/ common-obj-y += disas/ ###################################################################### diff --git a/qom/Makefile.objs b/qom/Makefile.objs deleted file mode 100644 index fc1248e..0000000 --- a/qom/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o diff --git a/qom/meson.build b/qom/meson.build index 4af044d..3875663 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -13,3 +13,8 @@ libqom = static_library('qom', qom_ss.sources(), name_suffix: 'fa') qom = declare_dependency(link_whole: libqom) + +softmmu_ss.add(files( + 'qom-hmp-cmds.c', + 'qom-qmp-cmds.c', +)) From patchwork Thu Dec 12 12:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sRbLtdco"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZYq6FPHz9sPL for ; Fri, 13 Dec 2019 00:35:43 +1100 (AEDT) Received: from localhost ([::1]:59378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOd3-0005T0-7I for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:35:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36390) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNya-0003rI-6G for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyZ-0007Cs-4P for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyY-0007BE-Tn for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:51 -0500 Received: by mail-wr1-x42e.google.com with SMTP id c14so2607694wrn.7 for ; Thu, 12 Dec 2019 04:53:50 -0800 (PST) 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=YBMtW7/slCFp25JbxpbTiSSPBB6bO91AS1uGQxrTq6o=; b=sRbLtdcohVktZDlC8bzgVvCOoBdiq7J74UytyJTT7QlzCuIA+4lKU3RnJUzEHNH4NS D++iKB7idrW9magoQRpKMQGfYoMvIXCVVNo6R0FL8eGAGYT65OH0lk0/08i5pJt+uuiZ YUm/tbwg88rGZVLJQMclVstop6cBuW7JH5q9JlaJkxd7QGdu1Z+OnAJT5xynuMiFkv/v Qme5IMgwihSjlRW599rto5J7bvSAax+TEkxYQWerxw50/whv7609gP0mxkI5SdHonohj t6lsvmiIQeTqsb2oK97Ug3z6YCXKdb5lApSKABTPGZZq9youonx0kJXzteICyW32n/BZ DCLg== 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=YBMtW7/slCFp25JbxpbTiSSPBB6bO91AS1uGQxrTq6o=; b=FFA/IoX0G2MthOkf8O9KAiyfXwZmsBgMJS4uHEEJMY7LYJ2GpQw/OA2tq6D41UUuvb UDTNbtkew9fT9PtDsDRgs45/t/fR68bMxJzlw9RwTM7hYp0WdNVMbKkX1ywJ2Kf/sPVG sFd7htRXyMGyiNpjTDtCr3ScGw+aAtaUnPb8wZLVvuhPqYV3ZAS56UpigwhmwKId5YKW 63eEplq6gL7fGp0Zl9SB51GTOVklEs7BhvlL09MtG161+Si+HFDfnTWfL0Ncv8mjrf0h bNixGNXkE7/8PbyIzMO8CP8dAWm0LoiERy5x6Z0vlCg0myPJCU/1U+utiayyAfaOknWy cS2w== X-Gm-Message-State: APjAAAV6hbQ1q9rqzLTzzsEqOn28+HQmc1lAcrsj+Yo2WKJ8rwcN3Fmi oBW32OeDmU6gLAX9OXFZjO1kzlBC X-Google-Smtp-Source: APXvYqw5xypLEGV3TVhCj8N0rTEZbwggGr+/p64I3ER0d3FHMlY7yIZT2oLIA0wMNdx6PJCbss/+0w== X-Received: by 2002:adf:d848:: with SMTP id k8mr5982149wrl.328.1576155229697; Thu, 12 Dec 2019 04:53:49 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 052/132] meson: convert block/ Date: Thu, 12 Dec 2019 13:51:36 +0100 Message-Id: <1576155176-2464-53-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.objs | 3 +-- block/Makefile.objs | 1 - block/meson.build | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 block/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 0bc9167..4c7ae48 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = block/ -common-obj-y += dump/ +common-obj-y = dump/ common-obj-y += monitor/ common-obj-y += net/ common-obj-$(CONFIG_LINUX) += fsdev/ diff --git a/block/Makefile.objs b/block/Makefile.objs deleted file mode 100644 index 83e87b3..0000000 --- a/block/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -common-obj-y += stream.o diff --git a/block/meson.build b/block/meson.build index a68689b..ca62992 100644 --- a/block/meson.build +++ b/block/meson.build @@ -98,4 +98,6 @@ module_block_h = custom_target('module_block.h', command: [module_block_py, '@OUTPUT0@', modsrc]) block_ss.add(module_block_h) +softmmu_ss.add(files('stream.c')) + modules += {'block': block_modules} From patchwork Thu Dec 12 12:51:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bha/P4oH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZch2sDDz9sPL for ; Fri, 13 Dec 2019 00:38:12 +1100 (AEDT) Received: from localhost ([::1]:59414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOfR-0000WG-Kx for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:38:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36619) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyb-0003tG-Kt for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNya-0007FF-5R for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:53 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:55228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyZ-0007DO-Tx for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: by mail-wm1-x32a.google.com with SMTP id b11so2236948wmj.4 for ; Thu, 12 Dec 2019 04:53:51 -0800 (PST) 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=Atnpcgx8oxW2ZL46UP1c38Ecu167rif8vvUIatLdPCk=; b=bha/P4oHOphE9TTm71AWhMgERPcecb1WRO7UkLXAXAlHecA3CsOfWevmYho23B6Jkb cj+MvLT0CrGS1Fz5havNVecunO79JIx+PifuGvr0FfSzw9lIjoPusNXzGQNZnr6eiJ3l Ad/bdHRYYDCwiJqDdJagO133ZmHZcZOLyVQqIQho1FQfyg/xjMuzmCBMFnNfz7SWKLi/ 6dm94fffQVpGytSJntbfR9/3RUXnte+zLkvUkRjr9Y14uKWOFQEvhF9Yn0TMOQAfnh3e 5cZjJigBH4WCS1KHYQ6F7Zzkz1UJV72jRwEm3sb1jwNJhimsc26P9jVZXTmIMJAxIXJW qtew== 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=Atnpcgx8oxW2ZL46UP1c38Ecu167rif8vvUIatLdPCk=; b=TSoaeqF8vpGWr/Yx/Onl4g/XGClkhQIZ3+1R4hfk/dBtTudP9gPKqKAbA8AuYVzJa1 O0sV2cItQCs4n9i5k+hzS/Q3hNyRyjgPEc3udS/dfC/em++A6Xr9EICTEKUEIYBAFda3 gziscTn4gza9akHajZ7nmZMieuqw0G4ArsDRqN0OIy4mgWG/G3kuqk8/VztCJ+KFZC/s 9Cf5c+brGJewlC8/LLTwNH6xKgI/wFd9/7JvrVtyV1wC55pz8Lp92UXR2b9mnTkdDNlj ROf9Jc1fP3gRAj4+LrdPDRYHRlDX6Zxz8qTicQeoDpTYgahTzg+RxhJbnrRSgehNwI30 RP1g== X-Gm-Message-State: APjAAAXSy0oxuiY2rXK3/wl17Yty3OYhTgRsz1Army5fGdL1AKwTCLD8 b9wWtkg+BykAUsjHkJR5FYrZrmc7 X-Google-Smtp-Source: APXvYqy9gc3UpLA5JB+Nc22BUEn+VMijDhB/wWQpJm15swGaEMN9y0xnMpoAqIiBuHjpPxV7HWNkMg== X-Received: by 2002:a1c:286:: with SMTP id 128mr6206268wmc.176.1576155230652; Thu, 12 Dec 2019 04:53:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 053/132] meson: convert dump/ Date: Thu, 12 Dec 2019 13:51:37 +0100 Message-Id: <1576155176-2464-54-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 4c7ae48..1b1eff5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = dump/ -common-obj-y += monitor/ +common-obj-y = monitor/ common-obj-y += net/ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration/ diff --git a/Makefile.target b/Makefile.target index bad50ce..569f2d9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -153,7 +153,6 @@ endif #CONFIG_BSD_USER ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o -obj-y += dump/ obj-y += hw/ obj-y += monitor/ obj-y += qapi/ diff --git a/configure b/configure index c4b50a7..8e55f3a 100755 --- a/configure +++ b/configure @@ -2351,6 +2351,7 @@ int main(void) { lzo_version(); return 0; } EOF if compile_prog "" "-llzo2" ; then libs_softmmu="$libs_softmmu -llzo2" + lzo_libs="-llzo2" lzo="yes" else if test "$lzo" = "yes"; then @@ -2370,6 +2371,7 @@ int main(void) { snappy_max_compressed_length(4096); return 0; } EOF if compile_prog "" "-lsnappy" ; then libs_softmmu="$libs_softmmu -lsnappy" + snappy_libs='-lsnappy' snappy="yes" else if test "$snappy" = "yes"; then @@ -6976,10 +6978,12 @@ fi if test "$lzo" = "yes" ; then echo "CONFIG_LZO=y" >> $config_host_mak + echo "LZO_LIBS=$lzo_libs" >> $config_host_mak fi if test "$snappy" = "yes" ; then echo "CONFIG_SNAPPY=y" >> $config_host_mak + echo "SNAPPY_LIBS=$snappy_libs" >> $config_host_mak fi if test "$bzip2" = "yes" ; then diff --git a/dump/Makefile.objs b/dump/Makefile.objs deleted file mode 100644 index d2a5db3..0000000 --- a/dump/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += dump.o -common-obj-y += dump-hmp-cmds.o -obj-$(TARGET_X86_64) += win_dump.o diff --git a/dump/meson.build b/dump/meson.build new file mode 100644 index 0000000..2eff29c --- /dev/null +++ b/dump/meson.build @@ -0,0 +1,4 @@ +softmmu_ss.add(files('dump-hmp-cmds.c')) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy, lzo]) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true: files('win_dump.c')) diff --git a/meson.build b/meson.build index cb60aac..804a9bc 100644 --- a/meson.build +++ b/meson.build @@ -265,6 +265,14 @@ if 'CONFIG_FDT' in config_host fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(), link_args: config_host['FDT_LIBS'].split()) endif +snappy = declare_dependency() +if 'CONFIG_SNAPPY' in config_host + snappy = declare_dependency(link_args: config_host['SNAPPY_LIBS'].split()) +endif +lzo = declare_dependency() +if 'CONFIG_LZO' in config_host + lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -546,6 +554,7 @@ subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') +subdir('dump') block_ss.add(files( 'block.c', From patchwork Thu Dec 12 12:51:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="btDYmDDO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZGB5HT0z9sPc for ; Fri, 13 Dec 2019 00:22:10 +1100 (AEDT) Received: from localhost ([::1]:59206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOPq-0003yy-Ul for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:22:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36775) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyc-0003uP-7c for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNya-0007Gw-VT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:54 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNya-0007FM-OB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: by mail-wm1-x32f.google.com with SMTP id p17so2392346wmb.0 for ; Thu, 12 Dec 2019 04:53:52 -0800 (PST) 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=BhjIZSbzDXjcTJIBhziqsn15p3DsoLde/mMNVXxEiZ4=; b=btDYmDDOk46C3BY24FAccxqqZxOt4YNYLUMQ661E17dEPA9you8jM5n7SlMTfZxczY jXkSYOLrG+Bbjdq7v6t0H3sHvkcD5jfW7LaeQVD9rwjUjvdOSTOSXCEyhc0oAYX6G7tW 7vUX9snuEKOBDKovYGZUMI/RPO8aBQS0KBhN636nL+Cd5ior5h6QWgVuiYfpc9Q3QnyI lS5necW50Dq4urWX1ohSKjLerC1/lSMKxH6coP1P6CM3oVbT2UMMI/hmHfLrDVzkIwl8 yDJyGbp8jslY9/v7lyPpkUQkKT9mbPgaZPfHh8+p4LQerolYTxLiOaBPXJ7O2fULKoEC kvUQ== 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=BhjIZSbzDXjcTJIBhziqsn15p3DsoLde/mMNVXxEiZ4=; b=IWt6g0e5cZF7rsz5uCwKcIRkbVkL28MB37F1oyddXZstF11VQVDnLdsAfXSYkOKF9j eMDGO55XfiRAv98nCwbRVYSX62eftBxHFL3KX9deUbLQrNIiPt+scj132KwtY3OA6czQ hAoUATAac9eeGu354WqQVwB3DmDAxxDDitcMxrL0vOo7b2odV4UQ6sBKcEjZQoNh49y1 BWDHWHZ8yH71hb59r5lvdArd6oxVfmleUwyQA1nQQv8uJXOft/q4nMZTH1vsnYZRfCmF wOs6FFXQIWZ+kItFXGUa29kqX1xTzqRcB68yVF94vCzpW9R/8c9HQ+OTsFLqjr+u8Gml G9EQ== X-Gm-Message-State: APjAAAW3L2M1gKEBGm9JN9Ik5OVyeWLgjzMCeSoFwymObNs0RR4TIUHP 40CZBIkEAJ/v/USDGYEuvfpPDMhI X-Google-Smtp-Source: APXvYqwjjEv1BDRXhrYBEdftOfSVdQnj3K0ircHYWXYEObwbYYLazohzGuk4ljp5l2qNIweW5RiQew== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr6830421wmh.30.1576155231503; Thu, 12 Dec 2019 04:53:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 054/132] meson: convert monitor directory to Meson Date: Thu, 12 Dec 2019 13:51:38 +0100 Message-Id: <1576155176-2464-55-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 3 +-- Makefile.target | 1 - meson.build | 2 ++ monitor/Makefile.objs | 3 --- monitor/meson.build | 9 +++++++++ 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 monitor/Makefile.objs create mode 100644 monitor/meson.build diff --git a/Makefile.objs b/Makefile.objs index 1b1eff5..98c16c5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = monitor/ -common-obj-y += net/ +common-obj-y = net/ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration/ diff --git a/Makefile.target b/Makefile.target index 569f2d9..8628e25 100644 --- a/Makefile.target +++ b/Makefile.target @@ -154,7 +154,6 @@ ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o obj-y += hw/ -obj-y += monitor/ obj-y += qapi/ obj-y += memory.o obj-y += memory_mapping.o diff --git a/meson.build b/meson.build index 804a9bc..2355a99 100644 --- a/meson.build +++ b/meson.build @@ -590,6 +590,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) +subdir('monitor') + mods = [] block_mods = [] softmmu_mods = [] diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs deleted file mode 100644 index e91a858..0000000 --- a/monitor/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += misc.o -common-obj-y += monitor.o qmp.o hmp.o -common-obj-y += qmp-cmds.o hmp-cmds.o diff --git a/monitor/meson.build b/monitor/meson.build new file mode 100644 index 0000000..1eabfd5 --- /dev/null +++ b/monitor/meson.build @@ -0,0 +1,9 @@ +softmmu_ss.add(files( + 'hmp-cmds.c', + 'hmp.c', + 'monitor.c', + 'qmp-cmds.c', + 'qmp.c', +)) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('misc.c')) From patchwork Thu Dec 12 12:51:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208476 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XgYiAkSW"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZXh6CqGz9sPK for ; Fri, 13 Dec 2019 00:34:44 +1100 (AEDT) Received: from localhost ([::1]:59370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOc6-0003xO-2D for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:34:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36998) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyd-0003wG-G7 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyc-0007JK-8b for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:55 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyc-0007Hs-26 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:54 -0500 Received: by mail-wr1-x430.google.com with SMTP id c9so2603640wrw.8 for ; Thu, 12 Dec 2019 04:53:54 -0800 (PST) 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=1UQ2kTNLPaicL/8LAE1GmhnSZYlZaS/Vm313Ic4mUkw=; b=XgYiAkSWQlt2SoFD0M62ObTvO2zVpIA8T7okLa0LVugQU/YkMN+0doPnRz+9+ZifRN CL8m5OAtADHNgTz8YhJ8iwPSKZjYKhL/kFU1Vd3X+niH/IuqAcnqCn9IrkdqeaeUVvO3 6lx+E5skrFyeRz2bmIKySVziYesO8BfCPC5zoW4eWwAtxf/BVcvCeP+7SBYEaN5hfs5u X4cxPuGdmy1KcZR1tRUw0YE2Rq2NP0ZZVubAjl2BbEcFBotnPvbaQ+7mkNNWmdXhVdQ6 0SaTYwN1ZRaNqa7bEdg7hBZW9uW3ZEGV4QV6sk9nfGuOjXOBBB1pfU25gPX6lHppaOv9 DdtA== 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=1UQ2kTNLPaicL/8LAE1GmhnSZYlZaS/Vm313Ic4mUkw=; b=g7RGOjEJMy+Ovne5/TD3DzSrscP7ehNAHFgMBzaLr0lRkg1+XBdURXiivs9AWnoHvA zQt456GFlrpUKVF6Mv5M6r6o3Vx28JcND0NaxaQPHfOW72BUJl0kwmz20K5JHG2+HWZL B2EkePYS0OP0Pqif5Mk+qgLN9yJoQ784WRQ3Y3Y9pZhMcDuallWF35lMBg0jXiaQ38ip kAhjptSW1+7nhNdvORd+u/QAEWo+YXCLY6rK/GdFVTRmFaecNCWOw7FE9x/8ELgghRWy G7BhcafEBJZsrAZo13mQ2VVV4Pnqx/VK1vlaCLLz3Gr9YWKS4KRnVEC9RD6zl23hu8JM pnFQ== X-Gm-Message-State: APjAAAXvw/TGJHV86+mQFK9StyAyL7BfiYG0TgUlYAS73dX07UpIbCXL xVqv0XqhsNtue4xcn5tP90O01fhy X-Google-Smtp-Source: APXvYqy2E9AxbVe9yQ698mq0hZ50w6kgQg4zunOK5GKhuGq9I4AZTKvPbmWJhd+EZoQ5JNBKobkG2w== X-Received: by 2002:a5d:494b:: with SMTP id r11mr6272794wrs.184.1576155232693; Thu, 12 Dec 2019 04:53:52 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 055/132] meson: convert replay directory to Meson Date: Thu, 12 Dec 2019 13:51:39 +0100 Message-Id: <1576155176-2464-56-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - meson.build | 1 + replay/Makefile.objs | 9 --------- replay/meson.build | 11 +++++++++++ 4 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 replay/Makefile.objs create mode 100644 replay/meson.build diff --git a/Makefile.objs b/Makefile.objs index 98c16c5..542d8e8 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -60,7 +60,6 @@ common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) common-obj-y += hw/ -common-obj-y += replay/ common-obj-y += backends/ endif diff --git a/meson.build b/meson.build index 2355a99..29c68cd 100644 --- a/meson.build +++ b/meson.build @@ -591,6 +591,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) subdir('monitor') +subdir('replay') mods = [] block_mods = [] diff --git a/replay/Makefile.objs b/replay/Makefile.objs deleted file mode 100644 index cee6539..0000000 --- a/replay/Makefile.objs +++ /dev/null @@ -1,9 +0,0 @@ -common-obj-y += replay.o -common-obj-y += replay-internal.o -common-obj-y += replay-events.o -common-obj-y += replay-time.o -common-obj-y += replay-input.o -common-obj-y += replay-char.o -common-obj-y += replay-snapshot.o -common-obj-y += replay-net.o -common-obj-y += replay-audio.o \ No newline at end of file diff --git a/replay/meson.build b/replay/meson.build new file mode 100644 index 0000000..b532189 --- /dev/null +++ b/replay/meson.build @@ -0,0 +1,11 @@ +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', +)) From patchwork Thu Dec 12 12:51:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208474 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j6piUDOq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZW33L8tz9sPK for ; Fri, 13 Dec 2019 00:33:19 +1100 (AEDT) Received: from localhost ([::1]:59360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOai-0002Cr-Np for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:33:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37291) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyf-0003yo-3v for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyd-0007MT-Uf for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:56 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyd-0007Ks-N8 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:55 -0500 Received: by mail-wm1-x32f.google.com with SMTP id b11so2237149wmj.4 for ; Thu, 12 Dec 2019 04:53:55 -0800 (PST) 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=YWa94VRNvdkdV9UdlmRb+gJmNrhRT3sbXNM7zUaP/FU=; b=j6piUDOqLjGdHp4Xhcmj14a2xCargHShx2VwH6unqHPVICKce5ovHw/yMZLaZmoy6L cVvbXiN5B6PQbpukz7T7fuQWLDiSi7rJ1vEXl7q9zIX4APZZbYryZFoJg3AzQ0iPyiRj pKp7ocQLqaysl+PR0HL4Sr1NRQsHcx+5YlJas0UwR1ZfGRBY2Ogqi/YX+wjj+O+aFCVC 3rMRYBn9v4ibjXvULh/o+h3Ktlaj/YnkO5/je9k7bJ3P0R9v9glS8DGgWtuXREW5TEEo NQE5NeYryce2FDANNJDJrkBnm5/37aC/qfjW/tEDnUjyxucxs69DmTSp0MSar/QPEKjr 4whw== 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=YWa94VRNvdkdV9UdlmRb+gJmNrhRT3sbXNM7zUaP/FU=; b=OWQEXU8h8ylMFce8c1XxshCsAsOGIdIPvrBo4uAwEqBw1LmoD65RIf12pv5AWZfdM5 TAKUVc9CEd5LltzVPp5A6+PHULnyCDyCEQlV2I8xmEA0t9SmqUWZzjFW/SGFIHqTfln9 DRWihbQXEV5sojmcwvxLScT33v1ZgxP/nkLTO3rILlFsKk7L3Fyyb+/AhDJnEso8LXou nnm0+fB+XxeBKytEKDF+0i+8YocKrTf89M7Ctsw4NG/EHISXHQt4D4CVJpT2ZWYfGd7w ry7dHopEe2+Hd25JVnHoj/72gwjrinOygFILxm3bgN+cBiDFOey4yZ3KQvHj8limYfJF QB2g== X-Gm-Message-State: APjAAAXV7FBqRT6UtQ894pOEBjthLZe8sKyS1xw3pAEprA1eV6lQcrZ4 Ywl2DTbSNEEf3f7bxegdDXg1oFxJ X-Google-Smtp-Source: APXvYqxAUrFE/Shxp2LqEb1SvfH8WovIAD0aSQOcjbNBaL6nn3uqsCf4SJJc3unJYdudViYb8AePFA== X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr6460054wmi.104.1576155234571; Thu, 12 Dec 2019 04:53:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 056/132] meson: convert migration directory to Meson Date: Thu, 12 Dec 2019 13:51:40 +0100 Message-Id: <1576155176-2464-57-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - meson.build | 5 +++++ migration/Makefile.objs | 15 --------------- migration/meson.build | 24 ++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 16 deletions(-) delete mode 100644 migration/Makefile.objs create mode 100644 migration/meson.build diff --git a/Makefile.objs b/Makefile.objs index 542d8e8..5f2a644 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -37,7 +37,6 @@ qom-obj-y = qom/libqom.fa ifeq ($(CONFIG_SOFTMMU),y) common-obj-y = net/ common-obj-$(CONFIG_LINUX) += fsdev/ -common-obj-y += migration/ common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) diff --git a/meson.build b/meson.build index 29c68cd..74837ff 100644 --- a/meson.build +++ b/meson.build @@ -273,6 +273,10 @@ lzo = declare_dependency() if 'CONFIG_LZO' in config_host lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split()) endif +rdma = declare_dependency() +if 'CONFIG_RDMA' in config_host + rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -590,6 +594,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) +subdir('migration') subdir('monitor') subdir('replay') diff --git a/migration/Makefile.objs b/migration/Makefile.objs deleted file mode 100644 index a4f3baf..0000000 --- a/migration/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -common-obj-y += migration.o socket.o fd.o exec.o -common-obj-y += tls.o channel.o savevm.o -common-obj-y += colo.o colo-failover.o -common-obj-y += vmstate.o vmstate-types.o page_cache.o -common-obj-y += qemu-file.o global_state.o -common-obj-y += qemu-file-channel.o -common-obj-y += xbzrle.o postcopy-ram.o -common-obj-y += qjson.o -common-obj-y += block-dirty-bitmap.o - -common-obj-$(CONFIG_RDMA) += rdma.o - -common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o - -rdma.o-libs := $(RDMA_LIBS) diff --git a/migration/meson.build b/migration/meson.build new file mode 100644 index 0000000..ee5a713 --- /dev/null +++ b/migration/meson.build @@ -0,0 +1,24 @@ +softmmu_ss.add(files( + 'block-dirty-bitmap.c', + 'channel.c', + 'colo-failover.c', + 'colo.c', + 'exec.c', + 'fd.c', + 'global_state.c', + 'migration.c', + 'page_cache.c', + 'postcopy-ram.c', + 'qemu-file-channel.c', + 'qemu-file.c', + 'qjson.c', + 'savevm.c', + 'socket.c', + 'tls.c', + 'vmstate-types.c', + 'vmstate.c', + 'xbzrle.c', +)) + +softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) +softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) From patchwork Thu Dec 12 12:51:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HZ1GX/VK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZJl0nGMz9sPc for ; Fri, 13 Dec 2019 00:24:23 +1100 (AEDT) Received: from localhost ([::1]:59238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOS4-0007ZG-9m for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:24:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37485) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyg-00040L-8q for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyf-0007O7-1y for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:58 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:38627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNye-0007N4-Qu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:56 -0500 Received: by mail-wm1-x32e.google.com with SMTP id p17so2376997wmi.3 for ; Thu, 12 Dec 2019 04:53:56 -0800 (PST) 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=sG12uHUoLcPjHAXyZN9GXqx+8ivdl+v+g5PNNph6V8U=; b=HZ1GX/VKefFTz+4rpYXaAuCYWU+509Tzrkz6gcRqLdkQXyWy6S9uTo9s6WZNrXmvOt /z+4cOPlGh6BzIRmD6DkPCjwhF4Z6Tvkhhy0yk1lmFcjRNe5Fqrrxu17QrTzENU/t7w3 1WZvNX7j9okfTs893yQatO8icr3cOchlsEFGu/DleWP75sO9K0QJelPXzMisZOno8TLh opdADTrF5j1SiVTLSLEzuKbicAEy/qZCGpry7nDqDXlqpthoRyhC5HK5a6GbaoEALk3Y iDHGN1k05uXjGzT9quhW+dOT0ZGu/u9PhIM3OmfjsWTipYDAEuRPAMB6aldaDk4RuVSi NsWA== 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=sG12uHUoLcPjHAXyZN9GXqx+8ivdl+v+g5PNNph6V8U=; b=pZtkigXzRd/+1DuEWWYEYbEc2eo34329p3FLvvabnTwWMdxitr0WaZxfhDk8ITzso3 QFhlbqFHVPm43AK+p8bqcuQqc/Z6KWTCLmUQ4g8hWXyw9UoVceQ0aw2S3S4IP3Dwsp+0 ccXTzDoODmCkhygEN1XMNSkDNbDGGjkaB8iqLuCpkdcw4xrosycQ7hzUe1fIPX2wzkoa ULsXJdMdL6ktPbZ7joTWrkW5kGv58Hp+Sd3J3nlbctlYDTbMW2NBchncfr1oUNJND/8S nKbgtNvPpKARTI22Rq0n1vheGGmu2KtKJIeHtiFOUm8l3Ns8W//2UhkcWCY28SkcwnNw 1nGw== X-Gm-Message-State: APjAAAViliTbyNxR5TlYKKycJQEB74QjhhH8Vkf09YhLtAdWbIo1L3Z+ f93hzzxBrNo9xYFI+TClQ8ncobKS X-Google-Smtp-Source: APXvYqyt41EjOD7beE7OErwtCMlXNLZaJER4jhc8lQneGt43ByYS8ir7bKbjFuVUzjS4BpvEQVFXnA== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr6853975wmj.104.1576155235662; Thu, 12 Dec 2019 04:53:55 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 057/132] meson: build softmmu-specific migration/ram.c Date: Thu, 12 Dec 2019 13:51:41 +0100 Message-Id: <1576155176-2464-58-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 1 - configure | 2 ++ meson.build | 5 +++++ migration/meson.build | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index 8628e25..cc0c038 100644 --- a/Makefile.target +++ b/Makefile.target @@ -157,7 +157,6 @@ obj-y += hw/ obj-y += qapi/ obj-y += memory.o obj-y += memory_mapping.o -obj-y += migration/ram.o LIBS := $(libs_softmmu) $(LIBS) # Temporary until emulators are linked by Meson diff --git a/configure b/configure index 8e55f3a..fc57ec5 100755 --- a/configure +++ b/configure @@ -7250,6 +7250,8 @@ fi if test "$libpmem" = "yes" ; then echo "CONFIG_LIBPMEM=y" >> $config_host_mak + echo "LIBPMEM_LIBS=$libpmem_libs" >> $config_host_mak + echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak fi if test "$bochs" = "yes" ; then diff --git a/meson.build b/meson.build index 74837ff..2961c44 100644 --- a/meson.build +++ b/meson.build @@ -277,6 +277,11 @@ rdma = declare_dependency() if 'CONFIG_RDMA' in config_host rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split()) endif +libpmem = declare_dependency() +if 'CONFIG_LIBPMEM' in config_host + libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(), + link_args: config_host['LIBPMEM_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') diff --git a/migration/meson.build b/migration/meson.build index ee5a713..1231e43 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -22,3 +22,5 @@ softmmu_ss.add(files( 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')) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('ram.c'), libpmem]) From patchwork Thu Dec 12 12:51:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="m2ZXIv0T"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZMV1vCvz9s4Y for ; Fri, 13 Dec 2019 00:26:43 +1100 (AEDT) Received: from localhost ([::1]:59276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOUK-0002YW-8d for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:26:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37740) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyh-00042U-Gy for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyg-0007Q1-39 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:59 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:38632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyf-0007OT-Rp for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:58 -0500 Received: by mail-wm1-x333.google.com with SMTP id p17so2377038wmi.3 for ; Thu, 12 Dec 2019 04:53:57 -0800 (PST) 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=WW4k8JNn6CBU2Fa9v+82C5oHQxkIO9+9vFjrxZX46U4=; b=m2ZXIv0TakOvPXiRh3KJ/E/le/wyI9sftjlXvwNWN6YnEB7q8B9UOPl5h81p17rg1G g5NmTuSNsDINMNWtPbDiFL/a6Ro4VQYfJSI+TJIQS0TqLfOF2C5voL4X6sNtYEbTId5A zCR/aR/rBN8SsYykDw/G0tx4Q+vRZHlnUWoJ9H2veMNa2LpMPEqh9dx89Lp1w/3T7t9S aRsJu9GGSpA5TRrHrq40ZudfUTMVPEUeDQcEZH3W77Kfn/Jvb3nR/mflhK7gV4KR6uKK N64z1n1xzpDuYWm/zH7hu2zBcpYLqzNNmCGekMLY551gA23MIH1cdgI+3Nb6EZm6o8Ot NUww== 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=WW4k8JNn6CBU2Fa9v+82C5oHQxkIO9+9vFjrxZX46U4=; b=sd8qd7VD7G+M6Y5WEryS5nZVkgKNVZfGUg5TcVAhFZnnqE7/XBmJa00jvQvZleq79a 2eiACCWr5szk7IbjgvJoJkVrBPemFDXj8My57qiJoXETYQJ1HYN81LVxrxF9d9ZnpH86 Yu7/QEs+Oxs3uPxNsUg4AlGNGVblhugK5EW3f0bqNxEU2i3RvCeBwfDfMPX5k6CnjjGT ZicWP0kpdAouaO5l4s9XUzlp6EAAFVsaXxmK7cyY/eOgdvuPiPshHJTHS0he7Q93lXHy jWQyPDkK5/eHOWaUyeTJewyLX7ng4pTSQDkgE0HIMmUITKGVJt/1Wi1lWC6IuV1B6xo/ T8Gg== X-Gm-Message-State: APjAAAXf86SR0Nv+YaT3bcG/WjmPa1IKeBeepUqgQSSpBvloPo/EiFkZ ouTASQVXjLNlbymJc8wyssbSkHrC X-Google-Smtp-Source: APXvYqyInI8iIQX9Wd0peKH5ML2sJlnPvRR+OHWAomflmQdhTZCLLdwvYUadLUT1lmqsbrOAtykgQg== X-Received: by 2002:a05:600c:2290:: with SMTP id 16mr6819118wmf.93.1576155236592; Thu, 12 Dec 2019 04:53:56 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 058/132] meson: convert net directory to Meson Date: Thu, 12 Dec 2019 13:51:42 +0100 Message-Id: <1576155176-2464-59-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André 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 | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 56 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 5f2a644..e316e96 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = net/ -common-obj-$(CONFIG_LINUX) += fsdev/ +common-obj-$(CONFIG_LINUX) = fsdev/ common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) diff --git a/Makefile.target b/Makefile.target index cc0c038..e025246 100644 --- a/Makefile.target +++ b/Makefile.target @@ -167,6 +167,7 @@ LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) endif LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS) LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) +LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/meson.build b/meson.build index 2961c44..2333a87 100644 --- a/meson.build +++ b/meson.build @@ -109,6 +109,15 @@ if 'CONFIG_LIBCAP_NG' in config_host libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) endif xkbcommon = dependency('xkbcommon', required: false) +slirp = declare_dependency() +if config_host.has_key('CONFIG_SLIRP') + slirp = declare_dependency(compile_args: config_host['SLIRP_CFLAGS'].split(), + link_args: config_host['SLIRP_LIBS'].split()) +endif +vde = declare_dependency() +if config_host.has_key('CONFIG_VDE') + vde = declare_dependency(link_args: config_host['VDE_LIBS'].split()) +endif pulse = declare_dependency() if 'CONFIG_LIBPULSE' in config_host pulse = declare_dependency(compile_args: config_host['PULSE_CFLAGS'].split(), @@ -601,6 +610,7 @@ common_ss.add(files('cpus-common.c')) subdir('migration') subdir('monitor') +subdir('net') subdir('replay') mods = [] diff --git a/net/Makefile.objs b/net/Makefile.objs deleted file mode 100644 index c5d076d..0000000 --- a/net/Makefile.objs +++ /dev/null @@ -1,32 +0,0 @@ -common-obj-y = net.o queue.o checksum.o util.o hub.o -common-obj-y += socket.o -common-obj-y += dump.o -common-obj-y += eth.o -common-obj-y += announce.o -common-obj-$(CONFIG_L2TPV3) += l2tpv3.o -common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) += vhost-user.o -common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o -common-obj-$(CONFIG_ALL) += vhost-user-stub.o -common-obj-$(CONFIG_SLIRP) += slirp.o -slirp.o-cflags := $(SLIRP_CFLAGS) -slirp.o-libs := $(SLIRP_LIBS) -common-obj-$(CONFIG_VDE) += vde.o -common-obj-$(CONFIG_NETMAP) += netmap.o -common-obj-y += filter.o -common-obj-y += filter-buffer.o -common-obj-y += filter-mirror.o -common-obj-y += colo-compare.o -common-obj-y += colo.o -common-obj-y += filter-rewriter.o -common-obj-y += filter-replay.o - -tap-obj-$(CONFIG_LINUX) = tap-linux.o -tap-obj-$(CONFIG_BSD) = tap-bsd.o -tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o -tap-obj-y ?= tap-stub.o -common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y) -common-obj-$(CONFIG_WIN32) += tap-win32.o - -vde.o-libs = $(VDE_LIBS) - -common-obj-$(CONFIG_CAN_BUS) += can/ diff --git a/net/can/Makefile.objs b/net/can/Makefile.objs deleted file mode 100644 index 9f35dc5..0000000 --- a/net/can/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-y += can_core.o can_host.o -common-obj-$(CONFIG_LINUX) += can_socketcan.o diff --git a/net/can/meson.build b/net/can/meson.build new file mode 100644 index 0000000..f53d9ec --- /dev/null +++ b/net/can/meson.build @@ -0,0 +1,5 @@ +can_ss = ss.source_set() +can_ss.add(files('can_core.c', 'can_host.c')) +can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c')) + +softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss) diff --git a/net/meson.build b/net/meson.build new file mode 100644 index 0000000..a67f5af --- /dev/null +++ b/net/meson.build @@ -0,0 +1,39 @@ +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 = 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 = ['tap.c'] +if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS') + tap_posix += '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')) + +subdir('can') From patchwork Thu Dec 12 12:51:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZQC4G24z9sPK for ; Fri, 13 Dec 2019 00:29:07 +1100 (AEDT) Received: from localhost ([::1]:59303 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOWe-00060f-VM for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37881) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyi-00043c-9x for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyg-0007Rr-Vw for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:00 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:33621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyg-0007QP-Oh for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:58 -0500 Received: by mail-wr1-x432.google.com with SMTP id b6so2660949wrq.0 for ; Thu, 12 Dec 2019 04:53:58 -0800 (PST) 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=KOERxOLlOz1AOeLYqss79EJLgVTJV4U6Tu8Gg25M3E4=; b=Hy6wLx+tjYJpuBvO/g9dNVOX6kF6HJe66OxWa7TP8iTI3XZSAEZ8URNlR4HwkbYkgX pmjUeOBsJ0q+ay8yKf1AjrDn8JGuYacjxR7oObIaLczNPHkQfH+YB1TunO7/YxzyLyad wwzuhcWU/STO6halcfMhwr1wjnO2un1aDVX9Oj+WOxcrATfkPA9oLLOg+ngUnqZTiGq/ aA3yQQAIrBw5tuj0qQP528RQI2LfpTsqeHg+oEo+pWXCjwQYNhkWCONP52ehkUyxEFCx sJgGbXUy9Gq8n87aQPiSLGrsh30icCIr3DFtkGOafU6dnH0h8flvJDMxtxAZQJTleUC4 Sn2w== 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=KOERxOLlOz1AOeLYqss79EJLgVTJV4U6Tu8Gg25M3E4=; b=Jd20g0YtU6OP1gGfhfacHj4iOcX5VRgnKBSCxzbZ+IHvoweiWc2aqMSAwfJqUPmwEK SLPxMHC4hd5kKn4AcjZTmIBdKtL60SgSlhw4OPGy/kwl/vj1MolDPPN/M9P2lsifXJfu 4oSLHwr/ONQpgeIDTfWP5DhYWpTkIhsZP87tL9qDMQbd8ts8TFSEU496AERAnoQl5LeU HlTfoWEOtWFGgjTvP1n68W+7WB5Sxhl5d0DodTmrOLRpcDYUQJflRXEEQQpWwC0uzBgF bbhlNPi/dLLzDRZcIh1una3y33G0K+7jRE9UM6pPxCC8WxxL6ENerTdaXfntpDYueZ7/ Pk4g== X-Gm-Message-State: APjAAAWoPGr4crOFACGSS0MIIl6qmOdFeW1Nu0XAgGMx8LF3JlSSKbSM CI8WlHWdHd+JvsTvXMQEVMPWOfP8 X-Google-Smtp-Source: APXvYqwJ3WKvj6oNFzEB7UkJaeqFuUWT/bF+Fdj5RIQXU3BEWL8rQ2UYBccJ2euwk1BlU9iSI2PSwg== X-Received: by 2002:adf:fe0e:: with SMTP id n14mr6191345wrr.116.1576155237601; Thu, 12 Dec 2019 04:53:57 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 059/132] meson: convert backends directory to Meson Date: Thu, 12 Dec 2019 13:51:43 +0100 Message-Id: <1576155176-2464-60-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - backends/Makefile.objs | 19 ------------------- backends/meson.build | 16 ++++++++++++++++ configure | 2 ++ meson.build | 5 +++++ 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 backends/Makefile.objs create mode 100644 backends/meson.build diff --git a/Makefile.objs b/Makefile.objs index e316e96..12d0a78 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -58,7 +58,6 @@ common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) common-obj-y += hw/ -common-obj-y += backends/ endif ####################################################################### diff --git a/backends/Makefile.objs b/backends/Makefile.objs deleted file mode 100644 index 981e8e1..0000000 --- a/backends/Makefile.objs +++ /dev/null @@ -1,19 +0,0 @@ -common-obj-y += rng.o rng-egd.o -common-obj-$(CONFIG_POSIX) += rng-random.o - -common-obj-$(CONFIG_TPM) += tpm.o - -common-obj-y += hostmem.o hostmem-ram.o -common-obj-$(CONFIG_POSIX) += hostmem-file.o - -common-obj-y += cryptodev.o -common-obj-y += cryptodev-builtin.o - -ifeq ($(CONFIG_VIRTIO_CRYPTO),y) -common-obj-y += cryptodev-vhost.o -common-obj-$(CONFIG_VHOST_CRYPTO) += cryptodev-vhost-user.o -endif - -common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o - -common-obj-$(CONFIG_LINUX) += hostmem-memfd.o diff --git a/backends/meson.build b/backends/meson.build new file mode 100644 index 0000000..b47864f --- /dev/null +++ b/backends/meson.build @@ -0,0 +1,16 @@ +softmmu_ss.add([files( + 'cryptodev-builtin.c', + 'cryptodev.c', + 'hostmem-ram.c', + 'hostmem.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_TPM', if_true: files('tpm.c')) +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c')) +softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'], if_true: files('vhost-user.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c')) +softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_true: files('cryptodev-vhost-user.c')) diff --git a/configure b/configure index fc57ec5..28746c1 100755 --- a/configure +++ b/configure @@ -4317,6 +4317,7 @@ EOF if compile_prog "" "-lnuma" ; then numa=yes libs_softmmu="-lnuma $libs_softmmu" + numa_libs="-lnuma" else if test "$numa" = "yes" ; then feature_not_found "numa" "install numactl devel" @@ -7798,6 +7799,7 @@ fi if test "$numa" = "yes"; then echo "CONFIG_NUMA=y" >> $config_host_mak + echo "NUMA_LIBS=$numa_libs" >> $config_host_mak fi if test "$ccache_cpp2" = "yes"; then diff --git a/meson.build b/meson.build index 2333a87..94bc696 100644 --- a/meson.build +++ b/meson.build @@ -291,6 +291,10 @@ if 'CONFIG_LIBPMEM' in config_host libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(), link_args: config_host['LIBPMEM_LIBS'].split()) endif +numa = declare_dependency() +if 'CONFIG_NUMA' in config_host + numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -608,6 +612,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) +subdir('backends') subdir('migration') subdir('monitor') subdir('net') From patchwork Thu Dec 12 12:51:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XkgVcHFj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZj96vscz9sPL for ; Fri, 13 Dec 2019 00:42:05 +1100 (AEDT) Received: from localhost ([::1]:59466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOjD-0005Oc-88 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:42:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38069) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyj-000450-AM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyh-0007Tq-V2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:01 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:33955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyh-0007SI-NK for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:59 -0500 Received: by mail-wm1-x334.google.com with SMTP id f4so3557009wmj.1 for ; Thu, 12 Dec 2019 04:53:59 -0800 (PST) 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=buKkqi9qKAWxhyG87IWpSJum7q79CbkXoaPrIe8090Y=; b=XkgVcHFjdMjArpF7+0JnbuFNSAAK0zSVtNJfwa5I1nLZKjuWePdnLpwN8yYOZXA3zO C/W4g/1mw/Btjp7OFP37h21e77U6wPiYDHt//Ln0FUQg9tB3/7vAaUDdMRbAGU+Vkmiw /U1D8gLeCVCmsgJRkdZJ63N3aN/2sgQeY34tH5qZGX7c8K+dFmsDHTextlM6qoO8sbpS HjeSaUsVKxk7CyGxUV8jLCA4vxYG9OlaiWUAAL49DUfXGoZMPcMtfYpRzmPW0WawLW6b IBRQCqidD9h9lE847C/fPUr1xF7z/IQ/cUULcikZNFwPmiLyMWDN0BCKRrKQu0OLr5qF QFmQ== 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=buKkqi9qKAWxhyG87IWpSJum7q79CbkXoaPrIe8090Y=; b=TM1LrPVdB9PPD9peAD6/ysqYM3oVYDnCLSrtvzc3ABRTSalJerZZUdt9LVV4o5zJZ0 jR866U+F2mIVI5YUvNoRoNVBSHEN8rMHKh/+KB6Jqte7rq88FlcddotE9BBS/6jIDpyB dYHfH6b+KImKyz0VsGNa1VMi8JGqIzAJl4MNW/cXo1abrEWjv474siE/9ZACUM1dezsc sKoJTGQwb7w+gqT53kieqGMuoZhyD8VogC7RsAl78YHxaxglFhm0Q0Nv9bXkJIgfDicL 1ryLARxNTBR85ymcw4+EESHVzMrs6N9XpCwPHM0C8q8rhULqRcdKsrEDLxEXervdBqCP dCrg== X-Gm-Message-State: APjAAAVRAxypwfXwMGDd+mypJLuSUP21Wj2b0zfb4C4Mi88pN+sLO38W oV2b603/Ne7wcp/R0w/XSQUcY31s X-Google-Smtp-Source: APXvYqzwwYzR4FoZnPU2n0R8Ng2AWbqj5v+KzbsW2vK+MVyyHwQaZUN8HEcvF01lhS0jgGVEA4KOBQ== X-Received: by 2002:a05:600c:257:: with SMTP id 23mr6429763wmj.123.1576155238539; Thu, 12 Dec 2019 04:53:58 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 060/132] meson: convert fsdev/ Date: Thu, 12 Dec 2019 13:51:44 +0100 Message-Id: <1576155176-2464-61-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.objs | 6 +----- fsdev/Makefile.objs | 12 ------------ fsdev/meson.build | 10 ++++++++++ 3 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 fsdev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 12d0a78..00289b6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,8 +35,6 @@ qom-obj-y = qom/libqom.fa # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-$(CONFIG_LINUX) = fsdev/ - common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF) @@ -56,14 +54,12 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF) common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) - -common-obj-y += hw/ endif ####################################################################### # Target-independent parts used in system and user emulation -common-obj-y += hw/ +common-obj-y = hw/ common-obj-y += disas/ ###################################################################### diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs deleted file mode 100644 index 42cd70c..0000000 --- a/fsdev/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual 9p backend if we also enabled virtio or xen. -ifeq ($(CONFIG_FSDEV_9P),y) -common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y = qemu-fsdev-dummy.o -endif -common-obj-y += 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) += qemu-fsdev-dummy.o diff --git a/fsdev/meson.build b/fsdev/meson.build index eee8507..ae84c13 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -1,3 +1,13 @@ +fsdev_ss = 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) + if have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'), dependencies: [qemuutil, libattr, libcap_ng]) From patchwork Thu Dec 12 12:51:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208479 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vCTuUdcD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZZ70cHwz9sPK for ; Fri, 13 Dec 2019 00:35:59 +1100 (AEDT) Received: from localhost ([::1]:59384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOdI-0005po-CM for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:35:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyk-000476-Jo for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyj-0007WD-4w for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:02 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyi-0007UL-U5 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:01 -0500 Received: by mail-wm1-x343.google.com with SMTP id p17so2377230wmi.3 for ; Thu, 12 Dec 2019 04:54:00 -0800 (PST) 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=psDOZxDsjLK+Fcx353/hqMoQ0LfVA9cA9zAuvNp3/WI=; b=vCTuUdcDu/0h4iTk1DMRK9XluLJZxh3Tqs2Q0KFIFdmvh2JQAzbFWy3+7d9EmHUQq3 zGe403yi6B8xNvmtyxEcyxHSBTiWZI8n8x8vD7NfwIE5qpUL40P2EKdSxgqMvXBUjuOQ /oI0QZrWXJ+CUIBcKD5cw1a2trznPn+IFD9Ciiyxb9gYIDyvq9rUEgY3EgHUWlouee+o nWiGQHQApspr7JpTHNSTN6Eo30qoALkCP6U160UkOorFWRYsOXIuxMa/C91kr1rWV3QB FDHmGEJspXocdnRxhTyu2sp6RDAb2VWX1k0BPk5WxtR8PdDoa4tVDaM2UzD0oHsFMzP3 Ihtg== 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=psDOZxDsjLK+Fcx353/hqMoQ0LfVA9cA9zAuvNp3/WI=; b=jjTxtUsH5NdZQ9Nz+cvTMKW1I2ba+v+pkk04OLsLhGAHmwfHKgN12RY4YgkgiJ5dZu GrDrE568C1OvIOTfqkk3uCCIVgyPItiUX5+x32DDPeeUB5Fbu4pbIMvL9nqOcEWq7jMv hqtnx9pJOcwIa2C27638bElA6iXoSL+iOx0C7+1fHQRrEI3I7lMtkVeVSVLh9knknAsx WJOApHAzBiQESv44SQh1cmL8X3K9bmL1qxmoIXWHK7zXET3ItjuyN0jEDXh43ouA3a22 BKtC3id8jsixfL6MgTyGzEmAetUQLTh0FclxMtOGOzkJ1SJceL2pJsCGS+LKSUoNVXlK 19Rw== X-Gm-Message-State: APjAAAW+a/Jk3Mh+DOce9Mvkbk4DZy7UKmTxIgHR5DVC4Hj+zoUuJK1P tmN9RH9CRoD8zcpgXlFtatUi4+1O X-Google-Smtp-Source: APXvYqydQvs2fR5gLWUPUqTz4WvwFwxp7qe/09r2mfI28OpE1RecEl5zRdWLLhi1sb9+97p8/MHGZA== X-Received: by 2002:a1c:e909:: with SMTP id q9mr6761170wmc.30.1576155239421; Thu, 12 Dec 2019 04:53:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 061/132] meson: convert disas directory to Meson Date: Thu, 12 Dec 2019 13:51:45 +0100 Message-Id: <1576155176-2464-62-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - 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(+), 36 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 00289b6..c27b527 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -60,7 +60,6 @@ endif # Target-independent parts used in system and user emulation common-obj-y = hw/ -common-obj-y += disas/ ###################################################################### # Resource file for Windows executables diff --git a/disas/Makefile.objs b/disas/Makefile.objs deleted file mode 100644 index 3c1cdce..0000000 --- a/disas/Makefile.objs +++ /dev/null @@ -1,30 +0,0 @@ - -common-obj-$(CONFIG_ALPHA_DIS) += alpha.o -common-obj-$(CONFIG_ARM_DIS) += arm.o -common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o -common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/ -libvixldir = $(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 := -I$(libvixldir) -Wno-sign-compare -common-obj-$(CONFIG_CRIS_DIS) += cris.o -common-obj-$(CONFIG_HPPA_DIS) += hppa.o -common-obj-$(CONFIG_I386_DIS) += i386.o -common-obj-$(CONFIG_M68K_DIS) += m68k.o -common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o -common-obj-$(CONFIG_MIPS_DIS) += mips.o -common-obj-$(CONFIG_NANOMIPS_DIS) += nanomips.o -common-obj-$(CONFIG_NIOS2_DIS) += nios2.o -common-obj-$(CONFIG_MOXIE_DIS) += moxie.o -common-obj-$(CONFIG_PPC_DIS) += ppc.o -common-obj-$(CONFIG_RISCV_DIS) += riscv.o -common-obj-$(CONFIG_S390_DIS) += s390.o -common-obj-$(CONFIG_SH4_DIS) += sh4.o -common-obj-$(CONFIG_SPARC_DIS) += sparc.o -common-obj-$(CONFIG_LM32_DIS) += lm32.o -common-obj-$(CONFIG_XTENSA_DIS) += 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) += tci.o diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs deleted file mode 100644 index 99a637f..0000000 --- a/disas/libvixl/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-$(CONFIG_ARM_A64_DIS) = vixl/utils.o \ - vixl/compiler-intrinsics.o \ - vixl/a64/instructions-a64.o \ - vixl/a64/decoder-a64.o \ - vixl/a64/disasm-a64.o diff --git a/disas/libvixl/meson.build b/disas/libvixl/meson.build new file mode 100644 index 0000000..5e2eb33 --- /dev/null +++ b/disas/libvixl/meson.build @@ -0,0 +1,7 @@ +libvixl_ss.add(files( + 'vixl/a64/decoder-a64.cc', + 'vixl/a64/disasm-a64.cc', + 'vixl/a64/instructions-a64.cc', + 'vixl/compiler-intrinsics.cc', + 'vixl/utils.cc', +)) diff --git a/disas/meson.build b/disas/meson.build new file mode 100644 index 0000000..0527d69 --- /dev/null +++ b/disas/meson.build @@ -0,0 +1,27 @@ +libvixl_ss = 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 94bc696..68a5f6e 100644 --- a/meson.build +++ b/meson.build @@ -613,6 +613,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) subdir('backends') +subdir('disas') subdir('migration') subdir('monitor') subdir('net') From patchwork Thu Dec 12 12:51:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DqKNEYE+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZd51qXNz9sPK for ; Fri, 13 Dec 2019 00:38:33 +1100 (AEDT) Received: from localhost ([::1]:59420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOfm-0000yu-N0 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:38:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38440) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyl-00047s-51 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyj-0007Y4-UW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:02 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39313) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyj-0007WI-Nh for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:01 -0500 Received: by mail-wr1-x442.google.com with SMTP id y11so2614572wrt.6 for ; Thu, 12 Dec 2019 04:54:01 -0800 (PST) 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=syJqPmkvJMmzIU8/98Xe13xx4bSEe0J6m0yTSrxfhOA=; b=DqKNEYE+2yxjHvOZAU+E8QKL5yav38LW2Q1/rO7yONRFFHdui5Gi2ER9E8kDy8ambK DSmKPSdzYl/iXUya2Zo5ydqDqg8yDyyHJS6E+mi/RUrcq97cfOcssP6vwoCvdPDIN59A g9x9HR/yap8+l4nodDFWc3uA4OxHeLxJ9ovW3f+yYBDIZH/lVOEjT5gGjk6DshIUoTAL 0W1s4oTDfDFoVHppHnvosaLQ+UmZe2dXmozER1tPI2A/Cc2hLuWazqKK4p/Dcm8o+jLn 8EIaacLJzotT/LSumpIXcmUBm/Rl8icDqYJLDqMOog/rYyfzMbL5AcGnUXmMOMZw0NAZ HpWQ== 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=syJqPmkvJMmzIU8/98Xe13xx4bSEe0J6m0yTSrxfhOA=; b=iQuDXgmcww7kRu6EMuzHxR7SjimyY6U0rLfysO3xoD5uKKwXtsXDkyNUjAoJP6s19s 04yHv4t9JIaA0hKB6Ogy7Bu7XoCz1RdYcOzRPL5wFOQd/hSW2yxuHh4gslm4QRIGPRby HAou/H9DEx/6qta1kprWlMClJDtIJDk3qAx4RCXPEWh9qcYehU9BMfWw+kyjvG90fxgj VMmx5wbu3AaPyfhSYTgHiVIiyIPthsqjERBqLZFg1euC8MiMhTLFrRsqHOeNYd2TVdNQ iNH3UIGJ/pYuwmRQAGVQUqjQYyiJOAHmA9eLDQmwQJx6CQCixdeWA4/xt0TmQbkg5CD+ H+fw== X-Gm-Message-State: APjAAAXf4kpeGXC+roKeeiRCn4Nn8Rmtv3PnRIPDWiV+YHfrWLM8Lu9V 8CXiBF2Iiulcio5yN2kXTP5OvjZ7 X-Google-Smtp-Source: APXvYqzaRwkMRKT2//tDyuphSKlcbksWqEXrm5cWTb6rk4WYCs01cW6KSB48ZT+X0rysGthlMx9wmA== X-Received: by 2002:adf:90e1:: with SMTP id i88mr5873056wri.95.1576155240488; Thu, 12 Dec 2019 04:54:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 062/132] meson: convert qapi-specific to meson Date: Thu, 12 Dec 2019 13:51:46 +0100 Message-Id: <1576155176-2464-63-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 1 - qapi/Makefile.objs | 11 ----------- qapi/meson.build | 21 +++++++++++++++++++-- 3 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 qapi/Makefile.objs diff --git a/Makefile.target b/Makefile.target index e025246..c2fcb22 100644 --- a/Makefile.target +++ b/Makefile.target @@ -154,7 +154,6 @@ ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o obj-y += hw/ -obj-y += qapi/ obj-y += memory.o obj-y += memory_mapping.o LIBS := $(libs_softmmu) $(LIBS) diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs deleted file mode 100644 index 10ca4f6..0000000 --- a/qapi/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -QAPI_TARGET_MODULES = machine-target misc-target - -obj-y = qapi-introspect.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o) -obj-y += qapi-types.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-visit-%.o) -obj-y += qapi-visit.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o) -obj-y += qapi-events.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) -obj-y += qapi-commands.o diff --git a/qapi/meson.build b/qapi/meson.build index 8431f26..4a335d9 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -67,11 +67,17 @@ foreach module : qapi_common_modules + qapi_target_modules endif endforeach -qapi_all_outputs += [ +qapi_specific_outputs = [ 'qapi-introspect.c', 'qapi-introspect.h', - 'qapi-doc.texi' + 'qapi-types.c', 'qapi-types.h', + 'qapi-visit.c', 'qapi-visit.h', + 'qapi-events.c', 'qapi-events.h', + 'qapi-commands.c', 'qapi-commands.h', ] +qapi_all_outputs += qapi_specific_outputs +qapi_all_outputs += 'qapi-doc.texi' + qapi_files = custom_target('QAPI files', output: qapi_all_outputs, input: [ files('qapi-schema.json') ], @@ -87,3 +93,14 @@ foreach output : qapi_util_outputs endif i = i + 1 endforeach + +i = 0 +foreach output : qapi_all_outputs + if output in qapi_specific_outputs + specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + endif + if output.endswith('-target.c') + specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + endif + i = i + 1 +endforeach From patchwork Thu Dec 12 12:51:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AqvO9J72"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZbW2WGFz9sPK for ; Fri, 13 Dec 2019 00:37:11 +1100 (AEDT) Received: from localhost ([::1]:59407 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOeS-0007ae-Oj for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:37:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38655) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNym-00049N-Ah for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyl-0007Zq-05 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:04 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyk-0007YU-On for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:02 -0500 Received: by mail-wr1-x42c.google.com with SMTP id c9so2604105wrw.8 for ; Thu, 12 Dec 2019 04:54:02 -0800 (PST) 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=TLIRCS+wjAUW+voOAGF0GUcqpTyXyeNhrBqncLIwiuE=; b=AqvO9J725lA+Hw7t70teDncrOjDv0SK5RBmENXig/vwwk9ZR/nZ5rekt7gWaodZwJS EXfCt96kVAhtVCHZesvAYxuY8YjZXhAJr7ZmQrz20s/ZSjGuELqsTvTTjwXuWiMETF+Q fIod5JagQgF3wcWyHapXJ3VbOTosZ8Y6sW+nKWZA8N4vrda0x0fi+0GiLXJkCTn8uCHO 4e7+QZ8gRhmSlN6jonArZqcJ4sO60z3ng54qW1458WwyJqfsX+5SBi2OJcFUEMylKUg1 JprFW/7A+axabvsSYCAONDY1sFIsoIkfte9OZt2Q+8gOSWXcKW8e2Wnib8P9PB/PrSsH 0IPA== 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=TLIRCS+wjAUW+voOAGF0GUcqpTyXyeNhrBqncLIwiuE=; b=VyOknBO8ZRcchQhhia7CkqxeYLtcC4vLkf0QQLWGpwjiVItrMHdX9+mnAM2sKbq1dy W23E2onidIIuGCnaUeCJh/XnydIexPhzDa3Nfz+JlHul0plo72OwUeEAzHi8zsRcwSU0 LKEK7We3blEvrVCCXFW2Mj7ZxVhBQsMV+1+H9c7Zr0Jp0KOscUNKQHM4p6KpOmGzyJjD Nt+1ZNWvLJ/FPnRJmMWGzrUJNQAfCtGYQQ5BYmtgAHDhuRggwAPA9nPUzi/D4u0PrQmO OVORd/k/rwZjw9i8ASYy3hjXCunIVoth+ueocsnk00lF1w4Q1gN0mzUdFuOwMqMDPOpf M8/A== X-Gm-Message-State: APjAAAVnlV+wDzCHeyIOEcqtKo6JweYe6MZ4ellOVkd98dN6jIpQG+SO bJ45UizkRSmo69wcSr5ZJUVAozwr X-Google-Smtp-Source: APXvYqwYU/BQAya4ZPTXfVfLMIdfSeXkFWVSwM0hz2Lu76zS+PeH0MhUsUuGWr21lCf9yDZtTcwLOw== X-Received: by 2002:adf:f288:: with SMTP id k8mr6539554wro.301.1576155241483; Thu, 12 Dec 2019 04:54:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 063/132] meson: convert hw/xen Date: Thu, 12 Dec 2019 13:51:47 +0100 Message-Id: <1576155176-2464-64-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- configure | 4 ++++ hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/xen/Makefile.objs | 6 ------ hw/xen/meson.build | 18 ++++++++++++++++++ meson.build | 6 ++++++ 6 files changed, 29 insertions(+), 7 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 28746c1..c53df48 100755 --- a/configure +++ b/configure @@ -2454,6 +2454,8 @@ if test "$xen" != "no" ; then fi QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)" libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu" + xen_cflags="$($pkg_config --cflags $xen_pc)" + xen_libs="$($pkg_config --libs $xen_pc)" else xen_libs="-lxenstore -lxenctrl -lxenguest" @@ -6843,6 +6845,8 @@ fi if test "$xen" = "yes" ; then echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak + echo "XEN_CFLAGS=$xen_cflags" >> $config_host_mak + echo "XEN_LIBS=$xen_libs" >> $config_host_mak fi if test "$linux_aio" = "yes" ; then echo "CONFIG_LINUX_AIO=y" >> $config_host_mak diff --git a/hw/Makefile.objs b/hw/Makefile.objs index ece6cc3..793d55b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-y += usb/ devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-y += virtio/ devices-dirs-y += watchdog/ -devices-dirs-y += xen/ devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ devices-dirs-y += semihosting/ devices-dirs-y += smbios/ diff --git a/hw/meson.build b/hw/meson.build new file mode 100644 index 0000000..08112a5 --- /dev/null +++ b/hw/meson.build @@ -0,0 +1 @@ +subdir('xen') diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs deleted file mode 100644 index 84df60a..0000000 --- a/hw/xen/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -# xen backend driver support -common-obj-$(CONFIG_XEN) += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-common.o xen-bus.o xen-bus-helper.o xen-backend.o - -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt_load_rom.o diff --git a/hw/xen/meson.build b/hw/xen/meson.build new file mode 100644 index 0000000..e9587b6 --- /dev/null +++ b/hw/xen/meson.build @@ -0,0 +1,18 @@ +softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files( + 'xen-backend.c', + 'xen-bus-helper.c', + 'xen-bus.c', + 'xen-common.c', + 'xen-legacy-backend.c', + 'xen_devconfig.c', + 'xen_pvdev.c', +)) + +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', +)) diff --git a/meson.build b/meson.build index 68a5f6e..f1c5e7a 100644 --- a/meson.build +++ b/meson.build @@ -295,6 +295,11 @@ numa = declare_dependency() if 'CONFIG_NUMA' in config_host numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split()) endif +xen = declare_dependency() +if 'CONFIG_XEN_BACKEND' in config_host + xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(), + link_args: config_host['XEN_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -618,6 +623,7 @@ subdir('migration') subdir('monitor') subdir('net') subdir('replay') +subdir('hw') mods = [] block_mods = [] From patchwork Thu Dec 12 12:51:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RIMiuXiJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZfl6BbTz9sPc for ; Fri, 13 Dec 2019 00:39:59 +1100 (AEDT) Received: from localhost ([::1]:59428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOhB-0002fr-HG for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:39:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyn-0004BD-Ic for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyl-0007bj-RK for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:05 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyl-0007Zz-JS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:03 -0500 Received: by mail-wr1-x42c.google.com with SMTP id d16so2590157wre.10 for ; Thu, 12 Dec 2019 04:54:03 -0800 (PST) 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=TESjvbFFHZQtGhm+TKmt7RVZlTLVhBorgrOtIeNvXYE=; b=RIMiuXiJ3sD9iLEgnhXrRiHGKfAkf2cguKBQ7yjaPqqSwx+lg+Q+LFzuBF9spDAjpZ AHcgsnoFpEkK41WUBhE8LePRKERJUnFkvnH4LRnwcDF9mel+VBeorXLijXqPh3ZzkebU UUKQPoKZQ7OZtT02rfWwWc3LtxmmHeW3Oo8dkNDEGZ8E9EJTiTtFiR+pBSASKGjAZmJ0 ALVJfC8Mpu1vZ8Km21MfjvcruW8Z/ZzJL0ATMLU6tYAxnfJ5+35GE5Tz+PsREj8VB7DC Vi0ANSG/F0OTdtYIsrtYiuZ61Bzatix41p9t5Ls+tsKaN8w2Xqz1S0Y8i8rtXa/rkjOH MjpQ== 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=TESjvbFFHZQtGhm+TKmt7RVZlTLVhBorgrOtIeNvXYE=; b=pYBJAYyF/2yo2GnKZzMdgSengmLdY/DbAn0CEZmXE+i2+6dus3bbNAchZjUmpfKb4Z rAnn7h1sZqoNXSxkHAwoHTfm0EJlflM13AQ7HQDF9cRj6bHzFN3nBom+DWWQaakiJQFd YDt8HoJeZ4ngtIK6Znc0y0m6CPIxgIbexZmAiUdYM69AEItbT7F1/bQrw7qWGFvGY2Gp 0QRjyqoRf4E94zGwaZMTNKhfhmcncPaxFXRRDl2+WpH7AnF4bPspu8JJa3fiM2B2kwC3 JZzfZZ40NZjt8Pfvu8/1+Fc3OYW5+Nvm4QOrQN3LMT4J+VdP1cr2EgR6eWiayBmmwR4l DLDQ== X-Gm-Message-State: APjAAAXP/b81poj3PQvF0+aEqeexXouTGuHMrmGFhOoGf1JWTLSk7WTn cWvGaudppIUkDBn4C+rKzMo8aRdw X-Google-Smtp-Source: APXvYqzfDEHha/vqe5JrB+opbsxZL4V3QVKCbH3z71XNg3oHkyU47i0TY6X/3+mULc1KDLIm+D+gZQ== X-Received: by 2002:a5d:6ca1:: with SMTP id a1mr6002872wra.36.1576155242414; Thu, 12 Dec 2019 04:54:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 064/132] meson: convert hw/core Date: Thu, 12 Dec 2019 13:51:48 +0100 Message-Id: <1576155176-2464-65-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/core/Makefile.objs | 30 ------------------------------ hw/core/meson.build | 39 +++++++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 40 insertions(+), 31 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 793d55b..2ef93e7 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,3 @@ -devices-dirs-y = core/ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/ devices-dirs-y += acpi/ diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs deleted file mode 100644 index fd0550d..0000000 --- a/hw/core/Makefile.objs +++ /dev/null @@ -1,30 +0,0 @@ -# core qdev-related obj files, also used by *-user: -common-obj-y += qdev.o qdev-properties.o -common-obj-y += bus.o reset.o -common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o -common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o -# irq.o needed for qdev GPIO handling: -common-obj-y += irq.o -common-obj-y += hotplug.o -common-obj-$(CONFIG_SOFTMMU) += nmi.o -common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o -common-obj-y += cpu.o - -common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o -common-obj-$(CONFIG_XILINX_AXI) += stream.o -common-obj-$(CONFIG_PTIMER) += ptimer.o -common-obj-$(CONFIG_SOFTMMU) += sysbus.o -common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += loader.o -common-obj-$(CONFIG_FITLOADER) += loader-fit.o -common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o -common-obj-$(CONFIG_REGISTER) += register.o -common-obj-$(CONFIG_OR_IRQ) += or-irq.o -common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o -common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o -common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o - -obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o -obj-$(CONFIG_SOFTMMU) += numa.o -common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o diff --git a/hw/core/meson.build b/hw/core/meson.build new file mode 100644 index 0000000..70bdff6 --- /dev/null +++ b/hw/core/meson.build @@ -0,0 +1,39 @@ +common_ss.add(files( + # core qdev-related obj files, also used by *-user: + 'bus.c', + 'cpu.c', + 'hotplug.c', + 'qdev-properties.c', + 'qdev.c', + 'reset.c', + # irq.c needed for qdev GPIO handling: + 'irq.c', +)) + +common_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) +common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) +common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.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( + 'fw-path-provider.c', + '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', +)) + +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'machine-qmp-cmds.c', + 'numa.c', +)) diff --git a/hw/meson.build b/hw/meson.build index 08112a5..fe7c466 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1 +1,2 @@ +subdir('core') subdir('xen') From patchwork Thu Dec 12 12:51:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hugI2/x9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZV14fDMz9sPc for ; Fri, 13 Dec 2019 00:32:25 +1100 (AEDT) Received: from localhost ([::1]:59346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOZo-00018R-In for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:32:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38962) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyo-0004Bz-14 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNym-0007dV-Ri for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:05 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNym-0007cI-LQ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:04 -0500 Received: by mail-wm1-x342.google.com with SMTP id b11so2237595wmj.4 for ; Thu, 12 Dec 2019 04:54:04 -0800 (PST) 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=RS88mU43BsDZbLTvz1eJVFNOqAsGkQFJZ4GvFL4UvXA=; b=hugI2/x9I8/d0IXYnMFRH8R0tX3jV1jKnVKvX3pZh6rDSDQMmkVRmAzHMK77bAkhlj loGGb6eqVKC9qW1Fx9Zkh5e56RWW09Z8oaLB6egumUHM7u2oiuWNcN05R/9+CKfxcZUV rdHzSUyGM4AHWCKKzxU/knEinGh++ibWFFvocOSL79ckZX6jIV85RPTMpLwUMsg/QQWW G+30DXk1EYg2pRfIDPiaIQNVrHnFIk0lRbFtIHjkRNJ5isZnoErO7ZaocS+zHOFIvo4G Cp6tuF0KeN1NVUQuexOJPCGgQS0uAykRYnA/LsooAPdGe7L8eG7LZ2Ioh1B053LWlj/t wZmA== 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=RS88mU43BsDZbLTvz1eJVFNOqAsGkQFJZ4GvFL4UvXA=; b=GAxP4NA+uZMPO7s0wwhAd0pSAjtWxrmBwN31sPL4yc3f8soVmsKMJl2ZDtS+sRwRBh heV3+VXlQzNjtxCaj4lZH70DjshsqzxSloz6Hw90LYL24v90dRX7/dioMK+S2T3DCYtH KXEk0n6nr+dabWeKeaCsUJsXLoubihRwlwKjJJqo53qde8niI3/q02GkEBT1S5nSS627 7Dh3VKHKj9X0yZpDrM7JqF8u6jplm2co2jo7BT5PQS+5lydISqTEAPSaF3pLDdnhVTC+ eVlcVU8cOhRhE/Q6qsQEkDb0WtSe3jxmrmjxC46dUsYLG4kTggN6pN1bq9vFHcwIFSj/ Bkmw== X-Gm-Message-State: APjAAAX/cEaSmxHypzpEHvpGONTe5ECyn+GbElumyUVWYJFVPM7MnrQq jl7vQy4K0ZsPEiC869e4hvyBcxkO X-Google-Smtp-Source: APXvYqyvROj8f0kYG9Sw7eUOXpETsBfdfL3hLOOILpAk0GloBS9tG1/AYF0ZZuxuZNfdMQgZCyv9sg== X-Received: by 2002:a1c:286:: with SMTP id 128mr6207124wmc.176.1576155243366; Thu, 12 Dec 2019 04:54:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 065/132] meson: convert hw/semihosting Date: Thu, 12 Dec 2019 13:51:49 +0100 Message-Id: <1576155176-2464-66-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 2ef93e7..1e23cb9 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-y += virtio/ devices-dirs-y += watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ -devices-dirs-y += semihosting/ devices-dirs-y += smbios/ endif diff --git a/hw/meson.build b/hw/meson.build index fe7c466..66a2f6c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,2 +1,3 @@ subdir('core') +subdir('semihosting') subdir('xen') diff --git a/hw/semihosting/Makefile.objs b/hw/semihosting/Makefile.objs deleted file mode 100644 index 4ad47c0..0000000 --- a/hw/semihosting/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SEMIHOSTING) += config.o -obj-$(CONFIG_SEMIHOSTING) += console.o diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build new file mode 100644 index 0000000..f40ac57 --- /dev/null +++ b/hw/semihosting/meson.build @@ -0,0 +1,4 @@ +specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files( + 'config.c', + 'console.c', +)) From patchwork Thu Dec 12 12:51:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W7BHyjNI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZYG2GMRz9sPK for ; Fri, 13 Dec 2019 00:35:13 +1100 (AEDT) Received: from localhost ([::1]:59374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOcY-0004jd-SI for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:35:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyp-0004DP-0P for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyn-0007ex-Nn for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:06 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:36365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyn-0007dg-Fc for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:05 -0500 Received: by mail-wm1-x335.google.com with SMTP id p17so2391054wma.1 for ; Thu, 12 Dec 2019 04:54:05 -0800 (PST) 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=5sLKEsC2AjqCYXP02DMsL82Clyu5WweyfT29QYZ6O8w=; b=W7BHyjNICO3HQoVmcTNvWa+W1/N0jTgubmwDbqtBDfwikx6x2U8pkX+swYe+PIJHHF WJaGcgkIUjp4G/c3Qon05VN/QIn7fIvwDDLcQ8Sc9gKAjlLANd2rNuxBhuenR3rcPlxQ rUEbVyKfnDLss2D98Pz2fn6iMd2ipfGCIXDRw8VZlckvHNMHq9FlbFSc2T60iab+Db3e 9SuiVH1kfK7Uojwko+cZ6huU6WjW1Ttir/i7eiNnY2DZ8JyOCtGx7JIc/UDPuwFv0nYA BqrT/E7syOPM2hP/N1gmZJh8qdzkAX06aPYpOu4EQe+HbksfXAnNtWcbsMxbwj29TQ3m 7BXA== 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=5sLKEsC2AjqCYXP02DMsL82Clyu5WweyfT29QYZ6O8w=; b=jSSYN6t4wvqs3YIllGrF08r+1U87BCLOU/B03t4LWPhhAg7gxrlzhS6T+Rm9hrEkyE tVbmpTUJi3VrKjwfgLFg7JhCBCCVIMmrHv9+Qz9oKy72dZGtSfblkZBG6oT357s5kxmD pZPNZwPWrceW2jW9NQSfcrobZ1BvNGqCN/VKzbr6AcrqwTY2L19/kPvvyQifBDNhuUwb 8XV7Lyihg40IXBZ627p/umMXBOuBStOXcuPtu6qyeUHE9Y2yOqBbS7d2lTdh0WXmde2H +TsQy0//w1VZkZlHJxWUIwoZQwrw1VB/XEjaGHeJ+yzp7eS0lORBuR0CgIQfH4QkYIG8 /MBA== X-Gm-Message-State: APjAAAWbBx/oO76TKYEWaGAhxluYXzomMEamRRPEViLXrgFnt4UAI9Ts TZKgLUaPKPrCUL3Clj5RRqYMZU3G X-Google-Smtp-Source: APXvYqze+HnRgSQH2c7rAST6/EYRYw8RKVylv+k7ggbvh806W6kkxNaO4n0i6AEtlRgZA7tjIPU8Qg== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr6831350wmh.30.1576155244308; Thu, 12 Dec 2019 04:54:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 066/132] meson: convert hw/smbios Date: Thu, 12 Dec 2019 13:51:50 +0100 Message-Id: <1576155176-2464-67-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 1e23cb9..f5c2ab4 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-y += virtio/ devices-dirs-y += watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ -devices-dirs-y += smbios/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 66a2f6c..80da62d 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ subdir('core') subdir('semihosting') +subdir('smbios') subdir('xen') diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs deleted file mode 100644 index 23bb2ba..0000000 --- a/hw/smbios/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -ifeq ($(CONFIG_SMBIOS),y) -common-obj-y += smbios.o -common-obj-$(CONFIG_IPMI) += smbios_type_38.o -common-obj-$(call lnot,$(CONFIG_IPMI)) += smbios_type_38-stub.o -else -common-obj-y += smbios-stub.o -endif - -common-obj-$(CONFIG_ALL) += smbios-stub.o -common-obj-$(CONFIG_ALL) += smbios_type_38-stub.o diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build new file mode 100644 index 0000000..9e762c7 --- /dev/null +++ b/hw/smbios/meson.build @@ -0,0 +1,13 @@ +smbios_ss = 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', +)) From patchwork Thu Dec 12 12:51:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208482 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hBqnNhiz"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZcB1R03z9sPK for ; Fri, 13 Dec 2019 00:37:44 +1100 (AEDT) Received: from localhost ([::1]:59410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOev-0008FL-8F for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:37:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39269) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyp-0004Ec-N2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyo-0007gd-KB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:07 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53608) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyo-0007fD-DY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:06 -0500 Received: by mail-wm1-x342.google.com with SMTP id n9so2246555wmd.3 for ; Thu, 12 Dec 2019 04:54:06 -0800 (PST) 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=+voKtS/tCPLOrQL4iyH8p1hj5TaZ5R0ylnlgcmlNHwg=; b=hBqnNhizDVBrsZF/W11KNoMR8YBa83G1bA40OsApcxiXcWCNvmP6rmdfdJaDxFxFpw YoxcKA9TNoAPdQyPiZEm10JFwEFwuBAOFaxCsna1K+PunIelQKhn69loZUMF2MpvDb9E lWMaVIvx/691rwOSGDk4bMULdcf4E3yXuuBFxtPSlqUOZwhx3g9dsh9qrPNO35BTdcOi xRq0jZ4nPMYlHRY0ZXxGDfBaCSAa0UdxQAMymYPj4UOqjRUJEYeJ5b0/QncSj4voEt3V Jlw5tyc+3j7pgRoqb8QdgevthEshR7lMLwitiuL638W97HUeSQQqAbRo8xE2gOR7tPk7 tFRw== 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=+voKtS/tCPLOrQL4iyH8p1hj5TaZ5R0ylnlgcmlNHwg=; b=FKDgkm4W68B9dt95C1OZvH+VNjR09kNu0mkS9o7qa9m32vc06A+4/yidAEEXH1FSn1 mwwr688Zeuk6rUHFGU1amkjwPJmrK+WwkXciJQDM3hnbDEkhF5oElW61LBkXDNXvrciz 96fBXx/X+D929DFTuXWstFZjGMOeL77g6KZlXfsokQ6cgPV4q5z5akWZS8PZtALr4mlJ LvbCngdfmgqPKtW6LMLjfWenQn0t1euWVT9a8dBNf+IZYFkw4fM6nLpSoRN8VEHN8QcY bfnuCFIOX8KlOz9S0PIWHRnkCXxwtqSWbSV0B1i8Rom03pHu2qn5BzCsMBiQxSuVm6gr vSPg== X-Gm-Message-State: APjAAAW+KVRIq/+vNutWgQyu+OgdfLoUKqckX71SxNkDTj3oGxrkm3wD dmODlZjNWG6RQCJfvD1osHnNGrzF X-Google-Smtp-Source: APXvYqxROOcs3sQ1SXv14rfi0wZ/uMNuiX1CJjAh8z7a5HICSkvsEk8nGztWNlrponSXAPiRhlKWKg== X-Received: by 2002:a1c:9903:: with SMTP id b3mr6259272wme.139.1576155245229; Thu, 12 Dec 2019 04:54:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 067/132] meson: convert hw/mem Date: Thu, 12 Dec 2019 13:51:51 +0100 Message-Id: <1576155176-2464-68-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/mem/Kconfig | 1 + hw/mem/Makefile.objs | 3 --- hw/mem/meson.build | 3 +++ hw/meson.build | 1 + 5 files changed, 5 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 f5c2ab4..b91472b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -34,7 +34,6 @@ devices-dirs-y += usb/ devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-y += virtio/ devices-dirs-y += watchdog/ -devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index 620fd4c..9e6c6b8 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -9,3 +9,4 @@ config NVDIMM bool default y depends on PC + select MEM_DEVICE diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs deleted file mode 100644 index 3e2f7c5..0000000 --- a/hw/mem/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -common-obj-$(CONFIG_DIMM) += pc-dimm.o -common-obj-$(CONFIG_MEM_DEVICE) += memory-device.o -common-obj-$(CONFIG_NVDIMM) += nvdimm.o diff --git a/hw/mem/meson.build b/hw/mem/meson.build new file mode 100644 index 0000000..f9adc45 --- /dev/null +++ b/hw/mem/meson.build @@ -0,0 +1,3 @@ +common_ss.add(when: 'CONFIG_MEM_DEVICE', if_true: files('memory-device.c')) +common_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c')) +common_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) diff --git a/hw/meson.build b/hw/meson.build index 80da62d..d788be4 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('mem') subdir('semihosting') subdir('smbios') subdir('xen') From patchwork Thu Dec 12 12:51:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Cfd/51Iz"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZhZ4tmVz9sPK for ; Fri, 13 Dec 2019 00:41:34 +1100 (AEDT) Received: from localhost ([::1]:59456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOih-0004WE-7X for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:41:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39453) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyq-0004GD-Ot for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyp-0007iZ-KI for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:08 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:37687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyp-0007h6-CD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:07 -0500 Received: by mail-wr1-x42d.google.com with SMTP id w15so2626991wru.4 for ; Thu, 12 Dec 2019 04:54:07 -0800 (PST) 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=3XqOWTo9pEMflQmMyCPRoR+VpJ9UjXCtKVT4pIPgki4=; b=Cfd/51IzSLtuKpzYG0eSmIdjgu0myFRXyn1muYhV1WDBT6cxKnplHaeXlvhgk9iCke fTpyc9LUpQv39StB0k56JOIDS6jAMDCIU/UnWDahjFrI4m3xMwtFIXUc599RSo33POnu v2XKcXlwWnn8p2MfuZEvdHzZOCCXYwxwho491zplWqPdhrFxnV4I8o3iXm1Mewya2IuG usciPSmeP8YBuFBuEcrBZBy7kXw2oVgrPNEeirQPnTE4zrKlcEuSuCTS0rHbofn7wQD2 ZTUCHXbHHS8FMxZ9wL+g4HdpZVnKPSTj7gZ+eY/pQ1SppNAMNMeJChbkxcqaKgo5iaPG 73zQ== 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=3XqOWTo9pEMflQmMyCPRoR+VpJ9UjXCtKVT4pIPgki4=; b=ILMVOp+i3dD0m5ImABsZJaM6b/VziQYQgiN5Vlg96R5jauegGVH2n0dXTgjRAaUDE9 oXbqCW0KaekKeRcz77wbVUeqehmrQ3o+86+5HV3hVpIeIGCkx9t9iDVYAdUETf8WleP5 LMOfLne47Mq82Y9UC7rzjVrm5iNl/rsY/fo4eXC1Fkq+1JYIyN/Ycv1rV8Mr46Dxvoya gG4bGREhUpJbdWIM625P30QRmhBCRAUgpPqFO/eTg0ZUk3rZ0ReWjIOTDIetumyaNLdv XBFB+oL2BDWe9HW61+kdVfd7dRzWMLFONaFD1eUl+XSSUGk7O7L5QL3iz8SCqRBe1RCX eP6g== X-Gm-Message-State: APjAAAWCVc1Q2/5TiNZEnlFxBqmq3gBB+tTis1FcvPcH2rlFPfRohLZt OHzgzjpQ0MNEgG/eRFQjNOyba0h1 X-Google-Smtp-Source: APXvYqw4YDZHPTYPm4Sg+IzzKLhQpVmQDkFKiitQQ7frtG7R5E+vAEiTWbI6mKWHbvNq3Nv0iF3swQ== X-Received: by 2002:adf:a141:: with SMTP id r1mr6259370wrr.285.1576155246088; Thu, 12 Dec 2019 04:54:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 068/132] meson: convert hw/watchdog Date: Thu, 12 Dec 2019 13:51:52 +0100 Message-Id: <1576155176-2464-69-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/watchdog/Makefile.objs | 6 ------ hw/watchdog/meson.build | 6 ++++++ 4 files changed, 7 insertions(+), 7 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 b91472b..a1d3f07 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -33,7 +33,6 @@ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-y += usb/ devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-y += virtio/ -devices-dirs-y += watchdog/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index d788be4..376dbef 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,4 +2,5 @@ subdir('core') subdir('mem') 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 3f536d1..0000000 --- a/hw/watchdog/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -common-obj-y += watchdog.o -common-obj-$(CONFIG_CMSDK_APB_WATCHDOG) += cmsdk-apb-watchdog.o -common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o -common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o -common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o -common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build new file mode 100644 index 0000000..eafb57b --- /dev/null +++ b/hw/watchdog/meson.build @@ -0,0 +1,6 @@ +softmmu_ss.add(files('watchdog.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-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')) From patchwork Thu Dec 12 12:51:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BKzKwUW+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZgP0fBMz9sPK for ; Fri, 13 Dec 2019 00:40:32 +1100 (AEDT) Received: from localhost ([::1]:59434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOhh-0003K0-Ni for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:40:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39670) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyr-0004I1-Vz for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyq-0007k6-JL for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:09 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:41629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyq-0007il-B4 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:08 -0500 Received: by mail-wr1-x42b.google.com with SMTP id c9so2604405wrw.8 for ; Thu, 12 Dec 2019 04:54:08 -0800 (PST) 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=j12SgvFUEMlLTMG0dlw8JQNUMvzFA/y97s9nwnCqE4I=; b=BKzKwUW+igYVlfNZTSixnxrNjnDnnkVF9/0E/sd9cSUKKSnPFuaT94QBEerIzJlUme MKaGDeZOQrm1vSHBWwCeIBF9OYnFAuig50SsZWJ9k6EhOspRr6RhxvdcSL2+3rupOYkh GqNivcF+fbpOuYDe752wEkpd4289wr5IWtDFnoujG3VLoCFuyJDYHrCsiwB8Uo6dMa3i /NZiGCiM189V6tb01QtBpMWpocvPlApG0IDZPnaNJwBTjwcRg+eJp0ZDzm3cbKmRwyU7 8xEF+xMQdXnixib5fXygQzvNMxrfjnoFtPeqUlxf7Z+fTVYrSGKNByjOB6PGFZRF273y ontA== 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=j12SgvFUEMlLTMG0dlw8JQNUMvzFA/y97s9nwnCqE4I=; b=dyZoBEDVLf8o/u+duTsR1jc0WgTlwO+leuZmSJmsAg2vRCkXhA/9E7c9G55qna94W5 bZb7qOmcnTjPVc7ZxHRs5LaoPAmh29drZu9Ei2PhpaMxyVTIMsq4I37g5/dVhRrAoALV 0lnFRI5b9P/O4R4u4WVAou38aN6mR3+A0u9B3cVZsRupL6bXsRAQlQU8uKvZFLWK9CLx wHCXTKI0uShTzmKroWgU+T8KTKvcI7xUOcmgzK1aESpCNJ+6DkdFcogzC8VfaGaVJhqX icbdaHgI2adXVc3WEr4SeCORqkUqr/IF9nCXk/LL21qkfQKOUkVFpxRnxVoF/qs5P40L FY4g== X-Gm-Message-State: APjAAAVpBK/J8htMlsUBIROXgG+B/Lj35POBaUPYX88ZWMJ0pFUI7IO4 v8PxrVp3u8mA5MsMm4drmD9760kM X-Google-Smtp-Source: APXvYqyAnips2NxZhNeO61iScFJfWPcMLo0eNTGZdCmbd0DavSOoBbKPEYavcdI6uCyNBZyh4gl+4Q== X-Received: by 2002:adf:dfd2:: with SMTP id q18mr6168159wrn.152.1576155247095; Thu, 12 Dec 2019 04:54:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 069/132] meson: convert hw/virtio Date: Thu, 12 Dec 2019 13:51:53 +0100 Message-Id: <1576155176-2464-70-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/virtio/Makefile.objs | 39 --------------------------------------- hw/virtio/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 40 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 a1d3f07..3f528b5 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -32,7 +32,6 @@ devices-dirs-y += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-y += usb/ devices-dirs-$(CONFIG_VFIO) += vfio/ -devices-dirs-y += virtio/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 376dbef..a8e9acd 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,5 +2,6 @@ subdir('core') subdir('mem') 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 e0d7cd3..0000000 --- a/hw/virtio/Makefile.objs +++ /dev/null @@ -1,39 +0,0 @@ -ifeq ($(CONFIG_VIRTIO),y) -common-obj-y += virtio-bus.o -obj-y += virtio.o - -obj-$(CONFIG_VHOST) += vhost.o vhost-backend.o -common-obj-$(call lnot,$(CONFIG_VHOST)) += vhost-stub.o -obj-$(CONFIG_VHOST_USER) += vhost-user.o - -common-obj-$(CONFIG_VIRTIO_RNG) += virtio-rng.o -common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o -common-obj-$(CONFIG_VIRTIO_MMIO) += virtio-mmio.o -obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o -obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o -obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o -obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o -common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o -obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o - -ifeq ($(CONFIG_VIRTIO_PCI),y) -obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o -obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o -obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input-pci.o -obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o -obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-pci.o -obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o -obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-pci.o -obj-$(CONFIG_VIRTIO_RNG) += virtio-rng-pci.o -obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon-pci.o -obj-$(CONFIG_VIRTIO_9P) += virtio-9p-pci.o -obj-$(CONFIG_VIRTIO_SCSI) += virtio-scsi-pci.o -obj-$(CONFIG_VIRTIO_BLK) += virtio-blk-pci.o -obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o -obj-$(CONFIG_VIRTIO_SERIAL) += virtio-serial-pci.o -endif -else -common-obj-y += vhost-stub.o -endif - -common-obj-$(CONFIG_ALL) += vhost-stub.o diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build new file mode 100644 index 0000000..1a75a87 --- /dev/null +++ b/hw/virtio/meson.build @@ -0,0 +1,42 @@ +softmmu_virtio_ss = ss.source_set() +softmmu_virtio_ss.add(files('virtio-bus.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c')) +softmmu_virtio_ss.add(when: 'CONFIG_VHOST', if_false: files('vhost-stub.c')) +softmmu_virtio_ss.add(when: ['CONFIG_VIRTIO_PMEM', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-pmem-pci.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 = ss.source_set() +virtio_ss.add(files('virtio.c')) +virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c')) +virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.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_VIRTIO_PMEM', if_true: files('virtio-pmem.c')) +virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c')) + +virtio_pci_ss = 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_BLK', if_true: files('vhost-user-blk-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.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-input-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon-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-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pci.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) From patchwork Thu Dec 12 12:51:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WC/E6i7t"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZjr580Tz9sPL for ; Fri, 13 Dec 2019 00:42:40 +1100 (AEDT) Received: from localhost ([::1]:59476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOjl-0006Bp-Tp for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:42:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39814) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNys-0004Jc-Sm for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyr-0007mO-Nj for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:10 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:33627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyr-0007kg-Di for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:09 -0500 Received: by mail-wr1-x436.google.com with SMTP id b6so2661504wrq.0 for ; Thu, 12 Dec 2019 04:54:09 -0800 (PST) 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=3l9D/wa5LzkwNOYWyU/pU6VHkPV0wMYqTq2JxoBeQXg=; b=WC/E6i7tLfb5kQEJif57R+98ZRpCvLZ1QkUfpHl6A/3/Voe46aiSbPbSasTgmPehri yb/qh914JIEg79U1fDNpDC+JO9rts2P8+Kcg/oqS7Tz6NApyv+5hZnRCjQmP/kZVf5vO dFsKpmD0iN8qGJwnhCxdKEKnnvPYRfpyUM0ENZl/ffWdbX8ADFy/+Oq9s9wDlLgRaFkW AhhrHTcEkFzolbwnEoBpV8kSUg5h09QIPv+8GsC0p6aTtWOawpz0iFjcVDMFgVdPeol2 brm2qSw8N7oB9x+9OHH1HGLYjzUYYrm21oy76lW1OmLgb3hthN53D6zwBA/Jl6ZskcF5 kdQg== 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=3l9D/wa5LzkwNOYWyU/pU6VHkPV0wMYqTq2JxoBeQXg=; b=Fe2fPqic4XyRJY2cqj4MTn9V3ktRA5s6SODaRG61KNG4/NJ5Om04qlwV7WvnvPpUOB IRLbpVTrWPNqXS9CgUfhB1SFmWYcevddOTus45PpgTtpiCX7vJYU2hg8vbo8LYcJ9uaM tjGZ/lN2vLD0o/od7Stcd507dCIkTOT6vsxxXIDdfGJK/Hvu+rcBx8RiPPfhSu13xnro p1dMC/OYDEJusTzNLHTg3VcYhCqSt1cgkGkVd5n+FHjRyVIzirU1dEbeSpgnGYoKeiaw yTp3z0trjMQIIQeIhXsoLesnpjtUjs1J3yAd4YB6SO5QyHoSq58S1UTSVmzcOdmyiwOc VRdg== X-Gm-Message-State: APjAAAWsO5ZszeYJDHE34oL8Zv7qvXSBe0xj4OcyX7WF/11vlfN0JOC/ G8qRQ1WWYg85MSpLXK94STJQqpM8 X-Google-Smtp-Source: APXvYqzlbRhFv9m5ZKFTTWTstXLU9fSg0zb8ZHUBlClXVeTImFgSDtw9HXtURVK9Bf2y/X77ryAYJQ== X-Received: by 2002:adf:f288:: with SMTP id k8mr6540116wro.301.1576155248199; Thu, 12 Dec 2019 04:54:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 070/132] meson: convert hw/vfio Date: Thu, 12 Dec 2019 13:51:54 +0100 Message-Id: <1576155176-2464-71-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/vfio/Makefile.objs | 7 ------- hw/vfio/meson.build | 17 +++++++++++++++++ 4 files changed, 18 insertions(+), 8 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 3f528b5..d0c817b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -31,7 +31,6 @@ devices-dirs-y += ssi/ devices-dirs-y += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-y += usb/ -devices-dirs-$(CONFIG_VFIO) += vfio/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index a8e9acd..16c0abd 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') 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 abad8b8..0000000 --- a/hw/vfio/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -obj-y += common.o spapr.o -obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o -obj-$(CONFIG_VFIO_CCW) += ccw.o -obj-$(CONFIG_VFIO_PLATFORM) += platform.o -obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o -obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o -obj-$(CONFIG_VFIO_AP) += ap.o diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build new file mode 100644 index 0000000..b9a31ca --- /dev/null +++ b/hw/vfio/meson.build @@ -0,0 +1,17 @@ +vfio_ss = 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')) + +specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) From patchwork Thu Dec 12 12:51:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u3eRDAxs"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZkV1Fzrz9sPK for ; Fri, 13 Dec 2019 00:43:14 +1100 (AEDT) Received: from localhost ([::1]:59484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOkJ-0006uB-Mc for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:43:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40070) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyu-0004M9-Iv for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNys-0007oG-NN for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNys-0007ma-DA for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id z7so2570167wrl.13 for ; Thu, 12 Dec 2019 04:54:10 -0800 (PST) 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=Yg3Elyi3GPZ8zbUi+6JN6FhWHgdSQqQQaYWdguPJkKE=; b=u3eRDAxsXGtI7/3t2JhiWO88FGpBTaOIz+yGvErCQqyb8KFEpvOWAjNJjq61ye94CH eXk6gdmp+oBE0APzDqsCeaLFwn8z65IxKDSV2V4+mYbpiH5jTwiCoj+VvC1UknHB+bsN HavnEiQYlkYdMMbbtjA154OwEeGHuAP+CMkFtxRGS4GPUALQYPa4f0iWls4m0q3j6iNt Y/Nn5eGG9YC0a96uInPUPYiNCkxrelN3KwEr6p9OnA37DpINBtY03cf7B8pP9vDFLFs1 /4wLSiZoj4DgZL54BiVQuMxUxBycOeokd7F1maGDjfezuK8c3OmgsFEA/hUNiJ5zcVU9 +M0w== 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=Yg3Elyi3GPZ8zbUi+6JN6FhWHgdSQqQQaYWdguPJkKE=; b=LA3iMVX/cPk8XIJ4t6zoIHTuC7uVBmTeG/5+KgY5Z4awsXX+6s1/Kj+U0w/tj0ZMjW 6lmsowCv1RbUKU0PUpJLINwMkUdkXl7Fq+CglE57LHnbgFyx7dpX7chbHBvi8i97g7HL HH4Or1pWDspVS9dyX6zMvsx9lcn+xTLBqaFgTBjAZ2ojzo6FBP3FimF9UoBfVNdJ6DTK YkDXdEHJKStAjkN1yB6mmHQv8dZ3yh3rMobDUBYF5PwGXatZzyy3RtRLg2UdYnz2MGV+ QgfPRWNtlEahEdQx3h+u0BUkCTrA9c5YPbOXBisN9NVk5k4e+FkQmyOHGXHpT9SADW9/ 1B3w== X-Gm-Message-State: APjAAAXf9iX5g7Pzyjvhl2/Cpa68OjfH0foqSb1s/qgFuMdXLKsS/bkh ygnYg61ZOs+RMFZzNZ0rORqdYWhz X-Google-Smtp-Source: APXvYqwl93pb8GFvX9aN9s+30WXVX7tFKBfAD4UW80VndjO24scT3hxO+u0BEU59W+T8mBLOBCvt7g== X-Received: by 2002:a5d:5273:: with SMTP id l19mr6276768wrc.175.1576155249143; Thu, 12 Dec 2019 04:54:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 071/132] meson: convert hw/usb Date: Thu, 12 Dec 2019 13:51:55 +0100 Message-Id: <1576155176-2464-72-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 1 + hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/usb/Makefile.objs | 62 ---------------------------------------------------- hw/usb/meson.build | 54 +++++++++++++++++++++++++++++++++++++++++++++ meson.build | 15 +++++++++++++ 6 files changed, 71 insertions(+), 63 deletions(-) delete mode 100644 hw/usb/Makefile.objs create mode 100644 hw/usb/meson.build diff --git a/Makefile.target b/Makefile.target index c2fcb22..a41e4e5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -167,6 +167,7 @@ endif LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS) LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) +LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d0c817b..df804a0 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,6 @@ devices-dirs-y += sd/ devices-dirs-y += ssi/ devices-dirs-y += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ -devices-dirs-y += usb/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 16c0abd..43797f9 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') 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 303ac08..0000000 --- a/hw/usb/Makefile.objs +++ /dev/null @@ -1,62 +0,0 @@ -# usb subsystem core -common-obj-y += core.o combined-packet.o bus.o libhw.o -common-obj-$(CONFIG_USB) += desc.o desc-msos.o - -# usb host adapters -common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o -common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o -common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o -common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o -common-obj-$(CONFIG_USB_EHCI_PCI) += hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o -common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o -common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o -common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o - -obj-$(CONFIG_TUSB6010) += tusb6010.o -obj-$(CONFIG_IMX) += chipidea.o - -# emulated usb devices -common-obj-$(CONFIG_USB) += dev-hub.o -common-obj-$(CONFIG_USB) += dev-hid.o -common-obj-$(CONFIG_USB_TABLET_WACOM) += dev-wacom.o -common-obj-$(CONFIG_USB_STORAGE_BOT) += dev-storage.o -common-obj-$(CONFIG_USB_STORAGE_UAS) += dev-uas.o -common-obj-$(CONFIG_USB_AUDIO) += dev-audio.o -common-obj-$(CONFIG_USB_SERIAL) += dev-serial.o -common-obj-$(CONFIG_USB_NETWORK) += dev-network.o -common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o - -ifeq ($(CONFIG_USB_SMARTCARD),y) -common-obj-y += dev-smartcard-reader.o -common-obj-$(CONFIG_SMARTCARD) += smartcard.mo -smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o -smartcard.mo-cflags := $(SMARTCARD_CFLAGS) -smartcard.mo-libs := $(SMARTCARD_LIBS) -endif - -ifeq ($(CONFIG_POSIX),y) -common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o -endif - -# usb redirection -common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o -redirect.o-cflags = $(USB_REDIR_CFLAGS) -redirect.o-libs = $(USB_REDIR_LIBS) - -# usb pass-through -ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) -common-obj-y += host-libusb.o -else -common-obj-y += host-stub.o -endif -common-obj-$(CONFIG_ALL) += host-stub.o - -host-libusb.o-cflags := $(LIBUSB_CFLAGS) -host-libusb.o-libs := $(LIBUSB_LIBS) - -ifeq ($(CONFIG_USB_LIBUSB),y) -common-obj-$(CONFIG_XEN) += xen-usb.o -xen-usb.o-cflags := $(LIBUSB_CFLAGS) -xen-usb.o-libs := $(LIBUSB_LIBS) -endif diff --git a/hw/usb/meson.build b/hw/usb/meson.build new file mode 100644 index 0000000..8292256 --- /dev/null +++ b/hw/usb/meson.build @@ -0,0 +1,54 @@ +# 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')) + +specific_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c')) +specific_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.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_USB_BLUETOOTH', if_true: files('dev-bluetooth.c')) + +softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c')) +softmmu_ss.add(when: ['CONFIG_USB_SMARTCARD', 'CONFIG_SMARTCARD', cacard], if_true: files( + 'ccid-card-emulated.c', + 'ccid-card-passthru.c', +)) + +softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c')) + +# usb redirect +softmmu_ss.add(when: [usbredir, 'CONFIG_USB_REDIR'], if_true: files('redirect.c', 'quirks.c')) + +# usb pass-through +softmmu_ss.add(when: [libusb, 'CONFIG_USB_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: [libusb, 'CONFIG_XEN'], if_true: files('xen-usb.c')) diff --git a/meson.build b/meson.build index f1c5e7a..58bc25c 100644 --- a/meson.build +++ b/meson.build @@ -300,6 +300,21 @@ if 'CONFIG_XEN_BACKEND' in config_host xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(), link_args: config_host['XEN_LIBS'].split()) endif +cacard = declare_dependency() +if 'CONFIG_SMARTCARD' in config_host + cacard = declare_dependency(compile_args: config_host['SMARTCARD_CFLAGS'].split(), + link_args: config_host['SMARTCARD_LIBS'].split()) +endif +usbredir = declare_dependency() +if 'CONFIG_USB_REDIR' in config_host + usbredir = declare_dependency(compile_args: config_host['USB_REDIR_CFLAGS'].split(), + link_args: config_host['USB_REDIR_LIBS'].split()) +endif +libusb = declare_dependency() +if 'CONFIG_USB_LIBUSB' in config_host + libusb = declare_dependency(compile_args: config_host['LIBUSB_CFLAGS'].split(), + link_args: config_host['LIBUSB_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') From patchwork Thu Dec 12 12:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208492 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bB55BewK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZlM2pT0z9sPK for ; Fri, 13 Dec 2019 00:43:59 +1100 (AEDT) Received: from localhost ([::1]:59492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOl2-0007xj-P8 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:43:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyu-0004Mj-NP for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyt-0007q6-K3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyt-0007oW-CZ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:11 -0500 Received: by mail-wr1-x430.google.com with SMTP id c9so2604557wrw.8 for ; Thu, 12 Dec 2019 04:54:11 -0800 (PST) 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=7gkCOZ6HfKG25xVzS1LaU0MoLpk2e6Hmi4aWBpccGyI=; b=bB55BewKBun8y+zeAX+9qkn2U5gaOxA2JisV4rFFpUHQHXdOXUosmotfQeCM+nGVIi T9UL6ZI2vLCyel1vdhYENDxdEA8WQBm0ew8okOhliSVMK2Rt9Rj6PZsbzOP5Dv0eO9Sl HZ7TpkSTg7IzyOhxNsfKCn6c+AUzwnqtMga9nLserLL+hL/jQ6h0DMWWUYbMgJnKUrqD W8nwPijm00xmksn/Z3h3uEhQSD07Gm5CA5e32OIJQnyzUW+IPpygEt+/pxzNrVBUM4OH C1xYV3JYTtQoEJn+oyuoEIsEOURfayJqlIbu5Klhddoh4Jwhn9LFXIADqIOVRZzR9MPT twmA== 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=7gkCOZ6HfKG25xVzS1LaU0MoLpk2e6Hmi4aWBpccGyI=; b=VzCoBYphIkA9KifG47j6CRuOvxqt/Tc0HkEJhXnQjGx2kLeqY0C7Nb5mERsf1F3voU yl39WO5/+Lb3WTvh6lRxbBKLq4n4jk2EllT4RBsmqQ157bHRglNvWZg4AHaDjLdLBTvO mSBEFzG/n0oOOmstiJQdAIHKDnuRsKGfYQeEZHIPpxVr+u1Z5cLl7cUSS1Tg0aPJ0Pr2 B4+cUHOf6wYt/RvVURZWfOpSO8Tqx0t1x1kMRpzNMmH5vxu7h65ILjMPHefRCan6k2/H jVmJxVW+Nx6YP2RuY7OufCoVxlfyHijY1CBPmuxP8NRZB0XJN27M1Yse8hzskCvgzRRi ybQQ== X-Gm-Message-State: APjAAAVrCJK9cUlc9QUQx1mB85i1oN/b1FIiqfEa7n1FQyiiqvw/A+0U NX8Kb0Eh88oGst2PYc+ShS08N3tw X-Google-Smtp-Source: APXvYqxqMSwgukkJIGoHY96VHDPDOLK6iBrXWgznnIXx169zwgP3B/lKlXrU2nfRbQtyTK946HEgZA== X-Received: by 2002:adf:e591:: with SMTP id l17mr5704526wrm.139.1576155250082; Thu, 12 Dec 2019 04:54:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 072/132] meson: convert hw/tpm Date: Thu, 12 Dec 2019 13:51:56 +0100 Message-Id: <1576155176-2464-73-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/tpm/Makefile.objs | 6 ------ hw/tpm/meson.build | 7 +++++++ 4 files changed, 8 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 df804a0..6529617 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -29,7 +29,6 @@ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ devices-dirs-y += ssi/ devices-dirs-y += timer/ -devices-dirs-$(CONFIG_TPM) += tpm/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 43797f9..4e918d0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') 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 de0b85d..0000000 --- a/hw/tpm/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -common-obj-$(CONFIG_TPM) += tpm_util.o -obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o -common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o -common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o -common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o -common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build new file mode 100644 index 0000000..9ab7cd7 --- /dev/null +++ b/hw/tpm/meson.build @@ -0,0 +1,7 @@ +softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm_util.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis.c')) +softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) +softmmu_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c')) +softmmu_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c')) + +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPMDEV'], if_true: files('tpm_ppi.c')) From patchwork Thu Dec 12 12:51:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eA4fCgYs"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZmk2bvzz9sPL for ; Fri, 13 Dec 2019 00:45:10 +1100 (AEDT) Received: from localhost ([::1]:59498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOmA-0000VR-Ni for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:45:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyw-0004Oq-5j for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyu-0007rt-LB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyu-0007qZ-DW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: by mail-wr1-x436.google.com with SMTP id w15so2627269wru.4 for ; Thu, 12 Dec 2019 04:54:12 -0800 (PST) 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=yXQbJKsvQk7oYU4KlgfGRW1DYvBILSdETOHeXV/ZcBk=; b=eA4fCgYsbDn5WshczUK/HB7vxAdbF5kfSLKk29e3VQX8jEjcU+THyBWH8JSQKjdgZj 3gk4w1KlIIwjrD90XOsoGpgnDNHAAiSp2IpK1L5OkZ8KH9KMgkDApYsmWsWYTuExt/j/ xXiSCd9PDQb5UL5wsogcs6rykus553SwNNQc6kelzBDKiERo+t/ac2sDK2HkU5j7xS6T LuTG3g9jAmEjuj1UYrrpeWUIyD13XfQcg/iSFayJU9XhDousxN3CjGnTYWe4o+n8nWWX ExVzqA7/LS+8RjZRH9kVrfBgkd30JStLPUkDe3fP1VQ0KKR0puR3/Od1bwnl9EWKrDGF C3pA== 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=yXQbJKsvQk7oYU4KlgfGRW1DYvBILSdETOHeXV/ZcBk=; b=ClC1P9wIkgu9V31eCqkm3NLvOujAb0FrMDfVbprKymMxvQdmmg7po4wWLL8SbMrMLE i+41KvNuzbcY+LJZKgHYRt5OgCbnBQs5Vv3e1/v8y9Ca4GMvmkrDK/u2+9N5BcIyq/AA ivIL1jJHeC+Qhcsqr1TpOZ9olNAgCdC/f6zSaHtgITc3bd+HShQcnIjLowhADBHesR5T ao+Ma7hIB3eoAh+V5RIUaRwZ7CVL9yrAo1LgnrsE9b4DCvW3zH9JSDpEwrWIpZkJuZdK 0w0YsPKsWPavbxEYSOfRsv34PQnARfyphCsrvtA3RglQBgtD5jfd3sEMUUtLjfQ67qUz Vk0A== X-Gm-Message-State: APjAAAWxKJ1pH9CinfMEVMi7wLQxIsQpFtMrvoWKdRmvkbxaZvDF0gcu 7BQ/3Tej2ex5vnMrn9izbDHtTRb1 X-Google-Smtp-Source: APXvYqzZFA2cbfILZ0V7dqEr89xknJm/YKmcImxw7iWsKLY/rjl07OrvuqjZy5oonJfpDFqNH//KIA== X-Received: by 2002:adf:e3d0:: with SMTP id k16mr6303203wrm.241.1576155251115; Thu, 12 Dec 2019 04:54:11 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 073/132] meson: convert hw/timer Date: Thu, 12 Dec 2019 13:51:57 +0100 Message-Id: <1576155176-2464-74-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/timer/Makefile.objs | 49 ------------------------------------------------- hw/timer/meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 50 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 6529617..1d47113 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,7 +28,6 @@ devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ devices-dirs-y += ssi/ -devices-dirs-y += timer/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 4e918d0..960fd14 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') 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 123d92c..0000000 --- a/hw/timer/Makefile.objs +++ /dev/null @@ -1,49 +0,0 @@ -common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o -common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o -common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o -common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o -common-obj-$(CONFIG_CADENCE) += cadence_ttc.o -common-obj-$(CONFIG_DS1338) += ds1338.o -common-obj-$(CONFIG_HPET) += hpet.o -common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o -common-obj-$(CONFIG_M41T80) += m41t80.o -common-obj-$(CONFIG_M48T59) += m48t59.o -ifeq ($(CONFIG_ISA_BUS),y) -common-obj-$(CONFIG_M48T59) += m48t59-isa.o -endif -common-obj-$(CONFIG_PL031) += pl031.o -common-obj-$(CONFIG_PUV3) += puv3_ost.o -common-obj-$(CONFIG_TWL92230) += twl92230.o -common-obj-$(CONFIG_XILINX) += xilinx_timer.o -common-obj-$(CONFIG_SLAVIO) += slavio_timer.o -common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o -common-obj-$(CONFIG_GRLIB) += grlib_gptimer.o -common-obj-$(CONFIG_IMX) += imx_epit.o -common-obj-$(CONFIG_IMX) += imx_gpt.o -common-obj-$(CONFIG_LM32) += lm32_timer.o -common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o -common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o - -obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o -obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o -obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o -obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o -obj-$(CONFIG_OMAP) += omap_gptimer.o -obj-$(CONFIG_OMAP) += omap_synctimer.o -obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o -obj-$(CONFIG_SH4) += sh_timer.o -obj-$(CONFIG_DIGIC) += digic-timer.o -obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o - -obj-$(CONFIG_MC146818RTC) += mc146818rtc.o - -obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o - -common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o - -common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o -common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o -common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o -common-obj-$(CONFIG_MSF2) += mss-timer.o diff --git a/hw/timer/meson.build b/hw/timer/meson.build new file mode 100644 index 0000000..5162b9b --- /dev/null +++ b/hw/timer/meson.build @@ -0,0 +1,43 @@ +softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.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_rtc.c', '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-apb-dualtimer.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c')) +softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c')) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.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', 'i8254.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_M41T80', if_true: files('m41t80.c')) +softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.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_PL031', if_true: files('pl031.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) +softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c')) +softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c')) +softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c')) +softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c')) +softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c')) + +specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c')) +specific_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c')) +specific_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c')) +specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c')) +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) +specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) From patchwork Thu Dec 12 12:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SNE2+tez"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZqM4Kd9z9sPL for ; Fri, 13 Dec 2019 00:47:27 +1100 (AEDT) Received: from localhost ([::1]:59528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOoO-000239-G2 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:47:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40462) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyw-0004Pv-TK for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyv-0007tg-J0 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyv-0007s3-9e for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:13 -0500 Received: by mail-wr1-x435.google.com with SMTP id t2so2646587wrr.1 for ; Thu, 12 Dec 2019 04:54:13 -0800 (PST) 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=tSMwvOVlmljJ/d7pUHQjqPiE5EBDb5gSPZ7yrnNNJfk=; b=SNE2+tezie7kPxeQwQ1zKJ31REZIRUiH5F49tNoYAyrmeVoDq3nbxUaaz06z0nFi+z qr81l8U288WjjM9wnhoYADBu+9zY4WMMPtgIiGEerfoqzfWfej6Nj8TXnVhEEj+esGDc Hv4giCv5EKwFr7QsinMQv2/4A1tFmAo17DVXcimmnsPIzJgMOKZaHoyzO0vW4uvNREmv 3++QaqBtH5aWHUH2FVCy9ovDsP5xdo2ryQjxJSyZR7cQjzWHwEEXcgHQ4B9rDDmIKOtY I1gKqkXxNRbznj3E2/UUnlk5b43jURzrlA+N+IzwqSGNGsw5yyuZds4TsqG7O3Y0PC0Q Pj5g== 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=tSMwvOVlmljJ/d7pUHQjqPiE5EBDb5gSPZ7yrnNNJfk=; b=c8tyXWOutf2Uq0zt9fROB+T93LqDsUIM4TvonkKcXoQI1MxXLoH/ZZN6b8ZJv+AOie Bbit/aRm91+XPpWq52mXiIHyb2diF5k4xlLFgZzc4b1t1tsAnPLnNYaJGAlRw3SY1uP5 +bBboMYFl0QFZ+nVNZhHqb3dBEzqV3mUHj7/6f4V1SF+6bSbCNeg3Lflep8rEPVqV/Eg tpCPGN1ajCEb8wkXF83x/b9MIUiQK7N5SyHZJk8uBf0OAUJtP/TOD54HFVEDjxnse7Zs ZqWZ7bH/GB+GzrL46XRFf9J45J1MRR8SVIb7OWTy6VJxyUAG3/uFXgvQ/a7J299U6khV dQ2Q== X-Gm-Message-State: APjAAAUjJH9Bcw/IquIYFvHXDBvuO+Y51Fniz08dJ7NWmYPDCUiJSKc8 wZOeWM5orEA38pFfTyUOtaTnhBSI X-Google-Smtp-Source: APXvYqy5pey0D27+QQgofM/UsmmeEhimhJqgLZRBha717I8MkKwGaPoseAHiJ+a3u8OuhuivZjIMrQ== X-Received: by 2002:adf:ffc7:: with SMTP id x7mr6133054wrs.159.1576155252105; Thu, 12 Dec 2019 04:54:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 074/132] meson: convert hw/ssi Date: Thu, 12 Dec 2019 13:51:58 +0100 Message-Id: <1576155176-2464-75-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/ssi/Makefile.objs | 10 ---------- hw/ssi/meson.build | 10 ++++++++++ 4 files changed, 11 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 1d47113..201d614 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -27,7 +27,6 @@ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ -devices-dirs-y += ssi/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 960fd14..a867f82 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') 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 f5bcc65..0000000 --- a/hw/ssi/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-$(CONFIG_PL022) += pl022.o -common-obj-$(CONFIG_SSI) += ssi.o -common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o -common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o -common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o -common-obj-$(CONFIG_MSF2) += mss-spi.o - -obj-$(CONFIG_OMAP) += omap_spi.o -obj-$(CONFIG_IMX) += imx_spi.o diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build new file mode 100644 index 0000000..612c109 --- /dev/null +++ b/hw/ssi/meson.build @@ -0,0 +1,10 @@ +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')) + +specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c')) From patchwork Thu Dec 12 12:51:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208494 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rLIx+6/7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZpD2fqTz9sPK for ; Fri, 13 Dec 2019 00:46:28 +1100 (AEDT) Received: from localhost ([::1]:59506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOnR-0001Ia-Lq for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:46:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40634) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyx-0004RS-ON for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyw-0007vW-Iu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:15 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyw-0007u8-Bp for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: by mail-wr1-x42c.google.com with SMTP id q6so2584853wro.9 for ; Thu, 12 Dec 2019 04:54:14 -0800 (PST) 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=STEo9GpQKwUedfVo2QZeziTyW5VyS+cRQws0nwVdfdo=; b=rLIx+6/7wQtQbIIsVCFhNKlfjct2/7ZL9Kv1Jd4zSnlyQ103skp5mj565ZGwEyt16M 5hDBQNzVoZaLgbTOwmuvyqcvbL06B6VtKlahqPTO1FI8U99qVlJntJIlj7SYw0x4htWl mqDYMxaxdvD229mq/+cmAEsEUFO0jNc20QkXKYmwGRH2DJPBfGGgcfXdVUWNFgNFZbk2 1b/zsvt+K5baD0xmHXWnKNGgYuWDh1Q4tdjNw/X0CCkwFgi+EqonmQZtC0lkU90MVIbt UxDorWqOCs1H9UMmHu9fgFGsT494D2xfAq5qPco7ipRwWzfKL1J/R39Xbx51IIW9J7ef zhRA== 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=STEo9GpQKwUedfVo2QZeziTyW5VyS+cRQws0nwVdfdo=; b=tNBKxWudYC4PgiKK1Ze9xGzhMVJpcq5raOCiE4oMCbE2xUIkhJLoGgAZD4vPKhA9VW xXK1NKEnqsiKbxBnjVV5GxpDwagBlHPLz6/QbYyDzGwTt7A/1cF2tg6HYpVxr5TbI9E2 k4reO2excjJwruBpEZDIjBPopi61UPlX/WRtnluvW3vZ1SdiU5RJS8c5mdKLZ1/BKxgU bd3ny6M+6Ys7RF4p0FT4q+9Pji3OHI6ox2Pd3uEXtbO8DDfA3VMNdVTLgUFRx4BaYG/P Y6k7EfghX3185OL2AcBSyDzbSgtXyfbFZyat8+6VBzE0EHjmE4IToYNqI/KctdoDIPU/ U+XQ== X-Gm-Message-State: APjAAAVCUAj58/tGct+urm6sb2dyryb1QLpjGYIOA8cxnbftbFjW/CNt WPCzmJ40AJ+/xtNrtkAFyowCWJtx X-Google-Smtp-Source: APXvYqypoulI1wFnNv3bk9KDqQ7Vvb/Udh1ebsxSiJKTickJckhOwEpM4T0lxSwFsv73oJuoMQyj7g== X-Received: by 2002:adf:a141:: with SMTP id r1mr6259963wrr.285.1576155253143; Thu, 12 Dec 2019 04:54:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 075/132] meson: convert hw/sd Date: Thu, 12 Dec 2019 13:51:59 +0100 Message-Id: <1576155176-2464-76-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/sd/Makefile.objs | 10 ---------- hw/sd/meson.build | 10 ++++++++++ 4 files changed, 11 insertions(+), 11 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 201d614..22ea14a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -26,7 +26,6 @@ devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ -devices-dirs-y += sd/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index a867f82..0d29fa7 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +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 0665727..0000000 --- a/hw/sd/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-$(CONFIG_PL181) += pl181.o -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o -common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o -common-obj-$(CONFIG_SDHCI) += sdhci.o -common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o - -obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o -obj-$(CONFIG_OMAP) += omap_mmc.o -obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o -obj-$(CONFIG_RASPI) += bcm2835_sdhost.o diff --git a/hw/sd/meson.build b/hw/sd/meson.build new file mode 100644 index 0000000..65a5b04 --- /dev/null +++ b/hw/sd/meson.build @@ -0,0 +1,10 @@ +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')) + +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c')) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c')) From patchwork Thu Dec 12 12:52:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ScfKteO7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZvF5g87z9sPc for ; Fri, 13 Dec 2019 00:50:49 +1100 (AEDT) Received: from localhost ([::1]:59554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOrf-0005bQ-7P for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:50:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyz-0004TW-Pb for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyx-0007x2-Hx for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:17 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyx-0007vg-AA for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:15 -0500 Received: by mail-wr1-x431.google.com with SMTP id d16so2590736wre.10 for ; Thu, 12 Dec 2019 04:54:15 -0800 (PST) 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=lHyWIiwXqz7PUK23G2WjiaSirKHA3tPFe4PBKOzvAwM=; b=ScfKteO7hjhUi3JGJy6N8LP478VQKlVjEVuuubkr7O8YZniUrZwtMqej5B4c2PYUWM yADPGYRuTB14njr5yCZV2CRHAIj/utnuKolV5vamOJhNDLg7czhwAOaBZDg0/VOHtfN1 vkg8qtAwEZAGj9q0yXH4lW/QEn/7Xkk61dyj7OFPkWUhWotAdolaFmvfTFReICdBzKKp 7SZjKlo9ZqOcq5Wx+LdFY4ytOw+s5MTUsw01vyIAEsLPjn7ISseUE72tqc97vT2kI52X 3q3odCW+RQrykolMyG0dXdqRNukymt8EoOql2SS/SqSSZ9jgrKyZQqoq0wZy8TY4UwaT l4Xw== 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=lHyWIiwXqz7PUK23G2WjiaSirKHA3tPFe4PBKOzvAwM=; b=A4NT69dQFs649eRDiMOiXpRrjOQIo3iY4uO8h3CM4KU62qfR+UR8r5P/H2dQV0bP5F pcckogIbofuKN4DXBQdUpSGWZnvb0S3wJY96XBoGYAq/qli3KkbPRq31ROkAmRkjXTse af5qnKxbR+6Cm2pIDTJXDiRNSLacdq84ZWWS3FR9Qd5C5WfPwsjkEMtGtxLI4IQgivvZ M/S7VxoDgOmYQq9w2pt2gBAaSNr+enbXnPkzEos5iprFu/mAmzQ2tAkmyXWjMBnP1Fs5 puH9voTfwL31quwyfILt66FuuACMCfPo8LCnG38zEMdSiQ1H7oorPQK8BqzHf+LtV2rE Wvrg== X-Gm-Message-State: APjAAAXrsQ/8D6aMgZ3q1MoiEzOj3FxxRt6rD+plbyxpBGjoE2sHs4HA NyuE+wbKGUhrgzmAG/GUR+UzpgcL X-Google-Smtp-Source: APXvYqyHgEHNuciUAVqMeYt+6iNT/Aq1t/UmEBlorKxPkKuBQyrxAUOsEn5Kd9qWNkspgQi1g6qL9Q== X-Received: by 2002:a5d:438c:: with SMTP id i12mr6351464wrq.196.1576155254035; Thu, 12 Dec 2019 04:54:14 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 076/132] meson: convert hw/scsi Date: Thu, 12 Dec 2019 13:52:00 +0100 Message-Id: <1576155176-2464-77-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 22ea14a..4670061 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -25,7 +25,6 @@ devices-dirs-y += nvram/ devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ -devices-dirs-$(CONFIG_SCSI) += scsi/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 0d29fa7..37ff9ec 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('scsi') subdir('sd') subdir('semihosting') subdir('smbios') diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs deleted file mode 100644 index 54b36ed..0000000 --- a/hw/scsi/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -common-obj-y += scsi-disk.o emulation.o -common-obj-y += scsi-generic.o scsi-bus.o -common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o -common-obj-$(CONFIG_MPTSAS_SCSI_PCI) += mptsas.o mptconfig.o mptendian.o -common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o -common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) += vmw_pvscsi.o -common-obj-$(CONFIG_ESP) += esp.o -common-obj-$(CONFIG_ESP_PCI) += esp-pci.o -obj-$(CONFIG_SPAPR_VSCSI) += spapr_vscsi.o - -ifeq ($(CONFIG_VIRTIO_SCSI),y) -obj-y += virtio-scsi.o virtio-scsi-dataplane.o -obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o -obj-$(CONFIG_VHOST_USER_SCSI) += vhost-scsi-common.o vhost-user-scsi.o -endif diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build new file mode 100644 index 0000000..923a34f --- /dev/null +++ b/hw/scsi/meson.build @@ -0,0 +1,26 @@ +scsi_ss = 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', 'mptconfig.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 = ss.source_set() + +virtio_scsi_ss = 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-common.c', 'vhost-scsi.c')) +virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-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_vscsi.c')) + +specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss) From patchwork Thu Dec 12 12:52:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YrylU0Mt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZtc1lRkz9sPL for ; Fri, 13 Dec 2019 00:50:16 +1100 (AEDT) Received: from localhost ([::1]:59548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOr6-0004pQ-Tn for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:50:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41023) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz0-0004Ud-GH for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyz-000809-Cy for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:18 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyz-0007xD-5o for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:17 -0500 Received: by mail-wr1-x430.google.com with SMTP id c9so2604809wrw.8 for ; Thu, 12 Dec 2019 04:54:16 -0800 (PST) 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=NZznVY2PNcm8/8th1seZakUGMQB4kApyVOseMDs6r+M=; b=YrylU0Mto+scss+HWbGPVSjD9Gk8rSfvjR9eX9K824j4nioz3js1OS2OY1bF0igTLb D7xj93ghUIxkc1uGC2E9JnxVotNC9gpcP024nsKtwcGscxRos3VPaO460F1OlZhBklMq MXgSX5zVZLqvvD/tMzErrXAAFauBMoIRb8NDDe9vVF8b6AyPpNS0tJ0jc6bMiVgCLlEk 11KzItAInQWvkXE+KFBzcK8JyCRypue7Ygt1lfG1q0qkU6Edy5RUfU53wSgah884VEVX 8Mv8FAfoGkUtfJVnO+2XumoudWiD2Z3KH3Q1gcm+fqcHjgZ2vbLoIuRoThX2Moq9M9Ba 63gA== 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=NZznVY2PNcm8/8th1seZakUGMQB4kApyVOseMDs6r+M=; b=WUCVltmVa7H1LCLQFy7yLfgL0r8sWfKi/BNFuvioiPrjj1fdPrn3omwf4jRn5nC64G qpzovEnwtwRoY/Sd4oaPBu/IJJpxaGGZm8hp+Ss94aPgLQzRn+I+/bvJZF2dyvmmOwX8 jaowiquvQJUQPp5ntZGTt7+QJcfrXIgVX+CHbPcG+gp1Rxpg0vCPsuzsuP4Px92KXAIy 09Qv+XpX03v/vnI93TPqhS10dkMLNVh82IBJRj99p+lWgvKnhJtxn76PqCmbmJFTTV8y a9hbVuBYiZ41nViz0iH5jF21CX6SqTBQTboylS4Nlzp5pdEl6a02yvwZ4yRRUAJVC1b2 Xiag== X-Gm-Message-State: APjAAAUqYvkOIZDFDryUAm9A6n7s3Uf540J1pzXd+3wVPNDeZaw3Cw4P QvzEESZxtPKChq9LEP04v5wZiKbs X-Google-Smtp-Source: APXvYqxxomIJkq60aa8Ya3e4qnvPcvzpGBdJRA7R6DYdloh6jQz4isAm8SkM2rTM0dO4Jtu1bSwIqQ== X-Received: by 2002:adf:d848:: with SMTP id k8mr5983951wrl.328.1576155255004; Thu, 12 Dec 2019 04:54:15 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 077/132] meson: convert hw/pcmcia Date: Thu, 12 Dec 2019 13:52:01 +0100 Message-Id: <1576155176-2464-78-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 4670061..bfa305f 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -24,7 +24,6 @@ devices-dirs-y += rdma/ devices-dirs-y += nvram/ devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ -devices-dirs-y += pcmcia/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 37ff9ec..2356eda 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('pcmcia') subdir('scsi') subdir('sd') subdir('semihosting') diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs deleted file mode 100644 index 4eac060..0000000 --- a/hw/pcmcia/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-y += pcmcia.o -obj-$(CONFIG_PXA2XX) += pxa2xx.o diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build new file mode 100644 index 0000000..48ece81 --- /dev/null +++ b/hw/pcmcia/meson.build @@ -0,0 +1,2 @@ +softmmu_ss.add(files('pcmcia.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c')) From patchwork Thu Dec 12 12:52:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ihs6R6RV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZxh3lpHz9sPK for ; Fri, 13 Dec 2019 00:52:56 +1100 (AEDT) Received: from localhost ([::1]:59580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOth-0008Pk-To for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:52:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41057) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz0-0004V6-LE for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyz-000803-Cd for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:18 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:56060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyz-0007yU-5W for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id q9so2239157wmj.5 for ; Thu, 12 Dec 2019 04:54:17 -0800 (PST) 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=R77k2Mbztn4q8/5DxwujzSso8bXI5Kuue23snjdJl60=; b=ihs6R6RVw93NdSxyJz1hpBRqm2fDW1x1n7zly75lVY2ahry9q9mVIQjpCPCzUj4oqh /WhzfDqL6b6riXHad+kE/FzR6g4l/ka19TfA0uQvaFq9nJtSxzL6gLXQI0Jn2+TIaw4v D94PR69U5ltZmW3e3RtyzApJXdbMcnK7jmw/UAyPV6laaQIZC4dR/YQMLQYppCe6uJAL gOakeQHrhWULgYwfWRK1yDP2re3mV1hEcAFrNSskM9Yi/SktIsawxdnq8+6m+DgX6mrW /5EiilICRnCWYu5c9hZq+wMfnGx9XfNn5W6u20GeP8fAB5x2GWh/FBnjwkTQece2IcQc 8BYA== 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=R77k2Mbztn4q8/5DxwujzSso8bXI5Kuue23snjdJl60=; b=YYoMWCU6pLYufe9POrnRl3KMmP9Aks5nP3Fa+jgGhFmVVQHR9JnEGAAhoU2icyJcQw wfZ4ZliVTn+XnlAJmT2uSHideVQeVy0SmgZsJQzsNmN/Wk3fvK56b5ZDZ6Z/Q0gm0xBI Uvn8pwn2h48SBEKD0RVx2axtCXlEn6RF+qoVE+zufQnDub0fRr/mIuJquVN3deKCpTHz Xt9XOGum5wX+rvVZGJR4BauOqxZVbSvTcum8LotGX+wDrc5Q6Ms9mUEIFtJwLbgdY08y xDg5GdKxYQznoce00QNpWxJWFqtaYA9s1LbiM4qmBxiA37sDcwmFPHnopEoW86lY+SGw e1IQ== X-Gm-Message-State: APjAAAVDblrAgKuj8ZdzCGLhbBoWaANzci85gLLybqI+aV7IlIDi8R+S IoUlC9hyuABgYKxIWb0PXZv0/9zm X-Google-Smtp-Source: APXvYqyU9m8lDHsudgRuPs2/y8iNHNwLvBF+NTbwmIWH+Llw1v3BWXnnrU1V+2FhNwFNRfjLNQssAA== X-Received: by 2002:a7b:ce19:: with SMTP id m25mr6122964wmc.83.1576155255921; Thu, 12 Dec 2019 04:54:15 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 078/132] meson: convert hw/pci-host Date: Thu, 12 Dec 2019 13:52:02 +0100 Message-Id: <1576155176-2464-79-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 2 +- hw/meson.build | 1 + hw/pci-host/Makefile.objs | 21 --------------------- hw/pci-host/meson.build | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 22 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 bfa305f..1f76ce1 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -23,7 +23,7 @@ devices-dirs-y += net/ devices-dirs-y += rdma/ devices-dirs-y += nvram/ devices-dirs-y += pci/ -devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ +devices-dirs-$(CONFIG_PCI) += pci-bridge/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 2356eda..b93a496 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('pci-host') subdir('pcmcia') subdir('scsi') subdir('sd') diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs deleted file mode 100644 index a9cd3e0..0000000 --- a/hw/pci-host/Makefile.objs +++ /dev/null @@ -1,21 +0,0 @@ -common-obj-$(CONFIG_PAM) += pam.o - -# PPC devices -common-obj-$(CONFIG_PREP_PCI) += prep.o -common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o -# NewWorld PowerMac -common-obj-$(CONFIG_UNIN_PCI) += uninorth.o -# PowerPC E500 boards -common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o - -# ARM devices -common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o - -common-obj-$(CONFIG_PCI_SABRE) += sabre.o -common-obj-$(CONFIG_FULONG) += bonito.o -common-obj-$(CONFIG_PCI_PIIX) += piix.o -common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o -common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o -common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o - -common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) += designware.o diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build new file mode 100644 index 0000000..4938826 --- /dev/null +++ b/hw/pci-host/meson.build @@ -0,0 +1,22 @@ +pci_ss = ss.source_set() +pci_ss.add(when: 'CONFIG_FULONG', if_true: files('bonito.c')) +pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c')) +pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true: files('designware.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_PIIX', if_true: files('piix.c')) +pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.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) From patchwork Thu Dec 12 12:52:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B+6PjBXS"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb0V0C4Cz9sPK for ; Fri, 13 Dec 2019 00:55:22 +1100 (AEDT) Received: from localhost ([::1]:59604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOw3-0003Vd-4c for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:55:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41154) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz1-0004WP-EC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz0-00081K-70 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:19 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:40424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyz-00080Q-W7 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:18 -0500 Received: by mail-wm1-x32e.google.com with SMTP id t14so2373539wmi.5 for ; Thu, 12 Dec 2019 04:54:17 -0800 (PST) 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=+4dOxdROAj+zoDtcNkjhpKvAio7iw22WNxOkmH2Hvlc=; b=B+6PjBXSz+c32XTh+Aa2SyZ+aAM0yh1rTvxsTbzF6ZfiIHPntH5Om2q/YJg0psWP+b HJFTlQEkedClXY+8w2WuuWG/5x17L9XsHdnZX4AVwUrboJHVO19yvFAyLy6tntu1QqI2 nnAcPAFhv6EJ0l7dpxxHCkrLYanXGC111LMZDxNkv5WNjOdF3YIoX62oOPlhEi5CI9CK 19or0rinMasUBiD/7EbGjje4Jq8mR2+4q0SZ+z/9O0FOTrwnKvWfPqRqNhqWFgV9cp6U IC4luoVRkicOkJ5xqEO5suiuAkqB/vec21T2rJr4zE7WWT+Vj6JqFrqPvOu51ZDhMJO2 9BwQ== 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=+4dOxdROAj+zoDtcNkjhpKvAio7iw22WNxOkmH2Hvlc=; b=WQhYe1rok8l3ISJeVxCBau12aYYXslAtCUs8vKGjx2l35CQlrzu8TWFGHHOT3F+T/o D6ukdLryhEDdgd1P+o04saVPl1b5Z2uoL83wDlQT/XLsGcHuUDl0AM4vaVFqQG+YcBxd M049j+MSvNZF3uL55Ax8eWuUIfAeOogTJ67qtxGGBmoKtGnME0fv1QDUiJizeWHUd5mK jBmWjm8aj4L6u53Q+5X8kDQxPFfBPsRLAQgQDKM9dtIhYlq0RJpXC5UzRT1+RI3x6YA6 1zT3Jk0jxVIEyBjs/Vtk86TCCQha2SbzgJEjFgIZBVgsh6VXm6GmcYMr0Lcsfy/sk7Rz M55w== X-Gm-Message-State: APjAAAWdH+wKskStboH5j3yR5FbfcyaHDKa1igD/IgFP1JfqfcTQMJvz 1CzkjdgDUK9ZiOOuRLEkHPLtuAmT X-Google-Smtp-Source: APXvYqxqe3ECFnhKhELAJimx55RoJCoiIg5aJANYuiFKRzt5GDXbEvzaHuSf5rl2VwNYy+wfJY/WQA== X-Received: by 2002:a05:600c:257:: with SMTP id 23mr6431280wmj.123.1576155256775; Thu, 12 Dec 2019 04:54:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 079/132] meson: convert hw/pci-bridge Date: Thu, 12 Dec 2019 13:52:03 +0100 Message-Id: <1576155176-2464-80-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 1f76ce1..8a56abf 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -23,7 +23,6 @@ devices-dirs-y += net/ devices-dirs-y += rdma/ devices-dirs-y += nvram/ devices-dirs-y += pci/ -devices-dirs-$(CONFIG_PCI) += pci-bridge/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index b93a496..4d88cfa 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') subdir('scsi') diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs deleted file mode 100644 index 47065f8..0000000 --- a/hw/pci-bridge/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-y += pci_bridge_dev.o -common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o pcie_pci_bridge.o -common-obj-$(CONFIG_PXB) += pci_expander_bridge.o -common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o -common-obj-$(CONFIG_IOH3420) += ioh3420.o -common-obj-$(CONFIG_I82801B11) += i82801b11.o -# NewWorld PowerMac -common-obj-$(CONFIG_DEC_PCI) += dec.o -# Sun4u -common-obj-$(CONFIG_SIMBA) += simba.o diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build new file mode 100644 index 0000000..daab8ac --- /dev/null +++ b/hw/pci-bridge/meson.build @@ -0,0 +1,14 @@ +pci_ss = 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', 'gen_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', 'xio3130_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) From patchwork Thu Dec 12 12:52:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nodDSSyA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZyL4yFMz9sPK for ; Fri, 13 Dec 2019 00:53:30 +1100 (AEDT) Received: from localhost ([::1]:59590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOuE-0000tB-Sp for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:53:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41321) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz2-0004YN-CC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz1-00082s-4z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:20 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:32989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz0-00081X-Ud for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:19 -0500 Received: by mail-wr1-x441.google.com with SMTP id b6so2661985wrq.0 for ; Thu, 12 Dec 2019 04:54:18 -0800 (PST) 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=7II7HXD2dCRyEaFrPk3gzA1HlPJFN/y0B2bCD8zF+hQ=; b=nodDSSyAAf9Gf/5/eQmt6w8OXZq77kqROWaOVOQa8n0/nbO1csHPcW5m27DoxAacqj DLtwTQXsPYlOrQp8HXgMbeluGz3WxjODbeIiNMX9vY4LcI+lq/jE+Q58PedaS9nJz0KU I6LRU9k3TbSncBSVieLbNxnSrSXJ4EE2TttddCHFpG1x55PrNpsaLZX906xvK5D1/82Z PofI1KpDarHcs1mzuSdjfcZg2eNXMC5KyYmLZAxnOS57R0QS1RZf6hm6wPK2q+y6qicB m7yq2MrBsXEHZV74M5jvc+OUThKg90mKyxFdsVayKkw+B4mY1yHrZg+NgH+0GWfoMpJR mI4w== 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=7II7HXD2dCRyEaFrPk3gzA1HlPJFN/y0B2bCD8zF+hQ=; b=T7QLx7GHzmUHHPZ6HFEDUFbVRtNNmnDMoDJTO8jKnykDhA8naBYtL0CRsp7+VBEPJb CbVqcrUkN+UwzehwdJJiXEelQSH1H1ykxhQ3F9NRR4ddVPWvtjz9f3XKBfA735qFCmH0 QrdTkom+lpx5pVJXIu2fBpNHTFgqyd3+qIX1gGigW77vczlP3ajw/X7SnPeu42Ow8xGK nQBL/612Z1QRYdLNmJGt9hOgKoIreQSqzIkTnlQ6pWBk6EoddIq3Lq2w/3ao/abjRIEr yWrdzMEmUCnXwDjAQ3sQ90F5wyT+wa8WBH7DNG/7uhCruaueMnl3LxyOgFrVUpnOYiJM E73A== X-Gm-Message-State: APjAAAXVF9Yw72HqY6ipaa0fQvMVoagzegBTRHZEvw06FBy0AKrZZZa/ A04NibtSkiysuByGQRcKaMmTgk/Z X-Google-Smtp-Source: APXvYqwwjd0rMZqpzjIS1x4vvjQGINspR4hli4t9X/d/605b7nPkt0cvtc4AcY7ExpOUjcTlRtSSOA== X-Received: by 2002:a5d:5704:: with SMTP id a4mr6171543wrv.198.1576155257766; Thu, 12 Dec 2019 04:54:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 080/132] meson: convert hw/pci Date: Thu, 12 Dec 2019 13:52:04 +0100 Message-Id: <1576155176-2464-81-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 8a56abf..512d10d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -22,7 +22,6 @@ devices-dirs-y += misc/ devices-dirs-y += net/ devices-dirs-y += rdma/ devices-dirs-y += nvram/ -devices-dirs-y += pci/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 4d88cfa..1fd9eb5 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('pci') subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs deleted file mode 100644 index c78f2fb..0000000 --- a/hw/pci/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o -common-obj-$(CONFIG_PCI) += msix.o msi.o -common-obj-$(CONFIG_PCI) += shpc.o -common-obj-$(CONFIG_PCI) += slotid_cap.o -common-obj-$(CONFIG_PCI) += 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=n. -common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o -common-obj-$(CONFIG_PCI_EXPRESS) += pcie_port.o pcie_host.o - -common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o -common-obj-$(CONFIG_ALL) += pci-stub.o diff --git a/hw/pci/meson.build b/hw/pci/meson.build new file mode 100644 index 0000000..5c4bbac --- /dev/null +++ b/hw/pci/meson.build @@ -0,0 +1,19 @@ +pci_ss = 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=n. +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')) From patchwork Thu Dec 12 12:52:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208496 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gdeyUl7Y"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZs624Lvz9sPK for ; Fri, 13 Dec 2019 00:48:58 +1100 (AEDT) Received: from localhost ([::1]:59536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOpr-0003EG-Od for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:48:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz3-0004a6-GB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz2-00084X-9D for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:21 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:37687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz2-00083V-2F for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:20 -0500 Received: by mail-wr1-x42b.google.com with SMTP id w15so2627654wru.4 for ; Thu, 12 Dec 2019 04:54:20 -0800 (PST) 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=f04wqxzvz6vmNitqs9qCctC0F90gACS660EYcjH2fbc=; b=gdeyUl7YImDpzWo98PSMUMyXIpGxpXGjRLEwx2k9VAYwQ+g0TRoAMjYUVWi9w+K9kU hcxKEdDJEY38r4QliP+bIah0YWI/Rt/Xt5pf6i8v7oVF91gnCIoRZwF3SRMNyb76HKK0 hu2y+vhg85F9JqEDyjPoarNIzFRQ7XH4rmRCTCTMIVzIAu/E2bQIuo9j0Glq98xzLzLA ZKuHRqUcj8LaLq5jtDcxp7SS2XJP+J1/LavfsBpOpbxd0FhgK5KMQZyfHWGZE6kEZNoz QlfDcjZrrZy/uDRkRe/knL/4/4WRWwEnD9/B+UjxwT/sBFQrn+K8dxb+5S+jY5nQaNqc iB3A== 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=f04wqxzvz6vmNitqs9qCctC0F90gACS660EYcjH2fbc=; b=nkRQqOants11kkv6NMc8yi3kcGBN0fOjBC56r4lT8ix4ukoh5wkEiYI5wbAtwI7vEe 0bZkWx6P2/IOmznlg3QsX/Piqslcy+DfpLrEtaoO/HiCFuN5QpB0+BwGlJ73+2ETWAm3 DtWTm3r55hprQwwnvb+Avf5rQB/SROY8GtrGud+bRxFT41OH4RUDKWZa36HyrCuChkBL m6A1PdpqGHGFoGqcsSE4XY2nvi15QIwEnjU7G0H1qREV3uIbZI4oaMU3GEEpJ+ss7GYV VQxp0CFIwVd+2IamDcDdOffi1rIeLC7a1tsphmxv9obE+zQ4P0RT+w8IFEWKo372e3fk L2yQ== X-Gm-Message-State: APjAAAW7+7Ikjj2lQsIUrD4Yo8pzWa41M+1tFdjLLkRcxHZiFFTbMv5+ G8d2T/x8EyB0Wq9DXhEFcneST4lT X-Google-Smtp-Source: APXvYqyU1gG4AULMpjCycLbtI+LYlPgT0Ysencj90hR2OFBJv0MK1HbCVdtoxwaIBbhkc2+n1zTnww== X-Received: by 2002:a05:6000:cf:: with SMTP id q15mr6067114wrx.393.1576155258893; Thu, 12 Dec 2019 04:54:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 081/132] meson: convert hw/nvram Date: Thu, 12 Dec 2019 13:52:05 +0100 Message-Id: <1576155176-2464-82-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/nvram/Makefile.objs | 8 -------- hw/nvram/meson.build | 11 +++++++++++ 4 files changed, 12 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 512d10d..6ce70d5 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -21,7 +21,6 @@ devices-dirs-y += isa/ devices-dirs-y += misc/ devices-dirs-y += net/ devices-dirs-y += rdma/ -devices-dirs-y += nvram/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 1fd9eb5..0c528e5 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +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 26f7b4c..0000000 --- a/hw/nvram/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -common-obj-$(CONFIG_DS1225Y) += ds1225y.o -common-obj-y += eeprom93xx.o -common-obj-$(CONFIG_AT24C) += eeprom_at24c.o -common-obj-y += fw_cfg.o -common-obj-y += chrp_nvram.o -common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o -obj-$(CONFIG_PSERIES) += spapr_nvram.o -obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build new file mode 100644 index 0000000..75fca7b --- /dev/null +++ b/hw/nvram/meson.build @@ -0,0 +1,11 @@ +softmmu_ss.add(files( + 'chrp_nvram.c', + 'eeprom93xx.c', + 'fw_cfg.c', +)) +softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c')) +softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c')) +softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c')) + +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c')) +specific_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c')) From patchwork Thu Dec 12 12:52:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Lpbc/8Rj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb165lg6z9sPf for ; Fri, 13 Dec 2019 00:55:54 +1100 (AEDT) Received: from localhost ([::1]:59622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOwa-0004Ky-Dm for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:55:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41644) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz4-0004bu-CW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz3-00086Q-7s for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:22 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz3-00085A-1L for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:21 -0500 Received: by mail-wm1-x330.google.com with SMTP id d73so2254549wmd.1 for ; Thu, 12 Dec 2019 04:54:20 -0800 (PST) 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=mu6uKBj23GfwgLLtrI1LQgebtJ3PayuYBhfAScWqBhc=; b=Lpbc/8Rjn+Wr7NKvGR/My43oDQn/nix3hE/0SCMSEfk+u21gObbAz2PXNdT002tvVG TKTfX05gEepb7UhXPZy2EDUb/8jukYkw8Z/FrBRkUqgBwkL0VthxHmlaMLqplNi03snt zZVJgF7cdNlDB99go9AxvCeWzASmQClWDeSsNvlSJCJC8iQcohU7n2EY5MIHQlwmt/PV jR8vJnSWFiNNa/o16xdIYvwmnXNOTVnXfN+WlTYqwHpv4Qzrm61SHvRavG8Shdpv8apQ EIJHjawV41bF+rJ3TWFFxmZPS8T53be02kpVw5SggJm9JRME8cZ9hrt9AlS6httIV4jV 22mQ== 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=mu6uKBj23GfwgLLtrI1LQgebtJ3PayuYBhfAScWqBhc=; b=F21Mvvu3plMXoNxwT7bzfY/QPioups6/zbLp6aDXUJw/kgp3HwFUb1wnQji3AXqHBW xGiJY6lnyNmLqwAqxij39Dh2yvX8ArVZ/XD+SM+9wocPwTtEF5Uv6UVaMa+hjuetsQE/ xN3eyUxUWY6NiNVkRgYVfG0fLObTK++TWjGsyS2BXTOMw1FUJIdRMAfkNDjHFypPn1oP lZjUIxrWnNpcUV7BH4voUHM+cK5OLhKY+rkt6DLkKleMDeAhTgLBDpSYAkxVgVwv08BP IUXPOFkfXYHj/fp6+ih2Ro58bmlMD2fyVB29NEptDoK+opU9vFq57mQOvjUP/+sBVSCU SYRQ== X-Gm-Message-State: APjAAAWfv0FZemrnkuyRt09jt+lEj9xI4TIl3dUwhF0RsA4NWYrNHmCS slRfoniFoa6b37N5SahGvy2gDZSY X-Google-Smtp-Source: APXvYqwnbxutPIv2whsrmxqhgb4ooXWL575xzOmLx6pgMojvTNct94bBq/M+QefTPvYhedcfwHDdmg== X-Received: by 2002:a1c:6755:: with SMTP id b82mr6379579wmc.126.1576155259892; Thu, 12 Dec 2019 04:54:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 082/132] meson: convert hw/rdma Date: Thu, 12 Dec 2019 13:52:06 +0100 Message-Id: <1576155176-2464-83-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 6ce70d5..4903808 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -20,7 +20,6 @@ devices-dirs-$(CONFIG_IPMI) += ipmi/ devices-dirs-y += isa/ devices-dirs-y += misc/ devices-dirs-y += net/ -devices-dirs-y += rdma/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 0c528e5..56e6057 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -5,6 +5,7 @@ subdir('pci') subdir('pci-bridge') subdir('pci-host') subdir('pcmcia') +subdir('rdma') subdir('scsi') subdir('sd') subdir('semihosting') diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs deleted file mode 100644 index 819bb12..0000000 --- a/hw/rdma/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_VMW_PVRDMA) += rdma_utils.o rdma_backend.o rdma_rm.o rdma.o -obj-$(CONFIG_VMW_PVRDMA) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ - vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build new file mode 100644 index 0000000..7325f40 --- /dev/null +++ b/hw/rdma/meson.build @@ -0,0 +1,10 @@ +specific_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files( + 'rdma.c', + 'rdma_backend.c', + 'rdma_rm.c', + 'rdma_utils.c', + 'vmw/pvrdma_cmd.c', + 'vmw/pvrdma_dev_ring.c', + 'vmw/pvrdma_main.c', + 'vmw/pvrdma_qp_ops.c', +)) From patchwork Thu Dec 12 12:52:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g3wZaF57"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZtv5ccNz9sPL for ; Fri, 13 Dec 2019 00:50:31 +1100 (AEDT) Received: from localhost ([::1]:59550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOrN-0005CW-FD for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:50:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz6-0004ed-26 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz4-00087u-5m for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37693) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz3-00086h-U2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:22 -0500 Received: by mail-wr1-x431.google.com with SMTP id w15so2627758wru.4 for ; Thu, 12 Dec 2019 04:54:21 -0800 (PST) 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=KINz8qNx0+6jNJVJIJbHyBsbBQ9NgbXzB65P3pZovbE=; b=g3wZaF57FmC5Cb6xq9Ra12TSi2jqxMy5iKL3i4rqThLoQvL+klwpsrh7JwtiZ1+5wB rcSuZrgScK7Kz7ydJjg6vej/iv9tRKIX/GyogoqOu4GbuxeL9oKIOFIyFSIvRe6J8aqy ZPdV27p0Cthxr/k/i3FeX0LF889UFykfmC+tEFDHa6vEEYVDXSiEVbkY+GlwEIPDbhNm Nx0ielZhSPQIjtcaXODw3ENxRieVd22KD1CXI+5gNwO1pjHFQa5IrerDzsP6SVdaiZRG h+sFsTVNldm1OzgmHrXvdKP6NnJy+IsnxvzRHigQnIGjYARgouWBN/NrQWfcbkjrZQFm yPfw== 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=KINz8qNx0+6jNJVJIJbHyBsbBQ9NgbXzB65P3pZovbE=; b=q5X4CaVNs8Sw7Nb1toroaQpF6/sLg+1Z9fQwFBFeB7JiZii6682j0gxzuMBn3N4oro plRBZ3lGFrzgzvS99Rmywl4VwOqkTfhtsqZUpAUrR6rGJexzom26n2JJFEuWWNd8PI1V /8B38ZMcj5uloIVBnTrb8uGtn3nKUKSun2Wr12nGR4mPWlDEMAAzq1mn+v044kXetnhZ Tmx4yA96kQtvM8zffw6xXo4vdLSuQspXHVGFUIi5IMQlXzHYcnJSnfpvP8J4UEslQK1d bd9Vrj7ghvlidGwTjBn3tkJ5/mJUyYvgB7k87yAqHdp0zkSrXOFERVgIs+Lxj7E/uLVO CRiA== X-Gm-Message-State: APjAAAVp1B9ofu/OJb4HeFE4deCvCWrefjnLIGpvBqUxdD2aUBFS8a6o DMWMuYaxsfT1TSD6BgDRvGERWMAr X-Google-Smtp-Source: APXvYqxJGuTMkO0rmMS7DGTT230AlEOpq9Pp454QviYCS3sqG3alWDTz0rwT3h76xP+N1WM4Ytd6Ww== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5998596wrt.208.1576155260660; Thu, 12 Dec 2019 04:54:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 083/132] meson: convert hw/net Date: Thu, 12 Dec 2019 13:52:07 +0100 Message-Id: <1576155176-2464-84-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/net/Makefile.objs | 53 ----------------------------------------- hw/net/can/Makefile.objs | 4 ---- hw/net/can/meson.build | 4 ++++ hw/net/meson.build | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 58 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 4903808..d9479e3 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -19,7 +19,6 @@ devices-dirs-$(CONFIG_IPACK) += ipack/ devices-dirs-$(CONFIG_IPMI) += ipmi/ devices-dirs-y += isa/ devices-dirs-y += misc/ -devices-dirs-y += net/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 56e6057..3b20fea 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('net') subdir('nvram') subdir('pci') subdir('pci-bridge') diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs deleted file mode 100644 index 9904273..0000000 --- a/hw/net/Makefile.objs +++ /dev/null @@ -1,53 +0,0 @@ -common-obj-$(CONFIG_DP8393X) += dp8393x.o -common-obj-$(CONFIG_XEN) += xen_nic.o -common-obj-$(CONFIG_NE2000_COMMON) += ne2000.o - -# PCI network cards -common-obj-$(CONFIG_NE2000_PCI) += ne2000-pci.o -common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o -common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o -common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o -common-obj-$(CONFIG_E1000_PCI) += e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += e1000e.o e1000e_core.o e1000x_common.o -common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o -common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o - -common-obj-$(CONFIG_SMC91C111) += smc91c111.o -common-obj-$(CONFIG_LAN9118) += lan9118.o -common-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o -common-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o -common-obj-$(CONFIG_XGMAC) += xgmac.o -common-obj-$(CONFIG_MIPSNET) += mipsnet.o -common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o -common-obj-$(CONFIG_ALLWINNER_EMAC) += allwinner_emac.o -common-obj-$(CONFIG_IMX_FEC) += imx_fec.o - -common-obj-$(CONFIG_CADENCE) += cadence_gem.o -common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o -common-obj-$(CONFIG_LANCE) += lance.o -common-obj-$(CONFIG_SUNHME) += sunhme.o -common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o -common-obj-$(CONFIG_SUNGEM) += sungem.o - -obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o -obj-$(CONFIG_COLDFIRE) += mcf_fec.o -obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o -obj-$(CONFIG_PSERIES) += spapr_llan.o -obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o - -obj-$(CONFIG_VIRTIO_NET) += virtio-net.o -common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o -common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o -common-obj-$(CONFIG_ALL) += vhost_net-stub.o - -obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \ - fsl_etsec/rings.o fsl_etsec/miim.o - -common-obj-$(CONFIG_ROCKER) += 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)) += rocker/qmp-norocker.o - -common-obj-$(CONFIG_CAN_BUS) += can/ diff --git a/hw/net/can/Makefile.objs b/hw/net/can/Makefile.objs deleted file mode 100644 index 9f0c4ee..0000000 --- a/hw/net/can/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-$(CONFIG_CAN_SJA1000) += can_sja1000.o -common-obj-$(CONFIG_CAN_PCI) += can_kvaser_pci.o -common-obj-$(CONFIG_CAN_PCI) += can_pcm3680_pci.o -common-obj-$(CONFIG_CAN_PCI) += can_mioe3680_pci.o diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build new file mode 100644 index 0000000..c9cfeb7 --- /dev/null +++ b/hw/net/can/meson.build @@ -0,0 +1,4 @@ +softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c')) diff --git a/hw/net/meson.build b/hw/net/meson.build new file mode 100644 index 0000000..9e7f176 --- /dev/null +++ b/hw/net/meson.build @@ -0,0 +1,61 @@ +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_pkt.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_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_emac.c')) +softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c')) + +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c')) +softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.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')) + +specific_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c')) +specific_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c')) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-minimac2.c')) +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c')) +specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.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: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) + +specific_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') From patchwork Thu Dec 12 12:52:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Mqf50fW4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZwQ5Cmvz9sPL for ; Fri, 13 Dec 2019 00:51:50 +1100 (AEDT) Received: from localhost ([::1]:59572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOsd-0006iS-Ve for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:51:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42030) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz6-0004gH-Uu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz5-00089D-4p for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:24 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:33956) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz4-000886-TR for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: by mail-wm1-x333.google.com with SMTP id f4so3557821wmj.1 for ; Thu, 12 Dec 2019 04:54:22 -0800 (PST) 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=lvgh+zBmcPIkOu0PE+ZarIMV7ERHiR4np+NUTMKTHqo=; b=Mqf50fW4OxW24TolMZ37YcIheXsrd9uEMXhBiiUXCHLGIZ1uFtIYC2DYIEFMoSMcoE jHT4yqUYvr0/3D5JZuW3SyYlLd+1V5gRcy5gBy658Yht/koPRpLuvbdqbBzL6SzMJdik u5ab3MJkyNEp8lFB3nCqripIHenTyMusiSvXeL9Vsbjz3xDpasQNNfiQl1f5crH80w/a HgI+EbBEQiDs4gjgUJFXHaCLW0BbChx5OZvlJR4ayqUOxtyEC+yaa3ABC0VXZgzo58Wi 6k1ZKKEE3skxDNyKy2L6yoC7sgMnJFyxQcllhHBz/aFTxWAez2H35yOSQwntAGuX55HV fDdw== 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=lvgh+zBmcPIkOu0PE+ZarIMV7ERHiR4np+NUTMKTHqo=; b=lF1wApWJRUSC1kvzY25ombR+XfEcdPY/VHHE5EioUQz2fv/IAVdIhUV6/Z53k7STM7 Gpgzrzz84EuuNkGQ1lspnYuoG7V1JRShj6zRQMz0o3yopTX7Fnf2lsjBXbraJ47GO6Y5 ZVr28l6OAO+4FJshn/ysBhnQKgK9CoeltVZSQrlE/tYmgFzg/541kMP8qgECA7dNH4eR Lyinhc5hfpZIFZx/k161tLGYPYYur0myg6Bl7jsAFtEYNSiJZOB6/bjviULUH/IVP+5n mZJmT+cRvnP8QwOQMuC2eQxI4BJmKd++RcSrxO1LSvSwYAtQ2CcPcAGuB9YDaCL/RDtS rgbg== X-Gm-Message-State: APjAAAXikLrAXsyzpN3/m/nIacgbtIviXHpW2Gq3s88ZI4MgfaY0Nkmn DD3wGxBQcJvnvQYnujvbtWdQOPUP X-Google-Smtp-Source: APXvYqxihiIlbVuHBJGV4iejN9DA35PUkMq4VrdhXvWmeHN85MNYKQrEAWS3N6wH3K/P8HX5GDMGHg== X-Received: by 2002:a7b:c8c7:: with SMTP id f7mr6453330wml.91.1576155261646; Thu, 12 Dec 2019 04:54:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 084/132] meson: convert hw/misc Date: Thu, 12 Dec 2019 13:52:08 +0100 Message-Id: <1576155176-2464-85-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/misc/Makefile.objs | 82 --------------------------------------------- hw/misc/macio/Makefile.objs | 5 --- hw/misc/macio/meson.build | 8 +++++ hw/misc/meson.build | 79 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 88 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 d9479e3..e630c54 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -18,7 +18,6 @@ devices-dirs-y += intc/ devices-dirs-$(CONFIG_IPACK) += ipack/ devices-dirs-$(CONFIG_IPMI) += ipmi/ devices-dirs-y += isa/ -devices-dirs-y += misc/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 3b20fea..c83f37c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('misc') subdir('net') subdir('nvram') subdir('pci') diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs deleted file mode 100644 index e4aad70..0000000 --- a/hw/misc/Makefile.objs +++ /dev/null @@ -1,82 +0,0 @@ -common-obj-$(CONFIG_APPLESMC) += applesmc.o -common-obj-$(CONFIG_MAX111X) += max111x.o -common-obj-$(CONFIG_TMP105) += tmp105.o -common-obj-$(CONFIG_TMP421) += tmp421.o -common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o -common-obj-$(CONFIG_SGA) += sga.o -common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o -common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o -common-obj-$(CONFIG_EDU) += edu.o -common-obj-$(CONFIG_PCA9552) += pca9552.o - -common-obj-$(CONFIG_UNIMP) += unimp.o -common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o - -# ARM devices -common-obj-$(CONFIG_PL310) += arm_l2x0.o -common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o -common-obj-$(CONFIG_A9SCU) += a9scu.o -common-obj-$(CONFIG_ARM11SCU) += arm11scu.o - -# Mac devices -common-obj-$(CONFIG_MOS6522) += mos6522.o - -# PKUnity SoC devices -common-obj-$(CONFIG_PUV3) += puv3_pm.o - -common-obj-$(CONFIG_MACIO) += macio/ - -obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o - -obj-$(CONFIG_REALVIEW) += arm_sysctl.o -obj-$(CONFIG_NSERIES) += cbus.o -obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o -obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o exynos4210_rng.o -obj-$(CONFIG_IMX) += imx_ccm.o -obj-$(CONFIG_IMX) += imx31_ccm.o -obj-$(CONFIG_IMX) += imx25_ccm.o -obj-$(CONFIG_IMX) += imx6_ccm.o -obj-$(CONFIG_IMX) += imx6ul_ccm.o -obj-$(CONFIG_IMX) += imx6_src.o -obj-$(CONFIG_IMX) += imx7_ccm.o -obj-$(CONFIG_IMX) += imx2_wdt.o -obj-$(CONFIG_IMX) += imx7_snvs.o -obj-$(CONFIG_IMX) += imx7_gpr.o -obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o -obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o -obj-$(CONFIG_MAINSTONE) += mst_fpga.o -obj-$(CONFIG_OMAP) += omap_clk.o -obj-$(CONFIG_OMAP) += omap_gpmc.o -obj-$(CONFIG_OMAP) += omap_l4.o -obj-$(CONFIG_OMAP) += omap_sdrc.o -obj-$(CONFIG_OMAP) += omap_tap.o -obj-$(CONFIG_RASPI) += bcm2835_mbox.o -obj-$(CONFIG_RASPI) += bcm2835_property.o -obj-$(CONFIG_RASPI) += bcm2835_rng.o -obj-$(CONFIG_SLAVIO) += slavio_misc.o -obj-$(CONFIG_ZYNQ) += zynq_slcr.o -obj-$(CONFIG_ZYNQ) += zynq-xadc.o -obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o -obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o -obj-$(CONFIG_MIPS_CPS) += mips_cpc.o -obj-$(CONFIG_MIPS_ITU) += mips_itu.o -obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o -obj-$(CONFIG_MPS2_SCC) += mps2-scc.o - -obj-$(CONFIG_TZ_MPC) += tz-mpc.o -obj-$(CONFIG_TZ_MSC) += tz-msc.o -obj-$(CONFIG_TZ_PPC) += tz-ppc.o -obj-$(CONFIG_IOTKIT_SECCTL) += iotkit-secctl.o -obj-$(CONFIG_IOTKIT_SYSCTL) += iotkit-sysctl.o -obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o -obj-$(CONFIG_ARMSSE_CPUID) += armsse-cpuid.o -obj-$(CONFIG_ARMSSE_MHU) += armsse-mhu.o - -obj-$(CONFIG_PVPANIC) += pvpanic.o -obj-$(CONFIG_AUX) += auxbus.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_xdma.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o -obj-$(CONFIG_MSF2) += msf2-sysreg.o -obj-$(CONFIG_NRF51_SOC) += nrf51_rng.o - -obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o diff --git a/hw/misc/macio/Makefile.objs b/hw/misc/macio/Makefile.objs deleted file mode 100644 index 07fdb32..0000000 --- a/hw/misc/macio/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-y += macio.o -common-obj-$(CONFIG_CUDA) += cuda.o -common-obj-$(CONFIG_MAC_PMU) += pmu.o -common-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o -common-obj-$(CONFIG_MACIO_GPIO) += gpio.o diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build new file mode 100644 index 0000000..17282da --- /dev/null +++ b/hw/misc/macio/meson.build @@ -0,0 +1,8 @@ +macio_ss = ss.source_set() +macio_ss.add(files('macio.c')) +macio_ss.add(when: 'CONFIG_CUDA', if_true: files('cuda.c')) +macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c')) +macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c')) +macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c')) + +softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss) diff --git a/hw/misc/meson.build b/hw/misc/meson.build new file mode 100644 index 0000000..8a971b4 --- /dev/null +++ b/hw/misc/meson.build @@ -0,0 +1,79 @@ +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')) + +# 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_integrator_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') + +specific_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c')) + +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c')) +specific_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c')) +specific_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c')) +specific_ss.add(when: 'CONFIG_IMX', if_true: files( + 'imx25_ccm.c', + 'imx2_wdt.c', + 'imx31_ccm.c', + 'imx6_ccm.c', + 'imx6_src.c', + 'imx6ul_ccm.c', + 'imx7_ccm.c', + 'imx7_gpr.c', + 'imx7_snvs.c', + 'imx_ccm.c', +)) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-hpdmc.c', 'milkymist-pfpu.c')) +specific_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files( + 'omap_clk.c', + 'omap_gpmc.c', + 'omap_l4.c', + 'omap_sdrc.c', + 'omap_tap.c', +)) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_mbox.c', 'bcm2835_property.c', 'bcm2835_rng.c')) +specific_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c')) +specific_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-xadc.c')) +specific_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c')) +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c')) +specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c')) +specific_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c')) +specific_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c')) + +specific_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c')) +specific_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c')) +specific_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c')) +specific_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c')) +specific_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) + +specific_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) +specific_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) +specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c')) +specific_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) +specific_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c')) + +specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c')) From patchwork Thu Dec 12 12:52:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VYkhY3in"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb3K59KRz9sPK for ; Fri, 13 Dec 2019 00:57:49 +1100 (AEDT) Received: from localhost ([::1]:59722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOyR-0006kY-7G for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:57:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42048) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz7-0004gW-5n for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz5-0008AX-Ue for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:25 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz5-00089I-Nu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: by mail-wr1-x434.google.com with SMTP id z3so2635594wru.3 for ; Thu, 12 Dec 2019 04:54:23 -0800 (PST) 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=17AHPCiKqOOmjq+krq1JE+g+YqSwYJy649/fcGzFxRw=; b=VYkhY3inx5x7P26CbLw2wwpMxtGniyObKYem5/Km0o0InA1707HORqugSpaqkWVJB6 ML6iJE679x1QpOVDpXFRws+izClEyo6g06XBiDDhGcWzBe2vs884n3/jOiaGrRtlHN19 UoqiTH8NUMY2UIFw6SvQZcQ7FYvXaXey8db9mqV8zDgzA4x8U14I1ThFriD6PDIX1WrN jZxGqyMtrgsr35wdxzMCOtPRikkYjjBwFywxw1LDxMHcNbtgkxcblQEMnu3wMBP1DKvJ 5lGoJ/+PnDOdHCfMkXD+tRfy8Kfq31wDG2U1Pvpb3gZuVyjANvPe+FLntkDMNDD429nq IEDg== 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=17AHPCiKqOOmjq+krq1JE+g+YqSwYJy649/fcGzFxRw=; b=cJD9B3YvhQuLXOzphVuLYMlNxvLWnTytdqe+FYRePzKfNQAR2A+95nFATTnCXiCsLW 73OwRmbbTQDz4OXogl5VjU8EfbZyQHv3By1lQhAbwRmLGrKguYXZCPtpPB05ahFLfB5b bfUeM9vZVPfxVq5Mcojd+aTh0MCBv/o3NvVSKrOVfAqsj5OTiIsx+Pmx6Bioil+YT8zg iZRnseWDjOCCnOS4Q6wBrWrjbLfvb5+h58DkOIErL0LyDUfKUJGNVbtCCbbN3CBa4NfF mGjldfbzxIY4kkkB0kZshnS0kpl9ZGvn3sMeK3kpTwN5P14uAC9yUi2Ad/KSs+98b94Y GHTA== X-Gm-Message-State: APjAAAVJh5VTmc9T2npw8V7yuXD0QYzs/9EtQErnddYcHWSLGsmjFWX/ uMG3ufIQ2XZkBh15vD1cnaCOgUWI X-Google-Smtp-Source: APXvYqxzUzfN/8aNbM6k4GBe/blJQ9BedXM8d5r26BRaJxVU6ZVpxk8Pnbmj9wZbxMkNsAmjVel7Og== X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr6528904wrx.304.1576155262573; Thu, 12 Dec 2019 04:54:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 085/132] meson: convert hw/isa Date: Thu, 12 Dec 2019 13:52:09 +0100 Message-Id: <1576155176-2464-86-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/isa/Makefile.objs | 10 ---------- hw/isa/meson.build | 9 +++++++++ hw/meson.build | 1 + 4 files changed, 10 insertions(+), 11 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 e630c54..1dd9f63 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -17,7 +17,6 @@ devices-dirs-y += input/ devices-dirs-y += intc/ devices-dirs-$(CONFIG_IPACK) += ipack/ devices-dirs-$(CONFIG_IPMI) += ipmi/ -devices-dirs-y += isa/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs deleted file mode 100644 index 9e106df..0000000 --- a/hw/isa/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-$(CONFIG_ISA_BUS) += isa-bus.o -common-obj-$(CONFIG_ISA_BUS) += isa-superio.o -common-obj-$(CONFIG_APM) += apm.o -common-obj-$(CONFIG_I82378) += i82378.o -common-obj-$(CONFIG_PC87312) += pc87312.o -common-obj-$(CONFIG_PIIX4) += piix4.o -common-obj-$(CONFIG_VT82C686) += vt82c686.o -common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o - -obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o diff --git a/hw/isa/meson.build b/hw/isa/meson.build new file mode 100644 index 0000000..729f799 --- /dev/null +++ b/hw/isa/meson.build @@ -0,0 +1,9 @@ +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', 'isa-superio.c')) +softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.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 c83f37c..db35232 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('isa') subdir('mem') subdir('misc') subdir('net') From patchwork Thu Dec 12 12:52:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R30gJOHd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb5b5pS4z9sPK for ; Fri, 13 Dec 2019 00:59:47 +1100 (AEDT) Received: from localhost ([::1]:59750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP0L-0000vf-8d for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:59:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42189) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz8-0004i3-2i for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz6-0008CF-Sl for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:25 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:41638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz6-0008Ax-L3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:24 -0500 Received: by mail-wr1-x432.google.com with SMTP id c9so2605270wrw.8 for ; Thu, 12 Dec 2019 04:54:24 -0800 (PST) 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=QbFWObULJeybCtcZDHjGFRdt1cmo+SNSIWE0SWmIUxY=; b=R30gJOHd+zEQfutd4N7javH9AFuK4VuCEjrbu6Mo17AwTwuJS/uydQtKgG5c+Sjj6o i/KgZDmfSCV+9awLXewXcAUdxEjaEQy0+EZoCMROMTIt8nT+qDFKbfmapTQ6gxdGvTOC pwZjeStvBNCixHDhuFL8lbRoTrPtKdg73xOaAMAQmzLJaGk+/RubvFrd3o9tCklwYQdt Qnx9Soc79cSZN6R5UThHFyNBMp+jCh55WfTSk2EPEEKYgyU+y3Py94xt5q5l8+sZP1v5 9kFWVp2gIp7ydN7fuuYNr++r3gqOYuaLbPbnXkXRGdqG64K428nNPm+eKNPSPWNDAqVD QAcQ== 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=QbFWObULJeybCtcZDHjGFRdt1cmo+SNSIWE0SWmIUxY=; b=uOuGkf+QMYND9jdNB3XaBwkZ4A+UMs+QjrOqsJrzPSw8adNVI+qj6W8SF7rK+ru6gJ N2qqusMIRhXTYKtzzTuoWTdt84F1GYDP29jjgRTlkpk/Njr4TACrjjxP0ZRxJEsfT6Xg UH31mfglMCLCKCUCMPFMsbaFT670cbZN9qS4TJsIqn7u3sBJjvvSyXydbWEZBBPQJ7T7 J3pVjP35hU7sQBRN4zFrbN9P+QgmtV2jxf4w7F4gNWPQV6403qkw50RngZLdpfCYHI1k kH1fwHNSp3OtSMmJ3D4LK71mAOdqEift5dGxE7uRjqotSO/RJl5tP+bqGVRTVVK2yiQ0 evEg== X-Gm-Message-State: APjAAAXnOYDV7ZlhNN2NJzfBwFN0E148efnvaa9okOHEPlziEA38PK7p inFfoLGOC7+zpD+PidtgHMO99pKc X-Google-Smtp-Source: APXvYqyWFxsamZMXHwlydJuAtApJEXL3rrfix4N/57EEyBv3JkVXg3Ma4qxiQg6LnXmsB0d6OMT4cw== X-Received: by 2002:adf:fe0e:: with SMTP id n14mr6193378wrr.116.1576155263491; Thu, 12 Dec 2019 04:54:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 086/132] meson: convert hw/ipmi Date: Thu, 12 Dec 2019 13:52:10 +0100 Message-Id: <1576155176-2464-87-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/ipmi/Makefile.objs | 5 ----- hw/ipmi/meson.build | 8 ++++++++ hw/meson.build | 1 + 4 files changed, 9 insertions(+), 6 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 1dd9f63..7d85aba 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -16,7 +16,6 @@ devices-dirs-y += ide/ devices-dirs-y += input/ devices-dirs-y += intc/ devices-dirs-$(CONFIG_IPACK) += ipack/ -devices-dirs-$(CONFIG_IPMI) += ipmi/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs deleted file mode 100644 index 1b422bb..0000000 --- a/hw/ipmi/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-$(CONFIG_IPMI) += ipmi.o -common-obj-$(CONFIG_IPMI_LOCAL) += ipmi_bmc_sim.o -common-obj-$(CONFIG_IPMI_EXTERN) += ipmi_bmc_extern.o -common-obj-$(CONFIG_ISA_IPMI_KCS) += isa_ipmi_kcs.o -common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build new file mode 100644 index 0000000..47671ba --- /dev/null +++ b/hw/ipmi/meson.build @@ -0,0 +1,8 @@ +ipmi_ss = ss.source_set() +ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.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_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c')) + +softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss) diff --git a/hw/meson.build b/hw/meson.build index db35232..276f9ed 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipmi') subdir('isa') subdir('mem') subdir('misc') From patchwork Thu Dec 12 12:52:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GzTL0E44"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZy66R89z9sPK for ; Fri, 13 Dec 2019 00:53:18 +1100 (AEDT) Received: from localhost ([::1]:59586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOtz-0000Sm-P5 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:53:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42340) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz9-0004jc-6j for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz7-0008Dx-RM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:26 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:54271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz7-0008CZ-LI for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:25 -0500 Received: by mail-wm1-x332.google.com with SMTP id n9so2247557wmd.3 for ; Thu, 12 Dec 2019 04:54:25 -0800 (PST) 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=mIHTX7legXEXhs75BG7UWtqDcO3CsnRpJQifiPnqN+k=; b=GzTL0E44NM2N7k9frPRuj5emf2qdY04f2vaJ81C360ha3zM/Sx6qhfuQKSuhX5rz4w WEhokNh08q5DrlKVJ9hAzIOTFiVRvAVhr/6gP/cJdz66gEJCBj+yMLYKmd8+ttHmf6U4 vwaUtbpoQq5zUl2mSorAgqyjhl6YZ1SdBjJlLnzUpuG2sRh9Alvnzc5Ks6uEEIAeumNm M/6azy/aq22UpIixpnZEkfm9LNyq8mj90RbrgYdp9WMGuQK1wxij3fq90prPB+TQd7fL JtAJUDbjBABtTePrbLWpZxt06AnEsQ7oyB13dN7aa6ZuOLwT0kbIBkfWhkvq65/Ne/09 vWBQ== 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=mIHTX7legXEXhs75BG7UWtqDcO3CsnRpJQifiPnqN+k=; b=LKzyNTZ/MeyvSqXy6EtXyRyQLMzoVhQ3xqQ1jpwwSqZT+5jm/J0joAQK9ZRvV4lWro ZYvJqqTk96h1arVZF7sHWFh9z0E1xWcSmtzROIRwtBsTebdHXyOSXW1dZ/Mpga+VT/Xw 1yqrObDQnevoOnS1oTKFFOwP50AkOXsLD7gY+wq+3BiSubAkW5ZeoJHKPHyKsytI0u35 kASvelUe/UYk8wNFqgUIfLBaUU3hpZgHlsahEZCvorxDAo/AJm67jSfm3byHDXPqOUCI EmXPqhTWil5NvWjXf53h/5+YYKOxGx7PyMBbm4cWqoYUVCQnWJCK3M5uXwcQuajxMLsw zYYA== X-Gm-Message-State: APjAAAUxupbbnndlpci4Qok5f588PFSy3cl20lGD7yZMgjkr3Y1BqYWf APXUBYXxXtOJMVLVqw2NsyGPmjjD X-Google-Smtp-Source: APXvYqzc1hphTsqVlJkfWiwuFSg5u2ilzMWsOFesuNoELxQhGz/Ib953XGjlego4WIIA8jxbw5+16w== X-Received: by 2002:a7b:c004:: with SMTP id c4mr6318668wmb.45.1576155264406; Thu, 12 Dec 2019 04:54:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 087/132] meson: convert hw/ipack Date: Thu, 12 Dec 2019 13:52:11 +0100 Message-Id: <1576155176-2464-88-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 7d85aba..8697b42 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -15,7 +15,6 @@ devices-dirs-$(CONFIG_I2C) += i2c/ devices-dirs-y += ide/ devices-dirs-y += input/ devices-dirs-y += intc/ -devices-dirs-$(CONFIG_IPACK) += ipack/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/ipack/Makefile.objs b/hw/ipack/Makefile.objs deleted file mode 100644 index 8b9bdcb..0000000 --- a/hw/ipack/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -common-obj-$(CONFIG_IPACK) += ipack.o -common-obj-$(CONFIG_IPACK) += tpci200.o diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build new file mode 100644 index 0000000..3f8138b --- /dev/null +++ b/hw/ipack/meson.build @@ -0,0 +1 @@ +softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c')) diff --git a/hw/meson.build b/hw/meson.build index 276f9ed..3e3f090 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipack') subdir('ipmi') subdir('isa') subdir('mem') From patchwork Thu Dec 12 12:52:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dzt334ha"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb8X3YW4z9sPK for ; Fri, 13 Dec 2019 01:02:20 +1100 (AEDT) Received: from localhost ([::1]:59794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP2n-0003br-UA for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 09:02:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzA-0004mH-PW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz9-0008Fc-38 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:28 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34270) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz8-0008EW-SF for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:27 -0500 Received: by mail-wr1-x444.google.com with SMTP id t2so2647209wrr.1 for ; Thu, 12 Dec 2019 04:54:26 -0800 (PST) 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=yvhzPXCU/CtE3qvXs+MVaNi1CSZGrYTGkfoEQFgKHMM=; b=Dzt334haj4r1KsBiaLkcAscYkAbtBeUwx1EX7UmAH54Dvbq5M7s6Y7fC2cjNjn1FsL WB5sbGy/kxxJmerZr5YdkLHNPl83FZTyqoz0rgYkyqN3Wc0RHAs/1yw2q67QHduaZaYD Q/EBZiNeQpeFQdRNXxRp7bnQUBSw393NBKLnSi1n8O26GamhWISYkp/Vm4K440m6KqmO W1mMOXwFGXHUX+gpC5y0UXbI97I9bJA/vFQvYcNZ6SIffOgcuKVssjWl7BF7BPSBMU61 QNjLnMVjwlMWqVgwDgoieXVE1HZKylmDSbEeTURFHC+wSlSn8/7I98qfJ1uewFMT/9nK fDUw== 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=yvhzPXCU/CtE3qvXs+MVaNi1CSZGrYTGkfoEQFgKHMM=; b=H00mvrSFdeQw7rQltOVBRwIbHDpM0QwztJjxIWqiy8Ygo/+YzD91G7MHeXnalGCu+p HLqluV0/OmxIuyAGRE1t+vWqNst9I2OFfPPRfXT+gL1ToT3aINvb6Q1Jc/pgUN1P+r8k 8ZA30HKZ/zXdhA44u+JjZsYvbCDVxoHD523H0EhYUPftSvQT8/1goMXMsldSdobQUfNt 6mjjOSkP44i1mISz5wEgV1HbQnQkkUMy+H6blc+XrC0O4IQ51Qqbpsl/DLLA7psi2mS0 tOhT2dp82omRj1umDyb+WrLSF28sLbjLkzs1u/EBkMw+23BzUaQCve+/gO0PSew7DMF5 imzA== X-Gm-Message-State: APjAAAU6Tm2GVxyUyOR0BhzfVHtEZ8NwBI2BJk1HDVVa785HkRemd+AD zZbhmRJyg0F0lYX9IIRV9YAIZYT/ X-Google-Smtp-Source: APXvYqwqXIvt+ezk0EX/JonqEnY45tTi95rZlOVziYhZvXt/izlucg8J74HwhE+jFsiNMjUCb9NBEw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr6036315wrt.169.1576155265590; Thu, 12 Dec 2019 04:54:25 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 088/132] meson: convert hw/intc Date: Thu, 12 Dec 2019 13:52:12 +0100 Message-Id: <1576155176-2464-89-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/intc/Makefile.objs | 51 -------------------------------------------------- hw/intc/meson.build | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 53 insertions(+), 52 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 8697b42..c89ca8d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -14,7 +14,6 @@ devices-dirs-$(CONFIG_HYPERV) += hyperv/ devices-dirs-$(CONFIG_I2C) += i2c/ devices-dirs-y += ide/ devices-dirs-y += input/ -devices-dirs-y += intc/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs deleted file mode 100644 index f726d87..0000000 --- a/hw/intc/Makefile.objs +++ /dev/null @@ -1,51 +0,0 @@ -common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o -common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o -common-obj-$(CONFIG_PL190) += pl190.o -common-obj-$(CONFIG_PUV3) += puv3_intc.o -common-obj-$(CONFIG_XILINX) += xilinx_intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o -common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o -common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o -common-obj-$(CONFIG_LM32) += lm32_pic.o -common-obj-$(CONFIG_REALVIEW) += realview_gic.o -common-obj-$(CONFIG_SLAVIO) += slavio_intctl.o -common-obj-$(CONFIG_IOAPIC) += ioapic_common.o -common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o -common-obj-$(CONFIG_ARM_GIC) += arm_gic.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv2m.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_common.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv3.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_dist.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_redist.o -common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_its_common.o -common-obj-$(CONFIG_OPENPIC) += openpic.o -common-obj-y += intc.o - -obj-$(CONFIG_APIC) += apic.o apic_common.o -obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_kvm.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_its_kvm.o -obj-$(CONFIG_ARM_V7M) += armv7m_nvic.o -obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o -obj-$(CONFIG_GRLIB) += grlib_irqmp.o -obj-$(CONFIG_IOAPIC) += ioapic.o -obj-$(CONFIG_OMAP) += omap_intc.o -obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o -obj-$(CONFIG_RASPI) += bcm2835_ic.o bcm2836_control.o -obj-$(CONFIG_SH4) += sh_intc.o -obj-$(CONFIG_XICS) += xics.o -obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o -obj-$(CONFIG_XICS_KVM) += xics_kvm.o -obj-$(CONFIG_XIVE) += xive.o -obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o -obj-$(CONFIG_XIVE_KVM) += spapr_xive_kvm.o -obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o -obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o -obj-$(CONFIG_S390_FLIC) += s390_flic.o -obj-$(CONFIG_S390_FLIC_KVM) += s390_flic_kvm.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_vic.o -obj-$(CONFIG_ARM_GIC) += arm_gicv3_cpuif.o -obj-$(CONFIG_MIPS_CPS) += mips_gic.o -obj-$(CONFIG_NIOS2) += nios2_iic.o -obj-$(CONFIG_OMPIC) += ompic.o diff --git a/hw/intc/meson.build b/hw/intc/meson.build new file mode 100644 index 0000000..a2e5314 --- /dev/null +++ b/hw/intc/meson.build @@ -0,0 +1,52 @@ +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', 'i8259.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-iomod-intc.c')) + +specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-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: files('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_IOAPIC', if_true: files('ioapic.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', 'bcm2836_control.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_kvm.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 3e3f090..a5032d3 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('intc') subdir('ipack') subdir('ipmi') subdir('isa') From patchwork Thu Dec 12 12:52:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208508 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U/M4N4Dd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZzF6gwWz9sPK for ; Fri, 13 Dec 2019 00:54:17 +1100 (AEDT) Received: from localhost ([::1]:59596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOv1-0001wX-40 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:54:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42698) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzB-0004nW-L6 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNzA-0008Hy-Ae for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:29 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:34220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNzA-0008GN-49 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:28 -0500 Received: by mail-wr1-x42a.google.com with SMTP id t2so2647279wrr.1 for ; Thu, 12 Dec 2019 04:54:28 -0800 (PST) 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=T8nlJuKHUFV6YDTgA0pf50k84pJ1aEuOI0caCAxP+sI=; b=U/M4N4DdnO7Xn28tAIEtwkjRZgcJjReHyw00UgJQoITPzs1AeeOvTAqaiRP2DXvpAb PC5Sc45wt+2qmzeMVPnldMVQdGD/vhrjHakT04YV2pa3yZLemjmcTRS49kOB8gpElWzh nQpNoJBGOnMy/JDuEq2y4D29mDi47e6Fi2Ls8fZrJn1bcFImXLGo9BERE+OIbo/FwRYQ v8iRqgFtrsTB7ObsWLBghSZu6c+j1iJWA6srKMjsFMa4dhmgWqAedxx3tydsoRRlC11O nFPhFhS0UVihJc7vJgYf1AhJP/h1esn/K4J/+hz6bkt57Ep2l+dmCCWKIiQGEuC6RFGj pyUg== 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=T8nlJuKHUFV6YDTgA0pf50k84pJ1aEuOI0caCAxP+sI=; b=KG7tW5nsUeiQ7ulkXI4VaR81zndydZ5GnAKMkBymuEjPXjt+vCT1KCMTmELsy3RNcV YLa2gdk752JkByqyyPCGp7NRO275O8FKAMX+T4vMJzlxARBOPyWGKdbTbsgTqvMGd+pR GICRDT769DUzGlK6utMfQ5/4aE7daqeqmJPuKGoP8V5rWOmxEKcLAJFnrhxgiSmogvZ7 JQjYajLqlXqCWZqw/UvIICuOEMAmLwrXszfipjRsvfd1y+GfrhBgb7rxWjuL57StRZdk lXyFG3k6QpkyOyt+QTB1wPkx9RCzv1E9i4yrqabHDLVy7x0LiFXXQQnz/BYhuLBp6BaE LO2Q== X-Gm-Message-State: APjAAAURT74yZrFR9BKA8+5rRZoQYalAkjIOB57z/VNs0E6kDowvl7sc 3m9MESJSGItQxcV9xWLaNasXQjQf X-Google-Smtp-Source: APXvYqzSdB9RsmIKQPuWTiPl8hUOUm6kgfOWyJEEsbqL+FmUvijdrf7zJW2XiDwQKwojHjIYegWEBA== X-Received: by 2002:adf:fe43:: with SMTP id m3mr6373042wrs.213.1576155266825; Thu, 12 Dec 2019 04:54:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 089/132] meson: convert hw/input Date: Thu, 12 Dec 2019 13:52:13 +0100 Message-Id: <1576155176-2464-90-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/input/Makefile.objs | 17 ----------------- hw/input/meson.build | 17 +++++++++++++++++ hw/meson.build | 1 + 4 files changed, 18 insertions(+), 18 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 c89ca8d..c99f7e3 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -13,7 +13,6 @@ devices-dirs-y += gpio/ devices-dirs-$(CONFIG_HYPERV) += hyperv/ devices-dirs-$(CONFIG_I2C) += i2c/ devices-dirs-y += ide/ -devices-dirs-y += input/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs deleted file mode 100644 index a1bc502..0000000 --- a/hw/input/Makefile.objs +++ /dev/null @@ -1,17 +0,0 @@ -common-obj-$(CONFIG_ADB) += adb.o adb-mouse.o adb-kbd.o -common-obj-y += hid.o -common-obj-$(CONFIG_LM832X) += lm832x.o -common-obj-$(CONFIG_PCKBD) += pckbd.o -common-obj-$(CONFIG_PL050) += pl050.o -common-obj-$(CONFIG_PS2) += ps2.o -common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o -common-obj-$(CONFIG_TSC2005) += tsc2005.o - -common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input.o -common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o -common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o -common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o - -obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o -obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o -obj-$(CONFIG_TSC210X) += tsc210x.o diff --git a/hw/input/meson.build b/hw/input/meson.build new file mode 100644 index 0000000..6cc59e6 --- /dev/null +++ b/hw/input/meson.build @@ -0,0 +1,17 @@ +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_input.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-hid.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c')) + +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-softusb.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c')) +specific_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c')) diff --git a/hw/meson.build b/hw/meson.build index a5032d3..a85ec93 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('input') subdir('intc') subdir('ipack') subdir('ipmi') From patchwork Thu Dec 12 12:52:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vKq6NAPZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb2K5344z9sPn for ; Fri, 13 Dec 2019 00:56:57 +1100 (AEDT) Received: from localhost ([::1]:59716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOxb-0005X6-6u for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:56:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42817) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzC-0004pG-Ha for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNzB-0008Jj-5i for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:30 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:50827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNzA-0008IJ-V9 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:29 -0500 Received: by mail-wm1-x32a.google.com with SMTP id a5so2260892wmb.0 for ; Thu, 12 Dec 2019 04:54:28 -0800 (PST) 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=Y1eC1US5t9rCGASLFzWBCNStyznZMB9jdOkTWcqcyvc=; b=vKq6NAPZGuuDdyc33e92L7mFmjhoaCp4i/GqwgcBGTRQazxA0zOWhvqaS1DBJwgybj LBh0L21lcMTp6iJ7XYT08Nwpw5LuFmXllBRhTBMAKWeiTNpPsMsdA69jUeNr+6NhLs8a 62PVpg2RvoingaHx0bR26QadxezaK0YfMNxAqf0KF7piNR4oeycRgJn8gONenPLX3LNy jAnQ3SPjt5DQtnRgeC42Qr8elEYp0s6c4Z4IOaF4rTXn4xueeRbc+kkD6u0ykPQzg2+m PgjhpmvwogYKDQXhbspNseI0Sq/aYqZrhvc7ZK70EQrxSnNhrXmj7w72Gvv/0tgLYGZG 0HLg== 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=Y1eC1US5t9rCGASLFzWBCNStyznZMB9jdOkTWcqcyvc=; b=ce+au6IjCFHdBm41aL9EExa8Hqao17/+RfgBwuWT+zTOaScZ0FpeSa4Bfs7vguTOG/ cwGoPuZRlVt5iW1+EczNQaJEQQtX6xrsqssrQQVk1bQXY52Jn8aBCDOQWUqi9uoPmc8M a1R77p1OBlyntx5qkAm4EdlqApUgZfmnkhaTmrURcey5WxfTXpVujRQkbiTzQr2wylVm q/qNBJBXKifcRLGOEBPeOhfOsL6T81yJ3JI9pv7T/WN/SaIT0LIWj4PX3m5ij5wmBqXq IUxCCU7j1aSz12I25L7jv6HGHNttEcoCliI+YMz9opR6XQ4vj+H4Ps6gLt/EXE022EKZ zxvg== X-Gm-Message-State: APjAAAVEF0sw9RyDudj6N2dfCiwLILQl0bi3zZ8B7H8xJ5SIQUjjvxIk HsJVv5kuRPtO97q4yWODyr1gXlwj X-Google-Smtp-Source: APXvYqwswPsBmraVAo8WeCOvx6A9MbfcpMcV01ndEKFvSm64N+NLRynq8VGN+bSLUeiBGDL7vFKD7w== X-Received: by 2002:a1c:286:: with SMTP id 128mr6209106wmc.176.1576155267803; Thu, 12 Dec 2019 04:54:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 090/132] meson: convert hw/ide Date: Thu, 12 Dec 2019 13:52:14 +0100 Message-Id: <1576155176-2464-91-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 c99f7e3..b75e027 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -12,7 +12,6 @@ devices-dirs-y += dma/ devices-dirs-y += gpio/ devices-dirs-$(CONFIG_HYPERV) += hyperv/ devices-dirs-$(CONFIG_I2C) += i2c/ -devices-dirs-y += ide/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs deleted file mode 100644 index faf04e0..0000000 --- a/hw/ide/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o -common-obj-$(CONFIG_IDE_QDEV) += qdev.o -common-obj-$(CONFIG_IDE_PCI) += pci.o -common-obj-$(CONFIG_IDE_ISA) += isa.o ioport.o -common-obj-$(CONFIG_IDE_PIIX) += piix.o ioport.o -common-obj-$(CONFIG_IDE_CMD646) += cmd646.o -common-obj-$(CONFIG_IDE_MACIO) += macio.o -common-obj-$(CONFIG_IDE_MMIO) += mmio.o -common-obj-$(CONFIG_IDE_VIA) += via.o -common-obj-$(CONFIG_MICRODRIVE) += microdrive.o -common-obj-$(CONFIG_AHCI) += ahci.o -common-obj-$(CONFIG_AHCI_ICH9) += ich.o -common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o -common-obj-$(CONFIG_IDE_SII3112) += sii3112.o diff --git a/hw/ide/meson.build b/hw/ide/meson.build new file mode 100644 index 0000000..ddcb3b2 --- /dev/null +++ b/hw/ide/meson.build @@ -0,0 +1,14 @@ +softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c')) +softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.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 a85ec93..848736d 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ide') subdir('input') subdir('intc') subdir('ipack') From patchwork Thu Dec 12 12:52:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="geY7uFeI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YbBz0WWpz9sPf for ; Fri, 13 Dec 2019 01:04:27 +1100 (AEDT) Received: from localhost ([::1]:59822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP4q-0006Vp-Ja for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 09:04:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42955) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzD-0004r6-ED for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNzC-0008LT-6N for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:31 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNzB-0008KP-Vl for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id j42so2575921wrj.12 for ; Thu, 12 Dec 2019 04:54:29 -0800 (PST) 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=B1cIguF+o7g6L/Tvyh0nFkUMyH+9grlYA2KZIF+cBA4=; b=geY7uFeIqPwdnWVJB4L9Dv4jZTkjjclNvjhd69o7QsMqYgQSf7ENTefo708s3/vq2W XCDN5t6kJKETK+Rism0kpDW5/686u1t6KtFORxztskvs2qsZ6mtWV8nV6HNT82KZAiyX mO8rMY9CsH+j+ig73CpkgW5AGZgjPwcR0iazGUKNkgVmzkYJEa9c2aEMDpR9oFBWDYsQ bwfAFp69D/GF0+nucrw/XOPjd3nl1R62PLeF4M3xURfZkAiynTiSV5n5boIwhSZ9U6ss JLpeHoGGQ4FUdroFTfZ2fiusszDb2xv5KnxjtOx+6/AYDWRDxfKgKeOZmwU6TTKJSMCW dodg== 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=B1cIguF+o7g6L/Tvyh0nFkUMyH+9grlYA2KZIF+cBA4=; b=Qk//csYL3hxzB0dc+4EgcbOFo4BGyDVSJyKWHWNRKh+WjiP/2sTQFpiG7qZ7bBraNK 6jFDVO4MsjyeXdB3+09NpLS4V2YMKf3Uq3AuFYs4fAXmHB6lWj11uSJd0vVbajsbypZI uHokQwaAwn1aeDC93z42vKuQJG5zzhr3xhArGHTOmLlMLztnVoDkfz2h545Gc7faAJJF MMyYGUwZN0vLKStwwbEukDFLWDAQ1Ie8JDctozMkdGuo94nOtZ2YwlSnyn5BwWLNK66P uojE5obOaCYNmqLO1kB44HQXh/EKsg5aBQf3heaTem9wedglv8/L81y2feoS930f40+k 84cw== X-Gm-Message-State: APjAAAWTgDqwbcqOtqm4yEq7rR8b7Pxx4gp5b/6NSYXXwdhknLS0lZIg XMCLefHYCFScowNh3dsm30/WD2Ms X-Google-Smtp-Source: APXvYqxfAP5NZHismulfhdGxUh2PJqm6OJch9DL64yNbwVND6yiZFiEY7jswLG2qOiHRPuUyDAkZ/A== X-Received: by 2002:a5d:494b:: with SMTP id r11mr6275554wrs.184.1576155268658; Thu, 12 Dec 2019 04:54:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 091/132] meson: convert hw/i2c Date: Thu, 12 Dec 2019 13:52:15 +0100 Message-Id: <1576155176-2464-92-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/i2c/Makefile.objs | 13 ------------- hw/i2c/meson.build | 18 ++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 19 insertions(+), 14 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 b75e027..0213b1b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -11,7 +11,6 @@ devices-dirs-y += display/ devices-dirs-y += dma/ devices-dirs-y += gpio/ devices-dirs-$(CONFIG_HYPERV) += hyperv/ -devices-dirs-$(CONFIG_I2C) += i2c/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs deleted file mode 100644 index d7073a4..0000000 --- a/hw/i2c/Makefile.objs +++ /dev/null @@ -1,13 +0,0 @@ -common-obj-$(CONFIG_I2C) += core.o smbus_slave.o smbus_master.o -common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o -common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o -common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o -common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o -common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o -common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o -common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o -common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o -obj-$(CONFIG_OMAP) += omap_i2c.o -obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build new file mode 100644 index 0000000..43901e6 --- /dev/null +++ b/hw/i2c/meson.build @@ -0,0 +1,18 @@ +i2c_ss = ss.source_set() +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_I2C', if_true: files('core.c', 'smbus_slave.c', 'smbus_master.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')) +softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss) + +specific_i2c_ss = ss.source_set() +specific_i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c')) +specific_i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c')) +specific_ss.add_all(when: 'CONFIG_I2C', if_true: specific_i2c_ss) diff --git a/hw/meson.build b/hw/meson.build index 848736d..e59ed44 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('i2c') subdir('ide') subdir('input') subdir('intc') From patchwork Thu Dec 12 12:52:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CIQd8Oto"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YbFQ4nF3z9sPh for ; Fri, 13 Dec 2019 01:06:34 +1100 (AEDT) Received: from localhost ([::1]:59888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP6q-0000to-71 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 09:06:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzE-0004v0-DA for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNzD-0008Mn-5T for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:32 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNzC-0008Lf-Ur for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:31 -0500 Received: by mail-wr1-x434.google.com with SMTP id y11so2616224wrt.6 for ; Thu, 12 Dec 2019 04:54:30 -0800 (PST) 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=wHl5lU6t4e5jkqS3GA+ZrkV9FVQZHTyfosUh/T46DLc=; b=CIQd8OtoPD9tDSiev4cZ2V75Uy1hPZK/IerWKIvHkjeDfRDhjEQvdgYfdo28NsVSeH mr4AwVOVGyd9XwQPvlaMCQ1EGwT9JY8FxFZWbjGFAKWD/iHbjOSA4x00dCZzF6d+3PhH 963FA/XMQJjMPnvnVKfugNyoE5K5jBJWIxWqXLiiRwafd7EkcluEmou96MsIlPszDjvP 0lBl2Bbg7nOwvOr0e9MEFUBhF+Qb2eRX2Gbm8IKCEnnsa8BEgdXL7fvoMoBPgQyknzzG wHaxphjnmgCpmvz9KH+cABEgNOj90JFijoAJ7meDtioyGl2DiVHq8TuPTljdmR+FAbI7 x8iQ== 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=wHl5lU6t4e5jkqS3GA+ZrkV9FVQZHTyfosUh/T46DLc=; b=Vp7YbfTNtEY0NJPh89ut8hqKBikeDeWrwrODbmKR9WTFOOE4yGeYjs+ExNlzmmQLvF fc9o9EGMCp3AgO2zo3yXj6kRp/rO+3seLExRsIVVMU9aWOLBr4S40UEZ2DBHDFFqFiGA bbi8AxHdieTD6w2QCUjcNhkRpVGnSqLKEAQ9eNKa16NHgNebPwwZ0nC++wGmJA7g8QUM WCi5+3jO+5BvVfnLa/BVCZkRCv7lr9cf8z1VrJS2NKcawEY2HlPAZmqGRqpuuiWYQ4BA KnZjqE/Tw6kRxJuolBxtjuSCApGmyYJbsUKbc1T/t+3CYlB7V+IMotJNXd626d5wpWRN Rvtg== X-Gm-Message-State: APjAAAUX5wBCf/fhhyMzzEJXZgdAcZaUMLjn3QPD9BMK1lt/W9arAKyn ffjdONEeFpc1zN45Zykz2l8Q+s8z X-Google-Smtp-Source: APXvYqxSLa358/VfY5IzoEoqTn0J1VFvcs/Ba0y5OcqHmuv1hkF/8eR9Bg++1+jPI0wkuQSLaJw+Cg== X-Received: by 2002:adf:fc03:: with SMTP id i3mr6329547wrr.306.1576155269824; Thu, 12 Dec 2019 04:54:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 092/132] meson: convert hw/hyperv Date: Thu, 12 Dec 2019 13:52:16 +0100 Message-Id: <1576155176-2464-93-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/hyperv/Makefile.objs | 2 -- hw/hyperv/meson.build | 2 ++ hw/meson.build | 1 + 4 files changed, 3 insertions(+), 3 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 0213b1b..2ca159e 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,6 @@ devices-dirs-y += cpu/ devices-dirs-y += display/ devices-dirs-y += dma/ devices-dirs-y += gpio/ -devices-dirs-$(CONFIG_HYPERV) += hyperv/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/hyperv/Makefile.objs b/hw/hyperv/Makefile.objs deleted file mode 100644 index edaca2f..0000000 --- a/hw/hyperv/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += hyperv.o -obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o diff --git a/hw/hyperv/meson.build b/hw/hyperv/meson.build new file mode 100644 index 0000000..98663ec --- /dev/null +++ b/hw/hyperv/meson.build @@ -0,0 +1,2 @@ +specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c')) +specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true: files('hyperv_testdev.c')) diff --git a/hw/meson.build b/hw/meson.build index e59ed44..bfd4d59 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('hyperv') subdir('i2c') subdir('ide') subdir('input') From patchwork Thu Dec 12 12:52:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Vi+C0EfX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb4W2HMfz9sPK for ; Fri, 13 Dec 2019 00:58:51 +1100 (AEDT) Received: from localhost ([::1]:59738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOzR-0008CD-5I for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:58:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43249) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzF-0004wZ-C5 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNzE-0008PQ-5S for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:33 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:35184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNzD-0008NA-Up for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:32 -0500 Received: by mail-wm1-x335.google.com with SMTP id p17so2394576wmb.0 for ; Thu, 12 Dec 2019 04:54:31 -0800 (PST) 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=BCzU6I2Xtbzw4y1h1eJ8RPM0tsmyA1ceqiw1bsOdQC8=; b=Vi+C0EfXbengYmqn9RP3O/TyjFZupQWSX3JdTZXO3fPV8oAIZcVQnVQwT8FG+AGwmZ 5YLwAQJCJaHu3+w6ecyQCWjCtk8jvr7YkBMLKHuSnVM/3nkWx8QRd7ss/cWFtWtLQ4RI /b6jVv3NTtU68nphmTUw2BQysSsxYmxN1SsYaQJ/fxiYbMGstkFYFOazkt9d3vv6WA8S w76Wldy1YnxsdRhkqLVpYa5R8tiXO6sMR32YiLrFO/0TVDuQIbFwr1zMDlU2H31S30i9 SxOfMdkcO5ap3KHW6Y0wQYKBdagfUwEFieU4y2V1ipr0uCwni0w2bt4EYITYOhmQA3CM GQ3g== 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=BCzU6I2Xtbzw4y1h1eJ8RPM0tsmyA1ceqiw1bsOdQC8=; b=LE+UaYELn+NY9HEdfPZsq2ZbxG1xRv82GV8fgdxF+kWuJ+FLxpVcUUZTaLgGyfbEet f6D0lDl/DnOf8HOd9WPce2UHOXGeaDFmjxo2OB9WlNxTc0W+ko+vlBC+00P1OEpsllC/ nPX/Et56b4YvXYa2fwb/f7UFiIFl5mhKt5gwU9KwiDBBUzCDZusJGA9wAykKGt6OptWM kfE9dc4OVLNDdNn2rpoUo/B5RjJOnsYxzhdoAh0Q7A2KfZjZKNMnyzG1RqXC+n+i4Agg VkVKGz6mwecl9EOHigNuG+8i795O3Rkqh5X65ZoCAhorQwTZs0ByGxxSKAN0kmJvbqfI /xkg== X-Gm-Message-State: APjAAAVWGlF7xlJ6umX872BswNW7u4rdwzreBRti5PjzvFMolPYuAoNR +Ri1isdsVzzMZJVpoA5BbnvgUELN X-Google-Smtp-Source: APXvYqx0kK5hTTcuYptbb3qaw1moBG34cLpSfB1DWkCGakFv+2hrLqZVLs6FpalBYXGxRyOZ36J3oQ== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr6833666wmh.30.1576155270659; Thu, 12 Dec 2019 04:54:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 093/132] meson: convert hw/gpio Date: Thu, 12 Dec 2019 13:52:17 +0100 Message-Id: <1576155176-2464-94-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/gpio/Makefile.objs | 11 ----------- hw/gpio/meson.build | 11 +++++++++++ hw/meson.build | 1 + 4 files changed, 12 insertions(+), 12 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 2ca159e..084bfc6 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -9,7 +9,6 @@ devices-dirs-y += char/ devices-dirs-y += cpu/ devices-dirs-y += display/ devices-dirs-y += dma/ -devices-dirs-y += gpio/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs deleted file mode 100644 index e5da0cb..0000000 --- a/hw/gpio/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -common-obj-$(CONFIG_MAX7310) += max7310.o -common-obj-$(CONFIG_PL061) += pl061.o -common-obj-$(CONFIG_PUV3) += puv3_gpio.o -common-obj-$(CONFIG_ZAURUS) += zaurus.o -common-obj-$(CONFIG_E500) += mpc8xxx.o -common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o - -obj-$(CONFIG_OMAP) += omap_gpio.o -obj-$(CONFIG_IMX) += imx_gpio.o -obj-$(CONFIG_RASPI) += bcm2835_gpio.o -obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build new file mode 100644 index 0000000..1d24a2d --- /dev/null +++ b/hw/gpio/meson.build @@ -0,0 +1,11 @@ +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')) + +specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) +specific_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c')) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c')) diff --git a/hw/meson.build b/hw/meson.build index bfd4d59..a61aeaf 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('gpio') subdir('hyperv') subdir('i2c') subdir('ide') From patchwork Thu Dec 19 12:23:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="f8vd7oHe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drjB46hDz9sPc for ; Thu, 19 Dec 2019 23:26:54 +1100 (AEDT) Received: from localhost ([::1]:40070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihutH-00019T-Uv for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:26:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56533) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqc-00076y-5j for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqa-0005AH-Qk for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:06 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43240 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqa-00055Q-KW for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758243; 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=MTILE6+vdxy7qBItCjQriTMu3xCd3lcb79EGh6nnh2c=; b=f8vd7oHeNfeUHjxtHoXqdCGRJeq/wTiHmSojwEmXwwRb4Jz1E5Kk3aWyUBKlPCfAYdFSzS jfu36Sz0H90iRjqJR8ePgNUNZ76HjaK1ZGpkxu9lA4TzFvK/7I8vrny6lPAJBM6nSPmagW 3MKAXIrakZx/Gd16pTXsYeqwHiF2h/s= 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-333-n9wBJ4gfPiyYVu7MNUwyBA-1; Thu, 19 Dec 2019 07:24:02 -0500 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 DCFB3801E66 for ; Thu, 19 Dec 2019 12:24:01 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE1F160C18; Thu, 19 Dec 2019 12:24:00 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 094/132] meson: convert hw/dma Date: Thu, 19 Dec 2019 13:23:14 +0100 Message-Id: <1576758232-12439-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: n9wBJ4gfPiyYVu7MNUwyBA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/dma/Makefile.objs | 16 ---------------- hw/dma/meson.build | 16 ++++++++++++++++ hw/meson.build | 1 + 4 files changed, 17 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 084bfc6..f5fd490 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -8,7 +8,6 @@ devices-dirs-y += bt/ devices-dirs-y += char/ devices-dirs-y += cpu/ devices-dirs-y += display/ -devices-dirs-y += dma/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs deleted file mode 100644 index b672e7a..0000000 --- a/hw/dma/Makefile.objs +++ /dev/null @@ -1,16 +0,0 @@ -common-obj-$(CONFIG_PUV3) += puv3_dma.o -common-obj-$(CONFIG_RC4030) += rc4030.o -common-obj-$(CONFIG_PL080) += pl080.o -common-obj-$(CONFIG_PL330) += pl330.o -common-obj-$(CONFIG_I82374) += i82374.o -common-obj-$(CONFIG_I8257) += i8257.o -common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o -common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o -common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o -common-obj-$(CONFIG_STP2000) += sparc32_dma.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o -common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o - -obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o -obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o -common-obj-$(CONFIG_RASPI) += bcm2835_dma.o diff --git a/hw/dma/meson.build b/hw/dma/meson.build new file mode 100644 index 0000000..84677ad --- /dev/null +++ b/hw/dma/meson.build @@ -0,0 +1,16 @@ +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-devcfg.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')) +specific_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')) + +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c')) +specific_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 a61aeaf..3263f33 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('dma') subdir('gpio') subdir('hyperv') subdir('i2c') From patchwork Thu Dec 19 12:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="NOY0gTT5"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drmD0sg3z9sPc for ; Thu, 19 Dec 2019 23:29:31 +1100 (AEDT) Received: from localhost ([::1]:40096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuvo-00052R-6h for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:29:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56860) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqe-0007AR-Cm for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqc-0005L0-Mr for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:08 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43639 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqc-0005HZ-Gw for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758245; 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=7gWYMTZampjPsNJm58M4yt8F4jJFZ6y7TePX+di3XQE=; b=NOY0gTT5rCVVR03qMGlCtnvgdsa034s8fl4OjuTUz5q35plGdVBTtV1Ku02UYlAMavsFVa p+lcjXocaD3nUcST9mYCFzELxKN6REzKsojLUs5fzOpW3AAT68ieEbQi+wFyvWj9PZFTjd Ng+vGdQdm41z6XekWOtFqlVpNG/b1Yg= 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-249-UMUlwgjkNh2b9K7LBiS0oA-1; Thu, 19 Dec 2019 07:24:04 -0500 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 93165107ACC5 for ; Thu, 19 Dec 2019 12:24:03 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66E6160C18; Thu, 19 Dec 2019 12:24:02 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 095/132] meson: convert hw/display Date: Thu, 19 Dec 2019 13:23:15 +0100 Message-Id: <1576758232-12439-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: UMUlwgjkNh2b9K7LBiS0oA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 1 + hw/Makefile.objs | 1 - hw/display/Makefile.objs | 59 ------------------------------------------------ hw/display/meson.build | 54 ++++++++++++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 5 files changed, 56 insertions(+), 60 deletions(-) delete mode 100644 hw/display/Makefile.objs create mode 100644 hw/display/meson.build diff --git a/Makefile.target b/Makefile.target index a41e4e5..82f384c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -168,6 +168,7 @@ LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOM LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) +LIBS := $(LIBS) $(VIRGL_LIBS) # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f5fd490..acc6bee 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -7,7 +7,6 @@ devices-dirs-y += block/ devices-dirs-y += bt/ devices-dirs-y += char/ devices-dirs-y += cpu/ -devices-dirs-y += display/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs deleted file mode 100644 index 0f11d55..0000000 --- a/hw/display/Makefile.objs +++ /dev/null @@ -1,59 +0,0 @@ -common-obj-$(CONFIG_DDC) += i2c-ddc.o -common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o - -common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o -common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o - -common-obj-$(CONFIG_ADS7846) += ads7846.o -common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o -common-obj-$(call land,$(CONFIG_VGA_CIRRUS),$(CONFIG_VGA_ISA))+=cirrus_vga_isa.o -common-obj-$(CONFIG_G364FB) += g364fb.o -common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o -common-obj-$(CONFIG_PL110) += pl110.o -common-obj-$(CONFIG_SII9022) += sii9022.o -common-obj-$(CONFIG_SSD0303) += ssd0303.o -common-obj-$(CONFIG_SSD0323) += ssd0323.o -common-obj-$(CONFIG_XEN) += xenfb.o - -common-obj-$(CONFIG_VGA_PCI) += vga-pci.o -common-obj-$(CONFIG_VGA_ISA) += vga-isa.o -common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o -common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o -common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o - -common-obj-$(CONFIG_BLIZZARD) += blizzard.o -common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o -common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o -obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o -common-obj-$(CONFIG_ZAURUS) += tc6393xb.o - -obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o -milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS) -milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS) - -common-obj-$(CONFIG_OMAP) += omap_dss.o -obj-$(CONFIG_OMAP) += omap_lcdc.o -common-obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o -common-obj-$(CONFIG_RASPI) += bcm2835_fb.o -common-obj-$(CONFIG_SM501) += sm501.o -common-obj-$(CONFIG_TCX) += tcx.o -common-obj-$(CONFIG_CG3) += cg3.o - -obj-$(CONFIG_VGA) += vga.o - -common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o - -obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o -obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o -obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o -obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o -obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o -obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o -virtio-gpu.o-cflags := $(VIRGL_CFLAGS) -virtio-gpu.o-libs += $(VIRGL_LIBS) -virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) -virtio-gpu-3d.o-libs += $(VIRGL_LIBS) -common-obj-$(CONFIG_DPCD) += dpcd.o -common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o - -common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o diff --git a/hw/display/meson.build b/hw/display/meson.build new file mode 100644 index 0000000..248510a --- /dev/null +++ b/hw/display/meson.build @@ -0,0 +1,54 @@ +softmmu_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c')) +softmmu_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-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: files('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')) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-vgafb.c')) +softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c')) + +specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: files('milkymist-tmu2.c')) + +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.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')) + +specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c')) + +softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c')) + +specific_ss.add(when: [pixman, 'CONFIG_VIRTIO_GPU'], if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), virgl]) +specific_ss.add(when: [pixman, 'CONFIG_VHOST_USER_GPU'], if_true: files('vhost-user-gpu.c')) +specific_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-gpu-pci.c')) +specific_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c')) +specific_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c')) +specific_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.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: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c')) diff --git a/hw/meson.build b/hw/meson.build index 3263f33..3f40df2 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('display') subdir('dma') subdir('gpio') subdir('hyperv') From patchwork Thu Dec 19 12:23:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Swo8TF/S"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drk50t15z9sNH for ; Thu, 19 Dec 2019 23:27:41 +1100 (AEDT) Received: from localhost ([::1]:40078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuu2-0002Wc-9B for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:27:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57416) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqi-0007Hg-PB for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqh-0005lb-HB for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38090 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqh-0005i4-AF for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758250; 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=dtALf0rmGbFrQn1hpqABDHjCWNaum13GWaizSDkJnFA=; b=Swo8TF/StTrSSqiWEfdwht9S/coICiu6rNoNQv4olOLRW/LSp/QOZ85T0S7MmQHgfvd8k/ +hIDkEP4P0CUJ9cZUDhOujT4o5oOF+U1p07GTUr1acCD/ZMWVN0QQQhSbEiidAfYycMBcD sE5TgFGMKaGt7jez9/7iJTzHN95e318= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-IL9d6mZAOUeynl13-hAz7Q-1; Thu, 19 Dec 2019 07:24:09 -0500 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 A76FE1005513 for ; Thu, 19 Dec 2019 12:24:08 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 282CE60C18; Thu, 19 Dec 2019 12:24:03 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 096/132] meson: convert hw/cpu Date: Thu, 19 Dec 2019 13:23:16 +0100 Message-Id: <1576758232-12439-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: IL9d6mZAOUeynl13-hAz7Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 acc6bee..67a2bb5 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -6,7 +6,6 @@ devices-dirs-y += audio/ devices-dirs-y += block/ devices-dirs-y += bt/ devices-dirs-y += char/ -devices-dirs-y += cpu/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs deleted file mode 100644 index 8db9e8a..0000000 --- a/hw/cpu/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o -obj-$(CONFIG_REALVIEW) += realview_mpcore.o -obj-$(CONFIG_A9MPCORE) += a9mpcore.o -obj-$(CONFIG_A15MPCORE) += a15mpcore.o -common-obj-y += core.o cluster.o diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build new file mode 100644 index 0000000..9e52fee --- /dev/null +++ b/hw/cpu/meson.build @@ -0,0 +1,6 @@ +softmmu_ss.add(files('core.c', 'cluster.c')) + +specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c')) +specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c')) +specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c')) diff --git a/hw/meson.build b/hw/meson.build index 3f40df2..5850b07 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('cpu') subdir('display') subdir('dma') subdir('gpio') From patchwork Thu Dec 19 12:23:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="aga2F9dU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drsY51rRz9sPc for ; Thu, 19 Dec 2019 23:34:08 +1100 (AEDT) Received: from localhost ([::1]:40183 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv0H-0002Hq-GY for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:34:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57870) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqm-0007MR-Mg for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuql-000669-0k for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:16 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33034 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqk-00062j-OA for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758254; 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=CqV/6Dei8VWL9nSm69LPJTUO2Sf2TZXXU7e/2BX6ZfI=; b=aga2F9dU4WVLzvqDwXR9TXyohX0eYb57gfCsUodRqNyz5SZYpPGl/ZBLQs34yx3oVDW5gJ 3EA5Bntpnjc8nU/lPWJJdEFuWfApJEl4xU1rabsRj38qyenf8/n1LQmMtpptW3Hs5v/HUk /xjSG3vlEsGZQEU/y7hwMTwQfGfckqI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-Yt5cnHP6P-Sj6wQWb7hPBA-1; Thu, 19 Dec 2019 07:24:13 -0500 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 24668801E6C for ; Thu, 19 Dec 2019 12:24:12 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51F7B60C18; Thu, 19 Dec 2019 12:24:09 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 097/132] meson: convert hw/char Date: Thu, 19 Dec 2019 13:23:17 +0100 Message-Id: <1576758232-12439-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Yt5cnHP6P-Sj6wQWb7hPBA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/char/Makefile.objs | 36 ------------------------------------ hw/char/meson.build | 34 ++++++++++++++++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 35 insertions(+), 37 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 67a2bb5..6752297 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -5,7 +5,6 @@ devices-dirs-y += adc/ devices-dirs-y += audio/ devices-dirs-y += block/ devices-dirs-y += bt/ -devices-dirs-y += char/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs deleted file mode 100644 index 02d8a66..0000000 --- a/hw/char/Makefile.objs +++ /dev/null @@ -1,36 +0,0 @@ -common-obj-$(CONFIG_IPACK) += ipoctal232.o -common-obj-$(CONFIG_ESCC) += escc.o -common-obj-$(CONFIG_NRF51_SOC) += nrf51_uart.o -common-obj-$(CONFIG_PARALLEL) += parallel.o -common-obj-$(CONFIG_ISA_BUS) += parallel-isa.o -common-obj-$(CONFIG_PL011) += pl011.o -common-obj-$(CONFIG_SERIAL) += serial.o -common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o -common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o -common-obj-$(CONFIG_SERIAL_PCI_MULTI) += serial-pci-multi.o -common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o -common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o -common-obj-$(CONFIG_XEN) += xen_console.o -common-obj-$(CONFIG_CADENCE) += cadence_uart.o - -obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o -obj-$(CONFIG_COLDFIRE) += mcf_uart.o -obj-$(CONFIG_OMAP) += omap_uart.o -obj-$(CONFIG_SH4) += sh_serial.o -obj-$(CONFIG_PSERIES) += spapr_vty.o -obj-$(CONFIG_DIGIC) += digic-uart.o -obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o -obj-$(CONFIG_RASPI) += bcm2835_aux.o - -common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o -common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o -common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o -common-obj-$(CONFIG_GRLIB) += grlib_apbuart.o -common-obj-$(CONFIG_IMX) += imx_serial.o -common-obj-$(CONFIG_LM32) += lm32_juart.o -common-obj-$(CONFIG_LM32) += lm32_uart.o -common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o -common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o - -obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o -obj-$(CONFIG_TERMINAL3270) += terminal3270.o diff --git a/hw/char/meson.build b/hw/char/meson.build new file mode 100644 index 0000000..002e5d0 --- /dev/null +++ b/hw/char/meson.build @@ -0,0 +1,34 @@ +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-uart.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_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-console.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')) + +specific_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c')) +specific_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c')) +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) +specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) +specific_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.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')) diff --git a/hw/meson.build b/hw/meson.build index 5850b07..d8a7493 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('char') subdir('core') subdir('cpu') subdir('display') From patchwork Thu Dec 19 12:23:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="XZTQnJkJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drp60kyYz9sPc for ; Thu, 19 Dec 2019 23:31:10 +1100 (AEDT) Received: from localhost ([::1]:40120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuxP-0006va-Dc for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:31:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58387) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqq-0007Sn-Fw for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqp-0006VM-De for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:20 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22959 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqp-0006Qq-44 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758258; 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=NCLdwUIVuOPMbdMCzMWR2b7tM2z9RzERTpsHQIVUq8c=; b=XZTQnJkJy40ITJoeW3PqiArrlQEeqnzpKPxBbwtHzcGoS3Ib6u1xrCj9srY9kl0SIBxTIa /qlBVTH8HxEzpoFKoSul5WjtcntAkSD+7YyznkB7XWv4KVejiEL4YOvOkDdLHmxMq/ncgc nukmPSFxZtiD65ydsdKGhU18bL9gMds= 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-268-vh5K73xzM8yG2Tbf2exQUA-1; Thu, 19 Dec 2019 07:24:17 -0500 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 3C1AB801E6C for ; Thu, 19 Dec 2019 12:24:16 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4AFF60C18; Thu, 19 Dec 2019 12:24:12 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 098/132] meson: convert hw/bt Date: Thu, 19 Dec 2019 13:23:18 +0100 Message-Id: <1576758232-12439-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: vh5K73xzM8yG2Tbf2exQUA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/bt/Makefile.objs | 3 --- hw/bt/meson.build | 8 ++++++++ hw/meson.build | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 hw/bt/Makefile.objs create mode 100644 hw/bt/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6752297..6ddffce 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -4,7 +4,6 @@ devices-dirs-y += acpi/ devices-dirs-y += adc/ devices-dirs-y += audio/ devices-dirs-y += block/ -devices-dirs-y += bt/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs deleted file mode 100644 index 867a7d2..0000000 --- a/hw/bt/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -common-obj-y += core.o l2cap.o sdp.o hci.o hid.o -common-obj-y += hci-csr.o - diff --git a/hw/bt/meson.build b/hw/bt/meson.build new file mode 100644 index 0000000..ab45116 --- /dev/null +++ b/hw/bt/meson.build @@ -0,0 +1,8 @@ +softmmu_ss.add(files( + 'core.c', + 'hci-csr.c', + 'hci.c', + 'hid.c', + 'l2cap.c', + 'sdp.c', +)) diff --git a/hw/meson.build b/hw/meson.build index d8a7493..54414a6 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('bt') subdir('char') subdir('core') subdir('cpu') From patchwork Thu Dec 19 12:23:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="GgiKpaj9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drws2hVZz9sPc for ; Thu, 19 Dec 2019 23:37:01 +1100 (AEDT) Received: from localhost ([::1]:40226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv34-0006WI-6n for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:36:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58835) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqt-0007YQ-U9 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqs-0006nJ-GE for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:23 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45188 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqs-0006k7-9j for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758261; 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=GY8eV7vOM/DBZpy9+Eb4dk6x6aTcb4shyecE+wleKs4=; b=GgiKpaj9gyyqfEpKCnLva6abs2i5CcNw4VD3ulylZE6s2eGts4SOIeX1fviMFkxV4WSIpk OM4GR56ljskujEEqM3FgS1zNDr02vwXgXeU3vk/lseFHrUOkPbS18psExT4KlBrDRlMl7v /5aWtuDGynAcr6DBbdLMChAD7VQFci8= 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-cgb9Z8Z1NGiAdYf0UkuNFA-1; Thu, 19 Dec 2019 07:24:20 -0500 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 B98E6107ACC5 for ; Thu, 19 Dec 2019 12:24:19 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DAAB60C18; Thu, 19 Dec 2019 12:24:16 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 099/132] meson: convert hw/block Date: Thu, 19 Dec 2019 13:23:19 +0100 Message-Id: <1576758232-12439-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: cgb9Z8Z1NGiAdYf0UkuNFA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/block/Makefile.objs | 17 ----------------- hw/block/dataplane/Makefile.objs | 2 -- hw/block/dataplane/meson.build | 2 ++ hw/block/meson.build | 20 ++++++++++++++++++++ hw/meson.build | 1 + 6 files changed, 23 insertions(+), 20 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 6ddffce..0c92a04 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -3,7 +3,6 @@ devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFI devices-dirs-y += acpi/ devices-dirs-y += adc/ devices-dirs-y += audio/ -devices-dirs-y += block/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs deleted file mode 100644 index f5f643f..0000000 --- a/hw/block/Makefile.objs +++ /dev/null @@ -1,17 +0,0 @@ -common-obj-y += block.o cdrom.o hd-geometry.o -common-obj-$(CONFIG_FDC) += fdc.o -common-obj-$(CONFIG_SSI_M25P80) += m25p80.o -common-obj-$(CONFIG_NAND) += nand.o -common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o -common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o -common-obj-$(CONFIG_XEN) += xen-block.o -common-obj-$(CONFIG_ECC) += ecc.o -common-obj-$(CONFIG_ONENAND) += onenand.o -common-obj-$(CONFIG_NVME_PCI) += nvme.o - -obj-$(CONFIG_SH4) += tc58128.o - -obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o -obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o - -obj-y += dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs deleted file mode 100644 index 0c52702..0000000 --- a/hw/block/dataplane/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o -obj-$(CONFIG_XEN) += xen-block.o diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build new file mode 100644 index 0000000..12c6a26 --- /dev/null +++ b/hw/block/dataplane/meson.build @@ -0,0 +1,2 @@ +specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) diff --git a/hw/block/meson.build b/hw/block/meson.build new file mode 100644 index 0000000..a435ab4 --- /dev/null +++ b/hw/block/meson.build @@ -0,0 +1,20 @@ +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_NVME_PCI', if_true: files('nvme.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_XEN', if_true: files('xen-block.c')) + +specific_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.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 54414a6..a6782a5 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('block') subdir('bt') subdir('char') subdir('core') From patchwork Thu Dec 19 12:23:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Crq5W09H"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drgc2WlCz9sPc for ; Thu, 19 Dec 2019 23:25:32 +1100 (AEDT) Received: from localhost ([::1]:39986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurx-0007o3-HS for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:25:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqz-0007he-FY for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqy-0007I3-2B for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34617 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqx-0007Ep-Ql for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758267; 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=9UmZA/EQkfFvwW1LST0o+SJaN2u7CPZNAGY4rHWJntk=; b=Crq5W09HQlIhAuRsU47pN7rqAihwtJ2TEtCALtKBNGZZ+FZHlpb+lQ+APE/6EQHYu+vEt0 3MuX5ncgAyaptggQyNXmqkHaicx1B8ygWh9OWZWAQIPQP3EleKsMX9hExDAW+4/q8m2dOO dyBFrtN3Tjl48IMiN+dHYOY3C8g2AVE= 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-164-8etFbDDZPoKwx1g8vxF1QA-1; Thu, 19 Dec 2019 07:24:25 -0500 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 9493A10054E3 for ; Thu, 19 Dec 2019 12:24:24 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A98260C81; Thu, 19 Dec 2019 12:24:19 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 100/132] meson: convert hw/audio Date: Thu, 19 Dec 2019 13:23:20 +0100 Message-Id: <1576758232-12439-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8etFbDDZPoKwx1g8vxF1QA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 0c92a04..c69c3aa 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))) += 9pfs/ devices-dirs-y += acpi/ devices-dirs-y += adc/ -devices-dirs-y += audio/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs deleted file mode 100644 index 63db383..0000000 --- a/hw/audio/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -# Sound -common-obj-$(CONFIG_SB16) += sb16.o -common-obj-$(CONFIG_ES1370) += es1370.o -common-obj-$(CONFIG_AC97) += ac97.o -common-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o -common-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o -common-obj-$(CONFIG_CS4231A) += cs4231a.o -common-obj-$(CONFIG_HDA) += intel-hda.o hda-codec.o - -common-obj-$(CONFIG_PCSPK) += pcspk.o -common-obj-$(CONFIG_WM8750) += wm8750.o -common-obj-$(CONFIG_PL041) += pl041.o lm4549.o - -common-obj-$(CONFIG_CS4231) += cs4231.o -common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o -common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o - -common-obj-y += soundhw.o diff --git a/hw/audio/meson.build b/hw/audio/meson.build new file mode 100644 index 0000000..549e9a0 --- /dev/null +++ b/hw/audio/meson.build @@ -0,0 +1,14 @@ +softmmu_ss.add(files('soundhw.c')) +softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c')) +softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c')) +softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c')) +softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c')) +softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c')) +softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c')) +softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c')) +softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.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 a6782a5..011139d 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('audio') subdir('block') subdir('bt') subdir('char') From patchwork Thu Dec 19 12:23:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="MMtsiP68"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds001tDnz9sQp for ; Thu, 19 Dec 2019 23:39:43 +1100 (AEDT) Received: from localhost ([::1]:40254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv5g-0001yn-G5 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:39:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59684) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihur0-0007jE-Ce for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqz-0007OA-5U for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21766 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqy-0007Kf-R9 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758268; 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=w/Ros+mNcR5fE9uxCniasjkjIaqEW1g0XSIhc7929kw=; b=MMtsiP68xH2ssf+sM9uOpShRdD5D/YhsWoEikWXh+VLgXEisap0qz26eT5rvuWazW5E2DB 2UVjNUlWcz2vTkoXljS3Ha3qe+iVDGho+DXA+vf/RjZza4KeA8Ye1N00HCCxehs9/V25nr k4XGmTdA/zU5hIU0+fmBOJtCDJzaCMc= 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-316-YgwqJ5MHNAabUA0GkAphjw-1; Thu, 19 Dec 2019 07:24:27 -0500 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 33B47477 for ; Thu, 19 Dec 2019 12:24:26 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 165E860C18; Thu, 19 Dec 2019 12:24:24 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 101/132] meson: convert hw/adc Date: Thu, 19 Dec 2019 13:23:21 +0100 Message-Id: <1576758232-12439-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: YgwqJ5MHNAabUA0GkAphjw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 c69c3aa..5823867 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))) += 9pfs/ devices-dirs-y += acpi/ -devices-dirs-y += adc/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs deleted file mode 100644 index 3f6dfde..0000000 --- a/hw/adc/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o diff --git a/hw/adc/meson.build b/hw/adc/meson.build new file mode 100644 index 0000000..2e7fea9 --- /dev/null +++ b/hw/adc/meson.build @@ -0,0 +1 @@ +specific_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c')) diff --git a/hw/meson.build b/hw/meson.build index 011139d..33d5f9f 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('adc') subdir('audio') subdir('block') subdir('bt') From patchwork Thu Dec 19 12:23:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="iW7WWw8q"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drqq04F5z9sPc for ; Thu, 19 Dec 2019 23:32:39 +1100 (AEDT) Received: from localhost ([::1]:40152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuyq-0000G9-B0 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:32:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihur2-0007mu-PC for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihur1-0007aN-6r for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25490 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihur0-0007XJ-VH for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758270; 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=Hzzv/OgiqADH7KAChwWwmBUi+2fw7rFny0fFHFYO0ng=; b=iW7WWw8qDViqjWNnPJe84ylulm8z8wz9UiVR+kXQ2I5Z+baAjNNNBvsoDYqnBtjW/SYBdL dXiD738JTtGigRDMTCOhIT9K6Y8HaBIrlmdajXY3/FWSEx1ZvR/8mJi7g1b9Rc1NXNdCaR Kjw7RsKUYK8RyD93imLQ6XKGHsdA5pk= 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-143-Kq-17XzfN6CKUCb9DcxLFA-1; Thu, 19 Dec 2019 07:24:29 -0500 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 3A3AA1005514 for ; Thu, 19 Dec 2019 12:24:28 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1DF760C18; Thu, 19 Dec 2019 12:24:26 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 102/132] meson: convert hw/acpi Date: Thu, 19 Dec 2019 13:23:22 +0100 Message-Id: <1576758232-12439-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Kq-17XzfN6CKUCb9DcxLFA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/acpi/Makefile.objs | 22 ---------------------- hw/acpi/meson.build | 21 +++++++++++++++++++++ hw/meson.build | 1 + 4 files changed, 22 insertions(+), 23 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 5823867..3dc4dec 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))) += 9pfs/ -devices-dirs-y += acpi/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs deleted file mode 100644 index 9bb2101..0000000 --- a/hw/acpi/Makefile.objs +++ /dev/null @@ -1,22 +0,0 @@ -ifeq ($(CONFIG_ACPI),y) -common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o -common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o -common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o -common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o -common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o -common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o -common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o -common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o - -common-obj-y += acpi_interface.o -common-obj-y += bios-linker-loader.o -common-obj-y += aml-build.o utils.o -common-obj-$(CONFIG_ACPI_PCI) += pci.o -common-obj-$(CONFIG_TPM) += tpm.o - -common-obj-$(CONFIG_IPMI) += ipmi.o -common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o -else -common-obj-y += acpi-stub.o -endif -common-obj-$(CONFIG_ALL) += acpi-stub.o ipmi-stub.o diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build new file mode 100644 index 0000000..7d160c2 --- /dev/null +++ b/hw/acpi/meson.build @@ -0,0 +1,21 @@ +acpi_ss = 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_hotplug.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_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_TPM', if_true: files('tpm.c')) +softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) + +softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'ipmi-stub.c')) diff --git a/hw/meson.build b/hw/meson.build index 33d5f9f..b2f8d6c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('acpi') subdir('adc') subdir('audio') subdir('block') From patchwork Thu Dec 19 12:23:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="EYZy2Usy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drkh6dp9z9sPn for ; Thu, 19 Dec 2019 23:28:12 +1100 (AEDT) Received: from localhost ([::1]:40086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuuY-0003PP-Cp for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:28:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihur5-0007qY-HT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihur4-0007pO-7S for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:35 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:35694 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihur3-0007mS-Ty for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758273; 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=2Wg/Q4q/RNcBJGQBWNYxbLFg95giGngh0RsUh+tG6p0=; b=EYZy2Usy4RUI77cVucQpcUpik+hnTYKI7sk8KnhayUGyeFOiVxoM1YYAPenNlq/GhBkSwz taFSxGf4Gdzzc3mt8VaZLSXwxWr9MQxCGWr6Ukp/+NU876B5RczaxKi0NmL6e9C7wuPh6H WiAvECFCBfzKnewDGWH/GPRTpdKbvEE= 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-410-zJu3RCx8PLGoWLXqC3reOQ-1; Thu, 19 Dec 2019 07:24:31 -0500 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 C9673184BECD for ; Thu, 19 Dec 2019 12:24:30 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B90F460C18; Thu, 19 Dec 2019 12:24:28 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 103/132] meson: convert hw/9pfs Date: Thu, 19 Dec 2019 13:23:23 +0100 Message-Id: <1576758232-12439-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: zJu3RCx8PLGoWLXqC3reOQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Kconfig.host | 1 + Makefile.objs | 5 ----- Makefile.target | 1 - hw/9pfs/Kconfig | 4 ++++ hw/9pfs/Makefile.objs | 9 --------- hw/9pfs/meson.build | 20 ++++++++++++++++++++ hw/Makefile.objs | 6 ------ hw/meson.build | 1 + 8 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 hw/9pfs/Makefile.objs create mode 100644 hw/9pfs/meson.build delete mode 100644 hw/Makefile.objs diff --git a/Kconfig.host b/Kconfig.host index 55136e0..ce78e49 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -34,6 +34,7 @@ config VHOST_KERNEL config XEN bool select FSDEV_9P if VIRTFS + select 9PFS if VIRTFS config VIRTFS bool diff --git a/Makefile.objs b/Makefile.objs index c27b527..76326e9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -56,11 +56,6 @@ common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) endif -####################################################################### -# Target-independent parts used in system and user emulation - -common-obj-y = hw/ - ###################################################################### # Resource file for Windows executables version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o diff --git a/Makefile.target b/Makefile.target index 82f384c..eecb11e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -153,7 +153,6 @@ endif #CONFIG_BSD_USER ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o -obj-y += hw/ obj-y += memory.o obj-y += memory_mapping.o LIBS := $(libs_softmmu) $(LIBS) diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 3ae5749..d3ebd73 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -2,8 +2,12 @@ config FSDEV_9P bool depends on VIRTFS +config 9PFS + bool + config VIRTIO_9P bool default y depends on VIRTFS && VIRTIO select FSDEV_9P + select 9PFS diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs deleted file mode 100644 index 70ded6f..0000000 --- a/hw/9pfs/Makefile.objs +++ /dev/null @@ -1,9 +0,0 @@ -common-obj-y = 9p.o 9p-util.o -common-obj-y += 9p-local.o 9p-xattr.o -common-obj-y += 9p-xattr-user.o 9p-posix-acl.o -common-obj-y += coth.o cofs.o codir.o cofile.o -common-obj-y += coxattr.o 9p-synth.o -common-obj-y += 9p-proxy.o - -common-obj-$(CONFIG_XEN) += xen-9p-backend.o -obj-$(CONFIG_VIRTIO_9P) += virtio-9p-device.o diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build new file mode 100644 index 0000000..cc09426 --- /dev/null +++ b/hw/9pfs/meson.build @@ -0,0 +1,20 @@ +fs_ss = 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 3dc4dec..0000000 --- a/hw/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -ifeq ($(CONFIG_SOFTMMU), y) -devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/ -endif - -common-obj-y += $(devices-dirs-y) -obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index b2f8d6c..a79400b 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('9pfs') subdir('acpi') subdir('adc') subdir('audio') From patchwork Thu Dec 19 12:23:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="gb0eEH56"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drp45sY1z9sPc for ; Thu, 19 Dec 2019 23:31:08 +1100 (AEDT) Received: from localhost ([::1]:40118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuxO-0006s1-4w for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:31:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60793) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurC-0007zx-7U for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurA-0008Ck-Na for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32727 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurA-00089S-H2 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758280; 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=fnnXPT/mDA3xX40/wFT9/3Y27tp8pejr/mUmdgIE2Y4=; b=gb0eEH56mAdURHFyWx0Ua+6ZlMYdsZPThuwYT0gQn8+bM6K0B2+qlucvKTKDfwE86YaLhm +Nwj+ot2orSWefWV4SXSifxSuVHTUeYOo1aYo+mOMpsUpJ1upy1YUVutYg1Hcso2pr3WeP V2R08Ly/5OkuWr4/ar40JbwvtRNpbNQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-ksIJyq-vMv2wQxIs1HJ6mw-1; Thu, 19 Dec 2019 07:24:35 -0500 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 0ED36107AD45 for ; Thu, 19 Dec 2019 12:24:35 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DDA860C18; Thu, 19 Dec 2019 12:24:31 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 104/132] meson: convert target/s390x/gen-features.h Date: Thu, 19 Dec 2019 13:23:24 +0100 Message-Id: <1576758232-12439-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ksIJyq-vMv2wQxIs1HJ6mw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Needed already by tracepoints. Signed-off-by: Marc-André Lureau --- 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 | 8 ++++++++ 6 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 target/meson.build create mode 100644 target/s390x/meson.build diff --git a/meson.build b/meson.build index 58bc25c..378d2c0 100644 --- a/meson.build +++ b/meson.build @@ -639,6 +639,7 @@ subdir('monitor') subdir('net') subdir('replay') subdir('hw') +subdir('target') mods = [] block_mods = [] diff --git a/target/meson.build b/target/meson.build new file mode 100644 index 0000000..e29dd3e --- /dev/null +++ b/target/meson.build @@ -0,0 +1 @@ +subdir('s390x') diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index 3e27455..9b9accc 100644 --- a/target/s390x/Makefile.objs +++ b/target/s390x/Makefile.objs @@ -8,23 +8,3 @@ obj-$(CONFIG_SOFTMMU) += sigp.o obj-$(CONFIG_KVM) += kvm.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o - -# build and run feature list generator -feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/ -feat-dst = $(BUILD_DIR)/$(TARGET_DIR) -ifneq ($(MAKECMDGOALS),clean) -generated-files-y += $(feat-dst)gen-features.h -endif - -$(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -$(feat-dst)gen-features.h-timestamp: $(feat-dst)gen-features - $(call quiet-command,$< >$@,"GEN","$(TARGET_DIR)gen-features.h") - -$(feat-dst)gen-features: $(feat-src)gen-features.c - $(call quiet-command,$(HOST_CC) $(QEMU_INCLUDES) -o $@ $<,"CC","$(TARGET_DIR)gen-features") - -clean-target: - rm -f gen-features.h-timestamp - rm -f gen-features.h - rm -f gen-features diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h index da695a8..2a29475 100644 --- a/target/s390x/cpu_features.h +++ b/target/s390x/cpu_features.h @@ -16,7 +16,7 @@ #include "qemu/bitmap.h" #include "cpu_features_def.h" -#include "gen-features.h" +#include "target/s390x/gen-features.h" /* CPU features are announced via different ways */ typedef enum { diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index 88bd01a6..74d1f87 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -14,7 +14,7 @@ #define TARGET_S390X_CPU_MODELS_H #include "cpu_features.h" -#include "gen-features.h" +#include "target/s390x/gen-features.h" #include "hw/core/cpu.h" /* static CPU definition */ diff --git a/target/s390x/meson.build b/target/s390x/meson.build new file mode 100644 index 0000000..980f67c --- /dev/null +++ b/target/s390x/meson.build @@ -0,0 +1,8 @@ +gen_features = executable('gen-features', 'gen-features.c', native: true) + +gen_features_h = custom_target('gen-features.h', + output: 'gen-features.h', + capture: true, + command: gen_features) + +specific_ss.add(gen_features_h) From patchwork Thu Dec 19 12:23:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SWrIIqas"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds6r6WCNz9sQp for ; Thu, 19 Dec 2019 23:45:40 +1100 (AEDT) Received: from localhost ([::1]:40340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvBS-0001Eb-0p for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:45:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32993) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurI-00087g-EF for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurD-0008Qt-75 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:47 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:57966 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurC-0008Lr-Uj for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758282; 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=oZRYcmcm2zMP3xjEgp8csWkDkQVunkELrRkYZRsQpo0=; b=SWrIIqasGBCK8GeNr5nng4L5OI0LNv6Fin9ByYX7tK6XqNEeFqbSz1icxH13iJMSzoR1Jd n9kAEQMdbb9MohmPrztKmJ5w49bLIGPk363lv3PCKf4NexHkQNjJbRb98j7l4iMqVCqGFY VGCsUGKFGNmKl+vZcT1U+sbgVgHEGpI= 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-206-lejpbxePO86JW4yWt0MzaQ-1; Thu, 19 Dec 2019 07:24:40 -0500 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 99E0B107ACCC for ; Thu, 19 Dec 2019 12:24:39 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8447960C18; Thu, 19 Dec 2019 12:24:35 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 105/132] meson: convert hw/arch* Date: Thu, 19 Dec 2019 13:23:25 +0100 Message-Id: <1576758232-12439-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: lejpbxePO86JW4yWt0MzaQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 7 ------ hw/alpha/Makefile.objs | 1 - hw/alpha/meson.build | 8 +++++++ hw/arm/Makefile.objs | 53 ------------------------------------------ hw/arm/meson.build | 56 +++++++++++++++++++++++++++++++++++++++++++++ hw/cris/Makefile.objs | 2 -- hw/cris/meson.build | 5 ++++ hw/hppa/Makefile.objs | 1 - hw/hppa/meson.build | 4 ++++ hw/i386/Makefile.objs | 15 ------------ hw/i386/kvm/Makefile.objs | 1 - hw/i386/kvm/meson.build | 7 ++++++ hw/i386/meson.build | 22 ++++++++++++++++++ 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 | 2 -- hw/m68k/meson.build | 5 ++++ hw/meson.build | 23 +++++++++++++++++++ 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 | 33 -------------------------- hw/ppc/meson.build | 39 +++++++++++++++++++++++++++++++ hw/riscv/Makefile.objs | 13 ----------- hw/riscv/meson.build | 16 +++++++++++++ hw/s390x/Makefile.objs | 36 ----------------------------- hw/s390x/meson.build | 45 ++++++++++++++++++++++++++++++++++++ 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 | 1 + hw/xtensa/Makefile.objs | 5 ---- hw/xtensa/meson.build | 10 ++++++++ 50 files changed, 318 insertions(+), 210 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/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/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 eecb11e..a8e5902 100644 --- a/Makefile.target +++ b/Makefile.target @@ -169,13 +169,6 @@ LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) LIBS := $(LIBS) $(VIRGL_LIBS) -# Hardware support -ifeq ($(TARGET_NAME), sparc64) -obj-y += hw/sparc64/ -else -obj-y += hw/$(TARGET_BASE_ARCH)/ -endif - generated-files-y += hmp-commands.h hmp-commands-info.h endif # CONFIG_SOFTMMU diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs deleted file mode 100644 index 62fdf3e..0000000 --- a/hw/alpha/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_DP264) += dp264.o pci.o typhoon.o diff --git a/hw/alpha/meson.build b/hw/alpha/meson.build new file mode 100644 index 0000000..81ca215 --- /dev/null +++ b/hw/alpha/meson.build @@ -0,0 +1,8 @@ +alpha_ss = ss.source_set() +alpha_ss.add(when: 'CONFIG_DP264', if_true: files( + 'dp264.c', + 'pci.c', + 'typhoon.c', +)) + +hw_arch += {'alpha': alpha_ss} diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs deleted file mode 100644 index 43ce8d5..0000000 --- a/hw/arm/Makefile.objs +++ /dev/null @@ -1,53 +0,0 @@ -obj-y += boot.o -obj-$(CONFIG_PLATFORM_BUS) += sysbus-fdt.o -obj-$(CONFIG_ARM_VIRT) += virt.o -obj-$(CONFIG_ACPI) += virt-acpi-build.o -obj-$(CONFIG_DIGIC) += digic_boards.o -obj-$(CONFIG_EXYNOS4) += exynos4_boards.o -obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o -obj-$(CONFIG_HIGHBANK) += highbank.o -obj-$(CONFIG_INTEGRATOR) += integratorcp.o -obj-$(CONFIG_MAINSTONE) += mainstone.o -obj-$(CONFIG_MICROBIT) += microbit.o -obj-$(CONFIG_MUSICPAL) += musicpal.o -obj-$(CONFIG_NETDUINO2) += netduino2.o -obj-$(CONFIG_NSERIES) += nseries.o -obj-$(CONFIG_SX1) += omap_sx1.o -obj-$(CONFIG_CHEETAH) += palm.o -obj-$(CONFIG_GUMSTIX) += gumstix.o -obj-$(CONFIG_SPITZ) += spitz.o -obj-$(CONFIG_TOSA) += tosa.o -obj-$(CONFIG_Z2) += z2.o -obj-$(CONFIG_REALVIEW) += realview.o -obj-$(CONFIG_SBSA_REF) += sbsa-ref.o -obj-$(CONFIG_STELLARIS) += stellaris.o -obj-$(CONFIG_COLLIE) += collie.o -obj-$(CONFIG_VERSATILE) += versatilepb.o -obj-$(CONFIG_VEXPRESS) += vexpress.o -obj-$(CONFIG_ZYNQ) += xilinx_zynq.o -obj-$(CONFIG_SABRELITE) += sabrelite.o - -obj-$(CONFIG_ARM_V7M) += armv7m.o -obj-$(CONFIG_EXYNOS4) += exynos4210.o -obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o -obj-$(CONFIG_DIGIC) += digic.o -obj-$(CONFIG_OMAP) += omap1.o omap2.o -obj-$(CONFIG_STRONGARM) += strongarm.o -obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o -obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o -obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o -obj-$(CONFIG_XLNX_VERSAL) += xlnx-versal.o xlnx-versal-virt.o -obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o -obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o -obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o -obj-$(CONFIG_MPS2) += mps2.o -obj-$(CONFIG_MPS2) += mps2-tz.o -obj-$(CONFIG_MSF2) += msf2-soc.o -obj-$(CONFIG_MUSCA) += musca.o -obj-$(CONFIG_ARMSSE) += armsse.o -obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o -obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o -obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o diff --git a/hw/arm/meson.build b/hw/arm/meson.build new file mode 100644 index 0000000..9859331 --- /dev/null +++ b/hw/arm/meson.build @@ -0,0 +1,56 @@ +arm_ss = 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_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_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_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', 'xlnx-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', 'aspeed.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', 'smmuv3.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) +arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) + +hw_arch += {'arm': arm_ss} diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs deleted file mode 100644 index a4a27b3..0000000 --- a/hw/cris/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += boot.o -obj-$(CONFIG_AXIS) += axis_dev88.o diff --git a/hw/cris/meson.build b/hw/cris/meson.build new file mode 100644 index 0000000..dc808a4 --- /dev/null +++ b/hw/cris/meson.build @@ -0,0 +1,5 @@ +cris_ss = ss.source_set() +cris_ss.add(files('boot.c')) +cris_ss.add(when: 'CONFIG_AXIS', if_true: files('axis_dev88.c')) + +hw_arch += {'cris': cris_ss} diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs deleted file mode 100644 index 67838f5..0000000 --- a/hw/hppa/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_DINO) += pci.o machine.o dino.o diff --git a/hw/hppa/meson.build b/hw/hppa/meson.build new file mode 100644 index 0000000..392cf99 --- /dev/null +++ b/hw/hppa/meson.build @@ -0,0 +1,4 @@ +hppa_ss = ss.source_set() +hppa_ss.add(when: 'CONFIG_DINO', if_true: files('pci.c', 'machine.c', 'dino.c')) + +hw_arch += {'hppa': hppa_ss} diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs deleted file mode 100644 index 5d9c9ef..0000000 --- a/hw/i386/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -obj-$(CONFIG_KVM) += kvm/ -obj-y += multiboot.o -obj-y += pc.o -obj-$(CONFIG_I440FX) += pc_piix.o -obj-$(CONFIG_Q35) += pc_q35.o -obj-y += fw_cfg.o pc_sysfw.o -obj-y += x86-iommu.o -obj-$(CONFIG_VTD) += intel_iommu.o -obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o -obj-$(CONFIG_XEN) += ../xenpv/ xen/ -obj-$(CONFIG_VMPORT) += vmport.o -obj-$(CONFIG_VMMOUSE) += vmmouse.o - -obj-y += kvmvapic.o -obj-y += acpi-build.o diff --git a/hw/i386/kvm/Makefile.objs b/hw/i386/kvm/Makefile.objs deleted file mode 100644 index 4224ed9..0000000 --- a/hw/i386/kvm/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y += clock.o apic.o i8259.o ioapic.o i8254.o diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build new file mode 100644 index 0000000..731a357 --- /dev/null +++ b/hw/i386/kvm/meson.build @@ -0,0 +1,7 @@ +i386_ss.add(when: 'CONFIG_KVM', if_true: files( + 'apic.c', + 'clock.c', + 'i8254.c', + 'i8259.c', + 'ioapic.c', +)) diff --git a/hw/i386/meson.build b/hw/i386/meson.build new file mode 100644 index 0000000..e33cf58 --- /dev/null +++ b/hw/i386/meson.build @@ -0,0 +1,22 @@ +i386_ss = ss.source_set() +i386_ss.add(files( + 'acpi-build.c', + 'fw_cfg.c', + 'kvmvapic.c', + 'multiboot.c', + 'pc.c', + 'pc_sysfw.c', + 'x86-iommu.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_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')) + +subdir('kvm') +subdir('xen') + +hw_arch += {'i386': i386_ss} diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs deleted file mode 100644 index be9d10c..0000000 --- a/hw/i386/xen/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y += xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o xen-mapcache.o diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build new file mode 100644 index 0000000..be84130 --- /dev/null +++ b/hw/i386/xen/meson.build @@ -0,0 +1,7 @@ +i386_ss.add(when: 'CONFIG_XEN', if_true: files( + 'xen-hvm.c', + 'xen-mapcache.c', + 'xen_apic.c', + 'xen_platform.c', + 'xen_pvdevice.c', +)) diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs deleted file mode 100644 index c394186..0000000 --- a/hw/lm32/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -# LM32 boards -obj-$(CONFIG_LM32) += lm32_boards.o -obj-$(CONFIG_MILKYMIST) += milkymist.o diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build new file mode 100644 index 0000000..8caf0a7 --- /dev/null +++ b/hw/lm32/meson.build @@ -0,0 +1,6 @@ +lm32_ss = 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 += {'lm32': lm32_ss} diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs deleted file mode 100644 index 482f847..0000000 --- a/hw/m68k/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_AN5206) += an5206.o mcf5206.o -obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o diff --git a/hw/m68k/meson.build b/hw/m68k/meson.build new file mode 100644 index 0000000..fd8f744 --- /dev/null +++ b/hw/m68k/meson.build @@ -0,0 +1,5 @@ +m68k_ss = 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')) + +hw_arch += {'m68k': m68k_ss} diff --git a/hw/meson.build b/hw/meson.build index a79400b..7d8ff92 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -39,3 +39,26 @@ subdir('vfio') subdir('virtio') subdir('watchdog') subdir('xen') + +subdir('alpha') +subdir('arm') +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('s390x') +subdir('sh4') +subdir('sparc') +subdir('sparc64') +subdir('tricore') +subdir('unicore32') +subdir('xenpv') +subdir('xtensa') diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs deleted file mode 100644 index 8595a62..0000000 --- a/hw/microblaze/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o -obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o -obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-zynqmp-pmu.o -obj-y += boot.o diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build new file mode 100644 index 0000000..bb9e4eb --- /dev/null +++ b/hw/microblaze/meson.build @@ -0,0 +1,7 @@ +microblaze_ss = ss.source_set() +microblaze_ss.add(files('boot.c')) +microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true: files('petalogix_s3adsp1800_mmu.c')) +microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true: files('petalogix_ml605_mmu.c')) +microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-zynqmp-pmu.c')) + +hw_arch += {'microblaze': microblaze_ss} diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs deleted file mode 100644 index 525809a..0000000 --- a/hw/mips/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y += addr.o mips_int.o -obj-$(CONFIG_R4K) += mips_r4k.o -obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o -obj-$(CONFIG_MIPSSIM) += mips_mipssim.o -obj-$(CONFIG_JAZZ) += mips_jazz.o -obj-$(CONFIG_FULONG) += mips_fulong2e.o -obj-$(CONFIG_MIPS_CPS) += cps.o -obj-$(CONFIG_MIPS_BOSTON) += boston.o diff --git a/hw/mips/meson.build b/hw/mips/meson.build new file mode 100644 index 0000000..06adda2 --- /dev/null +++ b/hw/mips/meson.build @@ -0,0 +1,11 @@ +mips_ss = ss.source_set() +mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(when: 'CONFIG_FULONG', if_true: files('mips_fulong2e.c')) +mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('mips_jazz.c')) +mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'mips_malta.c')) +mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mips_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('mips_r4k.c')) + +hw_arch += {'mips': mips_ss} diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs deleted file mode 100644 index ddbf300..0000000 --- a/hw/moxie/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -# moxie boards -obj-$(CONFIG_MOXIESIM) += moxiesim.o diff --git a/hw/moxie/meson.build b/hw/moxie/meson.build new file mode 100644 index 0000000..05a7c2e --- /dev/null +++ b/hw/moxie/meson.build @@ -0,0 +1,4 @@ +moxie_ss = ss.source_set() +moxie_ss.add(when: 'CONFIG_MOXIESIM', if_true: files('moxiesim.c')) + +hw_arch += {'moxie': moxie_ss} diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs deleted file mode 100644 index 3e01798..0000000 --- a/hw/nios2/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y = boot.o cpu_pic.o -obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o -obj-$(CONFIG_NIOS2_GENERIC_NOMMU) += generic_nommu.o diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build new file mode 100644 index 0000000..dd66ebb --- /dev/null +++ b/hw/nios2/meson.build @@ -0,0 +1,6 @@ +nios2_ss = 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_nommu.c')) + +hw_arch += {'nios2': nios2_ss} diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs deleted file mode 100644 index aa04de7..0000000 --- a/hw/openrisc/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y = pic_cpu.o cputimer.o -obj-$(CONFIG_OR1K_SIM) += openrisc_sim.o diff --git a/hw/openrisc/meson.build b/hw/openrisc/meson.build new file mode 100644 index 0000000..57c4255 --- /dev/null +++ b/hw/openrisc/meson.build @@ -0,0 +1,5 @@ +openrisc_ss = 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 += {'openrisc': openrisc_ss} diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs deleted file mode 100644 index 2c4e1c8..0000000 --- a/hw/ppc/Makefile.objs +++ /dev/null @@ -1,33 +0,0 @@ -# shared objects -obj-y += ppc.o ppc_booke.o fdt.o fw_cfg.o -# IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o -obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o -obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o -obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o -obj-$(CONFIG_PSERIES) += spapr_tpm_proxy.o -obj-$(CONFIG_SPAPR_RNG) += spapr_rng.o -# IBM PowerNV -obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o -ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy) -obj-y += spapr_pci_vfio.o spapr_pci_nvlink2.o -endif -obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o -# PowerPC 4xx boards -obj-$(CONFIG_PPC405) += ppc405_boards.o ppc405_uc.o -obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o -obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc4xx_devs.o -obj-$(CONFIG_SAM460EX) += sam460ex.o -# PReP -obj-$(CONFIG_PREP) += prep.o -obj-$(CONFIG_PREP) += prep_systemio.o -obj-${CONFIG_RS6000_MC} += rs6000_mc.o -# OldWorld PowerMac -obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o -# NewWorld PowerMac -obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o -# e500 -obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o -obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o -# PowerPC 440 Xilinx ML507 reference board. -obj-$(CONFIG_VIRTEX) += virtex_ml507.o diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build new file mode 100644 index 0000000..6e2fdbb --- /dev/null +++ b/hw/ppc/meson.build @@ -0,0 +1,39 @@ +ppc_ss = ss.source_set() +ppc_ss.add(files( + 'fdt.c', + 'fw_cfg.c', + 'ppc.c', + 'ppc_booke.c', +)) + +# IBM pSeries (sPAPR) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c', 'spapr_caps.c', 'spapr_vio.c', 'spapr_events.c')) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: [files('spapr_hcall.c', 'spapr_iommu.c', 'spapr_rtas.c'), fdt]) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_pci.c', 'spapr_rtc.c', 'spapr_drc.c')) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_cpu_core.c', 'spapr_ovec.c', 'spapr_irq.c', 'spapr_tpm_proxy.c')) +ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.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')) +ppc_ss.add(when: ['CONFIG_PCI', 'CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files('spapr_pci_vfio.c', 'spapr_pci_nvlink2.c')) +ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_rtas_ddw.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 += {'ppc': ppc_ss} diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs deleted file mode 100644 index eb9d4f9..0000000 --- a/hw/riscv/Makefile.objs +++ /dev/null @@ -1,13 +0,0 @@ -obj-y += boot.o -obj-$(CONFIG_SPIKE) += riscv_htif.o -obj-$(CONFIG_HART) += riscv_hart.o -obj-$(CONFIG_SIFIVE_E) += sifive_e.o -obj-$(CONFIG_SIFIVE) += sifive_clint.o -obj-$(CONFIG_SIFIVE) += sifive_gpio.o -obj-$(CONFIG_SIFIVE) += sifive_prci.o -obj-$(CONFIG_SIFIVE) += sifive_plic.o -obj-$(CONFIG_SIFIVE) += sifive_test.o -obj-$(CONFIG_SIFIVE_U) += sifive_u.o -obj-$(CONFIG_SIFIVE) += sifive_uart.o -obj-$(CONFIG_SPIKE) += spike.o -obj-$(CONFIG_RISCV_VIRT) += virt.o diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build new file mode 100644 index 0000000..8a43eca --- /dev/null +++ b/hw/riscv/meson.build @@ -0,0 +1,16 @@ +riscv_ss = 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_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_prci.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_U', if_true: files('sifive_u.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 += {'riscv': riscv_ss} diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs deleted file mode 100644 index e02ed80..0000000 --- a/hw/s390x/Makefile.objs +++ /dev/null @@ -1,36 +0,0 @@ -obj-y += s390-virtio-hcall.o -obj-y += sclp.o -obj-y += event-facility.o -obj-y += sclpquiesce.o -obj-y += sclpcpu.o -obj-y += ipl.o -obj-y += css.o -obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o -obj-$(CONFIG_TERMINAL3270) += 3270-ccw.o -ifeq ($(CONFIG_VIRTIO_CCW),y) -obj-y += virtio-ccw.o -obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o -obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o -obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o -obj-$(CONFIG_VIRTIO_RNG) += virtio-ccw-rng.o -obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-ccw-crypto.o -obj-$(CONFIG_VIRTIO_GPU) += virtio-ccw-gpu.o -obj-$(CONFIG_VIRTIO_INPUT) += virtio-ccw-input.o -obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o -obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o -obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o -obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o -endif -obj-y += css-bridge.o -obj-y += ccw-device.o -obj-y += s390-pci-bus.o s390-pci-inst.o -obj-y += s390-skeys.o -obj-y += s390-stattrib.o -obj-y += tod.o -obj-y += tod-qemu.o -obj-$(CONFIG_KVM) += tod-kvm.o -obj-$(CONFIG_KVM) += s390-skeys-kvm.o -obj-$(CONFIG_KVM) += s390-stattrib-kvm.o -obj-y += s390-ccw.o -obj-y += ap-device.o -obj-y += ap-bridge.o diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build new file mode 100644 index 0000000..f9a0bf8 --- /dev/null +++ b/hw/s390x/meson.build @@ -0,0 +1,45 @@ +s390x_ss = 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', +)) +s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c')) +s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) + +virtio_ss = ss.source_set() +virtio_ss.add(files('virtio-ccw.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-ccw-balloon.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-crypto.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-input.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-serial.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 += {'s390x': s390x_ss} diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs deleted file mode 100644 index 2a707f9..0000000 --- a/hw/sh4/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += sh7750.o sh7750_regnames.o -obj-y += sh_pci.o -obj-$(CONFIG_R2D) += r2d.o -obj-$(CONFIG_SHIX) += shix.o diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build new file mode 100644 index 0000000..303c0f4 --- /dev/null +++ b/hw/sh4/meson.build @@ -0,0 +1,10 @@ +sh4_ss = 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 += {'sh4': sh4_ss} diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs deleted file mode 100644 index d57e33f..0000000 --- a/hw/sparc/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_SUN4M) += sun4m_iommu.o -obj-$(CONFIG_SUN4M) += sun4m.o -obj-$(CONFIG_LEON3) += leon3.o diff --git a/hw/sparc/meson.build b/hw/sparc/meson.build new file mode 100644 index 0000000..19c442c --- /dev/null +++ b/hw/sparc/meson.build @@ -0,0 +1,6 @@ +sparc_ss = 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 += {'sparc': sparc_ss} diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs deleted file mode 100644 index af0525c..0000000 --- a/hw/sparc64/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += sparc64.o -obj-$(CONFIG_SUN4U) += sun4u_iommu.o -obj-$(CONFIG_SUN4U) += sun4u.o -obj-$(CONFIG_NIAGARA) += niagara.o diff --git a/hw/sparc64/meson.build b/hw/sparc64/meson.build new file mode 100644 index 0000000..58b5504 --- /dev/null +++ b/hw/sparc64/meson.build @@ -0,0 +1,6 @@ +sparc64_ss = 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_iommu.c')) + +hw_arch += {'sparc64': sparc64_ss} diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs deleted file mode 100644 index 5501f6c..0000000 --- a/hw/tricore/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_TRICORE) += tricore_testboard.o diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build new file mode 100644 index 0000000..579aa13 --- /dev/null +++ b/hw/tricore/meson.build @@ -0,0 +1,4 @@ +tricore_ss = ss.source_set() +tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c')) + +hw_arch += {'tricore': tricore_ss} diff --git a/hw/unicore32/Makefile.objs b/hw/unicore32/Makefile.objs deleted file mode 100644 index e0fd628..0000000 --- a/hw/unicore32/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -# For UniCore32 machines and boards - -# PKUnity-v3 SoC and board information -obj-${CONFIG_PUV3} += puv3.o diff --git a/hw/unicore32/meson.build b/hw/unicore32/meson.build new file mode 100644 index 0000000..fc26d6b --- /dev/null +++ b/hw/unicore32/meson.build @@ -0,0 +1,5 @@ +unicore32_ss = ss.source_set() +# PKUnity-v3 SoC and board information +unicore32_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3.c')) + +hw_arch += {'unicore32': unicore32_ss} diff --git a/hw/xenpv/Makefile.objs b/hw/xenpv/Makefile.objs deleted file mode 100644 index 8bfa458..0000000 --- a/hw/xenpv/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -# Xen PV machine support -obj-$(CONFIG_XEN) += xen_machine_pv.o diff --git a/hw/xenpv/meson.build b/hw/xenpv/meson.build new file mode 100644 index 0000000..d269a83 --- /dev/null +++ b/hw/xenpv/meson.build @@ -0,0 +1 @@ +i386_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 0bbfccd..0000000 --- a/hw/xtensa/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += mx_pic.o -obj-y += pic_cpu.o -obj-y += xtensa_memory.o -obj-$(CONFIG_XTENSA_SIM) += sim.o -obj-$(CONFIG_XTENSA_XTFPGA) += xtfpga.o diff --git a/hw/xtensa/meson.build b/hw/xtensa/meson.build new file mode 100644 index 0000000..b122f34 --- /dev/null +++ b/hw/xtensa/meson.build @@ -0,0 +1,10 @@ +xtensa_ss = 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_XTFPGA', if_true: files('xtfpga.c')) + +hw_arch += {'xtensa': xtensa_ss} From patchwork Thu Dec 19 12:23:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Y4KqTGre"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drsj6jfLz9sPc for ; Thu, 19 Dec 2019 23:34:17 +1100 (AEDT) Received: from localhost ([::1]:40186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv0R-0002LF-87 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:34:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33248) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurO-0008D6-DQ for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurI-0000HL-U2 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:53 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:44276 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurH-0000Dq-0a for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758285; 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=C7p6CsNf36RV2pEl5d2Wfr1jzcofXYk0f3MxvYkhmYI=; b=Y4KqTGreIvsBoCmZSKF4We7CqFoek71L2q65nv6Res0x0mlwN1WqWkRqBECPmDFTa8IhET qgLpLCgz7+7vVYf08ZVlU4toZUZ9BaM7jIRfmDxt1U3S/wiupWUOcswmrWGXNZxdaJok/9 hvIOqNSRdRJeae9q8Jm9+GReWr0jFm8= 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-272-CxBu_yi1OJqYmzpXLHxyVA-1; Thu, 19 Dec 2019 07:24:44 -0500 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 7BCCE184BEE9 for ; Thu, 19 Dec 2019 12:24:43 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64FE360C18; Thu, 19 Dec 2019 12:24:40 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 106/132] meson: target Date: Thu, 19 Dec 2019 13:23:26 +0100 Message-Id: <1576758232-12439-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: CxBu_yi1OJqYmzpXLHxyVA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 3 +-- libdecnumber/Makefile.objs | 5 ---- libdecnumber/meson.build | 7 ++++++ meson.build | 5 ++++ scripts/decodetree.py | 2 +- target/alpha/Makefile.objs | 4 ---- target/alpha/meson.build | 18 ++++++++++++++ target/arm/Makefile.objs | 45 ---------------------------------- target/arm/meson.build | 53 +++++++++++++++++++++++++++++++++++++++++ target/arm/translate-sve.c | 2 +- target/arm/translate-vfp.inc.c | 4 ++-- 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 | 22 ----------------- target/i386/hvf/Makefile.objs | 2 -- target/i386/hvf/meson.build | 12 ++++++++++ target/i386/meson.build | 41 +++++++++++++++++++++++++++++++ target/lm32/Makefile.objs | 4 ---- target/lm32/meson.build | 15 ++++++++++++ target/m68k/Makefile.objs | 5 ---- target/m68k/meson.build | 17 +++++++++++++ target/meson.build | 20 ++++++++++++++++ target/microblaze/Makefile.objs | 3 --- target/microblaze/meson.build | 14 +++++++++++ target/mips/Makefile.objs | 5 ---- target/mips/meson.build | 22 +++++++++++++++++ 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 | 23 ------------------ target/riscv/meson.build | 30 +++++++++++++++++++++++ target/riscv/translate.c | 4 ++-- 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 | 14 +++++++++++ target/unicore32/Makefile.objs | 8 ------- target/unicore32/meson.build | 14 +++++++++++ target/xtensa/Makefile.objs | 16 ------------- target/xtensa/meson.build | 30 +++++++++++++++++++++++ 56 files changed, 535 insertions(+), 231 deletions(-) delete mode 100644 libdecnumber/Makefile.objs create mode 100644 libdecnumber/meson.build 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/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/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 a8e5902..bc5a019 100644 --- a/Makefile.target +++ b/Makefile.target @@ -116,7 +116,6 @@ obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-$(CONFIG_TCG) += fpu/softfloat.o -obj-y += target/$(TARGET_BASE_ARCH)/ obj-y += disas.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o LIBS := $(libs_cpu) $(LIBS) @@ -167,7 +166,7 @@ LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOM LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) -LIBS := $(LIBS) $(VIRGL_LIBS) +LIBS := $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS) generated-files-y += hmp-commands.h hmp-commands-info.h diff --git a/libdecnumber/Makefile.objs b/libdecnumber/Makefile.objs deleted file mode 100644 index d81db04..0000000 --- a/libdecnumber/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += decContext.o -obj-y += decNumber.o -obj-y += dpd/decimal32.o -obj-y += dpd/decimal64.o -obj-y += dpd/decimal128.o diff --git a/libdecnumber/meson.build b/libdecnumber/meson.build new file mode 100644 index 0000000..4d04139 --- /dev/null +++ b/libdecnumber/meson.build @@ -0,0 +1,7 @@ +libdecnumber = files( + 'decContext.c', + 'decNumber.c', + 'dpd/decimal128.c', + 'dpd/decimal32.c', + 'dpd/decimal64.c', +) diff --git a/meson.build b/meson.build index 378d2c0..c8428c0 100644 --- a/meson.build +++ b/meson.build @@ -35,6 +35,10 @@ configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', configuration: config_host) +decodetree = generator(find_program('scripts/decodetree.py'), + output: 'decode-@BASENAME@.inc', + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) + m = cc.find_library('m', required: false) util = cc.find_library('util', required: false) winmm = [] @@ -639,6 +643,7 @@ subdir('monitor') subdir('net') subdir('replay') subdir('hw') +subdir('libdecnumber') subdir('target') mods = [] diff --git a/scripts/decodetree.py b/scripts/decodetree.py index d8c59ca..1ff4878 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -1198,7 +1198,7 @@ def main(): long_opts = ['decode=', 'translate=', 'output=', 'insnwidth=', 'static-decode=', 'varinsnwidth='] try: - (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts) + (opts, args) = getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opts) except getopt.GetoptError as err: error(0, err) for o, a in opts: diff --git a/target/alpha/Makefile.objs b/target/alpha/Makefile.objs deleted file mode 100644 index 6366462..0000000 --- a/target/alpha/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_SOFTMMU) += machine.o -obj-y += translate.o helper.o cpu.o -obj-y += int_helper.o fpu_helper.o vax_helper.o sys_helper.o mem_helper.o -obj-y += gdbstub.o diff --git a/target/alpha/meson.build b/target/alpha/meson.build new file mode 100644 index 0000000..1aec55a --- /dev/null +++ b/target/alpha/meson.build @@ -0,0 +1,18 @@ +alpha_ss = 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 = ss.source_set() +alpha_softmmu_ss.add(files('machine.c')) + +target_arch += {'alpha': alpha_ss} +target_softmmu_arch += {'alpha': alpha_softmmu_ss} diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs deleted file mode 100644 index 5cafc1e..0000000 --- a/target/arm/Makefile.objs +++ /dev/null @@ -1,45 +0,0 @@ -obj-$(CONFIG_TCG) += arm-semi.o -obj-y += helper.o vfp_helper.o -obj-y += cpu.o gdbstub.o -obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o - -obj-$(CONFIG_SOFTMMU) += machine.o arch_dump.o monitor.o -obj-$(CONFIG_SOFTMMU) += arm-powerctl.o - -obj-$(CONFIG_KVM) += kvm.o -obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o -obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o - -DECODETREE = $(SRC_PATH)/scripts/decodetree.py - -target/arm/decode-sve.inc.c: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --decode disas_sve -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/decode-vfp.inc.c: $(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.c: $(SRC_PATH)/target/arm/vfp-uncond.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\ - "GEN", $(TARGET_DIR)$@) - -target/arm/translate-sve.o: target/arm/decode-sve.inc.c -target/arm/translate.o: target/arm/decode-vfp.inc.c -target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c - -obj-y += tlb_helper.o debug_helper.o -obj-y += translate.o op_helper.o -obj-y += crypto_helper.o -obj-y += iwmmxt_helper.o vec_helper.o neon_helper.o -obj-y += m_helper.o - -obj-$(CONFIG_SOFTMMU) += psci.o - -obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o -obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o -obj-$(TARGET_AARCH64) += pauth_helper.o diff --git a/target/arm/meson.build b/target/arm/meson.build new file mode 100644 index 0000000..7a612d9 --- /dev/null +++ b/target/arm/meson.build @@ -0,0 +1,53 @@ +gen = [ + decodetree.process('sve.decode', extra_args: '--decode=disas_sve'), + decodetree.process('vfp.decode', extra_args: '--static-decode=disas_vfp'), + decodetree.process('vfp-uncond.decode', extra_args: '--static-decode=disas_vfp_uncond'), +] + +arm_ss = 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', +)) +arm_ss.add(zlib) + +arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) + +kvm_ss = ss.source_set() +kvm_ss.add(when: 'TARGET_AARCH64', if_true: 'kvm64.c', if_false: 'kvm32.c') +arm_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss) +arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', + 'helper-a64.c', + 'pauth_helper.c', + 'sve_helper.c', + 'translate-a64.c', + 'translate-sve.c', +)) + +arm_softmmu_ss = ss.source_set() +arm_softmmu_ss.add(files( + 'arch_dump.c', + 'arm-powerctl.c', + 'machine.c', + 'monitor.c', + 'psci.c', +)) + +target_arch += {'arm': arm_ss} +target_softmmu_arch += {'arm': arm_softmmu_ss} diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index fa068b0..f8acb26 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. */ -#include "decode-sve.inc.c" +#include "decode-sve.inc" /* * 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.c index 3e8ea80..c0f92ad 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -27,8 +27,8 @@ */ /* 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" /* * The imm8 encodes the sign bit, enough bits to represent an exponent in diff --git a/target/cris/Makefile.objs b/target/cris/Makefile.objs deleted file mode 100644 index 7779227..0000000 --- a/target/cris/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += gdbstub.o -obj-$(CONFIG_SOFTMMU) += mmu.o machine.o diff --git a/target/cris/meson.build b/target/cris/meson.build new file mode 100644 index 0000000..67c3793 --- /dev/null +++ b/target/cris/meson.build @@ -0,0 +1,14 @@ +cris_ss = ss.source_set() +cris_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +cris_softmmu_ss = ss.source_set() +cris_softmmu_ss.add(files('mmu.c', 'machine.c')) + +target_arch += {'cris': cris_ss} +target_softmmu_arch += {'cris': cris_softmmu_ss} diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs deleted file mode 100644 index 174f50a..0000000 --- a/target/hppa/Makefile.objs +++ /dev/null @@ -1,11 +0,0 @@ -obj-y += translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o -obj-y += int_helper.o -obj-$(CONFIG_SOFTMMU) += machine.o - -DECODETREE = $(SRC_PATH)/scripts/decodetree.py - -target/hppa/decode.inc.c: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) - -target/hppa/translate.o: target/hppa/decode.inc.c diff --git a/target/hppa/meson.build b/target/hppa/meson.build new file mode 100644 index 0000000..8a7ff82 --- /dev/null +++ b/target/hppa/meson.build @@ -0,0 +1,19 @@ +gen = decodetree.process('insns.decode') + +hppa_ss = 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 = ss.source_set() +hppa_softmmu_ss.add(files('machine.c')) + +target_arch += {'hppa': hppa_ss} +target_softmmu_arch += {'hppa': hppa_softmmu_ss} diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 8c61895..2f17259 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -334,7 +334,7 @@ static int expand_shl11(DisasContext *ctx, int val) /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode-insns.inc" /* 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 48e0c28..0000000 --- a/target/i386/Makefile.objs +++ /dev/null @@ -1,22 +0,0 @@ -obj-y += helper.o cpu.o gdbstub.o xsave_helper.o -obj-$(CONFIG_TCG) += translate.o -obj-$(CONFIG_TCG) += bpt_helper.o cc_helper.o excp_helper.o fpu_helper.o -obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o mpx_helper.o -obj-$(CONFIG_TCG) += seg_helper.o smm_helper.o svm_helper.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o -ifeq ($(CONFIG_SOFTMMU),y) -obj-y += machine.o arch_memory_mapping.o arch_dump.o monitor.o -obj-$(CONFIG_KVM) += kvm.o -obj-$(CONFIG_HYPERV) += hyperv.o -obj-$(call lnot,$(CONFIG_HYPERV)) += hyperv-stub.o -ifeq ($(CONFIG_WIN32),y) -obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o -endif -ifeq ($(CONFIG_POSIX),y) -obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-posix.o -endif -obj-$(CONFIG_HVF) += hvf/ -obj-$(CONFIG_WHPX) += whpx-all.o -endif -obj-$(CONFIG_SEV) += sev.o -obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o diff --git a/target/i386/hvf/Makefile.objs b/target/i386/hvf/Makefile.objs deleted file mode 100644 index 927b86b..0000000 --- a/target/i386/hvf/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += hvf.o -obj-y += x86.o x86_cpuid.o x86_decode.o x86_descr.o x86_emu.o x86_flags.o x86_mmu.o x86hvf.o x86_task.o diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build new file mode 100644 index 0000000..c8a4371 --- /dev/null +++ b/target/i386/hvf/meson.build @@ -0,0 +1,12 @@ +i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files( + 'hvf.c', + 'x86.c', + 'x86_cpuid.c', + 'x86_decode.c', + 'x86_descr.c', + 'x86_emu.c', + 'x86_flags.c', + 'x86_mmu.c', + 'x86_task.c', + 'x86hvf.c', +)) diff --git a/target/i386/meson.build b/target/i386/meson.build new file mode 100644 index 0000000..58a70da --- /dev/null +++ b/target/i386/meson.build @@ -0,0 +1,41 @@ +i386_ss = 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', +)) +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 = 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 += {'i386': i386_ss} +target_softmmu_arch += {'i386': i386_softmmu_ss} diff --git a/target/lm32/Makefile.objs b/target/lm32/Makefile.objs deleted file mode 100644 index c3e1bd6..0000000 --- a/target/lm32/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += gdbstub.o -obj-y += lm32-semi.o -obj-$(CONFIG_SOFTMMU) += machine.o diff --git a/target/lm32/meson.build b/target/lm32/meson.build new file mode 100644 index 0000000..ef0eef0 --- /dev/null +++ b/target/lm32/meson.build @@ -0,0 +1,15 @@ +lm32_ss = ss.source_set() +lm32_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'lm32-semi.c', + 'op_helper.c', + 'translate.c', +)) + +lm32_softmmu_ss = ss.source_set() +lm32_softmmu_ss.add(files('machine.c')) + +target_arch += {'lm32': lm32_ss} +target_softmmu_arch += {'lm32': lm32_softmmu_ss} diff --git a/target/m68k/Makefile.objs b/target/m68k/Makefile.objs deleted file mode 100644 index ac61948..0000000 --- a/target/m68k/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += m68k-semi.o -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += fpu_helper.o softfloat.o -obj-y += gdbstub.o -obj-$(CONFIG_SOFTMMU) += monitor.o diff --git a/target/m68k/meson.build b/target/m68k/meson.build new file mode 100644 index 0000000..05cd9fb --- /dev/null +++ b/target/m68k/meson.build @@ -0,0 +1,17 @@ +m68k_ss = 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 = ss.source_set() +m68k_softmmu_ss.add(files('monitor.c')) + +target_arch += {'m68k': m68k_ss} +target_softmmu_arch += {'m68k': m68k_softmmu_ss} diff --git a/target/meson.build b/target/meson.build index e29dd3e..d98d276 100644 --- a/target/meson.build +++ b/target/meson.build @@ -1 +1,21 @@ +subdir('alpha') +subdir('arm') +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('s390x') +subdir('sh4') +subdir('sparc') +subdir('tilegx') +subdir('tricore') +subdir('unicore32') +subdir('xtensa') diff --git a/target/microblaze/Makefile.objs b/target/microblaze/Makefile.objs deleted file mode 100644 index f3d7b44..0000000 --- a/target/microblaze/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += gdbstub.o -obj-$(CONFIG_SOFTMMU) += mmu.o diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build new file mode 100644 index 0000000..b8fe4af --- /dev/null +++ b/target/microblaze/meson.build @@ -0,0 +1,14 @@ +microblaze_ss = ss.source_set() +microblaze_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +microblaze_softmmu_ss = ss.source_set() +microblaze_softmmu_ss.add(files('mmu.c')) + +target_arch += {'microblaze': microblaze_ss} +target_softmmu_arch += {'microblaze': microblaze_softmmu_ss} diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs deleted file mode 100644 index 3448ad5..0000000 --- a/target/mips/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o -obj-y += gdbstub.o msa_helper.o -obj-$(CONFIG_SOFTMMU) += mips-semi.o -obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o -obj-$(CONFIG_KVM) += kvm.o diff --git a/target/mips/meson.build b/target/mips/meson.build new file mode 100644 index 0000000..ad35f00 --- /dev/null +++ b/target/mips/meson.build @@ -0,0 +1,22 @@ +mips_ss = ss.source_set() +mips_ss.add(files( + 'cpu.c', + 'dsp_helper.c', + 'gdbstub.c', + 'helper.c', + 'lmi_helper.c', + 'msa_helper.c', + 'op_helper.c', + 'translate.c', +)) +mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) + +mips_softmmu_ss = ss.source_set() +mips_softmmu_ss.add(files( + 'cp0_timer.c', + 'machine.c', + 'mips-semi.c', +)) + +target_arch += {'mips': mips_ss} +target_softmmu_arch += {'mips': mips_softmmu_ss} diff --git a/target/moxie/Makefile.objs b/target/moxie/Makefile.objs deleted file mode 100644 index 6381d4d..0000000 --- a/target/moxie/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += translate.o helper.o machine.o cpu.o machine.o -obj-$(CONFIG_SOFTMMU) += mmu.o diff --git a/target/moxie/meson.build b/target/moxie/meson.build new file mode 100644 index 0000000..b4beb52 --- /dev/null +++ b/target/moxie/meson.build @@ -0,0 +1,14 @@ +moxie_ss = ss.source_set() +moxie_ss.add(files( + 'cpu.c', + 'helper.c', + 'machine.c', + 'machine.c', + 'translate.c', +)) + +moxie_softmmu_ss = ss.source_set() +moxie_softmmu_ss.add(files('mmu.c')) + +target_arch += {'moxie': moxie_ss} +target_softmmu_arch += {'moxie': moxie_softmmu_ss} diff --git a/target/nios2/Makefile.objs b/target/nios2/Makefile.objs deleted file mode 100644 index 010de0e..0000000 --- a/target/nios2/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o mmu.o nios2-semi.o -obj-$(CONFIG_SOFTMMU) += monitor.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) diff --git a/target/nios2/meson.build b/target/nios2/meson.build new file mode 100644 index 0000000..e643917 --- /dev/null +++ b/target/nios2/meson.build @@ -0,0 +1,15 @@ +nios2_ss = ss.source_set() +nios2_ss.add(files( + 'cpu.c', + 'helper.c', + 'mmu.c', + 'nios2-semi.c', + 'op_helper.c', + 'translate.c', +)) + +nios2_softmmu_ss = ss.source_set() +nios2_softmmu_ss.add(files('monitor.c')) + +target_arch += {'nios2': nios2_ss} +target_softmmu_arch += {'nios2': nios2_softmmu_ss} diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs deleted file mode 100644 index b5432f4..0000000 --- a/target/openrisc/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -obj-$(CONFIG_SOFTMMU) += machine.o -obj-y += cpu.o exception.o interrupt.o mmu.o translate.o disas.o -obj-y += exception_helper.o fpu_helper.o \ - interrupt_helper.o sys_helper.o -obj-y += gdbstub.o - -DECODETREE = $(SRC_PATH)/scripts/decodetree.py - -target/openrisc/decode.inc.c: \ - $(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE) - $(call quiet-command,\ - $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) - -target/openrisc/translate.o: target/openrisc/decode.inc.c -target/openrisc/disas.o: target/openrisc/decode.inc.c diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c index 7091832..4014518 100644 --- a/target/openrisc/disas.c +++ b/target/openrisc/disas.c @@ -25,7 +25,7 @@ typedef disassemble_info DisasContext; /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode-insns.inc" #define output(mnemonic, format, ...) \ (info->fprintf_func(info->stream, "%-9s " format, \ diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build new file mode 100644 index 0000000..9774a58 --- /dev/null +++ b/target/openrisc/meson.build @@ -0,0 +1,23 @@ +gen = decodetree.process('insns.decode') + +openrisc_ss = 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 = ss.source_set() +openrisc_softmmu_ss.add(files('machine.c')) + +target_arch += {'openrisc': openrisc_ss} +target_softmmu_arch += {'openrisc': openrisc_softmmu_ss} diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 4360ce4..9add656 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -60,7 +60,7 @@ static inline bool is_user(DisasContext *dc) } /* Include the auto-generated decoder. */ -#include "decode.inc.c" +#include "decode-insns.inc" static TCGv cpu_sr; static TCGv cpu_R[32]; diff --git a/target/ppc/Makefile.objs b/target/ppc/Makefile.objs deleted file mode 100644 index e8fa18c..0000000 --- a/target/ppc/Makefile.objs +++ /dev/null @@ -1,20 +0,0 @@ -obj-y += cpu-models.o -obj-y += cpu.o -obj-y += translate.o -ifeq ($(CONFIG_SOFTMMU),y) -obj-y += machine.o mmu_helper.o mmu-hash32.o monitor.o arch_dump.o -obj-$(TARGET_PPC64) += mmu-hash64.o mmu-book3s-v3.o compat.o -obj-$(TARGET_PPC64) += mmu-radix64.o -endif -obj-$(CONFIG_KVM) += kvm.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o -obj-y += dfp_helper.o -obj-y += excp_helper.o -obj-y += fpu_helper.o -obj-y += int_helper.o -obj-y += timebase_helper.o -obj-y += misc_helper.o -obj-y += mem_helper.o -obj-y += ../../libdecnumber/ -obj-$(CONFIG_USER_ONLY) += user_only_helper.o -obj-y += gdbstub.o diff --git a/target/ppc/meson.build b/target/ppc/meson.build new file mode 100644 index 0000000..bbfef90 --- /dev/null +++ b/target/ppc/meson.build @@ -0,0 +1,37 @@ +ppc_ss = 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('kvm-stub.c')) +ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c')) + +ppc_softmmu_ss = 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 += {'ppc': ppc_ss} +target_softmmu_arch += {'ppc': ppc_softmmu_ss} diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs deleted file mode 100644 index b1c79bc..0000000 --- a/target/riscv/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -obj-y += translate.o op_helper.o cpu_helper.o cpu.o csr.o fpu_helper.o gdbstub.o pmp.o - -DECODETREE = $(SRC_PATH)/scripts/decodetree.py - -decode32-y = $(SRC_PATH)/target/riscv/insn32.decode -decode32-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn32-64.decode - -decode16-y = $(SRC_PATH)/target/riscv/insn16.decode -decode16-$(TARGET_RISCV32) += $(SRC_PATH)/target/riscv/insn16-32.decode -decode16-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn16-64.decode - -target/riscv/decode_insn32.inc.c: $(decode32-y) $(DECODETREE) - $(call quiet-command, \ - $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \ - $(decode32-y), "GEN", $(TARGET_DIR)$@) - -target/riscv/decode_insn16.inc.c: $(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.c \ - target/riscv/decode_insn16.inc.c diff --git a/target/riscv/meson.build b/target/riscv/meson.build new file mode 100644 index 0000000..1a7ad20 --- /dev/null +++ b/target/riscv/meson.build @@ -0,0 +1,30 @@ +# FIXME extra_args should accept files() +dir = meson.current_source_dir() +gen32 = [ + decodetree.process('insn16.decode', extra_args: [dir / 'insn16-32.decode', '--static-decode=decode_insn16', '--insnwidth=16']), + decodetree.process('insn32.decode', extra_args: '--static-decode=decode_insn32'), +] + +gen64 = [ + decodetree.process('insn16.decode', extra_args: [dir / 'insn16-64.decode', '--static-decode=decode_insn16', '--insnwidth=16']), + decodetree.process('insn32.decode', extra_args: [dir / 'insn32-64.decode', '--static-decode=decode_insn32']), +] + +riscv_ss = 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', + 'pmp.c', + 'translate.c', +)) + +riscv_softmmu_ss = ss.source_set() + +target_arch += {'riscv': riscv_ss} +target_softmmu_arch += {'riscv': riscv_softmmu_ss} diff --git a/target/riscv/translate.c b/target/riscv/translate.c index adeddb8..b4fdc68 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -566,7 +566,7 @@ static int ex_rvc_shifti(DisasContext *ctx, int imm) } /* Include the auto-generated decoder for 32 bit insn */ -#include "decode_insn32.inc.c" +#include "decode-insn32.inc" static bool gen_arith_imm_fn(DisasContext *ctx, arg_i *a, void (*func)(TCGv, TCGv, target_long)) @@ -709,7 +709,7 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, #include "insn_trans/trans_privileged.inc.c" /* Include the auto-generated decoder for 16 bit insn */ -#include "decode_insn16.inc.c" +#include "decode-insn16.inc" static void decode_opc(DisasContext *ctx) { diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs deleted file mode 100644 index 9b9accc..0000000 --- a/target/s390x/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o -obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o -obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o -obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o vec_string_helper.o -obj-$(CONFIG_TCG) += vec_fpu_helper.o -obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o -obj-$(CONFIG_SOFTMMU) += sigp.o -obj-$(CONFIG_KVM) += kvm.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o -obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 980f67c..4757e58 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -1,3 +1,30 @@ +s390x_ss = 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 = executable('gen-features', 'gen-features.c', native: true) gen_features_h = custom_target('gen-features.h', @@ -5,4 +32,17 @@ gen_features_h = custom_target('gen-features.h', capture: true, command: gen_features) -specific_ss.add(gen_features_h) +s390x_ss.add(gen_features_h) + +s390x_softmmu_ss = ss.source_set() +s390x_softmmu_ss.add(files( + 'arch_dump.c', + 'diag.c', + 'ioinst.c', + 'machine.c', + 'mmu_helper.c', + 'sigp.c', +)) + +target_arch += {'s390x': s390x_ss} +target_softmmu_arch += {'s390x': s390x_softmmu_ss} diff --git a/target/sh4/Makefile.objs b/target/sh4/Makefile.objs deleted file mode 100644 index 2c25d96..0000000 --- a/target/sh4/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) += monitor.o -obj-y += gdbstub.o diff --git a/target/sh4/meson.build b/target/sh4/meson.build new file mode 100644 index 0000000..56a5757 --- /dev/null +++ b/target/sh4/meson.build @@ -0,0 +1,14 @@ +sh4_ss = ss.source_set() +sh4_ss.add(files( + 'cpu.c', + 'gdbstub.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) + +sh4_softmmu_ss = ss.source_set() +sh4_softmmu_ss.add(files('monitor.c')) + +target_arch += {'sh4': sh4_ss} +target_softmmu_arch += {'sh4': sh4_softmmu_ss} diff --git a/target/sparc/Makefile.objs b/target/sparc/Makefile.objs deleted file mode 100644 index ec90569..0000000 --- a/target/sparc/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -obj-$(CONFIG_SOFTMMU) += machine.o monitor.o -obj-y += translate.o helper.o cpu.o -obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o -obj-$(TARGET_SPARC) += int32_helper.o -obj-$(TARGET_SPARC64) += int64_helper.o -obj-$(TARGET_SPARC64) += vis_helper.o -obj-y += gdbstub.o diff --git a/target/sparc/meson.build b/target/sparc/meson.build new file mode 100644 index 0000000..a3638b9 --- /dev/null +++ b/target/sparc/meson.build @@ -0,0 +1,23 @@ +sparc_ss = 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 = ss.source_set() +sparc_softmmu_ss.add(files( + 'machine.c', + 'monitor.c', +)) + +target_arch += {'sparc': sparc_ss} +target_softmmu_arch += {'sparc': sparc_softmmu_ss} diff --git a/target/tilegx/Makefile.objs b/target/tilegx/Makefile.objs deleted file mode 100644 index 0db778f..0000000 --- a/target/tilegx/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y += cpu.o translate.o helper.o simd_helper.o diff --git a/target/tilegx/meson.build b/target/tilegx/meson.build new file mode 100644 index 0000000..6785904 --- /dev/null +++ b/target/tilegx/meson.build @@ -0,0 +1,13 @@ +tilegx_ss = ss.source_set() +tilegx_ss.add(files( + 'cpu.c', + 'helper.c', + 'simd_helper.c', + 'translate.c', +)) +tilegx_ss.add(zlib) + +tilegx_softmmu_ss = ss.source_set() + +target_arch += {'tilegx': tilegx_ss} +target_softmmu_arch += {'tilegx': tilegx_softmmu_ss} diff --git a/target/tricore/Makefile.objs b/target/tricore/Makefile.objs deleted file mode 100644 index 7a05670..0000000 --- a/target/tricore/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-y += translate.o helper.o cpu.o op_helper.o fpu_helper.o diff --git a/target/tricore/meson.build b/target/tricore/meson.build new file mode 100644 index 0000000..d7db446 --- /dev/null +++ b/target/tricore/meson.build @@ -0,0 +1,14 @@ +tricore_ss = ss.source_set() +tricore_ss.add(files( + 'cpu.c', + 'fpu_helper.c', + 'helper.c', + 'op_helper.c', + 'translate.c', +)) +tricore_ss.add(zlib) + +tricore_softmmu_ss = ss.source_set() + +target_arch += {'tricore': tricore_ss} +target_softmmu_arch += {'tricore': tricore_softmmu_ss} diff --git a/target/unicore32/Makefile.objs b/target/unicore32/Makefile.objs deleted file mode 100644 index 35d8bf5..0000000 --- a/target/unicore32/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += ucf64_helper.o - -obj-$(CONFIG_SOFTMMU) += softmmu.o - -# Huh? Uses curses directly instead of using ui/console.h interfaces ... -helper.o-cflags := $(CURSES_CFLAGS) -helper.o-libs := $(CURSES_LIBS) diff --git a/target/unicore32/meson.build b/target/unicore32/meson.build new file mode 100644 index 0000000..0fa7877 --- /dev/null +++ b/target/unicore32/meson.build @@ -0,0 +1,14 @@ +unicore32_ss = ss.source_set() +unicore32_ss.add(files( + 'cpu.c', + 'helper.c', + 'op_helper.c', + 'translate.c', + 'ucf64_helper.c', +), curses) + +unicore32_softmmu_ss = ss.source_set() +unicore32_softmmu_ss.add(files('softmmu.c')) + +target_arch += {'unicore32': unicore32_ss} +target_softmmu_arch += {'unicore32': unicore32_softmmu_ss} diff --git a/target/xtensa/Makefile.objs b/target/xtensa/Makefile.objs deleted file mode 100644 index c7e7fe6..0000000 --- a/target/xtensa/Makefile.objs +++ /dev/null @@ -1,16 +0,0 @@ -obj-y += core-dc232b.o -obj-y += core-dc233c.o -obj-y += core-de212.o -obj-y += core-fsf.o -obj-y += core-sample_controller.o -obj-y += core-test_kc705_be.o -obj-y += core-test_mmuhifi_c3.o -obj-$(CONFIG_SOFTMMU) += monitor.o xtensa-semi.o -obj-y += xtensa-isa.o -obj-y += translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) += dbg_helper.o -obj-y += exc_helper.o -obj-y += fpu_helper.o -obj-y += gdbstub.o -obj-$(CONFIG_SOFTMMU) += mmu_helper.o -obj-y += win_helper.o diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build new file mode 100644 index 0000000..27e453e --- /dev/null +++ b/target/xtensa/meson.build @@ -0,0 +1,30 @@ +xtensa_ss = 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 = ss.source_set() +xtensa_softmmu_ss.add(files( + 'dbg_helper.c', + 'mmu_helper.c', + 'monitor.c', + 'xtensa-semi.c', +)) + +target_arch += {'xtensa': xtensa_ss} +target_softmmu_arch += {'xtensa': xtensa_softmmu_ss} From patchwork Thu Dec 19 12:23:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="DNirbZwb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drvW3r22z9sPc for ; Thu, 19 Dec 2019 23:35:51 +1100 (AEDT) Received: from localhost ([::1]:40204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv1v-0004eZ-KR for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:35:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33107) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurK-0008A8-NI for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurI-0000HN-TX for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:50 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:31913 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurI-0000FT-Ib for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758287; 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=LQZDIc3n2Tb43fnushtjf+kc25/BGN65mq3k8eHW6+E=; b=DNirbZwbSllE+enwDz4IHoQIREQtKqZaHEFD7F05Goj8QROoF6sH0e3ZRoqUp0ag6K8xNw jJVrXtDq7G5Bw0i8dYNsE68XC9su57BQMk477DdiU41w3tyTpkA2oTWpEhtPM7ePwlVZO6 Md+Yp2YRYTs6E+swfUlyIix0ukef9S8= 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-kRu0lpW7OZeNrIcl4uQ5Ig-1; Thu, 19 Dec 2019 07:24:46 -0500 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 24A5B107ACC4 for ; Thu, 19 Dec 2019 12:24:45 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02DE160C18; Thu, 19 Dec 2019 12:24:43 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 107/132] meson: accel Date: Thu, 19 Dec 2019 13:23:27 +0100 Message-Id: <1576758232-12439-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: kRu0lpW7OZeNrIcl4uQ5Ig-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 1 - accel/Makefile.objs | 5 ----- accel/kvm/Makefile.objs | 2 -- accel/kvm/meson.build | 5 +++++ accel/meson.build | 6 ++++++ accel/stubs/Makefile.objs | 5 ----- accel/stubs/meson.build | 5 +++++ accel/tcg/Makefile.objs | 8 -------- accel/tcg/meson.build | 14 ++++++++++++++ meson.build | 1 + 10 files changed, 31 insertions(+), 21 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 diff --git a/Makefile.target b/Makefile.target index bc5a019..438d27b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -110,7 +110,6 @@ obj-y += trace/ ######################################################### # cpu emulator library obj-y += exec.o -obj-y += accel/ obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-gvec.o obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o diff --git a/accel/Makefile.objs b/accel/Makefile.objs deleted file mode 100644 index 8b498d3..0000000 --- a/accel/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_SOFTMMU) += accel.o -obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) += qtest.o -obj-$(CONFIG_KVM) += kvm/ -obj-$(CONFIG_TCG) += tcg/ -obj-y += stubs/ diff --git a/accel/kvm/Makefile.objs b/accel/kvm/Makefile.objs deleted file mode 100644 index fdfa481..0000000 --- a/accel/kvm/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += kvm-all.o -obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o diff --git a/accel/kvm/meson.build b/accel/kvm/meson.build new file mode 100644 index 0000000..4db2388 --- /dev/null +++ b/accel/kvm/meson.build @@ -0,0 +1,5 @@ +kvm_ss = ss.source_set() +kvm_ss.add(files('kvm-all.c')) +kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c')) + +specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss) diff --git a/accel/meson.build b/accel/meson.build new file mode 100644 index 0000000..c356284 --- /dev/null +++ b/accel/meson.build @@ -0,0 +1,6 @@ +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('accel.c')) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: files('qtest.c')) + +subdir('kvm') +subdir('tcg') +subdir('stubs') diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs deleted file mode 100644 index 3894caf..0000000 --- a/accel/stubs/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o -obj-$(call lnot,$(CONFIG_HVF)) += hvf-stub.o -obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o -obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build new file mode 100644 index 0000000..8456de4 --- /dev/null +++ b/accel/stubs/meson.build @@ -0,0 +1,5 @@ +specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-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 d381a02..0000000 --- a/accel/tcg/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-$(CONFIG_SOFTMMU) += tcg-all.o -obj-$(CONFIG_SOFTMMU) += cputlb.o -obj-y += tcg-runtime.o tcg-runtime-gvec.o -obj-y += cpu-exec.o cpu-exec-common.o translate-all.o -obj-y += translator.o - -obj-$(CONFIG_USER_ONLY) += user-exec.o -obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build new file mode 100644 index 0000000..605810a --- /dev/null +++ b/accel/tcg/meson.build @@ -0,0 +1,14 @@ +tcg_ss = 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')) +specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) + +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tcg-all.c', 'cputlb.c')) diff --git a/meson.build b/meson.build index c8428c0..1c9a941 100644 --- a/meson.build +++ b/meson.build @@ -645,6 +645,7 @@ subdir('replay') subdir('hw') subdir('libdecnumber') subdir('target') +subdir('accel') mods = [] block_mods = [] From patchwork Thu Dec 19 12:23:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="RYBIQcLr"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dryQ0l1Tz9sPc for ; Thu, 19 Dec 2019 23:38:22 +1100 (AEDT) Received: from localhost ([::1]:40242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv4N-0008WT-Ei for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:38:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34404) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurZ-0008Tb-TA for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurY-0001HB-9w for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:05 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32145 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurX-0001Dj-V2 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758303; 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=qf0EzKe6oLRsH/L+PXJBFfkGsboS7PCszn0vT0Ecovc=; b=RYBIQcLrteGmsE3O5fjpQzYBb+b05dFM72KuR2UN2i2id5jt++5hZ6O7rFrT+r+NDJwf/n OpwBOZeLToGXyJttK6hnkbJqDl9Q7oA5JPrig657Vnf4EL/vIx5UTj7sz1JP6uYF5Lepme 7+A2ROb7s5JmjRj5KLwHfXRw805/m4k= 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-113-Mpwd7xGmOmS5pwUudlOfOg-1; Thu, 19 Dec 2019 07:24:48 -0500 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 21487107ACC9 for ; Thu, 19 Dec 2019 12:24:47 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id A927060C18; Thu, 19 Dec 2019 12:24:45 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 108/132] meson: linux-user Date: Thu, 19 Dec 2019 13:23:28 +0100 Message-Id: <1576758232-12439-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Mpwd7xGmOmS5pwUudlOfOg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Acked-by: Laurent Vivier --- Makefile.target | 3 --- linux-user/Makefile.objs | 10 ---------- linux-user/arm/nwfpe/Makefile.objs | 2 -- linux-user/arm/nwfpe/meson.build | 10 ++++++++++ linux-user/meson.build | 22 ++++++++++++++++++++++ meson.build | 4 ++++ 6 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 linux-user/Makefile.objs delete mode 100644 linux-user/arm/nwfpe/Makefile.objs create mode 100644 linux-user/arm/nwfpe/meson.build create mode 100644 linux-user/meson.build diff --git a/Makefile.target b/Makefile.target index 438d27b..a8e6a28 100644 --- a/Makefile.target +++ b/Makefile.target @@ -128,9 +128,6 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/linux-user/host/$(ARCH) \ -I$(SRC_PATH)/linux-user -obj-y += linux-user/ -obj-y += gdbstub.o thunk.o - endif #CONFIG_LINUX_USER ######################################################### diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs deleted file mode 100644 index d2f33be..0000000 --- a/linux-user/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -obj-y = 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) += flatload.o -obj-$(TARGET_I386) += vm86.o -obj-$(TARGET_ARM) += arm/nwfpe/ -obj-$(TARGET_ARM) += arm/semihost.o -obj-$(TARGET_AARCH64) += arm/semihost.o diff --git a/linux-user/arm/nwfpe/Makefile.objs b/linux-user/arm/nwfpe/Makefile.objs deleted file mode 100644 index 51b0c32..0000000 --- a/linux-user/arm/nwfpe/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o -obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o diff --git a/linux-user/arm/nwfpe/meson.build b/linux-user/arm/nwfpe/meson.build new file mode 100644 index 0000000..1c27e55 --- /dev/null +++ b/linux-user/arm/nwfpe/meson.build @@ -0,0 +1,10 @@ +linux_user_ss.add(when: 'TARGET_ARM', if_true: files( + 'double_cpdo.c', + 'extended_cpdo.c', + 'fpa11.c', + 'fpa11_cpdo.c', + 'fpa11_cpdt.c', + 'fpa11_cprt.c', + 'fpopcode.c', + 'single_cpdo.c', +)) diff --git a/linux-user/meson.build b/linux-user/meson.build new file mode 100644 index 0000000..b5711d9 --- /dev/null +++ b/linux-user/meson.build @@ -0,0 +1,22 @@ +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_AARCH64', if_true: files('arm/semihost.c')) +linux_user_ss.add(when: 'TARGET_ARM', if_true: files('arm/semihost.c')) +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')) + +subdir('arm/nwfpe') diff --git a/meson.build b/meson.build index 1c9a941..64cbab1 100644 --- a/meson.build +++ b/meson.build @@ -646,6 +646,10 @@ subdir('hw') subdir('libdecnumber') subdir('target') 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) mods = [] block_mods = [] From patchwork Thu Dec 19 12:23:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="B5k/h+3C"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drnM23v3z9sPn for ; Thu, 19 Dec 2019 23:30:31 +1100 (AEDT) Received: from localhost ([::1]:40104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuwm-0006C8-Hs for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:30:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33642) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurT-0008JY-6C for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurR-0000gR-SG for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:58 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23372 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurR-0000dQ-L1 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758297; 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=Kp9bVNFjrivXHia4Yh8td83EMWOHenrJjacQknfP6M0=; b=B5k/h+3CRIxSxj078qUbOjD9d4+VMvd3Mh9Pl6VH8VZPmTcbpHJZCD0sKY6NG9rEHrkXLQ FksFvalZfo8adp3MZ4RMcyZFvOhC+dZDttRzrqjQvzz5HVb3TvDjh7bya8Gheqpap/rx5U aaNiEF+LyX32Vgzg9jqVNbccg+xlaRc= 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-244-gWNlDfbmOq-l13EueBbpzw-1; Thu, 19 Dec 2019 07:24:54 -0500 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 7C7AA184BECC for ; Thu, 19 Dec 2019 12:24:53 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2625D60C18; Thu, 19 Dec 2019 12:24:47 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 109/132] meson: bsd-user Date: Thu, 19 Dec 2019 13:23:29 +0100 Message-Id: <1576758232-12439-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: gWNlDfbmOq-l13EueBbpzw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- 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 a8e6a28..0eca5f8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -138,9 +138,6 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) -obj-y += bsd-user/ -obj-y += gdbstub.o - endif #CONFIG_BSD_USER ######################################################### diff --git a/bsd-user/Makefile.objs b/bsd-user/Makefile.objs deleted file mode 100644 index 5e77f57..0000000 --- a/bsd-user/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ - uaccess.o diff --git a/bsd-user/meson.build b/bsd-user/meson.build new file mode 100644 index 0000000..0369549 --- /dev/null +++ b/bsd-user/meson.build @@ -0,0 +1,10 @@ +bsd_user_ss.add(files( + 'bsdload.c', + 'elfload.c', + 'main.c', + 'mmap.c', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', +)) diff --git a/meson.build b/meson.build index 64cbab1..31c9591 100644 --- a/meson.build +++ b/meson.build @@ -646,8 +646,12 @@ subdir('hw') subdir('libdecnumber') subdir('target') subdir('accel') +subdir('bsd-user') subdir('linux-user') +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) From patchwork Thu Dec 19 12:23:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="hbjaZdCd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drx76Wcgz9sQp for ; Thu, 19 Dec 2019 23:37:15 +1100 (AEDT) Received: from localhost ([::1]:40232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv3J-0006wf-9W for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:37:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34321) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurZ-0008Se-4Z for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurX-0001Bi-9b for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:04 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:27592 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurX-00019x-2r for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758302; 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=eNyIVA4SPkztD/cV2RluZ5XY7kMDeBqg3trG/yvw3YM=; b=hbjaZdCdSeebenAUWPdt7Bd+ExsIuoGk4d0CKw9qmdOZEkadQpESv9cyhVy81T/3Et7jC3 6Oa45ArYQ7A+A2DjqaBWQHp6lKhfdLoREPByJd4h5gSFkrwGOXKxQhwEAsudxbOB8Xk1vs NOtXr5jBzlLXyGU7uNlf4hvqIcHPP0I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-15-X5YTZIzSPUKy6FREHGfAMQ-1; Thu, 19 Dec 2019 07:24:57 -0500 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 38A2510054E3 for ; Thu, 19 Dec 2019 12:24:55 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0503860C81; Thu, 19 Dec 2019 12:24:53 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 110/132] meson: cpu-emu Date: Thu, 19 Dec 2019 13:23:30 +0100 Message-Id: <1576758232-12439-19-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: X5YTZIzSPUKy6FREHGfAMQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 12 ------------ configure | 6 ++++++ meson.build | 28 ++++++++++++++++++++++++++++ scripts/feature_to_c.sh | 24 ++++++++---------------- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/Makefile.target b/Makefile.target index 0eca5f8..7b5b254 100644 --- a/Makefile.target +++ b/Makefile.target @@ -108,15 +108,6 @@ obj-y += $(LIBQEMU) obj-y += trace/ ######################################################### -# cpu emulator library -obj-y += exec.o -obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-gvec.o -obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o -obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o -obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o -obj-$(CONFIG_TCG) += fpu/softfloat.o -obj-y += disas.o -obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o LIBS := $(libs_cpu) $(LIBS) ######################################################### @@ -199,9 +190,6 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") 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)$@") - clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') diff --git a/configure b/configure index c53df48..ad36082 100755 --- a/configure +++ b/configure @@ -5034,9 +5034,13 @@ case "$capstone" in LIBCAPSTONE=libcapstone.a fi libs_cpu="-L$PWD/capstone -lcapstone $libs_cpu" + capstone_libs="-L$PWD/capstone -lcapstone" + capstone_cflags="-I${source_path}/capstone/include" ;; system) + capstone_libs="$($pkg_config --libs capstone)" + capstone_cflags="$($pkg_config --cflags capstone)" QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)" libs_cpu="$($pkg_config --libs capstone) $libs_cpu" ;; @@ -7230,6 +7234,8 @@ if test "$ivshmem" = "yes" ; then fi if test "$capstone" != "no" ; then echo "CONFIG_CAPSTONE=y" >> $config_host_mak + echo "CAPSTONE_CFLAGS=$capstone_cflags" >> $config_host_mak + echo "CAPSTONE_LIBS=$capstone_libs" >> $config_host_mak fi if test "$debug_mutex" = "yes" ; then echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak diff --git a/meson.build b/meson.build index 31c9591..6f2c838 100644 --- a/meson.build +++ b/meson.build @@ -319,6 +319,11 @@ if 'CONFIG_USB_LIBUSB' in config_host libusb = declare_dependency(compile_args: config_host['LIBUSB_CFLAGS'].split(), link_args: config_host['LIBUSB_LIBS'].split()) endif +capstone = declare_dependency() +if 'CONFIG_CAPSTONE' in config_host + capstone = declare_dependency(compile_args: config_host['CAPSTONE_CFLAGS'].split(), + link_args: config_host['CAPSTONE_LIBS'].split()) +endif create_config = find_program('scripts/create_config') minikconf = find_program('scripts/minikconf.py') @@ -481,6 +486,18 @@ hw_arch = {} target_arch = {} target_softmmu_arch = {} +specific_ss.add(files('disas.c', 'exec.c'), capstone) +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')) + # TODO: add each directory to the subdirs from its own meson.build, once # we have those trace_events_subdirs = [ @@ -717,6 +734,8 @@ common_all = static_library('common', dependencies: common_all.dependencies(), name_suffix: 'fa') +feature_to_c = find_program('scripts/feature_to_c.sh') + foreach target : target_dirs config_target = target_config[target] target_name = config_target['TARGET_NAME'] @@ -762,6 +781,15 @@ foreach target : target_dirs endif endif + if 'TARGET_XML_FILES' in config_target + gdbstub_xml = custom_target(target + '-gdbstub-xml.c', + output: target + '-gdbstub-xml.c', + input: files(config_target['TARGET_XML_FILES'].split()), + command: [feature_to_c, '@INPUT@'], + capture: true) + arch_srcs += gdbstub_xml + endif + t = target_arch[arch].apply(config_target, strict: false) arch_srcs += t.sources() arch_deps += t.dependencies() diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh index c8ce9b8..b116989 100644 --- a/scripts/feature_to_c.sh +++ b/scripts/feature_to_c.sh @@ -19,16 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -output=$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 @@ -60,17 +52,17 @@ for input; do printf "'\''\\n'\'', \n" } END { print " 0 };" - }' < $input >> $output + }' < $input done -echo >> $output -echo "const char *const xml_builtin[][2] = {" >> $output +echo +echo "const char *const xml_builtin[][2] = {" for input; do basename=$(echo $input | sed 's,.*/,,') arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g') - echo " { \"$basename\", $arrayname }," >> $output + echo " { \"$basename\", $arrayname }," done -echo " { (char *)0, (char *)0 }" >> $output -echo "};" >> $output +echo " { (char *)0, (char *)0 }" +echo "};" From patchwork Thu Dec 19 12:23:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ZebZTCGb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds1Y0XFgz9sPc for ; Thu, 19 Dec 2019 23:41:05 +1100 (AEDT) Received: from localhost ([::1]:40266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv70-0004Cr-G2 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:41:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihura-0008Tk-0V for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurY-0001KA-RJ for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:05 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47311 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurY-0001GI-FO for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758303; 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=NxM519PDR8MUQ5auUJML+qbNF8cdzpZsMmwVqKmE5+0=; b=ZebZTCGbCqBooEBo2XjEXEIteh3cX7hpJxBwLPz2t6bIeqwTmYCQHEJjpUGVxC7SVVlh+Q Hfon7oVwaTX24bnJhGMfCKCL6QMEUisI+Pf/AqMwF5VCDnG7s3/kPX7LzmPUSmUk+Gb20A DzRemJ5M9lbBGIBjiaQgRqvjWxjKmZo= 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-72-koVrUG5fMGi5MVWmJv2rRg-1; Thu, 19 Dec 2019 07:24:57 -0500 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 D5E30107ACFA for ; Thu, 19 Dec 2019 12:24:56 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B845F60C18; Thu, 19 Dec 2019 12:24:55 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 111/132] meson: softmmu Date: Thu, 19 Dec 2019 13:23:31 +0100 Message-Id: <1576758232-12439-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: koVrUG5fMGi5MVWmJv2rRg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 4 ---- meson.build | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 7b5b254..32c0521 100644 --- a/Makefile.target +++ b/Makefile.target @@ -134,10 +134,6 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target ifdef CONFIG_SOFTMMU -obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o -obj-y += qtest.o -obj-y += memory.o -obj-y += memory_mapping.o LIBS := $(libs_softmmu) $(LIBS) # Temporary until emulators are linked by Meson diff --git a/meson.build b/meson.build index 6f2c838..655571c 100644 --- a/meson.build +++ b/meson.build @@ -498,6 +498,18 @@ specific_ss.add(when: 'CONFIG_TCG', if_true: files( )) specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c', 'tcg/tci.c')) +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'arch_init.c', + 'balloon.c', + 'cpus.c', + 'gdbstub.c', + 'ioport.c', + 'memory.c', + 'memory_mapping.c', + 'migration/ram.c', + 'qtest.c', +)) + # TODO: add each directory to the subdirs from its own meson.build, once # we have those trace_events_subdirs = [ From patchwork Thu Dec 19 12:23:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="TX1Hwu7Y"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsD65bMWz9sPc for ; Thu, 19 Dec 2019 23:50:14 +1100 (AEDT) Received: from localhost ([::1]:40400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvFs-0006vo-4W for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:50:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihura-0008UI-CM for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurX-0001BZ-9d for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:06 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:27858 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurW-000176-Qk for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758302; 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=DUsqlpHqwwxmIckfDRHk13b6nUixXxTxUVyyyck8DZU=; b=TX1Hwu7Y+9CZWxHsCDY+98wy7/Lyj9xjU2jEg4+e3ekD7SfTj2/gDbtHuWzrD7IBrkZUf1 T/DrMzqz1deZbgpn96QXIXmL0/56W0+y8sgORh35TxDIzBI8i/ILaAtISUygOFgMuAJGMk NlMQgyT5jQJce+BkcxW6DrWRCTvIlVg= 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-190-Hk1VcQzCPK2yxTfhwEuGpA-1; Thu, 19 Dec 2019 07:25:00 -0500 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 943E3DB60 for ; Thu, 19 Dec 2019 12:24:59 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 626D160C18; Thu, 19 Dec 2019 12:24:57 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 112/132] Aaaaallelujah! Date: Thu, 19 Dec 2019 13:23:32 +0100 Message-Id: <1576758232-12439-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Hk1VcQzCPK2yxTfhwEuGpA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- .gitlab-ci.yml | 6 +- Makefile | 29 ------- Makefile.target | 124 +----------------------------- docs/devel/blkverify.txt | 4 +- docs/devel/testing.rst | 4 +- docs/interop/live-block-operations.rst | 4 +- meson.build | 24 ++++++ os-posix.c | 2 +- scripts/device-crash-test | 2 +- tests/Makefile.include | 11 ++- tests/acceptance/avocado_qemu/__init__.py | 3 +- tests/data/acpi/rebuild-expected-aml.sh | 2 +- tests/libqos/qgraph.h | 2 +- tests/multiboot/run_test.sh | 2 +- tests/qemu-iotests/check | 6 +- tests/rtas-test.c | 2 +- tests/tcg/Makefile.target | 6 ++ 17 files changed, 58 insertions(+), 175 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd4c033..2a527db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,9 +75,9 @@ build-tci: - make -j2 - make tests/boot-serial-test tests/cdrom-test tests/pxe-test - for tg in $TARGETS ; do - export QTEST_QEMU_BINARY="${tg}-softmmu/qemu-system-${tg}" ; + export QTEST_QEMU_BINARY="./qemu-system-${tg}" ; ./tests/boot-serial-test || exit 1 ; ./tests/cdrom-test || exit 1 ; done - - QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/pxe-test - - QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x" ./tests/pxe-test -m slow + - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/pxe-test + - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/pxe-test -m slow diff --git a/Makefile b/Makefile index 5bdd400..71c3352 100644 --- a/Makefile +++ b/Makefile @@ -135,36 +135,10 @@ ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs endif -dummy := $(call unnest-vars,, common-obj-y) - include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules -TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) -SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) - -SOFTMMU_ALL_RULES=$(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 - -# meson: this is sub-optimal but going away after conversion -TARGET_DEPS = $(patsubst %,%-config-target.h, $(TARGET_DIRS)) -TARGET_DEPS += $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TARGET_DIRS))) -TARGET_DEPS += $(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_DEPS) - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) - DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt @@ -202,9 +176,6 @@ subdir-dtc: dtc/all subdir-capstone: capstone/all subdir-slirp: slirp/all -$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) block.syms qemu.syms - ROM_DIRS = $(addprefix pc-bios/, $(ROMS)) ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) # Only keep -O and -g cflags diff --git a/Makefile.target b/Makefile.target index 32c0521..8ee4c78 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,43 +6,16 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak -FULL_TARGET_NAME=$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-user) - -ifdef CONFIG_SOFTMMU -include ../$(FULL_TARGET_NAME)-config-devices.mak -endif - $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) -ifdef CONFIG_LINUX -QEMU_CFLAGS += -I../linux-headers -endif -QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H - -QEMU_CFLAGS+=-iquote $(SRC_PATH)/include - -QEMU_CFLAGS += -DCONFIG_TARGET=\"../$(FULL_TARGET_NAME)-config-target.h\" -QEMU_CFLAGS += -DCONFIG_DEVICES=\"../$(FULL_TARGET_NAME)-config-devices.h\" ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=qemu-$(TARGET_NAME) -QEMU_PROG_BUILD = $(QEMU_PROG) else # system emulator name QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF) -ifneq (,$(findstring -mwindows,$(SDL_LIBS))) -# Terminate program name with a 'w' because the linker builds a windows executable. -QEMU_PROGW=qemu-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 = $(QEMU_PROGW) -else -QEMU_PROG_BUILD = $(QEMU_PROG) -endif endif -LIBQEMU = ../libqemu-$(FULL_TARGET_NAME).fa -PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= ifdef CONFIG_TRACE_SYSTEMTAP @@ -98,96 +71,10 @@ stap: endif .PHONY: stap -all: $(PROGS) stap - -# Dummy command so that make thinks it has done something - @true - -obj-y += $(LIBQEMU) - -obj-y += trace/ - -######################################################### -LIBS := $(libs_cpu) $(LIBS) - -######################################################### -# Linux user emulator target - -ifdef CONFIG_LINUX_USER +all: stap -QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ - -I$(SRC_PATH)/linux-user/host/$(ARCH) \ - -I$(SRC_PATH)/linux-user - -endif #CONFIG_LINUX_USER - -######################################################### -# BSD user emulator target - -ifdef CONFIG_BSD_USER - -QEMU_CFLAGS+=-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 -LIBS := $(libs_softmmu) $(LIBS) - -# Temporary until emulators are linked by Meson -LIBS := $(LIBS) @../block.syms @../qemu.syms -ifneq ($(CONFIG_MODULES),y) -LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) -LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS) -endif -LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS) -LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) -LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) -LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) -LIBS := $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS) - -generated-files-y += hmp-commands.h hmp-commands-info.h - -endif # CONFIG_SOFTMMU - -dummy := $(call unnest-vars,,obj-y) -all-obj-y := $(obj-y) - -include $(SRC_PATH)/Makefile.objs -dummy := $(call fix-paths,../,, \ - authz-obj-y \ - block-obj-y \ - chardev-obj-y \ - crypto-obj-y \ - io-obj-y \ - qom-obj-y) -dummy := $(call unnest-vars,.., \ - common-obj-y) -all-obj-y += $(common-obj-y) -all-obj-y += $(qom-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) - -ifdef CONFIG_SOFTMMU -$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak -endif - -COMMON_LDADDS = ../libqemuutil.a - -# build either PROG or PROGW -$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) - $(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 - -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 @@ -196,9 +83,6 @@ ifdef CONFIG_TRACE_SYSTEMTAP 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" @@ -206,4 +90,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp" endif -Makefile: $(generated-files-y) +.PHONY: all clean install diff --git a/docs/devel/blkverify.txt b/docs/devel/blkverify.txt index d556dc4..aca826c 100644 --- a/docs/devel/blkverify.txt +++ b/docs/devel/blkverify.txt @@ -62,8 +62,8 @@ A more realistic scenario is verifying the installation of a guest OS: $ ./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=blkverify:raw.img:test.qcow2 + $ ./qemu-system-x86_64 -cdrom debian.iso \ + -drive file=blkverify:raw.img:test.qcow2 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 c81ed35..b26f240 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -707,7 +707,7 @@ the following approaches: 1) Set ``qemu_bin``, and use the given binary 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. The resulting ``qemu_bin`` value will be preserved in the @@ -763,7 +763,7 @@ like the following: .. code:: - PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64 + PARAMS (key=qemu_bin, path=*, default=./qemu-system-x86_64) => './qemu-system-x86_64 arch ~~~~ diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst index 48afdc7..e13f5a2 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the following invocation of QEMU, with a QMP server running over UNIX socket:: - $ ./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=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \ -device virtio-blk,drive=node-A,id=virtio0 \ @@ -694,7 +694,7 @@ instance, with the following invocation. (As noted earlier, for simplicity's sake, the destination QEMU is started on the same host, but it could be located elsewhere):: - $ ./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=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ -device virtio-blk,drive=node-TargetDisk,id=virtio0 \ diff --git a/meson.build b/meson.build index 655571c..ab53b62 100644 --- a/meson.build +++ b/meson.build @@ -170,10 +170,12 @@ brlapi = declare_dependency() if 'CONFIG_BRLAPI' in config_host brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split()) endif +sdlwindows = false sdl = declare_dependency() if 'CONFIG_SDL' in config_host sdl = declare_dependency(compile_args: config_host['SDL_CFLAGS'].split(), link_args: config_host['SDL_LIBS'].split()) + sdlwindows = config_host['SDL_LIBS'].contains('-mwindows') endif rbd = declare_dependency() if 'CONFIG_RBD' in config_host @@ -754,6 +756,7 @@ foreach target : target_dirs arch = config_target['TARGET_BASE_ARCH'] arch_srcs = [] arch_deps = [] + link_args = [] target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] if host_machine.system() == 'linux' @@ -774,6 +777,7 @@ foreach target : target_dirs arch_srcs += hw.sources() arch_srcs += target_devices_h[target] arch_deps += hw.dependencies() + link_args = ['@block.syms', '@qemu.syms'] else target_type='user' qemu_target_name = 'qemu-' + target_name @@ -827,6 +831,26 @@ foreach target : target_dirs '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)], name_suffix: 'fa') + + execs = [{'postfix': '', 'gui': false}] + if sdlwindows + execs += [{'postfix': 'w', 'gui': true}] + endif + foreach exe: execs + exe_name = qemu_target_name + exe['postfix'] + executable(exe_name, + install: true, + sources: target_specific.sources() + arch_srcs + [config_target_h], + dependencies: [qom, qemuutil] + target_specific.dependencies() + arch_deps + deps, + link_depends: [block_syms, qemu_syms], + link_args: link_args, + objects: objects, + gui_app: exe['gui'], + include_directories: target_inc, + c_args: ['-DNEED_CPU_H', + '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), + '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]) + endforeach endforeach # Other build targets diff --git a/os-posix.c b/os-posix.c index 3cd52e1..b2c6ae7 100644 --- a/os-posix.c +++ b/os-posix.c @@ -93,7 +93,7 @@ char *os_find_datadir(void) exec_dir = qemu_get_exec_dir(); g_return_val_if_fail(exec_dir != NULL, NULL); - dir = g_build_filename(exec_dir, "..", "pc-bios", NULL); + dir = 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/scripts/device-crash-test b/scripts/device-crash-test index 15f213a..3add052 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -384,7 +384,7 @@ def binariesToTest(args, testcase): if args.qemu: r = args.qemu else: - r = glob.glob('./*-softmmu/qemu-system-*') + r = glob.glob('./qemu-system-*') return r diff --git a/tests/Makefile.include b/tests/Makefile.include index 659f087..7bab8e5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -896,9 +896,9 @@ define do_test_tap endef .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y) +$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) $(call do_test_human,$(check-qtest-$*-y) $(check-qtest-generic-y), \ - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ + QTEST_QEMU_BINARY=$(BUILD_DIR)/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) check-unit: $(check-unit-y) @@ -909,9 +909,9 @@ check-speed: $(check-speed-y) # gtester tests with TAP output -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y) +$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: $(check-qtest-y) $(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \ - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ + QTEST_QEMU_BINARY=$(BUILD_DIR)/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) check-report-unit.tap: $(check-unit-y) @@ -1098,8 +1098,7 @@ QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = 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))) + qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y)) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index aee5d82..754e4e1 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -39,8 +39,7 @@ def pick_default_qemu_bin(arch=None): """ if arch is None: arch = os.uname()[4] - qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, - "qemu-system-%s" % arch) + qemu_bin_relative_path = "qemu-system-%s" % arch if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh index f89d462..0193562 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. -qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64" +qemu_bins="./qemu-system-x86_64 ./qemu-system-aarch64" if [ ! -e "tests/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this script." diff --git a/tests/libqos/qgraph.h b/tests/libqos/qgraph.h index 3a25dda..184b5b4 100644 --- a/tests/libqos/qgraph.h +++ b/tests/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=x86_64-softmmu/qemu-system-x86_64 + * QTEST_QEMU_BINARY=./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/multiboot/run_test.sh b/tests/multiboot/run_test.sh index 98df91e..f968bf7 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -QEMU=${QEMU:-"../../x86_64-softmmu/qemu-system-x86_64"} +QEMU=${QEMU:-"../../qemu-system-x86_64"} run_qemu() { local kernel=$1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index c24874f..a29651c 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -561,11 +561,11 @@ if [ -z "$QEMU_PROG" ] then if [ -x "$build_iotests/qemu" ]; then export QEMU_PROG="$build_iotests/qemu" - elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then - export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" + elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then + export QEMU_PROG="$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/rtas-test.c b/tests/rtas-test.c index ee88867..c936bec 100644 --- a/tests/rtas-test.c +++ b/tests/rtas-test.c @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); 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/Makefile.target b/tests/tcg/Makefile.target index 8808bea..9f5092b 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -63,6 +63,12 @@ CFLAGS= QEMU_CFLAGS= LDFLAGS= +# The QEMU for this TARGET +ifdef CONFIG_USER_ONLY +QEMU=../../qemu-$(TARGET_NAME) +else +QEMU=../../qemu-system-$(TARGET_NAME) +endif QEMU_OPTS= From patchwork Thu Dec 19 12:23:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="h9gPyaLJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds0H2Pqmz9sRC for ; Thu, 19 Dec 2019 23:39:59 +1100 (AEDT) Received: from localhost ([::1]:40258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv5w-0002p3-Ln for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:39:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34432) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihura-0008Ty-53 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurY-0001HS-AA for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46719 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurY-0001DZ-1r for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758303; 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=xScWpd/1C0/iEBxf92MCAY1mKNBXL5XSJxDprBKrzs8=; b=h9gPyaLJ4x0Qp3/etm65+penJISt/exnQPXg0Xx3PrpjMCm/Rh+yjnXLwSUIsJGQfj/b3W nTChGZV+dyMDCZ7eNDmC8igK5h2Mq9g4kjwnnj4fR3/jc76M/kxkyEv7PulaW7z6JMruIS V7u6xOEtq0Aei57Z6emYuaN9zUL0CZ4= 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-290-jnMsodF3MCy5pdcsq90hmw-1; Thu, 19 Dec 2019 07:25:02 -0500 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 4DBFC184BEC0 for ; Thu, 19 Dec 2019 12:25:01 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 166A660C18; Thu, 19 Dec 2019 12:24:59 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 113/132] systemtap Date: Thu, 19 Dec 2019 13:23:33 +0100 Message-Id: <1576758232-12439-22-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: jnMsodF3MCy5pdcsq90hmw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.target | 84 ++----------------------------------------------------- meson.build | 26 +++++++++++++++++ trace/meson.build | 14 +++++----- 3 files changed, 35 insertions(+), 89 deletions(-) diff --git a/Makefile.target b/Makefile.target index 8ee4c78..4f72a89 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,88 +6,8 @@ include ../config-host.mak include config-target.mak include $(SRC_PATH)/rules.mak -$(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) - -ifdef CONFIG_USER_ONLY -# user emulator name -QEMU_PROG=qemu-$(TARGET_NAME) -else -# system emulator name -QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF) -endif - -STPFILES= - -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=user -else -TARGET_TYPE=system -endif - -tracetool-y = $(SRC_PATH)/scripts/tracetool.py -tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") - -$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=all \ - --format=stap \ - --backends=$(TRACE_BACKENDS) \ - --binary=$(bindir)/$(QEMU_PROG) \ - --target-name=$(TARGET_NAME) \ - --target-type=$(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=all \ - --format=stap \ - --backends=$(TRACE_BACKENDS) \ - --binary=$(realpath .)/$(QEMU_PROG) \ - --target-name=$(TARGET_NAME) \ - --target-type=$(TARGET_TYPE) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp") - -$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y) - $(call quiet-command,$(TRACETOOL) \ - --group=all \ - --format=simpletrace-stap \ - --backends=$(TRACE_BACKENDS) \ - --probe-prefix=qemu.$(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=all \ - --format=log-stap \ - --backends=$(TRACE_BACKENDS) \ - --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \ - $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-log.stp") - -else -stap: -endif -.PHONY: stap - -all: stap - +all: 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 - 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)/../systemtap/tapset/$(QEMU_PROG)-log.stp" -endif - + .PHONY: all clean install diff --git a/meson.build b/meson.build index ab53b62..4fb3bdc 100644 --- a/meson.build +++ b/meson.build @@ -749,6 +749,7 @@ common_all = static_library('common', name_suffix: 'fa') feature_to_c = find_program('scripts/feature_to_c.sh') +tracetool = find_program('scripts/tracetool.py') foreach target : target_dirs config_target = target_config[target] @@ -850,6 +851,31 @@ foreach target : target_dirs c_args: ['-DNEED_CPU_H', '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]) + + if 'CONFIG_TRACE_SYSTEMTAP' in config_host + foreach stp: [ + {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir() / exe_name, 'install': false}, + {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_option('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'] / '../systemtap/tapset', + command: [ + tracetool, '--group=all', '--format=' + stp['fmt'], + '--backends=' + config_host['TRACE_BACKENDS'], + '--binary=' + stp['bin'], + '--target-name=' + target_name, + '--target-type=' + target_type, + '--probe-prefix=qemu.' + target_type + '.' + target_name, + '@INPUT@', + ]) + endforeach + endif endforeach endforeach diff --git a/trace/meson.build b/trace/meson.build index b113425..eb28aff 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -55,13 +55,13 @@ foreach dir : [ '.' ] + trace_events_subdirs 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']) +trace_events_all = 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']) foreach d : [ ['generated-tcg-tracers.h', 'tcg-h'], From patchwork Thu Dec 19 12:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="DOveZFXP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drrq4XlGz9sPc for ; Thu, 19 Dec 2019 23:33:31 +1100 (AEDT) Received: from localhost ([::1]:40170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuzg-0001U9-Ma for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:33:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34578) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurb-0008Vh-AE for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurZ-0001Q4-RL for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:07 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30332 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurZ-0001NB-K0 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758305; 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=9X/QHYeeNuH4098z9sf5qGPqF8ZS5vX+fP9s1JD1Nvc=; b=DOveZFXPIE/JamKEfInFO7riEuUWMe+Tl8qENDD4MJRSdzM2SJgeNyWJD9ubFdlPfkPJrF 7Jnc8w6MUBvzUN5FWgrEwsM6XKXHm0XAodbwHtz+XgqaUmrK0Ui7MS1wD0afo1aaheBaVS ufPGsMSOr7Oxo1eZPyoqM7l5C384jUs= 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-363-f6eAdgX8Pz2Nwec6AySnhw-1; Thu, 19 Dec 2019 07:25:03 -0500 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 F07D2477 for ; Thu, 19 Dec 2019 12:25:02 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD2AA60C18; Thu, 19 Dec 2019 12:25:01 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 114/132] build-sys/rules.mak: remove version.o Date: Thu, 19 Dec 2019 13:23:34 +0100 Message-Id: <1576758232-12439-23-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: f6eAdgX8Pz2Nwec6AySnhw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 5 ----- Makefile.objs | 4 ---- rules.mak | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 71c3352..afb5e26 100644 --- a/Makefile +++ b/Makefile @@ -189,11 +189,6 @@ recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS)) recurse-install: $(addsuffix /install, $(TARGET_DIRS)) $(addsuffix /install, $(TARGET_DIRS)): all -$(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) - ###################################################################### COMMON_LDADDS = libqemuutil.a diff --git a/Makefile.objs b/Makefile.objs index 76326e9..9fd3932 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -55,7 +55,3 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF) common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) endif - -###################################################################### -# Resource file for Windows executables -version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o diff --git a/rules.mak b/rules.mak index 162ecb5..6c6b909 100644 --- a/rules.mak +++ b/rules.mak @@ -78,8 +78,6 @@ expand-objs = $(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)$@") # 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. @@ -87,7 +85,7 @@ LINKPROG = $(or $(CXX),$(CC)) LINK = $(call quiet-command, $(LINKPROG) $(QEMU_LDFLAGS) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ $(call process-archive-undefs, $1) \ - $(version-obj-y) $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") + $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") %.o: %.S $(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ From patchwork Thu Dec 19 12:23:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="A/+gMEiF"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsGv44Nwz9sPc for ; Thu, 19 Dec 2019 23:52:39 +1100 (AEDT) Received: from localhost ([::1]:40444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvID-0002n6-0z for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:52:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35004) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihure-00009R-P4 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurc-0001gu-VG for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:10 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27289 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurc-0001cl-OV for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758308; 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=HTp3AFdVG+9DbuSB4ysWaPGf33poJXFBs+GyAx0PFd8=; b=A/+gMEiFh4WvH6M1cAcwyEUciRoYtD3yabdm0DNox+HM7NN3PhM3z0Mtwd5np4qgUJ2NN2 0VQwpgEPNosSjaywY3QpDFpF6lc0b3wzIPxBbFm4xLN/X+47qCnsxsxoLW2k6Dm+nXhcEv sIJycdL7BqPjXk8+H0Qhtfp4/Qv7wgo= 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-398-6dzoZy3lNq-EPnkSd5cKUw-1; Thu, 19 Dec 2019 07:25:06 -0500 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 F3687184BEC0 for ; Thu, 19 Dec 2019 12:25:05 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7959460C18; Thu, 19 Dec 2019 12:25:03 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 115/132] remove Makefile.target Date: Thu, 19 Dec 2019 13:23:35 +0100 Message-Id: <1576758232-12439-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 6dzoZy3lNq-EPnkSd5cKUw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 32 +++----------------------------- Makefile.objs | 27 --------------------------- Makefile.target | 13 ------------- configure | 2 -- meson.build | 9 --------- 5 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 Makefile.target diff --git a/Makefile b/Makefile index afb5e26..f2152ce 100644 --- a/Makefile +++ b/Makefile @@ -184,10 +184,9 @@ $(ROM_DIRS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" CFLAGS="$(filter -O% -g%,$(CFLAGS))" $(notdir $@),) .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 +recurse-all: $(ROM_DIRS) +recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) +recurse-install: ###################################################################### @@ -265,9 +264,6 @@ distclean: clean $(call clean-manual,devel) $(call clean-manual,interop) $(call clean-manual,specs) - for d in $(TARGET_DIRS); do \ - rm -rf $$d || exit 1 ; \ - done rm -Rf .sdk if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi @@ -419,9 +415,6 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done - for d in $(TARGET_DIRS); do \ - $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ - done .PHONY: ctags ctags: @@ -525,20 +518,6 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl -# 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 INSTALLER = qemu-setup-$(VERSION)$(EXESUF) @@ -622,11 +601,6 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_DIRS), \ - echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ - printf " %-30s - Build for %s\\n" $(t)/all $(t);) \ - echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the config' @echo ' distclean - Remove all generated files' diff --git a/Makefile.objs b/Makefile.objs index 9fd3932..654667f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -28,30 +28,3 @@ crypto-obj-y = crypto/libcrypto.fa io-obj-y = io/libio.fa qom-obj-y = qom/libqom.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 -# single QEMU executable should support all CPUs and machines. - -ifeq ($(CONFIG_SOFTMMU),y) -common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) -common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) -common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF) -common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF) - -common-obj-$(if $(CONFIG_CURSES),m) += ui-curses$(DSOSUF) -common-obj-$(if $(CONFIG_GTK),m) += ui-gtk$(DSOSUF) -common-obj-$(if $(CONFIG_SDL),m) += ui-sdl$(DSOSUF) -common-obj-$(if $(CONFIG_SPICE),m) += ui-spice-app$(DSOSUF) - -common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF) -common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF) -common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF) -common-obj-$(if $(CONFIG_LIBNFS),m) += block-nfs$(DSOSUF) -common-obj-$(if $(CONFIG_LIBSSH),m) += block-ssh$(DSOSUF) -common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF) - -common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF) -common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF) -endif diff --git a/Makefile.target b/Makefile.target deleted file mode 100644 index 4f72a89..0000000 --- a/Makefile.target +++ /dev/null @@ -1,13 +0,0 @@ -# -*- Mode: makefile -*- - -BUILD_DIR?=$(CURDIR)/.. - -include ../config-host.mak -include config-target.mak -include $(SRC_PATH)/rules.mak - -all: -clean: -install: all - -.PHONY: all clean install diff --git a/configure b/configure index ad36082..f6e3b0a 100755 --- a/configure +++ b/configure @@ -7597,8 +7597,6 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then TARGET_BASE_ARCH=$TARGET_ARCH fi -symlink "$source_path/Makefile.target" "$target_dir/Makefile" - upper() { echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]' } diff --git a/meson.build b/meson.build index 4fb3bdc..55ccb79 100644 --- a/meson.build +++ b/meson.build @@ -823,15 +823,6 @@ foreach target : target_dirs command: [create_config, '@INPUT@']) target_specific = specific_ss.apply(config_target, strict: false) - static_library('qemu-' + target, - sources: target_specific.sources() + arch_srcs + [config_target_h], - dependencies: target_specific.dependencies() + arch_deps + deps, - objects: objects, - include_directories: target_inc, - c_args: ['-DNEED_CPU_H', - '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), - '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)], - name_suffix: 'fa') execs = [{'postfix': '', 'gui': false}] if sdlwindows From patchwork Thu Dec 19 12:23:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="cHvi9t3W"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds4g1Pjnz9sPn for ; Thu, 19 Dec 2019 23:43:47 +1100 (AEDT) Received: from localhost ([::1]:40310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv9c-0007lN-O7 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:43:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35289) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurh-0000Eq-HS for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurf-0001vM-NQ for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:13 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36087 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurf-0001sB-Bw for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758311; 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=h2IFmOVEohUjR3HLNvRqKGi19CA29/Dw84gjDW537l4=; b=cHvi9t3WUhIZMMio0X3KjPFvfVAau0Vijm+amZBeMgnaD+4qMOsw0pCllXGDpDH6uR0KoB 6fAp5fjIvwK0w0ebDAdWZwV56B0TRKiiK6QEhaOz/s/M4nRIT5VX3omCwA6acExOMu97O2 Ux44zu0xBGS5/ctn7FcO9pGiQw5FeXg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-197-VkA9dLnjPOChJ9wLk0P6xg-1; Thu, 19 Dec 2019 07:25:08 -0500 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 02F82477 for ; Thu, 19 Dec 2019 12:25:08 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D7E060C18; Thu, 19 Dec 2019 12:25:06 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 116/132] meson: sphinx-build Date: Thu, 19 Dec 2019 13:23:36 +0100 Message-Id: <1576758232-12439-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: VkA9dLnjPOChJ9wLk0P6xg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 56 +----------------------------------------- docs/meson.build | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ meson.build | 2 ++ 3 files changed, 78 insertions(+), 55 deletions(-) create mode 100644 docs/meson.build diff --git a/Makefile b/Makefile index f2152ce..d60a0c9 100644 --- a/Makefile +++ b/Makefile @@ -224,22 +224,6 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" -# 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 := docs/built -else -MANUAL_BUILDDIR := docs -endif - -define clean-manual = -rm -rf $(MANUAL_BUILDDIR)/$1/_static -rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(MANUAL_BUILDDIR)/$1/*.html -endef - distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi rm -f tests/tcg/config-*.mak @@ -260,10 +244,6 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 rm -f docs/qemu-cpu-models.7 - rm -rf .doctrees - $(call clean-manual,devel) - $(call clean-manual,interop) - $(call clean-manual,specs) rm -Rf .sdk if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi @@ -303,21 +283,7 @@ BLOBS= DESCS= endif -# Note that we manually filter-out the non-Sphinx documentation which -# is currently built into the docs/interop directory in the build tree. -define install-manual = -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 '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) - -install-doc: $(DOCS) install-sphinxdocs +install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" @@ -458,26 +424,6 @@ docs/version.texi: $(SRC_PATH)/VERSION config-host.mak %.pdf: %.texi docs/version.texi $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") -# 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 - -# Canned command to build a single manual -build-manual = $(call quiet-command,sphinx-build $(if $(V),,-q) -W -n -b html -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1") -# We assume all RST files in the manual's directory are used in it -manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py - -$(MANUAL_BUILDDIR)/devel/index.html: $(call manual-deps,devel) - $(call build-manual,devel) - -$(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) - $(call build-manual,interop) - -$(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs) - $(call build-manual,specs) - docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ diff --git a/docs/meson.build b/docs/meson.build new file mode 100644 index 0000000..8680aaa --- /dev/null +++ b/docs/meson.build @@ -0,0 +1,75 @@ +sphinx = find_program('sphinx-build', required: build_docs) + +if sphinx.found() + devel_rst = [ + 'devel/decodetree.rst', + 'devel/index.rst', + 'devel/kconfig.rst', + 'devel/loads-stores.rst', + 'devel/memory.rst', + 'devel/migration.rst', + 'devel/secure-coding-practices.rst', + 'devel/stable-process.rst', + 'devel/tcg.rst', + 'devel/testing.rst', + ] + devel = custom_target('sphinx-devel', + build_by_default: build_docs, + input: devel_rst, + depend_files: [files('conf.py', 'devel/conf.py')], + output: 'devel', + command: [sphinx, '-W', '-n', '-b', 'html', '-q', + '-Dversion=' + config_host['VERSION'], + '-Drelease=' + config_host['PKGVERSION'], + meson.current_source_dir() / 'devel', + '@OUTPUT@', + ]) + + interop_rst = [ + 'interop/bitmaps.rst', + 'interop/index.rst', + 'interop/live-block-operations.rst', + 'interop/pr-helper.rst', + 'interop/vhost-user-gpu.rst', + 'interop/vhost-user.rst', + ] + interop = custom_target('sphinx-interop', + build_by_default: build_docs, + input: interop_rst, + depend_files: [files('conf.py', 'interop/conf.py')], + output: 'interop', + command: [sphinx, '-W', '-n', '-b', 'html', '-q', + '-Dversion=' + config_host['VERSION'], + '-Drelease=' + config_host['PKGVERSION'], + meson.current_source_dir() / 'interop', + '@OUTPUT@', + ]) + if build_docs + install_subdir(meson.current_build_dir() / 'interop', + install_dir: config_host['qemu_docdir'], + exclude_directories: '.doctrees') + endif + + specs_rst = [ + 'specs/index.rst', + 'specs/ppc-spapr-xive.rst', + 'specs/ppc-xive.rst', + ] + specs = custom_target('sphinx-specs', + input: specs_rst, + depend_files: [files('conf.py', 'specs/conf.py')], + output: 'specs', + command: [sphinx, '-W', '-n', '-b', 'html', '-q', + '-Dversion=' + config_host['VERSION'], + '-Drelease=' + config_host['PKGVERSION'], + meson.current_source_dir() / 'specs', + '@OUTPUT@', + ]) + if build_docs + install_subdir(meson.current_build_dir() / 'specs', + install_dir: config_host['qemu_docdir'], + exclude_directories: '.doctrees') + endif + + sphinxdocs = alias_target('sphinxdocs', devel, interop, specs) +endif diff --git a/meson.build b/meson.build index 55ccb79..5b4b472 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,7 @@ config_host = kconfig.load(meson.current_build_dir() / 'config-host.mak') config_all_disas = kconfig.load(meson.current_build_dir() / 'config-all-disas.mak') enable_modules = 'CONFIG_MODULES' in config_host +build_docs = 'BUILD_DOCS' in config_host add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) @@ -923,3 +924,4 @@ if have_tools endif subdir('pc-bios') +subdir('docs') From patchwork Thu Dec 19 12:23:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ERO+ZmVc"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsKq6MdMz9sR8 for ; Thu, 19 Dec 2019 23:55:10 +1100 (AEDT) Received: from localhost ([::1]:40470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvKd-0006dt-LF for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:55:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35600) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurr-0000QG-En for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurp-0002I1-RG for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:23 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43094 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuro-0002Eh-4o for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758318; 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=TOjiAa4p9HnN6M6zxs5kEy2FEQoTDPRdAVjm51scqPM=; b=ERO+ZmVct96uCoqzFg7VQrEUor9iezvQaZKzeoiz+0NUX0UMEOQ4lmdhHlR49JeqffAZGS 8aa512RdBVg3WiwCFq+H/9THVg3hfLEyY/MBf9D8JfYvrfQska2sLysJZW1R5NeiEFgxPT 26NPU/JMevNTUD9oBDtL43ZhUwo3W4Y= 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-147-l8REVcC7OYyMyACCuRGuOQ-1; Thu, 19 Dec 2019 07:25:13 -0500 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 9796C800D48 for ; Thu, 19 Dec 2019 12:25:12 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 847BF60C81; Thu, 19 Dec 2019 12:25:08 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 117/132] meson: generate version.texi Date: Thu, 19 Dec 2019 13:23:37 +0100 Message-Id: <1576758232-12439-26-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: l8REVcC7OYyMyACCuRGuOQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 6 ------ docs/meson.build | 4 ++++ docs/version.texi.in | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 docs/version.texi.in diff --git a/Makefile b/Makefile index d60a0c9..c1ea39f 100644 --- a/Makefile +++ b/Makefile @@ -404,12 +404,6 @@ MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES) TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)" TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES) -docs/version.texi: $(SRC_PATH)/VERSION config-host.mak - $(call quiet-command,(\ - echo "@set VERSION $(VERSION)" && \ - echo "@set CONFDIR $(qemu_confdir)" \ - )> $@,"GEN","$@") - %.html: %.texi docs/version.texi $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ --html $< -o $@,"GEN","$@") diff --git a/docs/meson.build b/docs/meson.build index 8680aaa..c71fff9 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,3 +1,7 @@ +configure_file(output: 'version.texi', + input: 'version.texi.in', + configuration: config_host) + sphinx = find_program('sphinx-build', required: build_docs) if sphinx.found() diff --git a/docs/version.texi.in b/docs/version.texi.in new file mode 100644 index 0000000..0a723b8 --- /dev/null +++ b/docs/version.texi.in @@ -0,0 +1,2 @@ +@set VERSION @VERSION@ +@set CONFDIR @qemu_confdir@ From patchwork Thu Dec 19 12:23:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Agv8BDwD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds8Y4CQKz9sPc for ; Thu, 19 Dec 2019 23:47:09 +1100 (AEDT) Received: from localhost ([::1]:40370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvCs-00030T-Oo for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:47:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurx-0000VG-9a for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurq-0002Iv-KT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41209 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurp-0002Fu-Pv for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758320; 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=lLCOLGc9HCwQfuDdNFFvWe1ryUt857w2OCIR1OAe89s=; b=Agv8BDwD5XlpNejOJ2J0bIojyQxwAUNzfHnIr2t7RVV/2UZsRy8Cw560UudgcXbo1gj9z+ qvc7TJHDCRhiDUx/rvXnyL4Erv2ZOspP1CjetjxKtaU1gF7qJc3aVMhp+Ca8rFKOWYYDuL OjG5ZO7zXTnjXW1J1swniQp1WefK2dI= 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-45-dQ1CxBNONDCAo45GkHnWkQ-1; Thu, 19 Dec 2019 07:25:15 -0500 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 6F828107ACC4 for ; Thu, 19 Dec 2019 12:25:14 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3011660C18; Thu, 19 Dec 2019 12:25:12 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 118/132] meson: build texi doc Date: Thu, 19 Dec 2019 13:23:38 +0100 Message-Id: <1576758232-12439-27-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: dQ1CxBNONDCAo45GkHnWkQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 139 ++--------------------------------------- docs/interop/qemu-ga-ref.texi | 2 +- docs/interop/qemu-qmp-ref.texi | 2 +- docs/meson.build | 1 + meson.build | 117 +++++++++++++++++++++++++++++++++- rules.mak | 12 ---- 6 files changed, 125 insertions(+), 148 deletions(-) diff --git a/Makefile b/Makefile index c1ea39f..ac21e14 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ BUILD_DIR=$(CURDIR) SRC_PATH=. UNCHECKED_GOALS := %clean TAGS cscope ctags dist \ - html info pdf txt \ help check-help print-% \ docker docker-% vm-help vm-test vm-build-% @@ -106,29 +105,13 @@ edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) Makefile: ; configure: ; -.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 $(call set-vpath, $(SRC_PATH)) LIBS+=-lz $(LIBS_TOOLS) -ifdef BUILD_DOCS -DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 -DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 -DOCS+=docs/qemu-block-drivers.7 -DOCS+=docs/qemu-cpu-models.7 -ifdef CONFIG_VIRTFS -DOCS+=fsdev/virtfs-proxy-helper.1 -endif -ifdef CONFIG_TRACE_SYSTEMTAP -DOCS+=scripts/qemu-trace-stap.1 -endif -else -DOCS= -endif - SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) ifneq ($(wildcard config-host.mak),) @@ -137,7 +120,7 @@ endif include $(SRC_PATH)/tests/Makefile.include -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules +all: recurse-all modules DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) @@ -225,25 +208,13 @@ qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" distclean: clean - rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f config-host.mak config-host.h* config-host.ld 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 roms/seabios/config.mak roms/vgabios/config.mak - rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps - rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys - rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp - rm -f qemu-doc.vr qemu-doc.txt 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 -f docs/qemu-block-drivers.7 - rm -f docs/qemu-cpu-models.7 rm -Rf .sdk if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi @@ -283,39 +254,6 @@ BLOBS= DESCS= endif -install-doc: $(DOCS) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" -ifdef CONFIG_POSIX - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" -ifeq ($(CONFIG_TOOLS),y) - $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" - $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" -endif -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1" -endif -ifeq ($(CONFIG_GUEST_AGENT),y) - $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" -endif -endif -ifdef CONFIG_VIRTFS - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1" -endif - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" @@ -328,7 +266,7 @@ endif ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 -install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ +install: all install-datadir install-localstatedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(vhost-user-json-y),) @@ -397,67 +335,6 @@ cscope: find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PATH)/cscope.files" cscope -b -i"$(SRC_PATH)/cscope.files" -# documentation -MAKEINFO=makeinfo -MAKEINFOINCLUDES= -I docs -I $( $@, \ - "GEN","$@") - -%.1: - $(call TEXI2MAN) -%.7: - $(call TEXI2MAN) -%.8: - $(call TEXI2MAN) From patchwork Thu Dec 19 12:23:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="R5xIQHof"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsD315pqz9sPc for ; Thu, 19 Dec 2019 23:50:09 +1100 (AEDT) Received: from localhost ([::1]:40398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvFl-0006vD-N0 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:50:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35674) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurt-0000RU-7W for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurr-0002KJ-EP for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:25 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:52167 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurq-0002Em-LC for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758318; 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=6vJv+3RorrvWn+cJmBlppbndFpDtm/N3rUqEtwJZ7Wg=; b=R5xIQHofTi8Gb+MT2/V/BTGFe/Z5DU8vRBLrQ9Pc/QSCPgFoplRmtBBIOUoRcBIqnM1sx1 IOdUu/Iq4M5WBxoIiouiVsB56kv88mYaH6z12kelF/NCW1V0aWbIvD+dmIuQN4REkJFpcs W4vQHxjyYj2otoRwOIRpCmWIl4bp2Fw= 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-122-AmuHFdzxNwaCa9qX9pS_bw-1; Thu, 19 Dec 2019 07:25:16 -0500 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 20773800EBF for ; Thu, 19 Dec 2019 12:25:16 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id E87B260C18; Thu, 19 Dec 2019 12:25:14 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 119/132] meson: add NSIS building Date: Thu, 19 Dec 2019 13:23:39 +0100 Message-Id: <1576758232-12439-28-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: AmuHFdzxNwaCa9qX9pS_bw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 57 -------------------------------------------------------- meson.build | 23 +++++++++++++++++++++++ scripts/nsis.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 57 deletions(-) create mode 100755 scripts/nsis.sh diff --git a/Makefile b/Makefile index ac21e14..710659b 100644 --- a/Makefile +++ b/Makefile @@ -335,62 +335,6 @@ cscope: find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PATH)/cscope.files" cscope -b -i"$(SRC_PATH)/cscope.files" -ifdef CONFIG_WIN32 - -INSTALLER = qemu-setup-$(VERSION)$(EXESUF) - -nsisflags = -V2 -NOCD - -ifneq ($(wildcard $(SRC_PATH)/dll),) -ifeq ($(ARCH),x86_64) -# 64 bit executables -DLL_PATH = $(SRC_PATH)/dll/w64 -nsisflags += -DW64 -else -# 32 bit executables -DLL_PATH = $(SRC_PATH)/dll/w32 -endif -endif - -.PHONY: installer -installer: $(INSTALLER) - -INSTDIR=/tmp/qemu-nsis - -$(INSTALLER): $(SRC_PATH)/qemu.nsi - $(MAKE) install prefix=${INSTDIR} -ifdef SIGNCODE - (cd ${INSTDIR}; \ - for i in *.exe; do \ - $(SIGNCODE) $${i}; \ - done \ - ) -endif # SIGNCODE - (cd ${INSTDIR}; \ - for i in qemu-system-*.exe; do \ - arch=$${i%.exe}; \ - arch=$${arch#qemu-system-}; \ - echo Section \"$$arch\" Section_$$arch; \ - echo SetOutPath \"\$$INSTDIR\"; \ - echo File \"\$${BINDIR}\\$$i\"; \ - echo SectionEnd; \ - done \ - ) >${INSTDIR}/system-emulations.nsh - makensis $(nsisflags) \ - $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \ - $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \ - -DBINDIR="${INSTDIR}" \ - $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \ - -DSRCDIR="$(SRC_PATH)" \ - -DOUTFILE="$(INSTALLER)" \ - -DDISPLAYVERSION="$(VERSION)" \ - $(SRC_PATH)/qemu.nsi - rm -r ${INSTDIR} -ifdef SIGNCODE - $(SIGNCODE) $(INSTALLER) -endif # SIGNCODE -endif # CONFIG_WIN - # Add a dependency on the generated files, so that they are always # rebuilt before other object files ifneq ($(wildcard config-host.mak),) @@ -430,7 +374,6 @@ endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' - @echo ' installer - Build NSIS-based installer for QEMU' ifdef QEMU_GA_MSI_ENABLED @echo ' msi - Build MSI-based installer for qemu-ga' endif diff --git a/meson.build b/meson.build index 40ba735..ce67e4c 100644 --- a/meson.build +++ b/meson.build @@ -1040,3 +1040,26 @@ if pod2man.found() and build_docs '--release=" "', '@INPUT@']) endforeach endif + +if host_machine.system() == 'windows' + nsis_cmd = [ + find_program('scripts/nsis.sh'), + '@OUTPUT@', + get_option('prefix'), + meson.current_source_dir(), + host_machine.cpu_family(), + '-DDISPLAYVERSION=@0@'.format(config_host['VERSION']), + ] + if build_docs + nsis_cmd += '-DCONFIG_DOCUMENTATION=y' + endif + if 'CONFIG_GTK' in config_host + nsis_cmd += '-DCONFIG_GTK=y' + endif + + custom_target('nsis', + output: 'qemu-setup-' + config_host['VERSION'] + '.exe', + input: files('qemu.nsi'), + build_always_stale: true, + command: nsis_cmd + ['@INPUT@']) +endif diff --git a/scripts/nsis.sh b/scripts/nsis.sh new file mode 100755 index 0000000..ad23708 --- /dev/null +++ b/scripts/nsis.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +OUTFILE="$1" +shift +PREFIX="$1" +shift +SRCDIR="$1" +shift +CPU="$1" +shift + +DESTDIR=$(mktemp -d) +trap "rm -rf $DESTDIR" EXIT +make DESTDIR="$DESTDIR" install + +signcode() { + if [ -z "$SIGNCODE" ]; then + return + fi + "$SIGNCODE" "$@" +} + +shopt -s nullglob + +( + cd "$DESTDIR$PREFIX" + for i in qemu-system-*.exe; do + arch=${i%.exe} + arch=${arch#qemu-system-} + echo Section \"$arch\" Section_$arch + echo SetOutPath \"\$INSTDIR\" + echo File \"\${BINDIR}\\$i\" + echo SectionEnd + done +) > "$DESTDIR$PREFIX/system-emulations.nsh" + +( + cd "$DESTDIR$PREFIX" + for i in *.exe; do + signcode "$i" + done +) + +if [ "$CPU" = "x86_64" ]; then + CPUARG="-DW64" + DLLDIR="w64" +else + DLLDIR="w32" +fi + +if [ -d "$SRCDIR/dll" ]; then + DLLARG="-DDLLDIR=$SRCDIR/dll/$DLLDIR" +fi + +makensis -V2 -NOCD -DSRCDIR="$SRCDIR" -DBINDIR="$DESTDIR$PREFIX" \ + $CPUARG $DLLARG -DOUTFILE="$OUTFILE" "$@" + +signcode "$OUTFILE" From patchwork Thu Dec 19 12:23:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="UWmOrhne"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds8W3b7rz9sPc for ; Thu, 19 Dec 2019 23:47:07 +1100 (AEDT) Received: from localhost ([::1]:40368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvCq-000308-Jr for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:47:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurt-0000RT-7j for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurr-0002KR-Ey for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:24 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:51852 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurq-0002FU-Kw for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758319; 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=ib+TBuTaCY7leyC0IVdfkkv8AGpLyv11gaAtA9leCd8=; b=UWmOrhne5hqLey7UTkcliEJfdXLLQ8MLj0DCvNPs/D21/hi9JNv0C2H/3PAJfo/wdZ93CQ RKCB48Jx938otUXyBwZ+1/o626y/mFj+27aVyHZLcJKNtivU5pRDVKKLyHXY45p99BnTbD /d4zNawYB+7RSljOygEQXXtbm6FSoMY= 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-307-xk-_F9cmOn-ccIbo_mpErw-1; Thu, 19 Dec 2019 07:25:18 -0500 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 D0B9BDB60 for ; Thu, 19 Dec 2019 12:25:17 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC65B60C18; Thu, 19 Dec 2019 12:25:16 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 120/132] meson: install some scripts Date: Thu, 19 Dec 2019 13:23:40 +0100 Message-Id: <1576758232-12439-29-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: xk-_F9cmOn-ccIbo_mpErw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 3 --- meson.build | 1 + scripts/meson.build | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 scripts/meson.build diff --git a/Makefile b/Makefile index 710659b..d64e481 100644 --- a/Makefile +++ b/Makefile @@ -275,9 +275,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) -endif ifneq ($(BLOBS),) set -e; for x in $(BLOBS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ diff --git a/meson.build b/meson.build index ce67e4c..32b9430 100644 --- a/meson.build +++ b/meson.build @@ -943,6 +943,7 @@ if have_tools endif endif +subdir('scripts') subdir('pc-bios') subdir('docs') diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 0000000..e8cc638 --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,3 @@ +if 'CONFIG_TRACE_SYSTEMTAP' in config_host + install_data('qemu-trace-stap', install_dir: get_option('bindir')) +endif From patchwork Thu Dec 19 12:23:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="B8zFn6/M"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsGr3hKzz9sPc for ; Thu, 19 Dec 2019 23:52:36 +1100 (AEDT) Received: from localhost ([::1]:40438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvI9-0002ej-Ij for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:52:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurw-0000Ui-RM for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurv-0002PG-HT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50286 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurv-0002N6-B0 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758325; 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=Chk0PAaaVjz9FRUSm1XE8XtXZ4zZv3MPs/UVF4gbsq4=; b=B8zFn6/MnUaxY1AK0jqtLE/b1FzTVD0gk//GbMW4z9o8UvC1WmClm9Hu6vJWRR4M/cSa2i 6AWzCLDr1zhbOyRQz4sBXL/Kq1mI3+ywFk4rO1wxkAGa20bSYgl8P37elITSBFbIIaN9u9 m2TDPMw7/MrN8qOR1dOmFbiQLo3o224= 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-246-3Qn_yAI8NuKjc-wEKQrVBg-1; Thu, 19 Dec 2019 07:25:20 -0500 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 7BCD8800D48 for ; Thu, 19 Dec 2019 12:25:19 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E84660C18; Thu, 19 Dec 2019 12:25:18 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 121/132] meson: install edk2 Date: Thu, 19 Dec 2019 13:23:41 +0100 Message-Id: <1576758232-12439-30-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 3Qn_yAI8NuKjc-wEKQrVBg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- Makefile | 7 ------- pc-bios/meson.build | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d64e481..e961286 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,6 @@ generated-files-y = config-host.h generated-files-y += .git-submodule-status -edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; @@ -267,7 +266,6 @@ endif ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 install: all install-datadir install-localstatedir \ - $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(vhost-user-json-y),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/" @@ -280,11 +278,6 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifdef INSTALL_BLOBS - set -e; for x in $(edk2-decompressed); do \ - $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)"; \ - done -endif ifneq ($(DESCS),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 5524b95..18201b0 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -11,11 +11,15 @@ fds = [ 'edk2-x86_64-secure-code.fd', ] -foreach f : fds +install_blobs = 'INSTALL_BLOBS' in config_host + +foreach f: fds custom_target(f, output: f, input: '@0@.bz2'.format(f), capture: true, build_by_default: true, - command: [ bzip2, '-dc', '@INPUT0@' ]) + command: [ bzip2, '-dc', '@INPUT0@' ], + install: install_blobs, + install_dir: config_host['qemu_datadir']) endforeach From patchwork Thu Dec 19 12:23:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="X/V6hbe2"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drwS1Bt5z9sPc for ; Thu, 19 Dec 2019 23:36:40 +1100 (AEDT) Received: from localhost ([::1]:40222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv2j-0005zE-9l for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:36:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35865) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurx-0000VC-4G for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurv-0002Ow-IG for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21745 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurt-0002L0-53 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758323; 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=HjtTPaAIcdrp3lmVBw8yg0yqaiOzTbq0fvZ7/rAOgBI=; b=X/V6hbe2rnhK73W1jPH8KqIEE07j36QgffWfpld7LFDiGQKKOTxGj8xgfDd8IgRpzl5WyE gywhvO/ahDY0EPXHq89uvPiIQ4K1PUhsNiNw6PV6P7mTHfYTR0t1xKqi0MyEBO5A8ONB6v KA8gyORlNupwNleo7+fI1ud1CcyQyBA= 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-26-NRxnPPfPO2-pkzojzd_ACg-1; Thu, 19 Dec 2019 07:25:22 -0500 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 2F907107ACC4 for ; Thu, 19 Dec 2019 12:25:21 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0725C60C18; Thu, 19 Dec 2019 12:25:19 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 122/132] meson: install blobs Date: Thu, 19 Dec 2019 13:23:42 +0100 Message-Id: <1576758232-12439-31-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: NRxnPPfPO2-pkzojzd_ACg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 29 ------------------------- pc-bios/meson.build | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index e961286..b88110b 100644 --- a/Makefile +++ b/Makefile @@ -223,33 +223,9 @@ de-ch es fo fr-ca hu ja mk pt sl tr \ bepo cz ifdef INSTALL_BLOBS -BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ -vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \ -ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ -pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ -pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ -efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ -efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ -efi-e1000e.rom efi-vmxnet3.rom \ -qemu-nsis.bmp \ -bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \ -s390-ccw.img s390-netboot.img \ -slof.bin skiboot.lid \ -palcode-clipper \ -u-boot.e500 u-boot-sam460-20100605.bin \ -qemu_vga.ndrv \ -edk2-licenses.txt \ -hppa-firmware.img \ -opensbi-riscv32-virt-fw_jump.bin \ -opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin - - DESCS=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 else -BLOBS= DESCS= endif @@ -273,11 +249,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif -ifneq ($(BLOBS),) - set -e; for x in $(BLOBS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ - done -endif ifneq ($(DESCS),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 18201b0..dc7de21 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -23,3 +23,64 @@ foreach f: fds install: install_blobs, install_dir: config_host['qemu_datadir']) endforeach + +blobs = files( + 'QEMU,cgthree.bin', + 'QEMU,tcx.bin', + 'bamboo.dtb', + 'bios-256k.bin', + 'bios.bin', + 'canyonlands.dtb', + 'edk2-licenses.txt', + 'efi-e1000.rom', + 'efi-e1000e.rom', + 'efi-eepro100.rom', + 'efi-ne2k_pci.rom', + 'efi-pcnet.rom', + 'efi-rtl8139.rom', + 'efi-virtio.rom', + 'efi-vmxnet3.rom', + 'hppa-firmware.img', + 'kvmvapic.bin', + 'linuxboot.bin', + 'linuxboot_dma.bin', + 'multiboot.bin', + 'openbios-ppc', + 'openbios-sparc32', + 'openbios-sparc64', + 'opensbi-riscv32-virt-fw_jump.bin', + 'opensbi-riscv64-sifive_u-fw_jump.bin', + 'opensbi-riscv64-virt-fw_jump.bin', + 'palcode-clipper', + 'petalogix-ml605.dtb', + 'petalogix-s3adsp1800.dtb', + 'ppc_rom.bin', + 'pvh.bin', + 'pxe-e1000.rom', + 'pxe-eepro100.rom', + 'pxe-ne2k_pci.rom', + 'pxe-pcnet.rom', + 'pxe-rtl8139.rom', + 'pxe-virtio.rom', + 'qemu-nsis.bmp', + 'qemu_vga.ndrv', + 's390-ccw.img', + 's390-netboot.img', + 'sgabios.bin', + 'skiboot.lid', + 'slof.bin', + 'u-boot-sam460-20100605.bin', + 'u-boot.e500', + 'vgabios-ati.bin', + 'vgabios-bochs-display.bin', + 'vgabios-cirrus.bin', + 'vgabios-qxl.bin', + 'vgabios-ramfb.bin', + 'vgabios-stdvga.bin', + 'vgabios-virtio.bin', + 'vgabios-vmware.bin', +) + +if install_blobs + install_data(blobs, install_dir: config_host['qemu_datadir']) +endif From patchwork Thu Dec 19 12:23:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="MdoOuEnt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drzN1XmCz9sPc for ; Thu, 19 Dec 2019 23:39:10 +1100 (AEDT) Received: from localhost ([::1]:40248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv59-0001CG-Sx for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:39:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36179) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihus0-0000ZZ-1R for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihury-0002cY-KD for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:31 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:42517 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihury-0002Zk-Bz for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758329; 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=rmNe3X0ZzfVBU65K14+bGrtLyTJ6nq2ofJAD52vy/qI=; b=MdoOuEnt+jCA52WCDBLzU18iQOWj1OjmPWk+t9qLA9d1vqumGfFVnBMJ8nu2jgJWSJhUpK GoyKHHlCjRXXtssVc8EwqOkoM98xsVpossJXUJv4x8ZHuYX/M8fRVEEuiLZY8fZlMhH1eM iuGIX+FNIpvyZa8TDvAXIlb5Y5+3G7E= 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-395-k-bcG04cN0mhMN5zXF5LVQ-1; Thu, 19 Dec 2019 07:25:24 -0500 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 B6E6B800D48 for ; Thu, 19 Dec 2019 12:25:23 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD07560C18; Thu, 19 Dec 2019 12:25:21 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 123/132] meson: install edk2 json descriptors Date: Thu, 19 Dec 2019 13:23:43 +0100 Message-Id: <1576758232-12439-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: k-bcG04cN0mhMN5zXF5LVQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 17 ----------------- pc-bios/descriptors/meson.build | 14 ++++++++++++++ pc-bios/meson.build | 2 ++ 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 pc-bios/descriptors/meson.build diff --git a/Makefile b/Makefile index b88110b..22f9883 100644 --- a/Makefile +++ b/Makefile @@ -222,13 +222,6 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ de-ch es fo fr-ca hu ja mk pt sl tr \ bepo cz -ifdef INSTALL_BLOBS -DESCS=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 -else -DESCS= -endif - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" @@ -249,16 +242,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif -ifneq ($(DESCS),) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" - set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ - for x in $(DESCS); do \ - sed -e 's,@DATADIR@,$(qemu_datadir),' \ - "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \ - $(INSTALL_DATA) "$$tmpf" \ - "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \ - done -endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build new file mode 100644 index 0000000..7c715ba --- /dev/null +++ b/pc-bios/descriptors/meson.build @@ -0,0 +1,14 @@ +foreach f: [ + '50-edk2-i386-secure.json', + '50-edk2-x86_64-secure.json', + '60-edk2-aarch64.json', + '60-edk2-arm.json', + '60-edk2-i386.json', + '60-edk2-x86_64.json' +] + configure_file(input: files(f), + output: f, + configuration: {'DATADIR': config_host['qemu_datadir']}, + install: install_blobs, + install_dir: config_host['qemu_datadir'] / 'firmware') +endforeach diff --git a/pc-bios/meson.build b/pc-bios/meson.build index dc7de21..75475a6 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -24,6 +24,8 @@ foreach f: fds install_dir: config_host['qemu_datadir']) endforeach +subdir('descriptors') + blobs = files( 'QEMU,cgthree.bin', 'QEMU,tcx.bin', From patchwork Thu Dec 19 12:23:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="jWMDglW4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds4r31Hhz9sQp for ; Thu, 19 Dec 2019 23:43:56 +1100 (AEDT) Received: from localhost ([::1]:40312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv9k-0007pa-Tg for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:43:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35931) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurx-0000WK-Lg for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurw-0002Sr-9G for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43331 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurw-0002Q6-20 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758327; 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=+3GKEwZiRFXr5Tov7HfXS2+8rrX3kLEb/Z2Pb/Ejb/I=; b=jWMDglW4zrYHYVOIq38p4MCo91pxIE3TC6qDY46O3AN6Tt6tS58Ua6h/VUPdJ3u3JeDW8S NZwcIGBFqGEIunNBmdzspp2jqtgecirDXKfGoQeM83vctQG6LD5l2/3J0FMwBjJl3cgblj yel4mPNXkJol2Z0iM6OJeglBDE6sbSc= 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-326-fVc58c5RMzuF-8jAN9OkxQ-1; Thu, 19 Dec 2019 07:25:26 -0500 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 6F9A0107ACC4 for ; Thu, 19 Dec 2019 12:25:25 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42B2C60C18; Thu, 19 Dec 2019 12:25:23 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 124/132] meson: install icons Date: Thu, 19 Dec 2019 13:23:44 +0100 Message-Id: <1576758232-12439-33-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: fVc58c5RMzuF-8jAN9OkxQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 14 -------------- ui/icons/meson.build | 13 +++++++++++++ ui/meson.build | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 ui/icons/meson.build diff --git a/Makefile b/Makefile index 22f9883..04a7d00 100644 --- a/Makefile +++ b/Makefile @@ -232,8 +232,6 @@ ifeq ($(CONFIG_GUEST_AGENT),y) endif endif -ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 - install: all install-datadir install-localstatedir \ recurse-install ifneq ($(vhost-user-json-y),) @@ -242,18 +240,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif - for s in $(ICON_SIZES); do \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ - "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ - done; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \ - "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \ - "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" - mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK diff --git a/ui/icons/meson.build b/ui/icons/meson.build new file mode 100644 index 0000000..b6e21f6 --- /dev/null +++ b/ui/icons/meson.build @@ -0,0 +1,13 @@ +foreach s: [16, 24, 32, 48, 64, 128, 256, 512] + s = '@0@x@0@'.format(s.to_string()) + install_data('qemu_@0@.png'.format(s), + rename: 'qemu.png', + install_dir: config_host['qemu_icondir'] / 'hicolor' / s / 'apps') +endforeach + +install_data('qemu_32x32.bmp', + rename: 'qemu.bmp', + install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32' / 'apps') + +install_data('qemu.svg', + install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scalable' / 'apps') diff --git a/ui/meson.build b/ui/meson.build index 0867cdc..22923e3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -107,5 +107,6 @@ foreach e : keymaps endforeach subdir('shader') +subdir('icons') modules += {'ui': ui_modules} From patchwork Thu Dec 19 12:23:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ggHHCtsI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsDC0g47z9sPc for ; Thu, 19 Dec 2019 23:50:19 +1100 (AEDT) Received: from localhost ([::1]:40404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvFw-00076a-IE for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:50:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36425) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihus6-0000eY-L6 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihus4-0002rr-Rd for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38157 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihus2-0002oa-Tp for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758333; 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=AlyXS8W7jZG4G49HK6DELfSaAvnHNqjMCw5GQGS2QZo=; b=ggHHCtsIPkp1tM5kZD2N0kpSKitcojZSGuQ7Jht5GG6ghNklxNEg5SSBCyGsOK9BryKBxL bN7gHbr0H9DJ7NUQR+wbkYZ+1palUMqJJ0FWM4E1D84aG6in2CHtU5ivu1S0WUTTiysxXv 9RkCE29eMnAUDq35qngZWn7KSj2OhJQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196--FK_vlH0NwGBG0e6F630-Q-1; Thu, 19 Dec 2019 07:25:31 -0500 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 E40D4DB61 for ; Thu, 19 Dec 2019 12:25:30 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F1F560C81; Thu, 19 Dec 2019 12:25:26 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 125/132] meson: install desktop file Date: Thu, 19 Dec 2019 13:23:45 +0100 Message-Id: <1576758232-12439-34-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: -FK_vlH0NwGBG0e6F630-Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 2 -- ui/meson.build | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04a7d00..8ebaacf 100644 --- a/Makefile +++ b/Makefile @@ -240,8 +240,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif - $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ - "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK $(MAKE) -C po $@ endif diff --git a/ui/meson.build b/ui/meson.build index 22923e3..e8b94ca 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -109,4 +109,6 @@ endforeach subdir('shader') subdir('icons') +install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) + modules += {'ui': ui_modules} From patchwork Thu Dec 19 12:23:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Y2zrBTUl"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsKn1sgFz9sR8 for ; Thu, 19 Dec 2019 23:55:08 +1100 (AEDT) Received: from localhost ([::1]:40464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvKc-0006bg-7I for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:55:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36488) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihus8-0000gn-PA for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihus6-0002vq-RT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:40 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46044 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihus6-0002rY-Iu for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758336; 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=t4jqXLhrAZcU4UANvFHVeNjc+sMakXQe/HeeoQkr3so=; b=Y2zrBTUliBqmAGzR4ADNwx1992ixYp5lMlhOYApqXC85nevw/hqSzE8Mz/NFgCiLObhd0J Ovqhe/sN2q7oUdfs7qBTP7IJ7tulM4bgw2sDR+8hroF2LdeC+BuXS9/9qTh+zSyITky9wr VGLFalIGEw6tfYd7DeCmisDSiTYYnw8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-gRAcQTfxP5Sy4EMyvBCSWw-1; Thu, 19 Dec 2019 07:25:33 -0500 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 9B8DD801E6D for ; Thu, 19 Dec 2019 12:25:32 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7530D60C18; Thu, 19 Dec 2019 12:25:31 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 126/132] meson: install keymaps Date: Thu, 19 Dec 2019 13:23:46 +0100 Message-Id: <1576758232-12439-35-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: gRAcQTfxP5Sy4EMyvBCSWw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 9 --------- pc-bios/keymaps/meson.build | 38 ++++++++++++++++++++++++++++++++++++++ pc-bios/meson.build | 1 + 3 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 pc-bios/keymaps/meson.build diff --git a/Makefile b/Makefile index 8ebaacf..3faf6a4 100644 --- a/Makefile +++ b/Makefile @@ -217,11 +217,6 @@ distclean: clean rm -Rf .sdk if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi -KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \ -ar de en-us fi fr-be hr it lv nl pl ru th \ -de-ch es fo fr-ca hu ja mk pt sl tr \ -bepo cz - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" @@ -243,10 +238,6 @@ endif 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_datadir)/keymaps"; \ - done .PHONY: ctags ctags: diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build new file mode 100644 index 0000000..04c2a17 --- /dev/null +++ b/pc-bios/keymaps/meson.build @@ -0,0 +1,38 @@ +keymaps = [ + 'ar', + 'bepo', + 'cz', + 'da', + 'de', + 'de-ch', + 'en-gb', + 'en-us', + 'es', + 'et', + 'fi', + 'fo', + 'fr', + 'fr-be', + 'fr-ca', + 'fr-ch', + 'hr', + 'hu', + 'is', + 'it', + 'ja', + 'lt', + 'lv', + 'mk', + 'nl', + 'no', + 'pl', + 'pt', + 'pt-br', + 'ru', + 'sl', + 'sv', + 'th', + 'tr', +] + +install_data(keymaps, install_dir: config_host['qemu_datadir'] / 'keymaps') diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 75475a6..9a46a8c 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -25,6 +25,7 @@ foreach f: fds endforeach subdir('descriptors') +subdir('keymaps') blobs = files( 'QEMU,cgthree.bin', From patchwork Thu Dec 19 12:23:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="WqK3e2xI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsNp1KPKz9s4Y for ; Thu, 19 Dec 2019 23:57:46 +1100 (AEDT) Received: from localhost ([::1]:40506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvN9-00027I-ET for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:57:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36494) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihus8-0000gs-Qi for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihus6-0002vx-Rq for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:40 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57348 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihus6-0002tG-JV for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758337; 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=oLE1nfwKXyX6lNaiMKq8XXlNtJf3EUmUtJk4eewFxvc=; b=WqK3e2xIybnn9Ix03PsXt+E10Scd7YKmCjjIOpvr51tJN6fbqTfM+KuktliGeP4ThuSz/g ZgRCyj0r0+bX6h8ndTqlfDF+KtUgcnvA7W10muRdAws3gMRPIJ0iQwByurLEKASOC4XJAn 7NTMxcLVf35kkdbCIbNUcq7N72mZqnI= 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-72-iwmHs8uYOUeioGbCANWqag-1; Thu, 19 Dec 2019 07:25:35 -0500 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 232F1107ACC7 for ; Thu, 19 Dec 2019 12:25:35 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44C460C18; Thu, 19 Dec 2019 12:25:33 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 127/132] meson: convert po/ Date: Thu, 19 Dec 2019 13:23:47 +0100 Message-Id: <1576758232-12439-36-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: iwmHs8uYOUeioGbCANWqag-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 3 --- meson.build | 4 ++++ po/LINGUAS | 7 ++++++ po/Makefile | 52 ----------------------------------------- po/POTFILES | 1 + po/meson.build | 5 ++++ po/messages.po | 74 ---------------------------------------------------------- 7 files changed, 17 insertions(+), 129 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 3faf6a4..0493a3b 100644 --- a/Makefile +++ b/Makefile @@ -235,9 +235,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif -ifdef CONFIG_GTK - $(MAKE) -C po $@ -endif .PHONY: ctags ctags: diff --git a/meson.build b/meson.build index 32b9430..9a5b9d9 100644 --- a/meson.build +++ b/meson.build @@ -1064,3 +1064,7 @@ if host_machine.system() == 'windows' build_always_stale: true, command: nsis_cmd + ['@INPUT@']) endif + +if 'CONFIG_GTK' in config_host + subdir('po') +endif diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..054930d --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,7 @@ +bg +de_DE +fr_FR +hu +it +tr +zh_CN diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index c041f4c..0000000 --- a/po/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# This makefile is very special as it's meant to build as part of the build -# process and also within the source tree to update the translation files. - -# Set SRC_PATH for in-tree builds without configuration. -SRC_PATH=.. - -# 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=$(SRC_PATH)/po - -VERSION=$(shell cat $(SRC_PATH)/VERSION) -SRCS=$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po)) -OBJS=$(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=$$(basename $$obj .mo); \ - $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ - $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ - done - -$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c - $(call quiet-command, ( cd $(SRC_PATH) && \ - xgettext -o - --from-code=UTF-8 --foreign-user --no-location \ - --package-name=QEMU --package-version=$(VERSION) \ - --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \ - sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@") - -$(PO_PATH)/%.po: $(PO_PATH)/messages.po - $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@") diff --git a/po/POTFILES b/po/POTFILES new file mode 100644 index 0000000..d34d5ed --- /dev/null +++ b/po/POTFILES @@ -0,0 +1 @@ +ui/gtk.c diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..b99d8e2 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,5 @@ +i18n = import('i18n') + +i18n.gettext(meson.project_name(), + args: '--msgid-bugs-address=qemu-devel@nongnu.org', + preset: 'glib') diff --git a/po/messages.po b/po/messages.po deleted file mode 100644 index 065bd45..0000000 --- a/po/messages.po +++ /dev/null @@ -1,74 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: QEMU 2.12.91\n" -"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n" -"POT-Creation-Date: 2018-07-18 07:56+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-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 "" From patchwork Thu Dec 19 12:23:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="WCiY7KuU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsNr6DS1z9s4Y for ; Thu, 19 Dec 2019 23:57:48 +1100 (AEDT) Received: from localhost ([::1]:40512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvNC-0002CB-8T for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:57:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36573) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihusC-0000kc-Ar for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihusA-00030G-Iv for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:43 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44251 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihus8-0002xr-MF for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758340; 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=t7UDH8pkl4r3jOup0r+QeLxo6bRKR2Bxv6cfZ6kMSKk=; b=WCiY7KuUg9Em+K4SBoA+w2qLn4cPk0PuE5nKmF7TDHnCD3XexiMbjUZM96Oq7/rb4Yyuoq 2cyytYzG4ZfT3sOhRTLXOACRuTOFB+X4KXpDy6cIxrkyccFqHfNbRKPo9zwniEbgNO047o 9Qvl58IYyh0yVZ9yUZSsIfViMGS38Ws= 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-317-qgR8pb5gPQaNywiR3xrQ5A-1; Thu, 19 Dec 2019 07:25:38 -0500 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 EA05D1005516 for ; Thu, 19 Dec 2019 12:25:37 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4396460C18; Thu, 19 Dec 2019 12:25:35 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 128/132] meson: replace pc-bios/keymaps/Makefile Date: Thu, 19 Dec 2019 13:23:48 +0100 Message-Id: <1576758232-12439-37-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: qgR8pb5gPQaNywiR3xrQ5A-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- meson.build | 13 ++++--- pc-bios/keymaps/Makefile | 56 --------------------------- pc-bios/keymaps/meson.build | 94 +++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 98 deletions(-) delete mode 100644 pc-bios/keymaps/Makefile diff --git a/meson.build b/meson.build index 9a5b9d9..884aa6c 100644 --- a/meson.build +++ b/meson.build @@ -897,6 +897,14 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif +# used for the update-keymaps target +if xkbcommon.found() + qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), + dependencies: [qemuutil, xkbcommon], install: have_tools) +else + qemu_keymap = disabler() +endif + if have_tools executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [block, qemuutil], install: true) if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or host_machine.system().endswith('bsd') @@ -907,11 +915,6 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') - if xkbcommon.found() - executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), - dependencies: [qemuutil, xkbcommon], install: true) - endif - executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'), dependencies: qemuutil) diff --git a/pc-bios/keymaps/Makefile b/pc-bios/keymaps/Makefile deleted file mode 100644 index 76217b0..0000000 --- a/pc-bios/keymaps/Makefile +++ /dev/null @@ -1,56 +0,0 @@ - -KEYMAP := $(shell which qemu-keymap 2>/dev/null) - -MAPS := ar bepo cz da de de-ch en-us en-gb es et fi fo \ - fr fr-be fr-ca fr-ch \ - hr hu is it ja lt lv mk nl no pl pt pt-br ru th tr - -ar : MAP_FLAGS := -l ar -bepo : MAP_FLAGS := -l fr -v dvorak -cz : MAP_FLAGS := -l cz -da : MAP_FLAGS := -l dk -de : MAP_FLAGS := -l de -v nodeadkeys -de-ch : MAP_FLAGS := -l ch -en-us : MAP_FLAGS := -l us -en-gb : MAP_FLAGS := -l gb -es : MAP_FLAGS := -l es -et : MAP_FLAGS := -l et -fi : MAP_FLAGS := -l fi -fo : MAP_FLAGS := -l fo -fr : MAP_FLAGS := -l fr -v nodeadkeys -fr-be : MAP_FLAGS := -l be -fr-ca : MAP_FLAGS := -l ca -v fr -fr-ch : MAP_FLAGS := -l ch -v fr -hr : MAP_FLAGS := -l hr -hu : MAP_FLAGS := -l hu -is : MAP_FLAGS := -l is -it : MAP_FLAGS := -l it -ja : MAP_FLAGS := -l jp -m jp106 -lt : MAP_FLAGS := -l lt -lv : MAP_FLAGS := -l lv -mk : MAP_FLAGS := -l mk -nl : MAP_FLAGS := -l nl -no : MAP_FLAGS := -l no -pl : MAP_FLAGS := -l pl -pt : MAP_FLAGS := -l pt -pt-br : MAP_FLAGS := -l br -ru : MAP_FLAGS := -l ru -th : MAP_FLAGS := -l th -tr : MAP_FLAGS := -l tr - -ifeq ($(KEYMAP),) - -all: - @echo "nothing to do (qemu-keymap not found)" - -else - -all: $(MAPS) - -clean: - rm -f $(MAPS) - -$(MAPS): $(KEYMAP) Makefile - $(KEYMAP) -f $@ $(MAP_FLAGS) - -endif diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 04c2a17..99cccd7 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -1,38 +1,58 @@ -keymaps = [ - 'ar', - 'bepo', - 'cz', - 'da', - 'de', - 'de-ch', - 'en-gb', - 'en-us', - 'es', - 'et', - 'fi', - 'fo', - 'fr', - 'fr-be', - 'fr-ca', - 'fr-ch', - 'hr', - 'hu', - 'is', - 'it', - 'ja', - 'lt', - 'lv', - 'mk', - 'nl', - 'no', - 'pl', - 'pt', - 'pt-br', - 'ru', - 'sl', - 'sv', - 'th', - 'tr', -] +keymaps = { + 'ar': '-l ar', + 'bepo': '-l fr -v dvorak', + 'cz': '-l cz', + 'da': '-l dk', + 'de': '-l de -v nodeadkeys', + 'de-ch': '-l ch', + 'en-gb': '-l us', + 'en-us': '-l gb', + 'es': '-l es', + 'et': '-l et', + 'fi': '-l fi', + 'fo': '-l fo', + 'fr': '-l fr -v nodeadkeys', + 'fr-be': '-l be', + 'fr-ca': '-l ca -v fr', + 'fr-ch': '-l ch -v fr', + 'hr': '-l hr', + 'hu': '-l hu', + 'is': '-l is', + 'it': '-l it', + 'ja': '-l jp -m jp106', + 'lt': '-l lt', + 'lv': '-l lv', + 'mk': '-l mk', + 'nl': '-l nl', + 'no': '-l no', + 'pl': '-l pl', + 'pt': '-l pt', + 'pt-br': '-l br', + 'ru': '-l ru', + 'sl': '', + 'sv': '', + 'th': '-l th', + 'tr': '-l tr', +} -install_data(keymaps, install_dir: config_host['qemu_datadir'] / 'keymaps') +install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / 'keymaps') + +if meson.is_cross_build() + native_qemu_keymap = find_program('qemu-keymap', required: false) + have_qemu_keymap = native_qemu_keymap.found() +else + native_qemu_keymap = qemu_keymap + # disabler disables everything below + have_qemu_keymap = true +endif +if have_qemu_keymap + t = [] + foreach km, args: keymaps + t += custom_target(km, + output: km, + command: [qemu_keymap, '-f', '@OUTPUT@', args.split()]) + endforeach + if t.length() > 0 + alias_target('update-keymaps', t) + endif +endif From patchwork Thu Dec 19 12:23:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="jVv07arB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsSj2jpPz9sPn for ; Fri, 20 Dec 2019 00:01:07 +1100 (AEDT) Received: from localhost ([::1]:40544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvQN-00066i-R8 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 08:01:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihusE-0000pW-Ma for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihusC-00032H-CK for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:46 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:26423 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihusC-0002zs-12 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758342; 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=2dnisNAPALhuQUK94jay98zcuPOipYD5w8C91vCkHsQ=; b=jVv07arB7g0fVzBeljJmzv+ujPaPrUnZkSNiFB1hJHAOtSACxQkU5fUkWzxsA/eocMdT0K HpL2jG+q3IDSYPHvQYO9jHbKExUFUKF6gJD/ls4m1n16sSS28A7UX1aspiL2dsWNjVKIgF +gEiiDYfw60n3Ah5LdIekE0bdoAsIK8= 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-hiaZiwjCPF-cxiKWTSlCig-1; Thu, 19 Dec 2019 07:25:41 -0500 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 01AA0DB62 for ; Thu, 19 Dec 2019 12:25:40 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C973E60C18; Thu, 19 Dec 2019 12:25:38 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 129/132] meson: replace mostly useless pc-bios/Makefile Date: Thu, 19 Dec 2019 13:23:49 +0100 Message-Id: <1576758232-12439-38-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: hiaZiwjCPF-cxiKWTSlCig-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- pc-bios/Makefile | 19 ------------------- pc-bios/meson.build | 12 ++++++++++++ 2 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 pc-bios/Makefile diff --git a/pc-bios/Makefile b/pc-bios/Makefile deleted file mode 100644 index 315288d..0000000 --- a/pc-bios/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# NOTE: only compilable with x86 cross compile tools -# -include ../config-host.mak - -DEFINES= - -TARGETS= - -all: $(TARGETS) - -%.o: %.S - $(CC) $(DEFINES) -c -o $@ $< - -%.dtb: %.dts - dtc -I dts -O dtb -o $@ $< - -clean: - rm -f $(TARGETS) *.o *~ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 9a46a8c..def68a4 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -87,3 +87,15 @@ blobs = files( if install_blobs install_data(blobs, install_dir: config_host['qemu_datadir']) endif + +dtc = find_program('dtc', required: false) +if dtc.found() + t = [] + foreach f: ['bamboo.dts', 'canyonlands.dts'] + t += custom_target(f, + input: f, + output: '@BASENAME@' + '.dtb', + command: [dtc, '-I', 'dts', '-O', 'dtb', '-o', '@OUTPUT@', '@INPUT@']) + endforeach + alias_target('update-dtb', t) +endif From patchwork Thu Dec 19 12:23:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213360 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="UV43Lyde"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsSj2YxWz9sPc for ; Fri, 20 Dec 2019 00:01:07 +1100 (AEDT) Received: from localhost ([::1]:40542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvQP-00065U-3u for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 08:01:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37324) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihusR-000114-70 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihusO-0003Wc-Na for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25815 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihusO-0003UM-AR for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758355; 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=iU9ljBKf9gxVwbpcHOGcW99UWNhyv6Vn2rEiVL5EXUs=; b=UV43LydeaWnccfztX//6jVKl1YQEEwpVttFzeHIlnd7Ykd+YF15AdCPIMogWXbYrfaft2l epeqIrYft4Q1NBv4LQK8iJMscEsi3+fp5h5+/ZgR+irtSZiJ3iLxzPgFQ92xGKTYxwrpg0 YZ1Q7Zr790gVQ+GH5pNZ8KZ8jnU2IFQ= 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-428-SOusPYY-NMmQDA9U-CN5JA-1; Thu, 19 Dec 2019 07:25:46 -0500 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 529551005502 for ; Thu, 19 Dec 2019 12:25:45 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53C060C18; Thu, 19 Dec 2019 12:25:40 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 130/132] meson: convert pc-bios/s390-ccw Date: Thu, 19 Dec 2019 13:23:50 +0100 Message-Id: <1576758232-12439-39-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: SOusPYY-NMmQDA9U-CN5JA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- configure | 8 -- pc-bios/meson.build | 5 ++ pc-bios/s390-ccw/Makefile | 103 ------------------------- pc-bios/s390-ccw/meson.build | 175 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 111 deletions(-) delete mode 100644 pc-bios/s390-ccw/Makefile create mode 100644 pc-bios/s390-ccw/meson.build diff --git a/configure b/configure index f6e3b0a..a1b71b9 100755 --- a/configure +++ b/configure @@ -6173,14 +6173,6 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ done fi -# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900 -if test "$cpu" = "s390x" ; then - write_c_skeleton - if compile_prog "-march=z900" ""; then - roms="$roms s390-ccw" - fi -fi - # Probe for the need for relocating the user-only binary. if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] ) && [ "$pie" = no ]; then textseg_addr= diff --git a/pc-bios/meson.build b/pc-bios/meson.build index def68a4..1697c55 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -99,3 +99,8 @@ if dtc.found() endforeach alias_target('update-dtb', t) endif + +cc = meson.get_compiler('c') +if host_machine.cpu_family() == 's390x' and cc.has_argument('-march=z900') + subdir('s390-ccw') +endif diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile deleted file mode 100644 index b512074..0000000 --- a/pc-bios/s390-ccw/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -SRC_DIR := $(dir $(CURRENT_MAKEFILE)) -TOPSRC_DIR := $(SRC_DIR)/../.. -VPATH = $(SRC_DIR) - -all: -# Dummy command so that make thinks it has done something - @true - -include ../../config-host.mak - -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2) - -override CFLAGS += $(filter -W%, $(QEMU_CFLAGS)) -override CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float -override CFLAGS += -march=z900 -fPIE -fno-strict-aliasing -override CFLAGS += -fno-asynchronous-unwind-tables -override CFLAGS += $(call cc-option, -fno-stack-protector) -LDFLAGS += -Wl,-pie -nostdlib - -OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \ - virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o - -STRIP ?= strip - -$(OBJECTS): Makefile - -SLOF_DIR := $(SRC_PATH)/roms/SLOF - -NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \ - libnet.a libc.a - -LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include -LIBNET_INC := -I$(SLOF_DIR)/lib/libnet - -$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC) - -# libc files: - -LIBC_CFLAGS := $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) - -CTYPE_OBJS = isdigit.o isxdigit.o toupper.o -$(CTYPE_OBJS) : %.o : $(SLOF_DIR)/lib/libc/ctype/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \ - strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \ - memset.o memcpy.o memmove.o memcmp.o -$(STRING_OBJS) : %.o : $(SLOF_DIR)/lib/libc/string/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o -$(STDLIB_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdlib/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \ - printf.o putc.o puts.o putchar.o stdchnls.o fileno.o -$(STDIO_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdio/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -sbrk.o: $(SLOF_DIR)/slof/sbrk.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o - -libc.a: $(LIBCOBJS) - $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@") - -# libnet files: - -LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \ - dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o -LIBNETCFLAGS := $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC) - -$(LIBNETOBJS) : %.o : $(SLOF_DIR)/lib/libnet/%.c - $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -libnet.a: $(LIBNETOBJS) - $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@") - -%.elf: - $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@") - -%.img: %.elf - $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@") - -s390-ccw.elf: $(OBJECTS) -s390-ccw.img: s390-ccw.elf -all: s390-ccw.img - -ifneq ($(wildcard $(SLOF_DIR)/lib/libnet),) -s390-netboot.elf: $(NETOBJS) -s390-netboot.elf: LDFLAGS += -Ttext=0x7800000 - -s390-netboot.img: s390-netboot.elf -all: s390-netboot.img -endif - -clean: - rm -f *.o *.d *.img *.elf *~ *.a - -.PHONY : all clean diff --git a/pc-bios/s390-ccw/meson.build b/pc-bios/s390-ccw/meson.build new file mode 100644 index 0000000..a4e0e3b --- /dev/null +++ b/pc-bios/s390-ccw/meson.build @@ -0,0 +1,175 @@ +strip = find_program('strip') +cc = meson.get_compiler('c') +link_args = ['-Wl,-pie', '-nostdlib'] + +# FIXME: find a better way to check/enable slof +slof = '../../roms/SLOF' +has_slof = cc.has_header('libnet/tftp.h', args: '-I' + meson.current_source_dir() / slof / 'lib') + +s390_cargs = [ + '-ffreestanding', + '-fno-delete-null-pointer-checks', + '-msoft-float', + '-march=z900', + '-fPIE', + '-fno-strict-aliasing', + '-fno-asynchronous-unwind-tables', + cc.get_supported_arguments('-fno-stack-protector') +] + +s390_incs = [] + +s390_srcs = [ + 'bootmap.c', + 'cio.c', + 'dasd-ipl.c', + 'jump2ipl.c', + 'libc.c', + 'main.c', + 'menu.c', + 'sclp.c', + 'start.S', + 'virtio-blkdev.c', + 'virtio-scsi.c', + 'virtio.c', +] + +if has_slof + s390_srcs += [ + 'netmain.c', + 'virtio-net.c', + ] + s390_incs += include_directories(slof / 'lib/libnet') + s390_incs += include_directories(slof / 'lib/libc/include') + s390_cargs += '-nostdinc' +endif + +s390_lib = static_library( + 's390', s390_srcs, + c_args: s390_cargs, + include_directories: s390_incs, +) + +s390_ccw_elf = executable( + 's390-ccw.elf', + link_args: link_args, + objects: s390_lib.extract_objects([ + 'bootmap.c', + 'cio.c', + 'dasd-ipl.c', + 'jump2ipl.c', + 'libc.c', + 'main.c', + 'menu.c', + 'sclp.c', + 'start.S', + 'virtio-blkdev.c', + 'virtio-scsi.c', + 'virtio.c', + ]), +) + +custom_target( + 's390-ccw.img', + output: 's390-ccw.img', + input: s390_ccw_elf, + command: [strip, '--strip-unneeded', '@INPUT@', '-o', '@OUTPUT@'], + build_by_default: true, +) + +if has_slof + slof_ctype = slof / 'lib/libc/ctype' + slof_str = slof / 'lib/libc/string' + slof_stdlib = slof / 'lib/libc/stdlib' + slof_stdio = slof / 'lib/libc/stdio' + + s390_libc = static_library( + 's390-libc', files( + slof_ctype / 'isdigit.c', + slof_ctype / 'isxdigit.c', + slof_ctype / 'toupper.c', + slof_str / 'strcat.c', + slof_str / 'strchr.c', + slof_str / 'strrchr.c', + slof_str / 'strcpy.c', + slof_str / 'strlen.c', + slof_str / 'strncpy.c', + slof_str / 'strcmp.c', + slof_str / 'strncmp.c', + slof_str / 'strcasecmp.c', + slof_str / 'strncasecmp.c', + slof_str / 'strstr.c', + slof_str / 'memset.c', + slof_str / 'memcpy.c', + slof_str / 'memmove.c', + slof_str / 'memcmp.c', + slof_stdlib / 'atoi.c', + slof_stdlib / 'atol.c', + slof_stdlib / 'strtoul.c', + slof_stdlib / 'strtol.c', + slof_stdlib / 'rand.c', + slof_stdlib / 'malloc.c', + slof_stdlib / 'free.c', + slof_stdio / 'sprintf.c', + slof_stdio / 'snprintf.c', + slof_stdio / 'vfprintf.c', + slof_stdio / 'vsnprintf.c', + slof_stdio / 'vsprintf.c', + slof_stdio / 'fprintf.c', + slof_stdio / 'printf.c', + slof_stdio / 'putc.c', + slof_stdio / 'puts.c', + slof_stdio / 'putchar.c', + slof_stdio / 'stdchnls.c', + slof_stdio / 'fileno.c', + slof / 'slof/sbrk.c', + ), + c_args: s390_cargs, + include_directories: s390_incs, + ) + + slof_libnet = slof / 'lib/libnet' + s390_libnet = static_library( + 's390-libnet', files( + slof_libnet / 'args.c', + slof_libnet / 'dhcp.c', + slof_libnet / 'dns.c', + slof_libnet / 'icmpv6.c', + slof_libnet / 'ipv6.c', + slof_libnet / 'tcp.c', + slof_libnet / 'udp.c', + slof_libnet / 'bootp.c', + slof_libnet / 'dhcpv6.c', + slof_libnet / 'ethernet.c', + slof_libnet / 'ipv4.c', + slof_libnet / 'ndp.c', + slof_libnet / 'tftp.c', + slof_libnet / 'pxelinux.c', + ), + c_args: [s390_cargs, '-DDHCPARCH=0x1F'], + include_directories: s390_incs, + ) + + s390_netboot_elf = executable( + 's390-netboot.elf', + link_with: [s390_libc, s390_libnet], + link_args: [link_args, '-Ttext=0x7800000'], + objects: s390_lib.extract_objects([ + 'cio.c', + 'jump2ipl.c', + 'netmain.c', + 'sclp.c', + 'start.S', + 'virtio-net.c', + 'virtio.c', + ]), + ) + + custom_target( + 's390-netboot.img', + output: 's390-netboot.img', + input: s390_netboot_elf, + command: [strip, '--strip-unneeded', '@INPUT@', '-o', '@OUTPUT@'], + build_by_default: true, + ) +endif From patchwork Thu Dec 19 12:23:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SH6X7FpI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds636qrTz9sPc for ; Thu, 19 Dec 2019 23:44:59 +1100 (AEDT) Received: from localhost ([::1]:40326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvAn-0000Yp-EH for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:44:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37449) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihusX-00013B-1f for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihusT-0003dF-Hq for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22521 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihusS-0003bG-T5 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758359; 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=d4VG0A2LeMVyZ2tnEceHhryyGS+Rkr3VA6D1UZnTY4Q=; b=SH6X7FpIRt6y9Uq7F3oZqrgQfdjmhqGq/9+/IOMURPt7stIdKvZkAWF8t9Yf8S2PLqomep 9g4sctPRMLlBqQHjL+YyBFL3I4WC2gqrqN7JUd3vb+c4/oqD6ljgYaaopoY7ujNd2uRsbk 6VRZdgaV/86f/qOy6PNw8BGx4cMKkFw= 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-uH7uqXlPOtqb1jvAzGBApQ-1; Thu, 19 Dec 2019 07:25:50 -0500 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 3C61F477 for ; Thu, 19 Dec 2019 12:25:49 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD3BD60C18; Thu, 19 Dec 2019 12:25:45 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 131/132] meson: convert pc-bios/optionrom Date: Thu, 19 Dec 2019 13:23:51 +0100 Message-Id: <1576758232-12439-40-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uH7uqXlPOtqb1jvAzGBApQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 12 ------- configure | 20 +---------- pc-bios/meson.build | 4 +++ pc-bios/optionrom/Makefile | 77 ------------------------------------------- pc-bios/optionrom/meson.build | 72 ++++++++++++++++++++++++++++++++++++++++ scripts/signrom.py | 2 ++ 6 files changed, 79 insertions(+), 108 deletions(-) delete mode 100644 pc-bios/optionrom/Makefile create mode 100644 pc-bios/optionrom/meson.build diff --git a/Makefile b/Makefile index 0493a3b..1bc219a 100644 --- a/Makefile +++ b/Makefile @@ -158,18 +158,6 @@ subdir-dtc: dtc/all subdir-capstone: capstone/all subdir-slirp: slirp/all -ROM_DIRS = $(addprefix pc-bios/, $(ROMS)) -ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) -# Only keep -O and -g cflags -.PHONY: $(ROM_DIRS_RULES) -$(ROM_DIRS_RULES): - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" CFLAGS="$(filter -O% -g%,$(CFLAGS))" $(notdir $@),) - -.PHONY: recurse-all recurse-clean recurse-install -recurse-all: $(ROM_DIRS) -recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) -recurse-install: - ###################################################################### COMMON_LDADDS = libqemuutil.a diff --git a/configure b/configure index a1b71b9..9d4974e 100755 --- a/configure +++ b/configure @@ -6156,23 +6156,6 @@ if test "$guest_agent_msi" = "yes"; then esac fi -# Mac OS X ships with a broken assembler -roms= -if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ - test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \ - test "$softmmu" = yes ; then - # Different host OS linkers have different ideas about the name of the ELF - # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd - # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. - for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then - ld_i386_emulation="$emu" - roms="optionrom" - break - fi - done -fi - # Probe for the need for relocating the user-only binary. if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] ) && [ "$pie" = no ]; then textseg_addr= @@ -7302,7 +7285,6 @@ else fi QEMU_INCLUDES="-iquote ${source_path}/tcg $QEMU_INCLUDES" -echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak @@ -7824,7 +7806,7 @@ DIRS="$DIRS roms/seabios roms/vgabios" LINKS="Makefile" LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile" LINKS="$LINKS tests/tcg/Makefile.target tests/fp/Makefile" -LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS="$LINKS pc-bios/keymaps" LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile" LINKS="$LINKS pc-bios/qemu-icon.bmp" diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 1697c55..ff1eebf 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -100,6 +100,10 @@ if dtc.found() alias_target('update-dtb', t) endif +if host_machine.cpu_family() in ['x86', 'x86_64'] + subdir('optionrom') +endif + cc = meson.get_compiler('c') if host_machine.cpu_family() == 's390x' and cc.has_argument('-march=z900') subdir('s390-ccw') diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile deleted file mode 100644 index 51cb6ca..0000000 --- a/pc-bios/optionrom/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -SRC_DIR := $(dir $(CURRENT_MAKEFILE)) -TOPSRC_DIR := $(SRC_DIR)/../.. -VPATH = $(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 - -include ../../config-host.mak - -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2) - -# Compiling with no optimization creates ROMs that are too large -ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0) -override CFLAGS += -O2 -endif -override CFLAGS += -march=i486 - -# Flags for dependency generation -override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d - -override CFLAGS += $(filter -W%, $(QEMU_CFLAGS)) -override CFLAGS += $(CFLAGS_NOPIE) -ffreestanding -I$(TOPSRC_DIR)/include -override CFLAGS += $(call cc-option, -fno-stack-protector) -override CFLAGS += $(call cc-option, -m16) - -ifeq ($(filter -m16, $(CFLAGS)),) -# Attempt to work around compilers that lack -m16 (GCC <= 4.8, clang <= ??) -# 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-reorder, -# 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. -override CFLAGS += $(call cc-option, -fno-toplevel-reorder) -override CFLAGS += $(call cc-option, -no-integrated-as) -override CFLAGS += -m32 -include $(SRC_DIR)/code16gcc.h -endif - -Wa = -Wa, -override ASFLAGS += -32 -override CFLAGS += $(call cc-option, $(Wa)-32) - - -LD_I386_EMULATION ?= elf_i386 -override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds -override LDFLAGS += $(LDFLAGS_NOPIE) - -all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin - -pvh.img: pvh.o pvh_main.o - -%.o: %.S - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") - -%.o: %.c - $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") - -%.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") - -%.raw: %.img - $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") - -%.bin: %.raw - $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,"SIGN","$@") - -include $(wildcard *.d) - -clean: - rm -f *.o *.d *.raw *.img *.bin *~ - -# suppress auto-removal of intermediate files -.SECONDARY: - -.PHONY: all clean diff --git a/pc-bios/optionrom/meson.build b/pc-bios/optionrom/meson.build new file mode 100644 index 0000000..5761736 --- /dev/null +++ b/pc-bios/optionrom/meson.build @@ -0,0 +1,72 @@ +cc = meson.get_compiler('c') +objcopy = find_program('objcopy') +signrom = find_program(meson.current_source_dir() / '../../scripts/signrom.py') + +emu = '' +foreach e: ['elf_i386', 'elf_i386_fbsd', 'elf_i386_obsd', 'i386pe'] + if cc.has_multi_link_arguments('-m32', '-Wl,-m' + e) + emu = e + break + endif +endforeach + +if emu == '' + message('No suitable compiler/linker found to build optionrom') +else + link_args = ['-nostdlib', '-m32', '-Wl,-m' + e] + link_args += cc.get_supported_link_arguments('-Wl,--build-id=none') + if cc.has_multi_link_arguments('-fno-pie', '-no-pie') + link_args += ['-no-pie'] + endif + + link_args += '-Wl,-T' + meson.current_source_dir() / 'flat.lds' + + c_args = ['-ffreestanding', '-march=i486'] + c_args += cc.get_supported_arguments('-fno-pie', '-fno-stack-protector', '-m32') + + # Compiling with no optimization creates ROMs that are too large + code16_c_args = ['-O2'] + if cc.has_argument('-m16') + code16_c_args += '-m16' + else + # Attempt to work around compilers that lack -m16 (GCC <= 4.8, clang <= ??) + # 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-reorder, + # 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. + code16_c_args += cc.get_supported_arguments('-fno-toplevel-reorder', '-no-integrated-as') + code16_c_args += ['-m32', '-include', meson.current_source_dir() / 'code16gcc.h'] + endif + + foreach target, opt: { + 'multiboot': {'src': ['multiboot.S'], 'cargs': ['-m32', '-g0']}, + 'linuxboot_dma': {'src': ['linuxboot_dma.c'], 'cargs': code16_c_args}, + 'linuxboot': {'src': ['linuxboot.S']}, + 'kvmvapic': {'src': ['kvmvapic.S']}, + 'pvh': {'src': ['pvh.S', 'pvh_main.c']}, + } + img = executable( + target + '.img', + opt['src'], + c_args: [c_args, opt.get('cargs', [])], + include_directories: include_directories('../../include'), + link_args: link_args, + ) + + raw = custom_target( + target + '.raw', + output: target + '.raw', + input: img, + command: [objcopy, '-O', 'binary', '-j', '.text', '@INPUT@', '@OUTPUT@'], + ) + + bin = custom_target( + target + '.bin', + output: target + '.bin', + input: raw, + command: [signrom, '@INPUT@', '@OUTPUT@'], + build_by_default: true, + ) + endforeach +endif diff --git a/scripts/signrom.py b/scripts/signrom.py index 313ee28..ba9ac03 100644 --- a/scripts/signrom.py +++ b/scripts/signrom.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + from __future__ import print_function # # Option ROM signing utility From patchwork Thu Dec 19 12:23:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="elhdSF3+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ds2c5ljWz9sPc for ; Thu, 19 Dec 2019 23:42:00 +1100 (AEDT) Received: from localhost ([::1]:40284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv7u-0005SG-5w for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:41:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37377) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihusT-000123-53 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihusQ-0003Y4-9d for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:26:00 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55944 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihusO-0003Up-GH for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758355; 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=e5J3FU6NAfIDrVMvliXjyvqfMRB+mxqB2AyF/v++Imc=; b=elhdSF3+NTONs27WfT+NkUoPlNKbEpK6uUXn0hwZvrAEWSpqpZU5njzM5M1jIuX5fJEnHX gbMes+4NH3+xGye9nsTRllW009zCyCIBqejOkCWMbHeUsXgk/2G5rUC9eQdJGqk3rlBZWp lgYg1Yk3xjdroKfdaZZpb0Ib4QVquvo= 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-4bxXXVMFMDaX3WrS5vyTWg-1; Thu, 19 Dec 2019 07:25:52 -0500 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 49DFADB60 for ; Thu, 19 Dec 2019 12:25:51 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2DED60C18 for ; Thu, 19 Dec 2019 12:25:49 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 132/132] rules.mak: drop unneeded macros Date: Thu, 19 Dec 2019 13:23:52 +0100 Message-Id: <1576758232-12439-41-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 4bxXXVMFMDaX3WrS5vyTWg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini --- rules.mak | 179 -------------------------------------------------------------- 1 file changed, 179 deletions(-) diff --git a/rules.mak b/rules.mak index 9259786..dd4ec2a 100644 --- a/rules.mak +++ b/rules.mak @@ -161,15 +161,6 @@ define install-prog $(if $(STRIP),$(STRIP) $(foreach T,$1,"$2/$(notdir $T)"),) endef -# 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 exist -# there. -find-in-path = $(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". @@ -208,173 +199,3 @@ clean: clean-timestamp # will delete the target of a rule if commands exit with a nonzero exit status .DELETE_ON_ERROR: - -# 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 := $(value $v)) - $(eval saved-vars-$v := $(foreach o,$($v), \ - $(if $($o-cflags), $o-cflags $(eval save-vars-$o-cflags := $($o-cflags))$(eval $o-cflags := )) \ - $(if $($o-libs), $o-libs $(eval save-vars-$o-libs := $($o-libs))$(eval $o-libs := )) \ - $(if $($o-objs), $o-objs $(eval save-vars-$o-objs := $($o-objs))$(eval $o-objs := )))) - $(eval $v := )) -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 := $(value $2)) - $(foreach v,$1, - $(eval $v := $(value save-vars-$v)) - $(foreach o,$(saved-vars-$v), - $(eval $o := $(save-vars-$o)) $(eval save-vars-$o := )) - $(eval save-vars-$v := ) - $(eval saved-vars-$v := )) - $(eval $2 := $(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 to all -# directories in @vars. -define fix-paths - $(foreach v,$3, - $(foreach o,$($v), - $(if $($o-libs), - $(eval $1$o-libs := $($o-libs))) - $(if $($o-cflags), - $(eval $1$o-cflags := $($o-cflags))) - $(if $($o-objs), - $(eval $1$o-objs := $(addprefix $1,$($o-objs))))) - $(eval $v := $(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 := $(sort $(filter %/,$($3)))) - $(eval $3 := $(filter-out %/,$($3))) - $(foreach d,$(dirs:%/=%), - $(call save-vars,$2) - $(eval obj := $(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 include -# ending '/'. -# -# @vars: the list of variable names to unnest. -# -# This macro will scan subdirectories's Makefile.objs, include them, to build -# up each variable listed in @vars. -# -# Per object and per module cflags and libs are saved with relative path fixed -# as well, those variables include -libs, -cflags and -objs. Items in -objs 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 variables, -# and will be built as modules, if enabled. -# -# A simple example of the unnest: -# -# obj_prefix = .. -# vars = hot cold -# hot = fire.o sun.o season/ -# cold = snow.o water/ season/ -# -# Unnest through a faked source directory structure: -# -# SRC_PATH -# ├── water -# │ └── Makefile.objs──────────────────┐ -# │ │ hot += steam.o │ -# │ │ cold += ice.mo │ -# │ │ ice.mo-libs := -licemaker │ -# │ │ ice.mo-objs := ice1.o ice2.o │ -# │ └──────────────────────────────┘ -# │ -# └── season -# └── Makefile.objs──────┐ -# │ hot += summer.o │ -# │ cold += winter.o │ -# └──────────────────┘ -# -# In the end, the result will be: -# -# hot = ../fire.o ../sun.o ../season/summer.o -# cold = ../snow.o ../water/ice.mo ../season/winter.o -# ../water/ice.mo-libs = -licemaker -# ../water/ice.mo-objs = ../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 == ..), fix path for top level - # 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 += $($o-cflags))) - $(if $($o-libs), $(eval $p-libs += $($o-libs)))))) - - # For all %.mo objects that are directly added into -y, just expand them - $(foreach v,$(filter %-y,$2), - $(eval $v := $(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=%.mo)-objs := $o)) - # Now unify .o in -m variable to .mo - $(eval $v := $($v:%.o=%.mo)) - $(eval modules-m += $($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 += $(DSO_OBJ_CFLAGS)) - $(eval $o: $($o-objs))) - $(eval $(patsubst %-m,%-y,$v) += $($v)) - $(eval modules: $($v:%.mo=%$(DSOSUF))), - $(eval $(patsubst %-m,%-y,$v) += $(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 rules - # according to .mo-objs. Report error if not set - $(if $($o-objs), - $(eval $(o:%.mo=%$(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 := $(filter-out %/,$($v)))) -endef