From nobody Sun Nov 16 23:02:11 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