From nobody Tue Feb 10 01:35:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597762305; cv=none; d=zohomail.com; s=zohoarc; b=h5VetmooD5ALSu4YqxPfWkZ+KxtH/rg7PImpznMPj3bC1bR/CoJpq7zeI6pdHpDlZM6wnqdpFpNu9BMQTlF02PDtPJo1w0n/+SJuZerfKLfYD5i2UBvCotApVf4LDsIGvuqye+iMy12gwFBip2OjWIFBoCkF1i+L/Pz0cs6Htlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597762305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CUB2d128Uw8Jo7HHKbSiuJv6mjwFT5oCh/Ss7ZAYU/o=; b=Be7EcdVSPASbWs49lGldZQpXKdn14PPoMr+/TbaIklCw3dUx9yc3kkgDDC3wRKvWx4gpc6w/IVsstX2SfscaQjThZFrCuywoRQ0oLprFMKo7wxje9QT8DeeQd47fVJ+Umq2ClxXX9nzD6B64RALVAa7/BHJREAuzQFiEvigjtUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597762305539339.96426996647244; Tue, 18 Aug 2020 07:51:45 -0700 (PDT) Received: from localhost ([::1]:37976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82jd-0002Tg-3n for importer@patchew.org; Tue, 18 Aug 2020 10:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82LD-00053K-Ta for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25375 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82L3-0007VU-BM for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-528-gmQNN0roMySoJT7MkF1crA-1; Tue, 18 Aug 2020 10:11:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E946186A568 for ; Tue, 18 Aug 2020 14:11:42 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC24B165D8; Tue, 18 Aug 2020 14:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759904; 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=CUB2d128Uw8Jo7HHKbSiuJv6mjwFT5oCh/Ss7ZAYU/o=; b=csrf1kfLPpdU/pe7HGrwoB332HNHAtoi67ZUA6QOZD9OcWc6qQ8fznhh2t1g2UwF2XdHQO ZZypRDux4pES3cEezmyhmpwP1jRFU8ptmXZ2Mk60da0m52qxdTYHFYajK4Ih/gud91Lctx ymRrHL/MiiaPShIg+XgRm0blSVBSVQk= X-MC-Unique: gmQNN0roMySoJT7MkF1crA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 089/150] meson: convert hw/smbios Date: Tue, 18 Aug 2020 10:09:24 -0400 Message-Id: <20200818141025.21608-90-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 03:19:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/smbios/Makefile.objs | 10 ---------- hw/smbios/meson.build | 13 +++++++++++++ 4 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 hw/smbios/Makefile.objs create mode 100644 hw/smbios/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 86bc201a55..73c49ddd3b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ -devices-dirs-y +=3D smbios/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 03ef30212e..dccc2d19a6 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') subdir('nubus') subdir('semihosting') +subdir('smbios') subdir('xen') diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs deleted file mode 100644 index 23bb2bac07..0000000000 --- a/hw/smbios/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -ifeq ($(CONFIG_SMBIOS),y) -common-obj-y +=3D smbios.o -common-obj-$(CONFIG_IPMI) +=3D smbios_type_38.o -common-obj-$(call lnot,$(CONFIG_IPMI)) +=3D smbios_type_38-stub.o -else -common-obj-y +=3D smbios-stub.o -endif - -common-obj-$(CONFIG_ALL) +=3D smbios-stub.o -common-obj-$(CONFIG_ALL) +=3D smbios_type_38-stub.o diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build new file mode 100644 index 0000000000..9e762c7108 --- /dev/null +++ b/hw/smbios/meson.build @@ -0,0 +1,13 @@ +smbios_ss =3D ss.source_set() +smbios_ss.add(files('smbios.c')) +smbios_ss.add(when: 'CONFIG_IPMI', + if_true: files('smbios_type_38.c'), + if_false: files('smbios_type_38-stub.c')) + +softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss) +softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c')) + +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files( + 'smbios-stub.c', + 'smbios_type_38-stub.c', +)) --=20 2.26.2