From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982751; cv=none; d=zohomail.com; s=zohoarc; b=Szk6hbWBR3BQcnLb5suHLICVunlo9rwadotlqNa616A1upENj7EOpx3RkGXuO6KECmwMl1KH800zfPmrIvCxdYVaQQGzCXN156kNe5Y5GgQowYjb/y5u7HPyor05Co+2iKZxD1FU96pMtN9BKONjWjnmDamb2mPzZrYn6PqIblo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=etfUyWzqCzlIALaB60Jij2GH0zWb1XjkmDYm3zzjL14=; b=H+tntOq7pOJ6jv6FR6iCSTP21cwXE50rJ/4MBeclNCln5i0YsvoBfbncJhpQZ6fUiDq7Jdip3GHqBNSOYh0A/WFmn6plYuSMFnvtISGyGxV582cPuA3lxWXFD9LLecaFlXSMBGOoLPdh3zmfZZvj6pAws1emM0rqkcfCVG7Hlu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982751102888.6831807760692; Tue, 6 Oct 2020 04:12:31 -0700 (PDT) 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-456-M02FjYJ5NEGwygcAcAY6Gw-1; Tue, 06 Oct 2020 07:12:28 -0400 Received: by mail-wr1-f72.google.com with SMTP id b2so5174315wrs.7 for ; Tue, 06 Oct 2020 04:12:27 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: M02FjYJ5NEGwygcAcAY6Gw-1 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=nwtP43Ma04QLqQz6ng0N354WkWrA8TZmN2mYtJ4Srb6MNZikEalvwEt3CcO905heja fq0NhThpbFR/6roKf2Cxk73E3KIyhH42hTii7Oxo8JPp5vqM6nMJC+g+FdrJ5q6tnv5L 4xMz1wx9Lux0r5R9I8WV1bZgRZl2jIBfeIylqKf4bamtI1T4QP49HcFs4L2SKjF/Dp1w IEJvNyfi/QFMlXX/klNQCYSPbgmKmnNSlEfJDDf0Gb57InrF65KPQ7hF8+HQ8fkvwlUE kDUr0e3ygJnRcqItfdErWQZbe07AnwHT2YqCHl56JkZ6pHBbn+1TV9/Zx+JeUNBfDdrv tLmQ== X-Gm-Message-State: AOAM532KSK3KWOdHDTvFW0P2AI//NtowrptD+JfkgoJWCDjbkzNf2CPd dm3qn4VV7M9NT3z7PsgoefKyYTda8eI9i1QRy4Rq9h/OYeaXJ9VABSG3Cchj/kPylLnT8YjGcYk vjANHIAhS3TVuTA== X-Received: by 2002:adf:ffca:: with SMTP id x10mr4700562wrs.342.1601982746873; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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=C3=A9 --- 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 =3D static_library('migration', sources: mig= ration_files + genh, build_by_default: false) migration =3D declare_dependency(link_with: libmigration, dependencies: [zlib, qom, io]) -softmmu_ss.add(migration) +softmmu_ss.add(migration_files) =20 softmmu_ss.add(files( 'block-dirty-bitmap.c', --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982755; cv=none; d=zohomail.com; s=zohoarc; b=DvY1zeK0ZWr/I8E0sGtotwNYL3YDdhBdosXvuNZLmNTaj0IP5rmpPj7v/H2Ho1x2/es0wJ2qFwn93HrUEwrmHGZinxIOSAkb8kD3LtO14VVGACmnkAHmczeIEmahZhs2K4UtMkIWcWBMiquFFA0WI5q0Hd12cA1MBKl8XhCZZZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982755; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XHSMU3H8MAqIi6xWpwYEGX/4wsnCDrIc6FNRKW4vl4w=; b=VTpzasgSVQDW5hrz7VrwuJmI1s1wN9APQxc58VWyg3ZfkVHBcD7Id0ezNH+hnLUaNorhaFjoFeSuwUa2lnaQv0kOokbOyduiPf/xxxHhYKROsaF/flcwWw5lyidCD44tX9O++E1djC+sW7ToAu/X4rVxBtQJLnPxUdQu8Fw1zAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601982755478808.0923961542907; Tue, 6 Oct 2020 04:12:35 -0700 (PDT) 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-579--M6cFPMGM5KuHFawC0BXPw-1; Tue, 06 Oct 2020 07:12:32 -0400 Received: by mail-wm1-f70.google.com with SMTP id w23so582929wmi.1 for ; Tue, 06 Oct 2020 04:12:32 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: -M6cFPMGM5KuHFawC0BXPw-1 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=b5Ws7ef91TUUmlOi7IQhyHzqece8byYU4ESmadr+gjlPvqtB347/OdRQiNMGWBSbiA g1eyIbyKqropBG5NC2MWMuXzaQy1eSdYyfa8kCWVK8mJWRVbmYixCKVuaIuUWS2n/mlH lPYfhb0OhIBRlxlfzo/wD1MRiNIPKK26TJgV2Q7As25OQG9flhBkqGmNlC++PtChobIW c58iaqfa/4rn9ywcLa0WPPtw9TEhe6WzXRN9GALVqZs8653HcGlUpcBVkiBY7KK41Thn K8ok5K2B6ONdTvxiFlriuLmv4Y/WX/o4Cm2fr/uqFNRHsspEeVzUcuRWSRJYpOpKGdYX VaYw== X-Gm-Message-State: AOAM532cYjPBAASdjv4VbMR+Yz5GWjivVhho5jto0Rmc5j7EtO2pjEsO d1LDKqdJCkhJ9cfCKsa0xCEXm58REsN3sjem3LhnwdmRKp2kkRvO0cwWJm802mDaYuGXEpmyTsA LMuI6TgDzt6gtrQ== X-Received: by 2002:a5d:4f82:: with SMTP id d2mr4242752wru.65.1601982751756; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D custom_target('qemu.syms', output: 'qe= mu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 +######################## +# Library dependencies # +######################## + block_ss =3D block_ss.apply(config_host, strict: false) libblock =3D static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), @@ -1363,6 +1367,10 @@ common_all =3D static_library('common', dependencies: common_all.dependencies(), name_suffix: 'fa') =20 +########### +# Targets # +########### + feature_to_c =3D find_program('scripts/feature_to_c.sh') =20 emulators =3D {} --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982760; cv=none; d=zohomail.com; s=zohoarc; b=LOhDWMuHDLgGlQhSPilzLFq1ArLgjG38lP3lGF2l8MyoxY3uFuIuSVbaH5qr4mvW1y6soLjYL0+moy0H91PwB8j0Ob9VkTT8t/WVu3FVFbm9vIx5PaIq++UgBqUG/Ad7Gizn7YUJwUq2EUrpDb6TcdYenxHLr/q2u5s+jSHvX1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982760; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PYkBU6VF5ZzK1I4YI1vWYKaFknMzqMpMtEs81El0mHU=; b=L9hAv8SM8y84cjfjLuwXJMKM18Krbif4+mLYVw9pOg2CvrPz55N5j5Gpt36QmmCSJuzSKRNTkTe/WM4oQ+oHOcSKsxO5TY8BTy/PN166OuVNP9H4TmjAUloDuuNbiqP8hnZ6Pm9LYJmDWovoEMZNyJd7p6RWbdJNxE5NI+ibt54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601982760846792.37925946898; Tue, 6 Oct 2020 04:12:40 -0700 (PDT) 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-175-axwujnVXMICCKtAg6KmAvw-1; Tue, 06 Oct 2020 07:12:37 -0400 Received: by mail-wm1-f69.google.com with SMTP id i9so582987wml.2 for ; Tue, 06 Oct 2020 04:12:37 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982759; 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=CuTq+InBgFnyfeUNSk32l1krrj2cTge5sSbdShMYBClKpvq1oFMhwbzLWi7/6svcT+k8RO b/BXLb5NPnpS3wF+yU0nKpo8v32Juz491mxemnz50XE7oa8ISlWaNQwbDW27PqdpHkNwgD qjhaSRmNDl+8jwqFuggJM7bT9brYY/0= X-MC-Unique: axwujnVXMICCKtAg6KmAvw-1 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=i1Am1DgUJduaxrbxB1A8DrHEfX4ywxbFhARJ6FX+qrmWL/hGPky3XX0LDgAZX6nyoH y0NiJw7W2hA3GPsfCWpkohELa+u/Sm6a9vm68i4y7phh/zZYSCYlsstCPnjxPYjTZtVl i6ejiapA6XpbTG2+785/IIqEzuq9qYQ2ibcBDpEA0Gld5yixIoQt2o2W0BtJxK4cecPA kBiS7V2JQLJiJ+M6vq1CQ1xewb77RuYuy8SWNyHmxmGSCbtezRgm1gRthyWfyWPMLjlF 8XWdInUCwI8DDc2InskZ+smLhTbhAgDOX76kRxcMUYJdYmNJRjjmpszFOEqMd2+0oeaD nEGQ== X-Gm-Message-State: AOAM5336KIXXa7bB5uAZQ0WcaVcn7ah2Y/ASXLpgO2RHRek5HJKRAIcx AkXHL+BqxdtGCWbKSHe+8OVRcJbuetx6AhP94aM5ZQ1WxnbhI9DRyhzCIXrn8ZjL3jcl/XZP+Hd 8szw9ufVheWoZ0w== X-Received: by 2002:adf:ffca:: with SMTP id x10mr4701395wrs.342.1601982756819; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D [ meson.source_root() / 'do= cs/sphinx/depfile.py', =20 # Collect sourcesets. =20 -util_ss =3D ss.source_set() +blockdev_ss =3D ss.source_set() +block_ss =3D ss.source_set() +bsd_user_ss =3D ss.source_set() +common_ss =3D ss.source_set() +linux_user_ss =3D ss.source_set() +qmp_ss =3D ss.source_set() +softmmu_ss =3D ss.source_set() +specific_fuzz_ss =3D ss.source_set() +specific_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() -block_ss =3D ss.source_set() -blockdev_ss =3D ss.source_set() -qmp_ss =3D ss.source_set() -common_ss =3D ss.source_set() -softmmu_ss =3D ss.source_set() user_ss =3D ss.source_set() -bsd_user_ss =3D ss.source_set() -linux_user_ss =3D ss.source_set() -specific_ss =3D ss.source_set() -specific_fuzz_ss =3D ss.source_set() +util_ss =3D ss.source_set() =20 modules =3D {} hw_arch =3D {} --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982765; cv=none; d=zohomail.com; s=zohoarc; b=YBsyWzmsnipGA9lErN1r5sJFMQU/igxR9YrmUYfIqyJdBNrXzn8rb4fnxMETfIec72S/Mr2cRAc2IdT6vFaMrIlvaPk/5APsx8KJeF0RuEuugH/uZJPLGgZMeXF9ThI4t6H/A95QP5w9Vprhm9CGnq6dK4icK+jO+nqqSoc0HSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=Yjt8BK2/wORxnVhdmxoUWVRZ/DNLl3yH0CqmHtZCMwbt5jMsg8/ivoWpg+cdW2m6VviI1urfo4i1U3ybAPmif0LKtJITYHcEDf+fS9K5aEJebfivEUiUXZxElXUoNia2WtLTxOaetRaVm1ovFvFhwwTVY+YQ0CSCrwrjzDm5xFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982765981298.9368429787829; Tue, 6 Oct 2020 04:12:45 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-M5ljCmjdPBCY8aLnWwrm6w-1; Tue, 06 Oct 2020 07:12:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id l20so1984974wrc.20 for ; Tue, 06 Oct 2020 04:12:42 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: M5ljCmjdPBCY8aLnWwrm6w-1 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=ksbF4QZivtC+8TgXEhz1D5FHbu3AiyXWGYmBuclkPBoHUSz7kDmbOeMTIzxWOFyD7W j9qo37U5P1QQR1m+GzzOsr+vUlk3yxd6WgzeS4tDYCkDiUg29Tx9A1rfLwjuGaAzH88L BWS2qLlyj0KopZK8DlK2hqV6STlSjI1aeK6oPjth3s4QFs6/MhOaaNGLqLDrafAQ2im2 bTuf11d3Hi0KWdxf+BPxWr6euyL6S+i4yA6dDGkaEAUvT/kPOGqbnblH1AV8iF1OePqB 9OCt8f4IA7EWJWojfYLgcJMrVKrH3xyeCxWJgOBGnFocnqjxR0NoCpyTYn5y3UXNnQRf el1g== X-Gm-Message-State: AOAM532hcd7O6DbNqSiuTF19VgfkP0aHQWngjxovH/0p6MY7eiR5tyS1 FCSU+huAKFvebvUQMpvuPeLY0gCnzlHeDt6V1PfVOypNDVSUe5TwWcNc307OMrPmZbaDvUy/LWq sXNPyYF7YH0FCEg== X-Received: by 2002:a1c:c908:: with SMTP id f8mr2390569wmb.28.1601982761825; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, + name_suffix: 'fa', + build_by_default: false) +hwcore =3D declare_dependency(link_whole: libhwcore) +common_ss.add(hwcore) + + 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 =3D files( 'qdev-clock.c', ) =20 -libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, - name_suffix: 'fa', - build_by_default: false) -hwcore =3D declare_dependency(link_whole: libhwcore) -common_ss.add(hwcore) - common_ss.add(files('cpu.c')) common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loade= r.c')) --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982770; cv=none; d=zohomail.com; s=zohoarc; b=Oz0z9dhkJ/nRKpVA947YN5Qq2m7UGc/REXRhSKgL8Uavw5S2OfjvMlTyD761am2qTcVDxEUTHddhYbCzRsY+aPLllAcT8x0lC1xQ+K+WzsxBXN/kxHpvk4vFbiKpxX2CUBkyHJ0M+Qw/CQMosFJDKybdJrtzwf8/zbMGveC3doQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=PN6y41N6JfhRwNq8ogLxCgmiopvbd14ywMC/zeHL30EUN1B42vL5hdq4DaUxkRzH6VhGcNzhDz9T65hK8unqiAtQCM7oFQRRbDJAWYeXo7TJzXuStEysxOtY0LdnqRgFowZSVmfxc9bcFpMYck46ayXDckjuYzq32TjNmQbvUVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601982770837474.21855422968133; Tue, 6 Oct 2020 04:12:50 -0700 (PDT) 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-221-HEqER9qMMzi0UogKLJE87A-1; Tue, 06 Oct 2020 07:12:48 -0400 Received: by mail-wm1-f72.google.com with SMTP id d76so980783wmd.8 for ; Tue, 06 Oct 2020 04:12:47 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: HEqER9qMMzi0UogKLJE87A-1 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=l96DZfmF+BHAjVTLonx5LZWbjmam1jT3shld9A+FJqmJNtfah4oSHONb5JjKrMAmkm +c9P6cHfTuf9/xpTgFQIKA+uwRuzE8sd6l80wLrxCrleXslg/dHSuOm3z/x9vIYlj2w9 M0OwtxPdjqsxvdQ3MdzOuZK00Z7D5pp9XCHszQfqFkHJQotNMRXHij69MklH6hiCn8Xy xSqRJsKt2683i6IhUotwuh3YwXkdyHPVOCB3eWhBYVi0QWDjG0yZphfRv8g8gQupFL22 lxTNK1Cw8weV21IVVhtbp9WsPD5vFJjrZn5LBbpXbDk1JH2CEGYsoyd0PDdXdiBigsJ7 p4Cg== X-Gm-Message-State: AOAM533Nl/k6BaeMag9N//UrOHenhu/F0ojpd1u40/RFE2RYCxUE+IPg X5EWZ0Rz1ujUUgWCrW46YjAwYosIxOggF49UFWdwgFulAEJpQU6+fThdVNIrzVYFdn/7nV0d9oc cHRwQE2tVfPu/fg== X-Received: by 2002:a1c:cc18:: with SMTP id h24mr4253865wmb.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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() +chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1346,6 +1347,12 @@ libqmp =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +libchardev =3D static_library('chardev', chardev_ss.sources() + genh, + name_suffix: 'fa', + build_by_default: false) + +chardev =3D declare_dependency(link_whole: libchardev) + libhwcore =3D 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 =3D 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( )) =20 chardev_ss =3D chardev_ss.apply(config_host, strict: false) -libchardev =3D static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', - build_by_default: false) - -chardev =3D declare_dependency(link_whole: libchardev) =20 softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testd= ev.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982776; cv=none; d=zohomail.com; s=zohoarc; b=axdsaiv3wo1wkpx9nujtUfDu+h8GqdkE1kbBArW6r+hMRVt1fh5HsV3PlwpUfjfEeOabWMVFgder1sg9dirCERPjRz2qBEDxRHt4I9v2H14GemUXFm6q+CE++lcJ790LBxmvfuiVZHa4VDUEHWNxGF34WL3xz2+Cu7eytHs5o4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982776; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=eQzKP06SroZyy9Zd+qPK43uTNQ+3Ne7R7h8yWx4kCdE=; b=RuJcuzaOuqWRUaqJs5xvP5aD5vuCpCyICIisnuiIPLpWP1poW6d08nb71lB92zY5NqOL4hhnEfHepsWj3bXuaz8Wcz4+T31HcmclXdejg3yMZr02wftYODvQ9NpC7l/pklIL+BCP/2Jy7Gl24M/pvCTpoxB4fiEiWVlErCH4WC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 16019827767121002.3665127604397; Tue, 6 Oct 2020 04:12:56 -0700 (PDT) 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-272-mKxx5_zkPGW_joNTrhkQOg-1; Tue, 06 Oct 2020 07:12:52 -0400 Received: by mail-wr1-f69.google.com with SMTP id 33so2888946wrf.22 for ; Tue, 06 Oct 2020 04:12:52 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: mKxx5_zkPGW_joNTrhkQOg-1 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=CUO+shPC06mSoTncFhbaJI4PiVT7r47KL1uYAxeXdDWXB4r1A2bA7yDeQQ/dosDYLA cTc1dW5OGIXlR+z6CDLD7Vj0rwzO9mfPyFMcEOwjLFjnhcZE6TJNuMDJbFBpj9SZWbc7 SLQS/0nhJ35pxN78SjTPepjGLl+YuasPr0MVcDLIhTZNSxrrtdy/1tg6E7r3HUxokqh9 yAUvJx3/GJXh2ZJ0Q8bKrCKAWsxzd1wdaubHegAoUH3So2JWy+X2ucOls75vVrnk4Ikz wBlznsdAM6oOeyVNJn5wi9Fr/45D89lxzwbjEtFRPUysUXvlHQDtL9BJl7VRjdIm20Yn XS6Q== X-Gm-Message-State: AOAM5314Jvli7BZEo6/VzN3YygXLNh1aLNhnpINcTsUEDfaXBBs8mpTa SoT1+b0WkZATzXZ7sJxi6pKCnJD2ZXToJz46A3+szMO5EL5WnvQXFCx5NeSGBuU2/0CjbA5VsXm dBO5lLqEF6AvHRQ== X-Received: by 2002:a1c:2ed3:: with SMTP id u202mr4236767wmu.162.1601982771603; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +libmigration =3D static_library('migration', sources: migration_files + ge= nh, + name_suffix: 'fa', + build_by_default: false) +migration =3D declare_dependency(link_with: libmigration, + dependencies: [zlib, qom, io]) + block_ss =3D block_ss.apply(config_host, strict: false) libblock =3D 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 =3D files( 'qemu-file.c', 'qjson.c', ) - -libmigration =3D static_library('migration', sources: migration_files + ge= nh, - name_suffix: 'fa', - build_by_default: false) -migration =3D declare_dependency(link_with: libmigration, - dependencies: [zlib, qom, io]) softmmu_ss.add(migration_files) =20 softmmu_ss.add(files( --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982781; cv=none; d=zohomail.com; s=zohoarc; b=d4fkoa4YjLu5FFUt/5i+C5l33mga9al8y92mwCia9rH5rv9gOfd9mrtaLaQUfcQzIchS9EuUNJNElJMz/AksDZvkZ+Ql80iW29uG4uAESzW5lFjaw2vr7FsPrliv1ifSLFkUY34tWk49mNqf65IYU7hSMXfawbkQP/LvO1JErd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982781; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=kZn95L6kUsLR6YDfNvagiwYZibhPsdA0FOVQExAddoU=; b=QpZ8gSHqC3bJsA3QNOEcNPXi/5mYC97Vgb2hHir8yRwxLCpBRshAUUzDtaLKNCAKPalEs3NO6nJrLSLv/0KB0UapUdYp40oVKkkmyUjY3armiUWymuit/UIDxC97WSCFPwXusHqM24qugu4nyPQOvaYOaiCIngxsXUS4w7j3k3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982781044845.9861435113511; Tue, 6 Oct 2020 04:13:01 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-nYCYtQBjOhC3U5bDt70qDQ-1; Tue, 06 Oct 2020 07:12:58 -0400 Received: by mail-wr1-f71.google.com with SMTP id f11so3016937wro.15 for ; Tue, 06 Oct 2020 04:12:57 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: nYCYtQBjOhC3U5bDt70qDQ-1 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=ntEJ/BzjMBfkMpvad81ZIbGHIzjAQUyFcImhypPuP/Hg1WmWdabGP4ed+KIM/o0C78 UgHt4FYifDuo5AS2351jpOjTaquuWJXMF+UNBDOmRVhOy7OW2OjOnVqhGRWvgjxCQQXl e2PJBH6eOqW/yRBljexOOuIyNpy3n2I2YrLi7FQgQl5kwX6laF+H1dh16jRr25klcA1s TtIyp7Hf3RTE+9osnZd9xbkTtK7t5P5OXH5vdxbUkA3eBc4SYtt/3XGS0DRFPbda1l41 pitxq88NHk7QC+pTVkZicjF+acTRnLlaYL6HBfnoeklETy/kWwAhVXDmsS3iD0wwL2rM s35Q== X-Gm-Message-State: AOAM530IS2PXBqLtaLRuBo+GDlbmRRwnsmlDayRRy8TXri8izNEQuhlM zZA6+X3Q8RXul8mesqmpif/msFSvCRVcPM/QnDBVK0LANRAKHK3VbvvNvLOz+9pNcpSRnRTVIWD xOjmH8dzDSyuRoQ== X-Received: by 2002:a05:600c:2159:: with SMTP id v25mr4507355wml.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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D ss.source_set() bsd_user_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() +io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() @@ -1328,6 +1329,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +io_ss =3D io_ss.apply(config_host, strict: false) +libio =3D static_library('io', io_ss.sources() + genh, + dependencies: [io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io =3D declare_dependency(link_whole: libio, dependencies: [crypto, qom]) + libmigration =3D static_library('migration', sources: migration_files + ge= nh, 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 =3D 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 =3D io_ss.apply(config_host, strict: false) -libio =3D static_library('io', io_ss.sources() + genh, - dependencies: [io_ss.dependencies()], - link_with: libqemuutil, - name_suffix: 'fa', - build_by_default: false) - -io =3D declare_dependency(link_whole: libio, dependencies: [crypto, qom]) --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982785; cv=none; d=zohomail.com; s=zohoarc; b=Sy89w9cXZMocMfE76H3AwFB5XvihgAxRjjZkeXfWETKweCPtC7jjlMrSCxY88yzoVpYI36WGuqzegFAHCJhtwiel5J157yfgrRBsgOrWLfnJOal9sHuOv8vkES/Vni3SC5H9I4r1TSPL/ikkyLjKzazs1aPBYvQHTaTn1a1Oh2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982785; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=K9GuMhVvfokBpyo8nVaL5aqlBS1wE+kxcTu7SCxhz8RVB5Mg1um+OqJOg62TvoSVwj1rq/VBJRWpdShp5fG9KIFOWZeoYsXm8vsCbOzLJNKPDjSauxLQeYElxdca7IdjjEjl5J9P6sas2zHVGc0TgT04zYMKgWFcXw6Bb2m7nDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982785413473.4426838512326; Tue, 6 Oct 2020 04:13:05 -0700 (PDT) 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-484-6AbNKjEIMg6uBvr4_-81Fw-1; Tue, 06 Oct 2020 07:13:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id f11so3017007wro.15 for ; Tue, 06 Oct 2020 04:13:02 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: 6AbNKjEIMg6uBvr4_-81Fw-1 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=j45ULPQ93sDrmDQvF2XVPB527WNqnCVD8PJbju/Fl/qav6DAPlPPS9nVnjJlgMZOrC sIynMuWSAsO4KTNAwa372RBP8Vd2Jhg7TNPz6RNJz5i+VGp0dxJubgTCLya7XMIb0pmd JRhI9OVFFl+5GEhlZP7b3lNuVwmOKo4CrL/mFO0zsMXNbqLO+dxfTJBM8OuzFuuxJY4t XwOggVKVpAIW55VMIhbbA21W8Dq1AhmoJH0iEdJkAmOb6cHCFaGPAGNteuoxvCCNjSdY WrHJby36D/1hb9tiwEmgkbextPOddcMNvmfn+po8nZN45ccywTSOonqIL11kYEbD4CV3 Eq8w== X-Gm-Message-State: AOAM530nR6KrYdHvY0cSZqq3Go/O/mcm0cWZeXVQ+O8LQcY4eWDGwDEv lidr5tL+Wf5qPFhrS+7svewGPvCxzUcXPjnbH1mjATDHdrZVLGjIcgC87wv3LhTgUQQfC8Iugln S1euXbE4/M9jz9Q== X-Received: by 2002:a1c:7f14:: with SMTP id a20mr4298710wmd.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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D ss.source_set() bsd_user_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() +crypto_ss =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1329,6 +1330,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +crypto_ss =3D crypto_ss.apply(config_host, strict: false) +libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto =3D declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss =3D io_ss.apply(config_host, strict: false) libio =3D 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 =3D ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif =20 =20 -crypto_ss =3D crypto_ss.apply(config_host, strict: false) -libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto =3D declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) =20 --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982790; cv=none; d=zohomail.com; s=zohoarc; b=G8Sbb32Zx+ASWNfWAVW3FKhnUWAw5CAXcFBmj7hssL67bArNhVe7PC41bh6Ajv/ZWx5naki36GHgUx5oyIoWFpHqp1tMOq8+aA1+CBR89oPR42sBwW7IKX4t4jfJUsP4QXML//g+uKpafF5h8bersaAGmYCdLwPlDnyXe4LfTnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982790; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=UGlTQyPHetsqq0zL2iZVU9NGjFB1rfxPXu9fGi39RP8=; b=L/kryHcizf7SQtDAktwz5+0o1IWgndyHxmkLCdih8Z2RSZrpEaxWju9YvPxoSqEFeoYx1ziw3KBNhjD/I1SswIX/09jL9lgiJZ0WlvFCr//TJ+057kPlx4kDUBF0Z7kPj6NeGu+VLGBc1qH5GlFFzbIdbT/mQ4RtcUsE3nu92xw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982790196233.41943475301173; Tue, 6 Oct 2020 04:13:10 -0700 (PDT) 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-298-1Ea9mmvqNT6OPRyXp3LE0A-1; Tue, 06 Oct 2020 07:13:07 -0400 Received: by mail-wr1-f72.google.com with SMTP id r16so5191852wrm.18 for ; Tue, 06 Oct 2020 04:13:07 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982788; 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=I4Dvb92N94aeCmzdZAo9/CisWT/dCzQ+dCanP2kyW5cG0TZXQYDj48W1NnqkWGRmI41QfT QNwMz/5Sgjv8TvsJCx2xls6zKYQkwNpQfGERHnh+eCO7t6irHmA1ow+3VQCr0RfZCKQ13/ SR/PsWTiZyh9z13ezy5nxutWjA6+EFw= X-MC-Unique: 1Ea9mmvqNT6OPRyXp3LE0A-1 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=n5mgpaIrleZpIhkDSmXwcgzbcL7D/hyIY0whKnEISXoFb/mkzpyRHGzwI5VOQUFMDj Stgra9wwpfE9xSjKN6+6HX427gfKRZJcda6PgAVjk73jR0ko8ZLiLFNOFw0Vvi/yIdaj w7s/hVVFWoBcNXMm4jGZgRnzdLVYGvkYfwLaaK1OCwVJ/w9f7VIK8jOGxfov/459y0+B 8lRtE7vWtWWr1S1bdSB0nV+M9MVVq703CiNO7j+fVodE07negoSbr6oqbH9rZh4dd+ut exE/gKEV3BbKOzog5x3RIhULA3+LLPYlPFm47kbJL34yVqX+Ck7qYV1hvgT40zN1VkSS 3zOg== X-Gm-Message-State: AOAM5320JmDCk48e46lb9pXw9fQZ2G30lDtR8K5F2C6QNCtjH6jX7CfT SUG+R+PHQmm4CkuIpZh/RulXfjgB94J0m4qP/nYu226iPoGBRtOARUankQ7jx/hnaX3B7GtbgTR rzrhmrYg+grFN7w== X-Received: by 2002:a5d:6409:: with SMTP id z9mr897083wru.391.1601982786277; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', =20 # Collect sourcesets. =20 +authz_ss =3D ss.source_set() blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() @@ -1330,6 +1331,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +authz_ss =3D authz_ss.apply(config_host, strict: false) +libauthz =3D static_library('authz', authz_ss.sources() + genh, + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz =3D declare_dependency(link_whole: libauthz, + dependencies: qom) + crypto_ss =3D crypto_ss.apply(config_host, strict: false) libcrypto =3D 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 =3D ss.source_set() authz_ss.add(genh) authz_ss.add(files( 'base.c', @@ -8,12 +7,3 @@ authz_ss.add(files( )) =20 authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) - -authz_ss =3D authz_ss.apply(config_host, strict: false) -libauthz =3D static_library('authz', authz_ss.sources() + genh, - dependencies: [authz_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -authz =3D declare_dependency(link_whole: libauthz, - dependencies: qom) --=20 2.26.2 From nobody Sun Nov 16 20:47:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982795; cv=none; d=zohomail.com; s=zohoarc; b=nLR3RCGxf8ARiSz4JE+BcYoxyiRZlM7pauUmCAcKD5MHVX8a11p/14Ta7QOP6RDxyVm7RxcRFnKaM8x7XXxDvplD3IcOLkosIeXW9OQ2AtNXaHkAmmgb1mx6Vxi0zWBYokhE1ziYbvzyKlKlVRwEuM4OQuQTZ1tws53OFPzLLSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982795; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=zHE0euJosau7rC4y0W3F/SPC4SETHEhDg1f1N9tjW8w=; b=fORYPhad0hgdkZLwbJof8qMccpz6cSr4rqyLCqKz2FYuUtVr0PsqtlgRUgGrsuu6Tf4ZsJY2LCMmxvWoljujum7Wz6LamhDkj6NygHh2ZYy8sg1TckJL+kwD79Vzo2x3bKBmfs8HXtUWCPn6H6QAs7j4dPlJvySL9xnD5UqPW7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601982795496853.3507555976427; Tue, 6 Oct 2020 04:13:15 -0700 (PDT) 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-569-BwG6edVVM5SHvtjhiY0VzQ-1; Tue, 06 Oct 2020 07:13:12 -0400 Received: by mail-wr1-f69.google.com with SMTP id b6so473941wrn.17 for ; Tue, 06 Oct 2020 04:13:12 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: BwG6edVVM5SHvtjhiY0VzQ-1 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=Xq/0AsxR1munoJixmEIrRDMpNv689cTMX4d/NU1XWScMxtTpPd2W4MssnF+RwAMQvC oHKIc44Iav+K4JwcGavunIzZaENUP3WZRWNh6cl7GmZM0yRdVi0K/XMYfrMN1nyEKcsl Kk5Ea8x3NpwJX9lB+6NjbivtJ3aTMSZ3NAb4l26/mAbS+lbWtbg9aGSVZxji08XtHDLW JQdjzMgxW0yaj+ziwj33LQvW6TIKg3Xo93yE/J0APa7AowGkJEj+vrSU5/EwmVIQtb1Y dKmxPeofBT/puUhRA1vtlTseSzcCM/KCEzUwqlmb3Dje/YMbaVibxxDUc22S/EgNZPlR 4MDA== X-Gm-Message-State: AOAM530Xt5yRb4Ku8Kh1N75YqU2QZyG1x3CYXjwLhWM9Ptzq0kxwlqC+ 9vUfRCV85af9mG71BKSM4upvRHNiB+rxqYACkF2CvYIzWPsoqebL+yf0sff1mOVj2TFkWJ26b4B GqePS0TdpVe/9TQ== X-Received: by 2002:adf:e802:: with SMTP id o2mr4220705wrm.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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() +qom_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() specific_fuzz_ss =3D ss.source_set() specific_ss =3D ss.source_set() @@ -1331,6 +1332,13 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +qom_ss =3D qom_ss.apply(config_host, strict: false) +libqom =3D static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') + +qom =3D declare_dependency(link_whole: libqom) + authz_ss =3D authz_ss.apply(config_host, strict: false) libauthz =3D 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 =3D ss.source_set() qom_ss.add(genh) qom_ss.add(files( 'container.c', @@ -9,10 +8,3 @@ qom_ss.add(files( =20 qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) - -qom_ss =3D qom_ss.apply(config_host, strict: false) -libqom =3D static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') - -qom =3D declare_dependency(link_whole: libqom) --=20 2.26.2