From: Xin Li Subject: [PATCH v1 1/1] hvmloader: allow overriding SMBIOS type 2 info Date: Tue, 26 Mar 2019 06:45:32 +0000 Message-ID: <20190326064532.9054-1-xin.li@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Xin Li , Sergey Dyasli , Andrew Cooper , Igor Druzhinin List-Id: xen-devel@lists.xenproject.org RXh0ZW5kIHNtYmlvcyB0eXBlIDIgc3RydWN0IHRvIG1hdGNoIHNwZWNpZmljYXRpb24sIGFkZCBz dXBwb3J0IHRvCm92ZXJyaWRlIHN0cmluZ3MgZnJvbSB0b29sc3RhY2suCgpTaWduZWQtb2ZmLWJ5 OiBYaW4gTGkgPHhpbi5saUBjaXRyaXguY29tPgoKLS0tCkNDOiBJZ29yIERydXpoaW5pbiA8aWdv ci5kcnV6aGluaW5AY2l0cml4LmNvbT4KQ0M6IFNlcmdleSBEeWFzbGkgPHNlcmdleS5keWFzbGlA Y2l0cml4LmNvbT4KQ0M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+ CgotLS0KIHRvb2xzL2Zpcm13YXJlL2h2bWxvYWRlci9zbWJpb3MuYyAgICAgICB8IDY0ICsrKysr KysrKysrKysrKysrKysrKysrKy0KIHRvb2xzL2Zpcm13YXJlL2h2bWxvYWRlci9zbWJpb3NfdHlw ZXMuaCB8ICA2ICsrKwogeGVuL2luY2x1ZGUvcHVibGljL2h2bS9odm1feHNfc3RyaW5ncy5oIHwg MzAgKysrKysrKy0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDEzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2Zpcm13YXJlL2h2bWxvYWRlci9zbWJpb3Mu YyBiL3Rvb2xzL2Zpcm13YXJlL2h2bWxvYWRlci9zbWJpb3MuYwppbmRleCA0MGQ4Mzk5YmUxLi45 MGNmZTlmZDEwIDEwMDY0NAotLS0gYS90b29scy9maXJtd2FyZS9odm1sb2FkZXIvc21iaW9zLmMK KysrIGIvdG9vbHMvZmlybXdhcmUvaHZtbG9hZGVyL3NtYmlvcy5jCkBAIC00OTcsOSArNDk3LDEx IEBAIHN0YXRpYyB2b2lkICoKIHNtYmlvc190eXBlXzJfaW5pdCh2b2lkICpzdGFydCkKIHsKICAg ICBzdHJ1Y3Qgc21iaW9zX3R5cGVfMiAqcCA9IChzdHJ1Y3Qgc21iaW9zX3R5cGVfMiAqKXN0YXJ0 OworICAgIGNvbnN0IGNoYXIgKnM7CiAgICAgdWludDhfdCAqcHRyOwogICAgIHZvaWQgKnB0czsK ICAgICB1aW50MzJfdCBsZW5ndGg7CisgICAgdWludDMyX3QgY291bnRlciA9IDA7CiAKICAgICBw dHMgPSBnZXRfc21iaW9zX3B0X3N0cnVjdCgyLCAmbGVuZ3RoKTsKICAgICBpZiAoIChwdHMgIT0g TlVMTCkmJihsZW5ndGggPiAwKSApCkBAIC01MTgsNyArNTIwLDY3IEBAIHNtYmlvc190eXBlXzJf aW5pdCh2b2lkICpzdGFydCkKICAgICAgICAgcmV0dXJuIChzdGFydCArIGxlbmd0aCk7CiAgICAg fQogCi0gICAgLyogT25seSBwcmVzZW50IHdoZW4gcGFzc2VkIGluICovCisgICAgcyA9IHhlbnN0 b3JlX3JlYWQoSFZNX1hTX0JBU0VCT0FSRF9NQU5VRkFDVFVSRVIsIE5VTEwpOworICAgIGlmICgg KHMgIT0gTlVMTCkgJiYgKCpzICE9ICdcMCcpICkKKyAgICB7CisgICAgICAgIG1lbXNldChwLCAw LCBzaXplb2YoKnApKTsKKyAgICAgICAgcC0+aGVhZGVyLnR5cGUgPSAyOworICAgICAgICBwLT5o ZWFkZXIubGVuZ3RoID0gc2l6ZW9mKHN0cnVjdCBzbWJpb3NfdHlwZV8yKTsKKyAgICAgICAgcC0+ aGVhZGVyLmhhbmRsZSA9IFNNQklPU19IQU5ETEVfVFlQRTI7CisgICAgICAgIHAtPmZlYXR1cmVf ZmxhZ3MgPSAweDA5OyAvKiBCb2FyZCBpcyBhIGhvc3RpbmcgYm9hcmQgYW5kIHJlcGxhY2VhYmxl ICovCisgICAgICAgIHAtPmNoYXNzaXNfaGFuZGxlID0gU01CSU9TX0hBTkRMRV9UWVBFMzsKKyAg ICAgICAgcC0+Ym9hcmRfdHlwZSA9IDB4MGE7IC8qIE1vdGhlcmJvYXJkICovCisgICAgICAgIHN0 YXJ0ICs9IHNpemVvZihzdHJ1Y3Qgc21iaW9zX3R5cGVfMik7CisKKyAgICAgICAgc3RyY3B5KChj aGFyICopc3RhcnQsIHMpOworICAgICAgICBzdGFydCArPSBzdHJsZW4ocykgKyAxOworICAgICAg ICBwLT5tYW51ZmFjdHVyZXJfc3RyID0gKytjb3VudGVyOworCisgICAgICAgIHMgPSB4ZW5zdG9y ZV9yZWFkKEhWTV9YU19CQVNFQk9BUkRfUFJPRFVDVF9OQU1FLCBOVUxMKTsKKyAgICAgICAgaWYg KCAocyAhPSBOVUxMKSAmJiAoKnMgIT0gJ1wwJykgKQorICAgICAgICB7CisgICAgICAgICAgICBz dHJjcHkoKGNoYXIgKilzdGFydCwgcyk7CisgICAgICAgICAgICBzdGFydCArPSBzdHJsZW4ocykg KyAxOworICAgICAgICAgICAgcC0+cHJvZHVjdF9uYW1lX3N0ciA9ICsrY291bnRlcjsKKyAgICAg ICAgfQorCisgICAgICAgIHMgPSB4ZW5zdG9yZV9yZWFkKEhWTV9YU19CQVNFQk9BUkRfVkVSU0lP TiwgTlVMTCk7CisgICAgICAgIGlmICggKHMgIT0gTlVMTCkgJiYgKCpzICE9ICdcMCcpICkKKyAg ICAgICAgeworICAgICAgICAgICAgc3RyY3B5KChjaGFyICopc3RhcnQsIHMpOworICAgICAgICAg ICAgc3RhcnQgKz0gc3RybGVuKHMpICsgMTsKKyAgICAgICAgICAgIHAtPnZlcnNpb25fc3RyID0g Kytjb3VudGVyOworICAgICAgICB9CisKKyAgICAgICAgcyA9IHhlbnN0b3JlX3JlYWQoSFZNX1hT X0JBU0VCT0FSRF9TRVJJQUxfTlVNQkVSLCBOVUxMKTsKKyAgICAgICAgaWYgKCAocyAhPSBOVUxM KSAmJiAoKnMgIT0gJ1wwJykgKQorICAgICAgICB7CisgICAgICAgICAgICBzdHJjcHkoKGNoYXIg KilzdGFydCwgcyk7CisgICAgICAgICAgICBzdGFydCArPSBzdHJsZW4ocykgKyAxOworICAgICAg ICAgICAgcC0+c2VyaWFsX251bWJlcl9zdHIgPSArK2NvdW50ZXI7CisgICAgICAgIH0KKworICAg ICAgICBzID0geGVuc3RvcmVfcmVhZChIVk1fWFNfQkFTRUJPQVJEX0FTU0VUX1RBRywgTlVMTCk7 CisgICAgICAgIGlmICggKHMgIT0gTlVMTCkgJiYgKCpzICE9ICdcMCcpICkKKyAgICAgICAgewor ICAgICAgICAgICAgc3RyY3B5KChjaGFyICopc3RhcnQsIHMpOworICAgICAgICAgICAgc3RhcnQg Kz0gc3RybGVuKHMpICsgMTsKKyAgICAgICAgICAgIHAtPmFzc2V0X3RhZ19zdHIgPSArK2NvdW50 ZXI7CisgICAgICAgIH0KKworICAgICAgICBzID0geGVuc3RvcmVfcmVhZChIVk1fWFNfQkFTRUJP QVJEX0xPQ0FUSU9OX0lOX0NIQVNTSVMsIE5VTEwpOworICAgICAgICBpZiAoIChzICE9IE5VTEwp ICYmICgqcyAhPSAnXDAnKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIHN0cmNweSgoY2hhciAq KXN0YXJ0LCBzKTsKKyAgICAgICAgICAgIHN0YXJ0ICs9IHN0cmxlbihzKSArIDE7CisgICAgICAg ICAgICBwLT5sb2NhdGlvbl9pbl9jaGFzc2lzX3N0ciA9ICsrY291bnRlcjsKKyAgICAgICAgfQor CisgICAgICAgICooKHVpbnQ4X3QgKilzdGFydCkgPSAwOworICAgICAgICByZXR1cm4gc3RhcnQg KyAxOworICAgIH0KKyAgIAorICAgIC8qIE9ubHkgcHJlc2VudCB3aGVuIHBhc3NlZCBpbiBvciBv dmVycmlkZW4gKi8KICAgICByZXR1cm4gc3RhcnQ7CiB9CiAKZGlmZiAtLWdpdCBhL3Rvb2xzL2Zp cm13YXJlL2h2bWxvYWRlci9zbWJpb3NfdHlwZXMuaCBiL3Rvb2xzL2Zpcm13YXJlL2h2bWxvYWRl ci9zbWJpb3NfdHlwZXMuaAppbmRleCBhY2I2M2UyZmU5Li44MzRlZjM4ZmJhIDEwMDY0NAotLS0g YS90b29scy9maXJtd2FyZS9odm1sb2FkZXIvc21iaW9zX3R5cGVzLmgKKysrIGIvdG9vbHMvZmly bXdhcmUvaHZtbG9hZGVyL3NtYmlvc190eXBlcy5oCkBAIC05MCw2ICs5MCwxMiBAQCBzdHJ1Y3Qg c21iaW9zX3R5cGVfMiB7CiAgICAgdWludDhfdCBwcm9kdWN0X25hbWVfc3RyOwogICAgIHVpbnQ4 X3QgdmVyc2lvbl9zdHI7CiAgICAgdWludDhfdCBzZXJpYWxfbnVtYmVyX3N0cjsKKyAgICB1aW50 OF90IGFzc2V0X3RhZ19zdHI7CisgICAgdWludDhfdCBmZWF0dXJlX2ZsYWdzOworICAgIHVpbnQ4 X3QgbG9jYXRpb25faW5fY2hhc3Npc19zdHI7CisgICAgdWludDE2X3QgY2hhc3Npc19oYW5kbGU7 CisgICAgdWludDhfdCBib2FyZF90eXBlOworICAgIHVpbnQ4X3QgY29udGFpbmVkX2hhbmRsZV9j b3VudDsKIH0gX19hdHRyaWJ1dGVfXyAoKHBhY2tlZCkpOwogCiAvKiBTeXN0ZW0gRW5jbG9zdXJl IC0gQ29udGFpbmVkIEVsZW1lbnRzICovCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9wdWJsaWMv aHZtL2h2bV94c19zdHJpbmdzLmggYi94ZW4vaW5jbHVkZS9wdWJsaWMvaHZtL2h2bV94c19zdHJp bmdzLmgKaW5kZXggZmVhMWRkNDQwNy4uZTNiMzI4MzIxZCAxMDA2NDQKLS0tIGEveGVuL2luY2x1 ZGUvcHVibGljL2h2bS9odm1feHNfc3RyaW5ncy5oCisrKyBiL3hlbi9pbmNsdWRlL3B1YmxpYy9o dm0vaHZtX3hzX3N0cmluZ3MuaApAQCAtNjIsMTggKzYyLDI0IEBACiAvKiBUaGUgZm9sbG93aW5n IHhlbnN0b3JlIHZhbHVlcyBhcmUgdXNlZCB0byBvdmVycmlkZSBzb21lIG9mIHRoZSBkZWZhdWx0 CiAgKiBzdHJpbmcgdmFsdWVzIGluIHRoZSBTTUJJT1MgdGFibGUgY29uc3RydWN0ZWQgaW4gaHZt bG9hZGVyLgogICovCi0jZGVmaW5lIEhWTV9YU19CSU9TX1NUUklOR1MgICAgICAgICAgICAiYmlv cy1zdHJpbmdzIgotI2RlZmluZSBIVk1fWFNfQklPU19WRU5ET1IgICAgICAgICAgICAgImJpb3Mt c3RyaW5ncy9iaW9zLXZlbmRvciIKLSNkZWZpbmUgSFZNX1hTX0JJT1NfVkVSU0lPTiAgICAgICAg ICAgICJiaW9zLXN0cmluZ3MvYmlvcy12ZXJzaW9uIgotI2RlZmluZSBIVk1fWFNfU1lTVEVNX01B TlVGQUNUVVJFUiAgICAgImJpb3Mtc3RyaW5ncy9zeXN0ZW0tbWFudWZhY3R1cmVyIgotI2RlZmlu ZSBIVk1fWFNfU1lTVEVNX1BST0RVQ1RfTkFNRSAgICAgImJpb3Mtc3RyaW5ncy9zeXN0ZW0tcHJv ZHVjdC1uYW1lIgotI2RlZmluZSBIVk1fWFNfU1lTVEVNX1ZFUlNJT04gICAgICAgICAgImJpb3Mt c3RyaW5ncy9zeXN0ZW0tdmVyc2lvbiIKLSNkZWZpbmUgSFZNX1hTX1NZU1RFTV9TRVJJQUxfTlVN QkVSICAgICJiaW9zLXN0cmluZ3Mvc3lzdGVtLXNlcmlhbC1udW1iZXIiCi0jZGVmaW5lIEhWTV9Y U19FTkNMT1NVUkVfTUFOVUZBQ1RVUkVSICAiYmlvcy1zdHJpbmdzL2VuY2xvc3VyZS1tYW51ZmFj dHVyZXIiCi0jZGVmaW5lIEhWTV9YU19FTkNMT1NVUkVfU0VSSUFMX05VTUJFUiAiYmlvcy1zdHJp bmdzL2VuY2xvc3VyZS1zZXJpYWwtbnVtYmVyIgotI2RlZmluZSBIVk1fWFNfRU5DTE9TVVJFX0FT U0VUX1RBRyAgICAgImJpb3Mtc3RyaW5ncy9lbmNsb3N1cmUtYXNzZXQtdGFnIgotI2RlZmluZSBI Vk1fWFNfQkFUVEVSWV9NQU5VRkFDVFVSRVIgICAgImJpb3Mtc3RyaW5ncy9iYXR0ZXJ5LW1hbnVm YWN0dXJlciIKLSNkZWZpbmUgSFZNX1hTX0JBVFRFUllfREVWSUNFX05BTUUgICAgICJiaW9zLXN0 cmluZ3MvYmF0dGVyeS1kZXZpY2UtbmFtZSIKKyNkZWZpbmUgSFZNX1hTX0JJT1NfU1RSSU5HUyAg ICAgICAgICAgICAgICAgICJiaW9zLXN0cmluZ3MiCisjZGVmaW5lIEhWTV9YU19CSU9TX1ZFTkRP UiAgICAgICAgICAgICAgICAgICAiYmlvcy1zdHJpbmdzL2Jpb3MtdmVuZG9yIgorI2RlZmluZSBI Vk1fWFNfQklPU19WRVJTSU9OICAgICAgICAgICAgICAgICAgImJpb3Mtc3RyaW5ncy9iaW9zLXZl cnNpb24iCisjZGVmaW5lIEhWTV9YU19TWVNURU1fTUFOVUZBQ1RVUkVSICAgICAgICAgICAiYmlv cy1zdHJpbmdzL3N5c3RlbS1tYW51ZmFjdHVyZXIiCisjZGVmaW5lIEhWTV9YU19TWVNURU1fUFJP RFVDVF9OQU1FICAgICAgICAgICAiYmlvcy1zdHJpbmdzL3N5c3RlbS1wcm9kdWN0LW5hbWUiCisj ZGVmaW5lIEhWTV9YU19TWVNURU1fVkVSU0lPTiAgICAgICAgICAgICAgICAiYmlvcy1zdHJpbmdz L3N5c3RlbS12ZXJzaW9uIgorI2RlZmluZSBIVk1fWFNfU1lTVEVNX1NFUklBTF9OVU1CRVIgICAg ICAgICAgImJpb3Mtc3RyaW5ncy9zeXN0ZW0tc2VyaWFsLW51bWJlciIKKyNkZWZpbmUgSFZNX1hT X0JBU0VCT0FSRF9NQU5VRkFDVFVSRVIgICAgICAgICJiaW9zLXN0cmluZ3MvYmFzZWJvYXJkLW1h bnVmYWN0dXJlciIKKyNkZWZpbmUgSFZNX1hTX0JBU0VCT0FSRF9QUk9EVUNUX05BTUUgICAgICAg ICJiaW9zLXN0cmluZ3MvYmFzZWJvYXJkLXByb2R1Y3QtbmFtZSIKKyNkZWZpbmUgSFZNX1hTX0JB U0VCT0FSRF9WRVJTSU9OICAgICAgICAgICAgICJiaW9zLXN0cmluZ3MvYmFzZWJvYXJkLXZlcnNp b24iCisjZGVmaW5lIEhWTV9YU19CQVNFQk9BUkRfU0VSSUFMX05VTUJFUiAgICAgICAiYmlvcy1z dHJpbmdzL2Jhc2Vib2FyZC1zZXJpYWwtbnVtYmVyIgorI2RlZmluZSBIVk1fWFNfQkFTRUJPQVJE X0FTU0VUX1RBRyAgICAgICAgICAgImJpb3Mtc3RyaW5ncy9iYXNlYm9hcmQtYXNzZXQtdGFnIgor I2RlZmluZSBIVk1fWFNfQkFTRUJPQVJEX0xPQ0FUSU9OX0lOX0NIQVNTSVMgImJpb3Mtc3RyaW5n cy9iYXNlYm9hcmQtbG9jYXRpb24taW4tY2hhc3NpcyIKKyNkZWZpbmUgSFZNX1hTX0VOQ0xPU1VS RV9NQU5VRkFDVFVSRVIgICAgICAgICJiaW9zLXN0cmluZ3MvZW5jbG9zdXJlLW1hbnVmYWN0dXJl ciIKKyNkZWZpbmUgSFZNX1hTX0VOQ0xPU1VSRV9TRVJJQUxfTlVNQkVSICAgICAgICJiaW9zLXN0 cmluZ3MvZW5jbG9zdXJlLXNlcmlhbC1udW1iZXIiCisjZGVmaW5lIEhWTV9YU19FTkNMT1NVUkVf QVNTRVRfVEFHICAgICAgICAgICAiYmlvcy1zdHJpbmdzL2VuY2xvc3VyZS1hc3NldC10YWciCisj ZGVmaW5lIEhWTV9YU19CQVRURVJZX01BTlVGQUNUVVJFUiAgICAgICAgICAiYmlvcy1zdHJpbmdz L2JhdHRlcnktbWFudWZhY3R1cmVyIgorI2RlZmluZSBIVk1fWFNfQkFUVEVSWV9ERVZJQ0VfTkFN RSAgICAgICAgICAgImJpb3Mtc3RyaW5ncy9iYXR0ZXJ5LWRldmljZS1uYW1lIgogCiAvKiAxIHRv IDk5IE9FTSBzdHJpbmdzIGNhbiBiZSBzZXQgaW4geGVuc3RvcmUgdXNpbmcgdmFsdWVzIG9mIHRo ZSBmb3JtCiAgKiBiZWxvdy4gVGhlc2Ugc3RyaW5ncyB3aWxsIGJlIGxvYWRlZCBpbnRvIHRoZSBT TUJJT1MgdHlwZSAxMSBzdHJ1Y3R1cmUuCi0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21h aWxtYW4vbGlzdGluZm8veGVuLWRldmVs