From patchwork Tue Oct 6 11:12:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17CDFC41604 for ; Tue, 6 Oct 2020 11:14:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9109F206F7 for ; Tue, 6 Oct 2020 11:14:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CqAcK/5u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9109F206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkv9-0003LN-GB for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPktX-0001fm-E4 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPktT-0005Hd-Do for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982749; 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=etfUyWzqCzlIALaB60Jij2GH0zWb1XjkmDYm3zzjL14=; b=CqAcK/5uiOeCyPJd6+IiUxG0ylZuN0NlgDVUnBLhAymltRHI/3l6Axr3RsgR+Cz6qVgNlB AJtjzEdNwQk01KOY6caWLuyrTh/Q960diFScY/bloKXCBkx+ekLvsCa6P2VIYuyFSqOhdy 9JIR1WATU7/uif01InMhr83dmSYT+bk= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-534-yp8fEjaFMa6YOErA2WBvLQ-1; Tue, 06 Oct 2020 07:12:28 -0400 X-MC-Unique: yp8fEjaFMa6YOErA2WBvLQ-1 Received: by mail-wm1-f72.google.com with SMTP id p17so577374wmi.7 for ; Tue, 06 Oct 2020 04:12:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=etfUyWzqCzlIALaB60Jij2GH0zWb1XjkmDYm3zzjL14=; b=JPuZ9yrLBzxgOBkIiqsTmq1wLxntZH31KuLUzPQSdB3ApZTw+OQGwSlzEiiY2JP6jH 6Y0+05+uA4cOpHS1JxExPJ2xrZrbMRFkU7CBCGR4uQujkjmIJ1Gqp1ihwTkzK7wxZRJi HIGJqkZLIOeSrEPaQjqag3Lu5s7rehRXP/mLZVbPCORBnfzDKZZ6qmEX7QaxNGP5/PSU ARzTNvdte0MuRbQ1ANLYvbgzzDl1z+FrbCU0rUU8DiA8chpxjVvq6zzDg9xudFulX8Y8 Gh8zgJzMHftM9PQ9AscxzeqT3/EOjUfoEZ+Ts0+vq4lyICKU7Kjllr4xALLbYxZeGe7N D6iA== X-Gm-Message-State: AOAM532jTTBaUKIXFUe1pqNmAjlqh2XNDDye4xHS/6BP1inEu7Ef0Kol HdXflVaulCsLyPtoQscDHv1frqFkbJC0R5cq7bl2Lr0Pqgq2+XGOknqVz1SG6aDTTzjdMDY/zwu Ru8uyxLxWCeIXH24= X-Received: by 2002:adf:ffca:: with SMTP id x10mr4700567wrs.342.1601982746874; Tue, 06 Oct 2020 04:12:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVaUhGKN/eK/MxaPd8ALcO7Brhfsz0vexxt3GbwQETMLKBc63ZGYVD7tchiwRYMEg/0K5QMg== X-Received: by 2002:adf:ffca:: with SMTP id x10mr4700548wrs.342.1601982746714; Tue, 06 Oct 2020 04:12:26 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id o16sm3805655wrp.52.2020.10.06.04.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset Date: Tue, 6 Oct 2020 13:12:10 +0200 Message-Id: <20201006111219.2300921-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" I'm not sure how that works, but keep the use of Meson sourcesets consistent, only add source files. Signed-off-by: Philippe Mathieu-Daudé --- migration/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/meson.build b/migration/meson.build index b5b71c8060..55c9e1329f 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -14,7 +14,7 @@ libmigration = static_library('migration', sources: migration_files + genh, build_by_default: false) migration = declare_dependency(link_with: libmigration, dependencies: [zlib, qom, io]) -softmmu_ss.add(migration) +softmmu_ss.add(migration_files) softmmu_ss.add(files( 'block-dirty-bitmap.c', From patchwork Tue Oct 6 11:12:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42018C4363D for ; Tue, 6 Oct 2020 11:14:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 97DA1206F7 for ; Tue, 6 Oct 2020 11:14:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X1/zp4y3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97DA1206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkvA-0003Nr-Hc for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:14:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPktZ-0001gM-CL for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPktX-0005JC-Cs for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982754; 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=XHSMU3H8MAqIi6xWpwYEGX/4wsnCDrIc6FNRKW4vl4w=; b=X1/zp4y3z9qqCq9MqVy8BW1quzuihsENAySas69OaIaDYDPndx5PbCNT6bTSA93EEHd1kj NtsK9HGcAwN4pfssp/3ZN3QPq1MIm7s46AVwF9IgHTbfTqmC4hmIUUfawF+LOJm5mVkfvr PJnFZAKwNBfYcFPyfX5y+zi98XvDqwk= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-EJRalVpgP_-AV8dzRrBVOA-1; Tue, 06 Oct 2020 07:12:33 -0400 X-MC-Unique: EJRalVpgP_-AV8dzRrBVOA-1 Received: by mail-wm1-f70.google.com with SMTP id p17so577437wmi.7 for ; Tue, 06 Oct 2020 04:12:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XHSMU3H8MAqIi6xWpwYEGX/4wsnCDrIc6FNRKW4vl4w=; b=j+9RWLKaimh7rFn4pKswpo69WV1Q4YZFq0KycNbk8HNjzGjncFtDVmdP0L7rCjNIDO VRdzbdrUzqFMD0w1dwL8XBUGmd6yTyBiPp/CXohAJE+ms499+v63FPp5bYBCPOcGM82n 4Ley3iUrJ14jXSZ+naey867lzwRoXmwojUnbGt7Mfc5NKbK084SLF5alE8Z2qofJpypc +wwU44kvceYohdOUU9Y1rgn+ykckjLTc9n+nTU8UJJNZPFlLgcNr5q3zEIUmQHBBvhds 4XbOUvZ92eJBBSY9qOaXBcy9crPOUirO4RTfEmZuSjO/NtJpreER3FDex1uaxvcnLYMr OqPg== X-Gm-Message-State: AOAM530w5rB7Xe1OnIKIQ2fmfveSUig3I1tmrfDooVxm1ZFcjapjmV4y MtBRWa2MRe/zN5ccATxTH86C+h0HvE5DFfKY96N6k9WTnFBKHcITwrRx471Ni+Kz42E+X9Sd/Qh 0JBDK+WuTMNMv3lc= X-Received: by 2002:a5d:4f82:: with SMTP id d2mr4242753wru.65.1601982751757; Tue, 06 Oct 2020 04:12:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztuI5MQgQsEFig4ahjsGUeWII8UCfOclJz6/4FmneUnD62NeONMVNzTjOwf7MmT8Zph3Ageg== X-Received: by 2002:a5d:4f82:: with SMTP id d2mr4242730wru.65.1601982751552; Tue, 06 Oct 2020 04:12:31 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id g144sm1302861wmg.30.2020.10.06.04.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/10] meson.build: Add comments to clarify code organization Date: Tue, 6 Oct 2020 13:12:11 +0200 Message-Id: <20201006111219.2300921-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meson.build b/meson.build index a02c743794..eaff16d482 100644 --- a/meson.build +++ b/meson.build @@ -1323,6 +1323,10 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) +######################## +# Library dependencies # +######################## + block_ss = block_ss.apply(config_host, strict: false) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), @@ -1363,6 +1367,10 @@ common_all = static_library('common', dependencies: common_all.dependencies(), name_suffix: 'fa') +########### +# Targets # +########### + feature_to_c = find_program('scripts/feature_to_c.sh') emulators = {} From patchwork Tue Oct 6 11:12:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC557C4363D for ; Tue, 6 Oct 2020 11:18:06 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3B58620760 for ; Tue, 6 Oct 2020 11:18:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Wg222ZM3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B58620760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkyr-0001AZ-AS for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:18:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPktl-0001jj-Ik for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPktd-0005Jw-Rb for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982760; 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=PYkBU6VF5ZzK1I4YI1vWYKaFknMzqMpMtEs81El0mHU=; b=Wg222ZM3UHwlDjyzxuiU0tIRe1wpCzxebEraqYNmdBK8uVOJO1uYwOsUtwRGoyc8l/A0rQ c0xr8ZLZu0QX149iJ1j+EwmltzxqN8tH7J08xAfPOhNclm2bNmZAYxz4VYuNRaFeXKkCHU s+Sb8cC6dGOVkYbOL67gwTXcek6S9Mg= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-fS2aNTz0OJqlicIBzYTsAA-1; Tue, 06 Oct 2020 07:12:38 -0400 X-MC-Unique: fS2aNTz0OJqlicIBzYTsAA-1 Received: by mail-wm1-f71.google.com with SMTP id f2so577564wml.6 for ; Tue, 06 Oct 2020 04:12:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PYkBU6VF5ZzK1I4YI1vWYKaFknMzqMpMtEs81El0mHU=; b=DZqEJGkbs+Zg08C2zdmOBy5q/sTcMd9jaI6IVh65CLwg4xBGDBRDAn4ZcgSQjQOkgv eTbv060BbwkY//RddWFfIgKriAgckOeX1MzAQfggKjAF8eSh7Z3RL9GobvVTJ97fqMKr po0FgUfy7MTkeTgKbKeaJaiLDAeJf54/wex1OYnJ4E3PZKSi4QWkltXakNQaIE/DaRGI ZyeqG5XdM4chCtcu+h/8mL+kHFf4/fFYZ/43HmE4mHTU9MC7TfoGy2mlBBtI9B4pwMLl PbpilBlISWKTR+ynUbjH9KxfGqV/EWzSVGhO0BJONVpWgWPpmSOtljgPgZ7Eg8YwovHv NJXw== X-Gm-Message-State: AOAM5305dF5w8RAzNyMs2PyF/bE2x/Hob6ypWuaDJm+/KpcLdeEjIGo1 AdAi66jZEDbspPx9ywhHeRFLuS7VS96EBgS/rtA/3jVCxY3D43/13Ap9Nwo+u1IxXBnHb98BuJL lWy7HtfLfupVP1Eg= X-Received: by 2002:adf:ffca:: with SMTP id x10mr4701396wrs.342.1601982756820; Tue, 06 Oct 2020 04:12:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhGhdihiyG8syFi/DhBcvQlSeDSbWVfJPx6xBrlh/vCCnxcssjdTYuqHUFld06u0bU1sePdw== X-Received: by 2002:adf:ffca:: with SMTP id x10mr4701380wrs.342.1601982756679; Tue, 06 Oct 2020 04:12:36 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id t124sm3713371wmg.31.2020.10.06.04.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/10] meson.build: Sort sourcesets alphabetically Date: Tue, 6 Oct 2020 13:12:12 +0200 Message-Id: <20201006111219.2300921-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index eaff16d482..fc7792b769 100644 --- a/meson.build +++ b/meson.build @@ -1059,19 +1059,19 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', # Collect sourcesets. -util_ss = ss.source_set() +blockdev_ss = ss.source_set() +block_ss = ss.source_set() +bsd_user_ss = ss.source_set() +common_ss = ss.source_set() +linux_user_ss = ss.source_set() +qmp_ss = ss.source_set() +softmmu_ss = ss.source_set() +specific_fuzz_ss = ss.source_set() +specific_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() -block_ss = ss.source_set() -blockdev_ss = ss.source_set() -qmp_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() -specific_fuzz_ss = ss.source_set() +util_ss = ss.source_set() modules = {} hw_arch = {} From patchwork Tue Oct 6 11:12:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24A1FC4363D for ; Tue, 6 Oct 2020 11:16:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7E8A520760 for ; Tue, 6 Oct 2020 11:16:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Zk8YOeo5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E8A520760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkxG-0006pY-Fm for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:16:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPkto-0001js-9J for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPkti-0005KM-5C for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982764; 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=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=Zk8YOeo5bgxTYK/jqetSwbwn2VQTRXngRPUswoZ+qp83NkLvh+R9zCJnI/K6DQhcQDkxrm Ske3BM/q4QMmtrOJ/oOdvc011Sv+ryODPoNnB5fwDCKhL6GSmiJaOJyGmlkJTwGxvG8+xd BbXjsr3d8ptNYk3AP0XatxJ6sy4ieGA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-xq9k0j18OQWFh-bBf7X2bg-1; Tue, 06 Oct 2020 07:12:43 -0400 X-MC-Unique: xq9k0j18OQWFh-bBf7X2bg-1 Received: by mail-wm1-f71.google.com with SMTP id 73so579921wma.5 for ; Tue, 06 Oct 2020 04:12:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=EAhyeDv8PF1s9EA9Gp9mafSAAzLRlFlVRxIxVGfZWaP9l/RPCGqMZBnmQ43dKxZQu0 RTvwp3nSVEPP3NzRZ14Mik0ggpnhEIWLOJzoheaBvgEKyiVFoCdNsp17eBrPp09gK5OH EAWzT2h8fAGYlzHXyGbey7zAcyPFf4HQwLr+4W7s66+nlerC72CIlvpsePhn+jTMiJdH /qzj+MjuB4VCWPMMJRF09hIIVOz6GrOsvWkdcQzA6Q02vM8rFSVy3Gd8CcycNE1TQctW S9NzSSZHLrKCkiINk7L2R4UIbUJN6ehbBQB1WExHY0DL9OV/mZXutss1llTK5VXAgf3r 22+A== X-Gm-Message-State: AOAM533bwZrr9hGaI6180zNb3KV7ryrYu/KPGUbFm+6woaVahtB2Skgm hBbE1S1fhuYlhCkhsOO31TN57Y4kTaH2SWmUYajlCJVx94CiujM+Rc86nfw48Cv1l+Srg6BfS4d zZUFAMH55GTnaUbM= X-Received: by 2002:a1c:c908:: with SMTP id f8mr2390575wmb.28.1601982761861; Tue, 06 Oct 2020 04:12:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlneto9wIwjvwYY63A2wQ5BaGTqaKUG2HUWPejnDShumhTXIWs8vBeDDYbU6Ra3PjrBL1Yhw== X-Received: by 2002:a1c:c908:: with SMTP id f8mr2390549wmb.28.1601982761662; Tue, 06 Oct 2020 04:12:41 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id a5sm4026965wrp.37.2020.10.06.04.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 04/10] hw/core: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:13 +0200 Message-Id: <20201006111219.2300921-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 7 +++++++ hw/core/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index fc7792b769..ccfa3e9531 100644 --- a/meson.build +++ b/meson.build @@ -1346,6 +1346,13 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh, qmp = declare_dependency(link_whole: [libqmp]) +libhwcore = static_library('hwcore', sources: hwcore_files + genh, + name_suffix: 'fa', + build_by_default: false) +hwcore = declare_dependency(link_whole: libhwcore) +common_ss.add(hwcore) + + foreach m : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', diff --git a/hw/core/meson.build b/hw/core/meson.build index fc91f98075..4a744f3b5e 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -14,12 +14,6 @@ hwcore_files = files( 'qdev-clock.c', ) -libhwcore = static_library('hwcore', sources: hwcore_files + genh, - name_suffix: 'fa', - build_by_default: false) -hwcore = declare_dependency(link_whole: libhwcore) -common_ss.add(hwcore) - common_ss.add(files('cpu.c')) common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) From patchwork Tue Oct 6 11:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C9E7C4363D for ; Tue, 6 Oct 2020 11:19:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 54F5F20760 for ; Tue, 6 Oct 2020 11:19:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="agptUs5y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54F5F20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkzw-000265-AK for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:19:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPktu-0001kn-GY for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPkto-0005Kk-TM for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982769; 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=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=agptUs5yGvSQszEvahz1EtyhljqZ9US7M+aGnQ1aqmE+VQXqmx5oXEBjwRBjyMMUZd2Txi lQDcA/Q29CLFMSa54d7XHMN7KY5MC3BRAWWjLJwMVkAzsnmMCoOzl+MzPadUa3sYUBgRA5 vgnJV4lmHnFopFCD+G+lEvwH4dngpfo= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-n_Y09hB8N8S_tRatBQR3SA-1; Tue, 06 Oct 2020 07:12:48 -0400 X-MC-Unique: n_Y09hB8N8S_tRatBQR3SA-1 Received: by mail-wm1-f69.google.com with SMTP id d197so582188wmd.4 for ; Tue, 06 Oct 2020 04:12:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=gCTt8Kj5QMyA3cizNMvZDUfwOfWLCdkvBnvn/jK+9pKEuvrFMAEMetLX2XOuSIzaz3 etDZk6ByfPCPtj0I++jPS2JDokydzdr1Eg1BSN/Ot7Rp9hUm12KMLMxeqBXmPpbifczr VSKbjURLaGhZHZSxI7vli++uSX2Uo4HN2thSmZ5TVoOg5r5wE/TluLW6R10Rwst8Xf56 dg9/J9eMIjxGvzKACtlIi20n+dmdpNj3yNh36YYPIpkCkq6Nx7ZArhHE/3JDK3kJFmf/ JwEu6hHjthKnFd71HlDlQmpz+p69x9T/Y7FKqEWRNC60LItaDjXj5GVS8UHljeiNln4s Pa8Q== X-Gm-Message-State: AOAM531nT2+w74I4vx3bAgMi187mdRKDSQrHx+sLh94PNpF3y9tnOLme SFTu4dQyqcQSxvxJp5VUzS8B67WHEh/3pqtNXqjn6jYJSdJZvMvBHvNjHevVQD/J2DahlB78P7v k3yOFTm6DdAA++AM= X-Received: by 2002:a1c:cc18:: with SMTP id h24mr4253866wmb.170.1601982766686; Tue, 06 Oct 2020 04:12:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMy/QU2uilQ/Xyup8ZFTEoGJqUG3jSl3lY0ZpSCF7XJgsUaz8JTmrGCdwQlwXTwBGoQgTf8Q== X-Received: by 2002:a1c:cc18:: with SMTP id h24mr4253842wmb.170.1601982766507; Tue, 06 Oct 2020 04:12:46 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id n10sm3548248wmk.7.2020.10.06.04.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/10] chardev: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:14 +0200 Message-Id: <20201006111219.2300921-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 7 +++++++ chardev/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index ccfa3e9531..6bec7a0994 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', blockdev_ss = ss.source_set() block_ss = ss.source_set() bsd_user_ss = ss.source_set() +chardev_ss = ss.source_set() common_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -1346,6 +1347,12 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh, qmp = declare_dependency(link_whole: [libqmp]) +libchardev = static_library('chardev', chardev_ss.sources() + genh, + name_suffix: 'fa', + build_by_default: false) + +chardev = declare_dependency(link_whole: libchardev) + libhwcore = static_library('hwcore', sources: hwcore_files + genh, name_suffix: 'fa', build_by_default: false) diff --git a/chardev/meson.build b/chardev/meson.build index 54e88d0310..dd2699a11b 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -1,4 +1,3 @@ -chardev_ss = ss.source_set() chardev_ss.add(files( 'char-fe.c', 'char-file.c', @@ -25,11 +24,6 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( )) chardev_ss = chardev_ss.apply(config_host, strict: false) -libchardev = static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', - build_by_default: false) - -chardev = declare_dependency(link_whole: libchardev) softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) From patchwork Tue Oct 6 11:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 064C8C4363D for ; Tue, 6 Oct 2020 11:16:25 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9379F206F7 for ; Tue, 6 Oct 2020 11:16:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qp8+oFrH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9379F206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkxD-0006mk-HX for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:16:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPktw-0001mg-2O for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPktu-0005L3-4k for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:12:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982774; 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=eQzKP06SroZyy9Zd+qPK43uTNQ+3Ne7R7h8yWx4kCdE=; b=Qp8+oFrHTEE5k/541XnAbxKBzU70gTUFnqyb2tvpQ5Qkij8CjZOhaNHGi0qbYnZQaMWwGb QRNhzpiPCwR/Tm0a5zwcjU077jRuvai/bbsVZsliT/cyegIQW+RLQlAqqDZ9l8MvdSMOim 7CF3nAZywg3W5ajiKJcZNcG5YesMzU8= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-2G3qUXqpOI2hJtjQGrINeQ-1; Tue, 06 Oct 2020 07:12:53 -0400 X-MC-Unique: 2G3qUXqpOI2hJtjQGrINeQ-1 Received: by mail-wm1-f69.google.com with SMTP id u5so582564wme.3 for ; Tue, 06 Oct 2020 04:12:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eQzKP06SroZyy9Zd+qPK43uTNQ+3Ne7R7h8yWx4kCdE=; b=RGqqnnOu3z5AZFpbHM9wubBbntJ+odoj47WxLad7LGVbjvfqxMbbQ9QXojchDE7SGK Q8jeTPQXBHPakAn9bnQGR8guYI8+N1WZSh2a33a/CkwTKkteVudmXZ8sxMFr086AHcnD lg10GxxomGR8tSoUXR3agh3zPEsBdK804b76jQFlluwjOqTANuIw00QZSX7FoOQ2yQC+ c7h9+7tYrDxE5Tbbb/5gkc87kBbJHakFNpS0dU7o0MC/ITLIY78NS/fhFfzE6OnGF107 10Y+nTEoit/ahjVlzehzlXtLqOasp9tFLSYqchlAHNd0HgZJpyWF4jdEmjLD8uvvlPdB fs5w== X-Gm-Message-State: AOAM530dASiFEdsoL3Iid3FlUL49HzSGkhqvjD6mcuW5H8CVCPILR8CE M0C8RMWVzjOgToKrpvKZ9p6aAd60pN0K+xWFb4B/oennpF9v/dF7To5d2xRmz25kyZh5gsRXG93 RTtEo8A9JlkcCUWo= X-Received: by 2002:a1c:2ed3:: with SMTP id u202mr4236765wmu.162.1601982771602; Tue, 06 Oct 2020 04:12:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj2DgMRyJb7iKsEcsydsn4uQUA4ZjVLyj0eRrIFKgvREU9Da1UifcbcZgtCUfZh8IMuk3ZHQ== X-Received: by 2002:a1c:2ed3:: with SMTP id u202mr4236739wmu.162.1601982771391; Tue, 06 Oct 2020 04:12:51 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id u15sm4069841wrm.77.2020.10.06.04.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/10] migration: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:15 +0200 Message-Id: <20201006111219.2300921-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 6 ++++++ migration/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 6bec7a0994..55966c3b60 100644 --- a/meson.build +++ b/meson.build @@ -1328,6 +1328,12 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +libmigration = static_library('migration', sources: migration_files + genh, + name_suffix: 'fa', + build_by_default: false) +migration = declare_dependency(link_with: libmigration, + dependencies: [zlib, qom, io]) + block_ss = block_ss.apply(config_host, strict: false) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), diff --git a/migration/meson.build b/migration/meson.build index 55c9e1329f..980e37865c 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -8,12 +8,6 @@ migration_files = files( 'qemu-file.c', 'qjson.c', ) - -libmigration = static_library('migration', sources: migration_files + genh, - name_suffix: 'fa', - build_by_default: false) -migration = declare_dependency(link_with: libmigration, - dependencies: [zlib, qom, io]) softmmu_ss.add(migration_files) softmmu_ss.add(files( From patchwork Tue Oct 6 11:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B344C4363D for ; Tue, 6 Oct 2020 11:14:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 04660206F7 for ; Tue, 6 Oct 2020 11:14:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="h1zOXEv8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04660206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkvE-0003WU-1b for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:14:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPku3-0001rF-Tk for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPktw-0005LY-CC for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982779; 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=kZn95L6kUsLR6YDfNvagiwYZibhPsdA0FOVQExAddoU=; b=h1zOXEv8l1/XHgPm7JLRj6xCnn5dZIOBJ4ZPDOAMA7uxZiOaHcuRitjyUTErumA7VYfluC 9yKKrSVId8uJ9AbuCgOetABEU3j4StlvSv8neJU2lHeyqiEO2d1AbXQqM1UtuRo/kTVyzW x9GDBNfe+dTTNgIjUB5qC6id4LeBe4c= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-Mqka_BOkOaGpLUWfWFpfIg-1; Tue, 06 Oct 2020 07:12:57 -0400 X-MC-Unique: Mqka_BOkOaGpLUWfWFpfIg-1 Received: by mail-wr1-f70.google.com with SMTP id g7so412547wrm.2 for ; Tue, 06 Oct 2020 04:12:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kZn95L6kUsLR6YDfNvagiwYZibhPsdA0FOVQExAddoU=; b=Q03ck9OIDgNpWfiEiankjpIUGa8MZEE3BseEc53yEWqyORD9igfjDg6d+S783oDo+H 7TWaVo6WEkKWK298D7aZkBZt8id9ti0gwUPHlHpEkism9tbgKW0eP+lSGk8L89MrY4bY LnLQsDnojyaCD/Ts/D7tlPqUfcM5go94L0R9BQhV20HQL340ShS+/tpnG9dMXoC3Wber UBhQYqwaKr2fxRZcIDHuSpOz9pTYCJLU6XjZK76FDP2S9uJSAsWmmY8nekE+R3twfH71 3IPm23INyLPvXcPJQLiC6Yet0xJA1Cn8EbPwzt3UhmWMDqQ4SVEGtQYsF7RoDPufFwQV 34LA== X-Gm-Message-State: AOAM532G8jDoxpkK/xMDLTvOQhZxuTX7p97iWCVWoDjJLRxgbPBUjoIq DdvyxrAhVh3+lHHaZWflY8FozCt4KwLSeh4cJQ3w+7EPnb0ENWJNrjlsGrAzOhbCCVKhTrxDQhs m3nSlmk5krG9WJa8= X-Received: by 2002:a05:600c:2159:: with SMTP id v25mr4507354wml.180.1601982776502; Tue, 06 Oct 2020 04:12:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCqSBFskFiADjiN4Pc7xQWdQivth2NlmZ5Ob4Em3X1XDJJqOZhhZo1aViSo2LgL+HMbfGBLA== X-Received: by 2002:a05:600c:2159:: with SMTP id v25mr4507335wml.180.1601982776271; Tue, 06 Oct 2020 04:12:56 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id a17sm4063654wra.29.2020.10.06.04.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/10] io: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:16 +0200 Message-Id: <20201006111219.2300921-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ io/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 55966c3b60..70545efd74 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss = ss.source_set() bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() +io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() softmmu_ss = ss.source_set() @@ -1328,6 +1329,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +io_ss = io_ss.apply(config_host, strict: false) +libio = static_library('io', io_ss.sources() + genh, + dependencies: [io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io = declare_dependency(link_whole: libio, dependencies: [crypto, qom]) + libmigration = static_library('migration', sources: migration_files + genh, name_suffix: 'fa', build_by_default: false) diff --git a/io/meson.build b/io/meson.build index 768c1b5ec3..bcd8b1e737 100644 --- a/io/meson.build +++ b/io/meson.build @@ -1,4 +1,3 @@ -io_ss = ss.source_set() io_ss.add(genh) io_ss.add(files( 'channel-buffer.c', @@ -14,12 +13,3 @@ io_ss.add(files( 'net-listener.c', 'task.c', )) - -io_ss = io_ss.apply(config_host, strict: false) -libio = static_library('io', io_ss.sources() + genh, - dependencies: [io_ss.dependencies()], - link_with: libqemuutil, - name_suffix: 'fa', - build_by_default: false) - -io = declare_dependency(link_whole: libio, dependencies: [crypto, qom]) From patchwork Tue Oct 6 11:12:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BAD5C41604 for ; Tue, 6 Oct 2020 11:16:36 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A162D20760 for ; Tue, 6 Oct 2020 11:16:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X/w3cQ1H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A162D20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkxO-00072w-Mw for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPku5-0001s4-SO for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPku1-0005M0-8R for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982784; 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=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=X/w3cQ1HqWemS782GKMwdBX/Fkeh3g48SAKkf1rUrPajXKgNGsz0GwuvCawwg2d1IEitJl 0ljULRvUG9Duud5k642IHfzkq7CEFoqbKJnWLW1/j98zRbA2gOYA7QKRgOyhb+pOLRaiR/ zb9Zc9IXOe6Z4NofQvuiqzosWrTJv8E= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-6zCPwmbAPreGwVHNkZgl_Q-1; Tue, 06 Oct 2020 07:13:02 -0400 X-MC-Unique: 6zCPwmbAPreGwVHNkZgl_Q-1 Received: by mail-wr1-f72.google.com with SMTP id c6so4252409wrt.6 for ; Tue, 06 Oct 2020 04:13:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=W7ymvXzCLY4giHp471dpL97C30F1zGnGjK+Vq2lYjqacYnzi9+fNX4tpu7Bkkel+XH NJ3fjkh8CUxRYl+nau3fIVqD6iEZgeP80b+u9HsNRd+qs58Io/Y4+xa9ll71nxJo5SWV 1NyHwDwjxZ+x76p5hL3OnP9YOtm279YlIeNAWlJ6VsSkjJmKRn2/iGqvnyCPJ5Y7P8On drbIl+SVXRDi94Mr/bCgx2b1dZbORIAZLnbufXtefdoHe2tI5He8+0+GkpO5G1oaSYjM d5RKUibVBYDp8vAKeqqfs8JiMh6KqCmEk6ROceVj/V2U56fQC1hx+S77CPYwX9gjolCl RdJA== X-Gm-Message-State: AOAM532nB1x4dIUu5DoymS3OOV175V80a+DqTAOCKGQKGGaJzUSzXB8/ iO/7+WJUdpMy/JSU+SZsK2a81oEp5PryWeRm28ltd3EPPL3WsEaIK2cWmE5ixyJpvGUzdiIGV4v msUh8pqAIR6sYD9Y= X-Received: by 2002:a1c:7f14:: with SMTP id a20mr4298712wmd.95.1601982781453; Tue, 06 Oct 2020 04:13:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+OHvtXrF4Cdv6W1e4q+LU5p8CBAVEgIZFh+mebr1bYRGoqWf7HScC+Fo6CvAOizEo66Y1Yg== X-Received: by 2002:a1c:7f14:: with SMTP id a20mr4298690wmd.95.1601982781233; Tue, 06 Oct 2020 04:13:01 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id a5sm4028173wrp.37.2020.10.06.04.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:13:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/10] crypto: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:17 +0200 Message-Id: <20201006111219.2300921-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ crypto/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 70545efd74..5ded67cb76 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss = ss.source_set() bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() +crypto_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -1329,6 +1330,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +crypto_ss = crypto_ss.apply(config_host, strict: false) +libcrypto = static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto = declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss = io_ss.apply(config_host, strict: false) libio = static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], diff --git a/crypto/meson.build b/crypto/meson.build index f6f5ce1ecd..7f37b5d335 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,4 +1,3 @@ -crypto_ss = ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif -crypto_ss = crypto_ss.apply(config_host, strict: false) -libcrypto = static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto = declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) From patchwork Tue Oct 6 11:12:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11497C4363D for ; Tue, 6 Oct 2020 11:16:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6EA5D20760 for ; Tue, 6 Oct 2020 11:16:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BHJ4RDmM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EA5D20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPkxM-0006xv-FJ for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:16:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPkuD-0001sz-Be for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPku7-0005MN-Af for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982789; 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=UGlTQyPHetsqq0zL2iZVU9NGjFB1rfxPXu9fGi39RP8=; b=BHJ4RDmMT+zU25dlzg3XAc2AWiyWW5T60ESV38bkag0g1bxkBvI0x2779gGWKPkNA5wXZM TehDgxzIUfU41hW3NhmfLzX1q8giHvLqx++Xzksj8Pl2mg+9/iQeceCmFmECPhijdm8IRM bMOgSnV5q7LWJY8T2ejS/XneVKRgy4A= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-182-LbRAOvYaOrykqiW2mYURQw-1; Tue, 06 Oct 2020 07:13:07 -0400 X-MC-Unique: LbRAOvYaOrykqiW2mYURQw-1 Received: by mail-wr1-f69.google.com with SMTP id t17so1899238wrm.13 for ; Tue, 06 Oct 2020 04:13:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UGlTQyPHetsqq0zL2iZVU9NGjFB1rfxPXu9fGi39RP8=; b=D12T6z2VD3+2ofm63WSATo7sqTXCdYlLk+bHEqxSWGaGORLA5+70W1St2mlbzn6CO+ S5m9HKNbCnWhDN+wNjKf7xjCeo5ozBXmwM33GY17KquLzCqQmY05G1xPN7QZtONwQwDw fWbyMxHzcsimsS2CtEApvvdP3ksi15mYRn5aukpbgMaTdo2wCEIpNOb7lSaSHCr2BnzO WQm/S2KOCAiwPPPasLiD8UqwO7iL0wG9hUlCMylOOCHnNuXjAQaTVKoRk8x0Ji9hINH0 soaj3/gzK0d/yJLmCMlIRsKGGAXv/6wKBQP/6h+0x/CNgmRzaQohmO6IPtcMdxFbINVb bhvg== X-Gm-Message-State: AOAM532U02AtD8znJiPOBXGLyl2YmCUVusEggEPVGxX1kHA8kwkp93Xz d5VMtXUaSkggERlzjFSV79YTgfg/4kuggoQMlg89DJlwCfsJqN2zjcVU9JD5zW8jCa3X5di/w3V XaF5Ar5aEqxVdrcs= X-Received: by 2002:a5d:6409:: with SMTP id z9mr897087wru.391.1601982786278; Tue, 06 Oct 2020 04:13:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxBXJAHlzAcMw3p8z9DJfZ2ANL9j5lqmE9paWPuCrC/DN1XW1f1o7e48W0ybuPeRSt9Ku6zQ== X-Received: by 2002:a5d:6409:: with SMTP id z9mr897068wru.391.1601982786103; Tue, 06 Oct 2020 04:13:06 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id f189sm3631986wmf.16.2020.10.06.04.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:13:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/10] authz: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:18 +0200 Message-Id: <20201006111219.2300921-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ authz/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 5ded67cb76..9ecfe93503 100644 --- a/meson.build +++ b/meson.build @@ -1059,6 +1059,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', # Collect sourcesets. +authz_ss = ss.source_set() blockdev_ss = ss.source_set() block_ss = ss.source_set() bsd_user_ss = ss.source_set() @@ -1330,6 +1331,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +authz_ss = authz_ss.apply(config_host, strict: false) +libauthz = static_library('authz', authz_ss.sources() + genh, + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz = declare_dependency(link_whole: libauthz, + dependencies: qom) + crypto_ss = crypto_ss.apply(config_host, strict: false) libcrypto = static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], diff --git a/authz/meson.build b/authz/meson.build index 516d71f2e2..88fa7769cb 100644 --- a/authz/meson.build +++ b/authz/meson.build @@ -1,4 +1,3 @@ -authz_ss = ss.source_set() authz_ss.add(genh) authz_ss.add(files( 'base.c', @@ -8,12 +7,3 @@ authz_ss.add(files( )) 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() + genh, - dependencies: [authz_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -authz = declare_dependency(link_whole: libauthz, - dependencies: qom) From patchwork Tue Oct 6 11:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303614 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3C70C4363D for ; Tue, 6 Oct 2020 11:21:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 63AC12080A for ; Tue, 6 Oct 2020 11:21:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MDxCLWQh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63AC12080A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPl1x-0003rB-Fn for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:21:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPkuI-0001zF-7i for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPkuD-0005Mk-Nq for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:13:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982794; 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=zHE0euJosau7rC4y0W3F/SPC4SETHEhDg1f1N9tjW8w=; b=MDxCLWQhbXknEy+8YIkkEY69XsCjQdhK0RZInB2dHVTb8e490k2xpA78LwWFPoc9CfYCfT KuqrmQ2hvjedidQ22bcPNCeKzbvvIo2VuJiceai0yWL+VPorhpbtmN62uOyEp0VvHIHJr8 kYo2/d467pGzNvjrDkHDSca3HVQ8svc= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-567-Xsu15Ee6PN-3Xz9TBSPs_A-1; Tue, 06 Oct 2020 07:13:12 -0400 X-MC-Unique: Xsu15Ee6PN-3Xz9TBSPs_A-1 Received: by mail-wm1-f70.google.com with SMTP id r19so977560wmh.9 for ; Tue, 06 Oct 2020 04:13:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zHE0euJosau7rC4y0W3F/SPC4SETHEhDg1f1N9tjW8w=; b=Bd/j1XGX9Bq+oouN5xHivuCHp62KUZ544hZBbEnaP/g5w8JOzlz54UKxGPNdVYxqzK Lg11sGTrNkaOC5v4O1NCcxPeUf6E01jbKZx1KaJVNQqUug0rR6GFVz9JN2Cee45gJn4M U0rjhOBwZJL/p6c81IXZr3qonmJq/848V1xKume8GfHygPgvFLgSE/k11SmhrL86Luio lFP2j0JXwMAv/5ZtCcqlvmkqWnGrAEz6iTL/nC3DYZKmcjuhBSxVEmlxtt8QlShqVLVl OKIqyD0m0IKRPupfGEdiJ36ZRRhKktngekwA0UOfOxqzpKF85qOAB2XGwZaaZH4TFYoO 24SQ== X-Gm-Message-State: AOAM532A47gVBnzf8lTCsWz8PMCy47UD7EdgIvmOj4xuzxWUI5NCXcHP kzBZ/yjDR31QA7rBMgkKIRgClVMQeZPH1MT7eDNt3IdbNO0ojKTM2SqHxQGtWoWGqKtMAgt1TUN MsS/bHq8oJpUSjyg= X-Received: by 2002:adf:e802:: with SMTP id o2mr4220702wrm.309.1601982791378; Tue, 06 Oct 2020 04:13:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6jWQHDML3fi5h/wIrbokDwSQgimm0127XS5oL31MDFZKP4gAxEKEhWCq7bQ+POWPZDfQQHg== X-Received: by 2002:adf:e802:: with SMTP id o2mr4220689wrm.309.1601982791175; Tue, 06 Oct 2020 04:13:11 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id j134sm3800716wmj.7.2020.10.06.04.13.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:13:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/10] qom: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:19 +0200 Message-Id: <20201006111219.2300921-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 8 ++++++++ qom/meson.build | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 9ecfe93503..29e397f285 100644 --- a/meson.build +++ b/meson.build @@ -1069,6 +1069,7 @@ crypto_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() +qom_ss = ss.source_set() softmmu_ss = ss.source_set() specific_fuzz_ss = ss.source_set() specific_ss = ss.source_set() @@ -1331,6 +1332,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +qom_ss = qom_ss.apply(config_host, strict: false) +libqom = static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') + +qom = declare_dependency(link_whole: libqom) + authz_ss = authz_ss.apply(config_host, strict: false) libauthz = static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], diff --git a/qom/meson.build b/qom/meson.build index a1cd03c82c..062a3789d8 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -1,4 +1,3 @@ -qom_ss = ss.source_set() qom_ss.add(genh) qom_ss.add(files( 'container.c', @@ -9,10 +8,3 @@ qom_ss.add(files( qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) - -qom_ss = qom_ss.apply(config_host, strict: false) -libqom = static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') - -qom = declare_dependency(link_whole: libqom)