From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web12.3294.1622062389345759245 for ; Wed, 26 May 2021 13:53:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FV32MwvL; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622062388; 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=ptzHlGrPCBurnVgCvGI9NnLGZdIWXeDYmLCR4FZWr+8=; b=FV32MwvL3DHCNdxp3vBxTcI/o9S8Oi7SIwjXOU4s2SGIEhFVPUq2i9g4spur3Ff4OeTbY5 MxryVIbrboS5Uw3acrx01n+8fwrce7GciDTZTANWADXYN+4g0xPAl3G+fyfgP7h9NsKkUe Oml8tC3MucXXcQCgdgTAprYs2uvqbzw= 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-264-WFINsaSEN6uIuesG-otcfg-1; Wed, 26 May 2021 16:53:04 -0400 X-MC-Unique: WFINsaSEN6uIuesG-otcfg-1 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 64F6E108C31A; Wed, 26 May 2021 20:53:03 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-61.ams2.redhat.com [10.36.114.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id E71A9131C4; Wed, 26 May 2021 20:52:37 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 36/43] OvmfPkg/SmbiosPlatformDxe: clean up #includes and INF Date: Wed, 26 May 2021 22:14:39 +0200 Message-Id: <20210526201446.12554-37-lersek@redhat.com> In-Reply-To: <20210526201446.12554-1-lersek@redhat.com> References: <20210526201446.12554-1-lersek@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=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 LSBTb3J0IGFsbCBzZWN0aW9ucyBpbiB0aGUgSU5GIGZpbGUuCgotIFJlbW92ZSB1bnVzZWQgcGFj a2FnZXMgKE1kZU1vZHVsZVBrZykgYW5kIGxpYiBjbGFzc2VzIChCYXNlTWVtb3J5TGliKQogIGZy b20gdGhlIElORiBmaWxlLgoKLSBSZXN0cmljdCBzb21lIGxpYiBjbGFzc2VzIChCYXNlTGliLCBI b2JMaWIpIGFuZCBHVUlEcyAoZ0VmaVhlbkluZm9HdWlkKQogIHRvIElBMzIgYW5kIFg2NCwgaW4g dGhlIElORiBmaWxlOyBvbmx5IHRoZSBJQTMyL1g2NCBYZW4gaW1wbGVtZW50YXRpb24KICByZXF1 aXJlcyB0aGVzZS4KCi0gRG9uJ3QgbWFrZSAiU21iaW9zUGxhdGZvcm1EeGUuaCIgI2luY2x1ZGUg ZXZlcnl0aGluZyBqdXN0IGFzIGEKICBjb252ZW5pZW5jZS4gU3BlbGwgb3V0IGRpcmVjdGx5IG5l ZWRlZCAjaW5jbHVkZXMgaW4gZXZlcnkgZmlsZSAoYW5ub3RhdGUKICBlYWNoIHdpdGggYW4gZXhh bXBsZSBpZGVudGlmaWVyIGNvbnN1bWVkKSwgZHJvcCB1bnVzZWQgI2luY2x1ZGVzLgoKLSBLZWVw ICNpbmNsdWRlcyBzb3J0ZWQuCgotIFJlbW92ZSB0aGUgbGVhZGluZyB1bmRlcnNjb3JlIGZyb20g dGhlICNpbmNsdWRlIGd1YXJkIG1hY3JvIG5hbWUgaW4KICAiU21iaW9zUGxhdGZvcm1EeGUuaCIu CgpDYzogQW50aG9ueSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+CkNjOiBBcmQg Qmllc2hldXZlbCA8YXJkYit0aWFub2NvcmVAa2VybmVsLm9yZz4KQ2M6IEpvcmRhbiBKdXN0ZW4g PGpvcmRhbi5sLmp1c3RlbkBpbnRlbC5jb20+CkNjOiBKdWxpZW4gR3JhbGwgPGp1bGllbkB4ZW4u b3JnPgpDYzogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgpSZWY6 IGh0dHBzOi8vYnVnemlsbGEudGlhbm9jb3JlLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMgpTaWdu ZWQtb2ZmLWJ5OiBMYXN6bG8gRXJzZWsgPGxlcnNla0ByZWRoYXQuY29tPgotLS0KIE92bWZQa2cv U21iaW9zUGxhdGZvcm1EeGUvU21iaW9zUGxhdGZvcm1EeGUuaW5mIHwgMjAgKysrKysrKysrKy0t LS0tLS0tLS0KIE92bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUvU21iaW9zUGxhdGZvcm1EeGUuaCAg IHwgMTUgKysrLS0tLS0tLS0tLS0tCiBPdm1mUGtnL1NtYmlvc1BsYXRmb3JtRHhlL1FlbXUuYyAg ICAgICAgICAgICAgICB8ICA4ICsrKysrLS0tCiBPdm1mUGtnL1NtYmlvc1BsYXRmb3JtRHhlL1Nt Ymlvc1BsYXRmb3JtRHhlLmMgICB8ICA2ICsrKysrKwogT3ZtZlBrZy9TbWJpb3NQbGF0Zm9ybUR4 ZS9YODZYZW4uYyAgICAgICAgICAgICAgfCAgNiArKysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgMjgg aW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvT3ZtZlBrZy9TbWJp b3NQbGF0Zm9ybUR4ZS9TbWJpb3NQbGF0Zm9ybUR4ZS5pbmYgYi9Pdm1mUGtnL1NtYmlvc1BsYXRm b3JtRHhlL1NtYmlvc1BsYXRmb3JtRHhlLmluZgppbmRleCA4YjU2ZDkwY2Y4MDUuLjYwNjNjMGM5 ZjYwOSAxMDA2NDQKLS0tIGEvT3ZtZlBrZy9TbWJpb3NQbGF0Zm9ybUR4ZS9TbWJpb3NQbGF0Zm9y bUR4ZS5pbmYKKysrIGIvT3ZtZlBrZy9TbWJpb3NQbGF0Zm9ybUR4ZS9TbWJpb3NQbGF0Zm9ybUR4 ZS5pbmYKQEAgLTIxLDQ0ICsyMSw0NCBAQCBbRGVmaW5lc10KICMgVGhlIGZvbGxvd2luZyBpbmZv cm1hdGlvbiBpcyBmb3IgcmVmZXJlbmNlIG9ubHkgYW5kIG5vdCByZXF1aXJlZCBieSB0aGUgYnVp bGQgdG9vbHMuDQogIw0KICMgIFZBTElEX0FSQ0hJVEVDVFVSRVMgICAgICAgICAgID0gSUEzMiBY NjQgRUJDIEFSTSBBQVJDSDY0DQogIw0KIA0KIFtTb3VyY2VzXQ0KLSAgU21iaW9zUGxhdGZvcm1E eGUuaA0KLSAgU21iaW9zUGxhdGZvcm1EeGUuYw0KICAgUWVtdS5jDQorICBTbWJpb3NQbGF0Zm9y bUR4ZS5jDQorICBTbWJpb3NQbGF0Zm9ybUR4ZS5oDQogDQogW1NvdXJjZXMuSUEzMiwgU291cmNl cy5YNjRdDQogICBYODZYZW4uYw0KIA0KIFtTb3VyY2VzLkFSTSwgU291cmNlcy5BQVJDSDY0XQ0K ICAgQXJtWGVuLmMNCiANCiBbUGFja2FnZXNdDQogICBNZGVQa2cvTWRlUGtnLmRlYw0KLSAgTWRl TW9kdWxlUGtnL01kZU1vZHVsZVBrZy5kZWMNCiAgIE92bWZQa2cvT3ZtZlBrZy5kZWMNCiANCiBb TGlicmFyeUNsYXNzZXNdDQotICBVZWZpQm9vdFNlcnZpY2VzVGFibGVMaWINCi0gIEJhc2VNZW1v cnlMaWINCi0gIEJhc2VMaWINCi0gIFVlZmlEcml2ZXJFbnRyeVBvaW50DQogICBEZWJ1Z0xpYg0K LSAgSG9iTGliDQotICBRZW11RndDZmdMaWINCiAgIE1lbW9yeUFsbG9jYXRpb25MaWINCiAgIFBj ZExpYg0KKyAgUWVtdUZ3Q2ZnTGliDQorICBVZWZpQm9vdFNlcnZpY2VzVGFibGVMaWINCisgIFVl ZmlEcml2ZXJFbnRyeVBvaW50DQorDQorW0xpYnJhcnlDbGFzc2VzLklBMzIsIExpYnJhcnlDbGFz c2VzLlg2NF0NCisgIEJhc2VMaWINCisgIEhvYkxpYg0KIA0KIFtQY2RdDQogICBnVWVmaU92bWZQ a2dUb2tlblNwYWNlR3VpZC5QY2RRZW11U21iaW9zVmFsaWRhdGVkDQogDQogW1Byb3RvY29sc10N CiAgIGdFZmlTbWJpb3NQcm90b2NvbEd1aWQgICAgICAgICAgICAgICAgICAgICAgIyBQUk9UT0NP TCBBTFdBWVNfQ09OU1VNRUQNCiANCi1bR3VpZHNdDQorW0d1aWRzLklBMzIsIEd1aWRzLlg2NF0N CiAgIGdFZmlYZW5JbmZvR3VpZA0KIA0KIFtEZXBleF0NCiAgIGdFZmlTbWJpb3NQcm90b2NvbEd1 aWQNCiANCmRpZmYgLS1naXQgYS9Pdm1mUGtnL1NtYmlvc1BsYXRmb3JtRHhlL1NtYmlvc1BsYXRm b3JtRHhlLmggYi9Pdm1mUGtnL1NtYmlvc1BsYXRmb3JtRHhlL1NtYmlvc1BsYXRmb3JtRHhlLmgK aW5kZXggMjFhYTkxNmQ3Nzg0Li5hZDQyYTMyNjQxOGMgMTAwNjQ0Ci0tLSBhL092bWZQa2cvU21i aW9zUGxhdGZvcm1EeGUvU21iaW9zUGxhdGZvcm1EeGUuaAorKysgYi9Pdm1mUGtnL1NtYmlvc1Bs YXRmb3JtRHhlL1NtYmlvc1BsYXRmb3JtRHhlLmgKQEAgLTUsMjUgKzUsMTYgQEAKICAgQ29weXJp Z2h0IChjKSAyMDExLCBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC48QlI+ DQogDQogICBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQlNELTItQ2xhdXNlLVBhdGVudA0KIA0K ICoqLw0KIA0KLSNpZm5kZWYgX1NNQklPU19QTEFURk9STV9EWEVfSF8NCi0jZGVmaW5lIF9TTUJJ T1NfUExBVEZPUk1fRFhFX0hfDQotDQotI2luY2x1ZGUgPFBpRHhlLmg+DQotDQotI2luY2x1ZGUg PFByb3RvY29sL1NtYmlvcy5oPg0KLSNpbmNsdWRlIDxJbmR1c3RyeVN0YW5kYXJkL1NtQmlvcy5o Pg0KLSNpbmNsdWRlIDxMaWJyYXJ5L0RlYnVnTGliLmg+DQotI2luY2x1ZGUgPExpYnJhcnkvQmFz ZUxpYi5oPg0KLSNpbmNsdWRlIDxMaWJyYXJ5L0Jhc2VNZW1vcnlMaWIuaD4NCi0jaW5jbHVkZSA8 TGlicmFyeS9VZWZpQm9vdFNlcnZpY2VzVGFibGVMaWIuaD4NCi0jaW5jbHVkZSA8TGlicmFyeS9N ZW1vcnlBbGxvY2F0aW9uTGliLmg+DQorI2lmbmRlZiBTTUJJT1NfUExBVEZPUk1fRFhFX0hfDQor I2RlZmluZSBTTUJJT1NfUExBVEZPUk1fRFhFX0hfDQogDQorI2luY2x1ZGUgPEluZHVzdHJ5U3Rh bmRhcmQvU21CaW9zLmg+IC8vIFNNQklPU19UQUJMRV9FTlRSWV9QT0lOVA0KIA0KIC8qKg0KICAg TG9jYXRlcyB0aGUgWGVuIFNNQklPUyBkYXRhIGlmIGl0IGV4aXN0cw0KIA0KICAgQHJldHVybiBT TUJJT1NfVEFCTEVfRU5UUllfUE9JTlQgICBBZGRyZXNzIG9mIFhlbiBTTUJJT1MgZGF0YQ0KIA0K ZGlmZiAtLWdpdCBhL092bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUvUWVtdS5jIGIvT3ZtZlBrZy9T bWJpb3NQbGF0Zm9ybUR4ZS9RZW11LmMKaW5kZXggZTM0NjU4MjM4MTIzLi5mY2ZjM2UzM2MyOGMg MTAwNjQ0Ci0tLSBhL092bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUvUWVtdS5jCisrKyBiL092bWZQ a2cvU21iaW9zUGxhdGZvcm1EeGUvUWVtdS5jCkBAIC0zLDE2ICszLDE4IEBACiANCiAgIENvcHly aWdodCAoQykgMjAxNCwgR2FicmllbCBMLiBTb21sbyA8c29tbG9AY211LmVkdT4NCiANCiAgIFNQ RFgtTGljZW5zZS1JZGVudGlmaWVyOiBCU0QtMi1DbGF1c2UtUGF0ZW50DQogKiovDQogDQorI2lu Y2x1ZGUgPExpYnJhcnkvRGVidWdMaWIuaD4gICAgICAgICAgICAvLyBBU1NFUlRfRUZJX0VSUk9S KCkNCisjaW5jbHVkZSA8TGlicmFyeS9NZW1vcnlBbGxvY2F0aW9uTGliLmg+IC8vIEFsbG9jYXRl UG9vbCgpDQorI2luY2x1ZGUgPExpYnJhcnkvUGNkTGliLmg+ICAgICAgICAgICAgICAvLyBQY2RH ZXRCb29sKCkNCisjaW5jbHVkZSA8TGlicmFyeS9RZW11RndDZmdMaWIuaD4gICAgICAgIC8vIFFl bXVGd0NmZ0ZpbmRGaWxlKCkNCisNCiAjaW5jbHVkZSAiU21iaW9zUGxhdGZvcm1EeGUuaCINCi0j aW5jbHVkZSA8TGlicmFyeS9RZW11RndDZmdMaWIuaD4NCi0jaW5jbHVkZSA8TGlicmFyeS9NZW1v cnlBbGxvY2F0aW9uTGliLmg+DQotI2luY2x1ZGUgPExpYnJhcnkvUGNkTGliLmg+DQogDQogLyoq DQogICBMb2NhdGVzIGFuZCBleHRyYWN0cyB0aGUgUUVNVSBTTUJJT1MgZGF0YSBpZiBwcmVzZW50 IGluIGZ3X2NmZw0KIA0KICAgQHJldHVybiAgICAgICAgICAgICAgICAgQWRkcmVzcyBvZiBleHRy YWN0ZWQgUUVNVSBTTUJJT1MgZGF0YQ0KIA0KZGlmZiAtLWdpdCBhL092bWZQa2cvU21iaW9zUGxh dGZvcm1EeGUvU21iaW9zUGxhdGZvcm1EeGUuYyBiL092bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUv U21iaW9zUGxhdGZvcm1EeGUuYwppbmRleCA3OTkxYTE5ZGM5YzYuLjliZmM5ZjE0ZjFhNSAxMDA2 NDQKLS0tIGEvT3ZtZlBrZy9TbWJpb3NQbGF0Zm9ybUR4ZS9TbWJpb3NQbGF0Zm9ybUR4ZS5jCisr KyBiL092bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUvU21iaW9zUGxhdGZvcm1EeGUuYwpAQCAtNSwx MiArNSwxOCBAQAogICBDb3B5cmlnaHQgKGMpIDIwMTEgLSAyMDE1LCBJbnRlbCBDb3Jwb3JhdGlv bi4gQWxsIHJpZ2h0cyByZXNlcnZlZC48QlI+DQogDQogICBTUERYLUxpY2Vuc2UtSWRlbnRpZmll cjogQlNELTItQ2xhdXNlLVBhdGVudA0KIA0KICoqLw0KIA0KKyNpbmNsdWRlIDxJbmR1c3RyeVN0 YW5kYXJkL1NtQmlvcy5oPiAgICAgICAgICAvLyBTTUJJT1NfVEFCTEVfVFlQRTANCisjaW5jbHVk ZSA8TGlicmFyeS9EZWJ1Z0xpYi5oPiAgICAgICAgICAgICAgICAgLy8gQVNTRVJUX0VGSV9FUlJP UigpDQorI2luY2x1ZGUgPExpYnJhcnkvTWVtb3J5QWxsb2NhdGlvbkxpYi5oPiAgICAgIC8vIEZy ZWVQb29sKCkNCisjaW5jbHVkZSA8TGlicmFyeS9VZWZpQm9vdFNlcnZpY2VzVGFibGVMaWIuaD4g Ly8gZ0JTDQorI2luY2x1ZGUgPFByb3RvY29sL1NtYmlvcy5oPiAgICAgICAgICAgICAgICAgIC8v IEVGSV9TTUJJT1NfUFJPVE9DT0wNCisNCiAjaW5jbHVkZSAiU21iaW9zUGxhdGZvcm1EeGUuaCIN CiANCiAjZGVmaW5lIFRZUEUwX1NUUklOR1MgXA0KICAgIkVGSSBEZXZlbG9wbWVudCBLaXQgSUkg LyBPVk1GXDAiICAgICAvKiBWZW5kb3IgKi8gXA0KICAgIjAuMC4wXDAiICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvKiBCaW9zVmVyc2lvbiAqLyBcDQogICAiMDIvMDYvMjAxNVwwIiAgICAg ICAgICAgICAgICAgICAgICAgIC8qIEJpb3NSZWxlYXNlRGF0ZSAqLw0KZGlmZiAtLWdpdCBhL092 bWZQa2cvU21iaW9zUGxhdGZvcm1EeGUvWDg2WGVuLmMgYi9Pdm1mUGtnL1NtYmlvc1BsYXRmb3Jt RHhlL1g4Nlhlbi5jCmluZGV4IGJlYWQ4MTBlZmRkYi4uZTBiMWIyOWY4MGRiIDEwMDY0NAotLS0g YS9Pdm1mUGtnL1NtYmlvc1BsYXRmb3JtRHhlL1g4Nlhlbi5jCisrKyBiL092bWZQa2cvU21iaW9z UGxhdGZvcm1EeGUvWDg2WGVuLmMKQEAgLTUsMTUgKzUsMTcgQEAKICAgQ29weXJpZ2h0IChjKSAy MDExLCBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC48QlI+DQogDQogICBT UERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQlNELTItQ2xhdXNlLVBhdGVudA0KIA0KICoqLw0KIA0K KyNpbmNsdWRlIDxMaWJyYXJ5L0Jhc2VMaWIuaD4gLy8gQXNjaWlTdHJuQ21wKCkNCisjaW5jbHVk ZSA8TGlicmFyeS9Ib2JMaWIuaD4gIC8vIEdldEZpcnN0R3VpZEhvYigpDQorI2luY2x1ZGUgPFBp L1BpSG9iLmg+ICAgICAgICAvLyBFRklfSE9CX0dVSURfVFlQRQ0KKw0KICNpbmNsdWRlICJTbWJp b3NQbGF0Zm9ybUR4ZS5oIg0KLSNpbmNsdWRlIDxMaWJyYXJ5L0hvYkxpYi5oPg0KLSNpbmNsdWRl IDxHdWlkL1hlbkluZm8uaD4NCiANCiAjZGVmaW5lIFhFTl9TTUJJT1NfUEhZU0lDQUxfQUREUkVT UyAgICAgICAweDAwMEVCMDAwDQogI2RlZmluZSBYRU5fU01CSU9TX1BIWVNJQ0FMX0VORCAgICAg ICAgICAgMHgwMDBGMDAwMA0KIA0KIC8qKg0KICAgVmFsaWRhdGVzIHRoZSBTTUJJT1MgZW50cnkg cG9pbnQgc3RydWN0dXJlDQotLSAKMi4xOS4xLjMuZzMwMjQ3YWE1ZDIwMQoKCg==