From nobody Sat Oct 4 20:33:21 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=1601989015; cv=none; d=zohomail.com; s=zohoarc; b=HaDdG1eriiBjQfMh3GeJ7wEVuk8W5K4WP3A+imGnAttrmg8hC3HaLTX01T2OT3bwaYDREOD/mESflyyhQa1/0f+ibriRt+cXtvUj36ve1A+uT27043bQbIM0Pozj6/rAQvE8Q1i01NHKjRVrRAz2rJo0cCtpehwk9L/7+OMWg90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601989015; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=TUuz3RaKn8kncMWTHYo+p1iiXu3IuD/E4+iBVpVXu+4W2VQPxNBUWYogxQfBywLPMt12dYeYZiRx2qg8yfL6P2YN2K/CnLVd0O+MB3Y1DCSrco0pQzz1/nHs1QUqFPPLKg6z0xBiu+adqX0yhRXEhe51/H2mHIK/wPxy+IoGlg8= 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 1601989014794821.7040305883992; Tue, 6 Oct 2020 05:56:54 -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-338-OXJvQKm2M8SOM9qy3Qt_6Q-1; Tue, 06 Oct 2020 08:56:51 -0400 Received: by mail-wm1-f70.google.com with SMTP id y83so657449wmc.8 for ; Tue, 06 Oct 2020 05:56:51 -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 m18sm3781973wmg.32.2020.10.06.05.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989013; 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=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=Mc07mg4+rPYylQ/TrLM1lIEW75xZakgQAorIljJjjL+MqG4bgUSoDripPwkpJa+2kPHZqI +V50+6AjlzpO6mpIt0MBbWjvj3B484F0XsBbT4g0fB3iq0cuZKDvFOO03SX/BB7m8zvY3S DZM+Q2rjtMseEFQhoT8XTBsZJGX2ZRc= X-MC-Unique: OXJvQKm2M8SOM9qy3Qt_6Q-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=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=NiUihN4sU24/fx0GFJmrdD2wsKA/w/YEIfoDx/Hkyc6Lwc0vh3KkH9R0AnKD5tOwU7 zDC27U6ou7VFfAv9DVATgkA4OUnGhbVxdJs+yW25wVpdsyuV0r0vgr4CiSoBLxMRl0ZR 1ogQHwFlkqK+UVCctRcaoaT3Y7UPl7MlntaQP6EHf0IeJrNx86q5V72yoIDN/K9UAUPN 44Xi4Z1hBsPD4mnD6i8XZyf2Voc41ycZjdfzVjh3UfMAp+iKzKMq5rNlq/+zXn08+eJ8 xppY+aqk7TTmlrx2TyROz6k4pEvOCef7/Sr65UXB51IjmyFryNP+wUr8UV+V8XpHiaP1 jFhA== X-Gm-Message-State: AOAM533KS/9lH3pncGsFxvpc127OQPVTjnHcJPUavneTVf1AJ6qeeF26 Hc5Pj5r4evkZSbEuZqQ/ni71l14zaWBuTZDXpasTR3VvDRg90tEIJYpJjsZO68W2WJ+x14+POum FgIR06z262HBx2Q== X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885718wmd.112.1601989010591; Tue, 06 Oct 2020 05:56:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCW/FuG9EMZZBisRNBdS8c1CZVhlrB5OFZKV8YoBlijS+J1iKw82pFtZPS9kKyQKj20dCQMA== X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885690wmd.112.1601989010423; Tue, 06 Oct 2020 05:56:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 9/9] qom: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:02 +0200 Message-Id: <20201006125602.2311423-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-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 73838d1d4f..72c8d3ad39 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