From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 17/35] netboot: Rename pxeboot functions Date: Fri, 20 Jan 2017 12:19:06 +0000 Message-ID: <1484914764-20861-18-git-send-email-ian.jackson@eu.citrix.com> References: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUYBu-00011s-BJ for xen-devel@lists.xenproject.org; Fri, 20 Jan 2017 12:21:14 +0000 In-Reply-To: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org IGdpdC1scy1maWxlcyB8IHhhcmdzIHBlcmwgLWl+IC1wZSAncy9cYnNldHVwX3B4ZWJvb3RfL3Nl dHVwX25ldGJvb3RfL2cnCiBnaXQtbHMtZmlsZXMgfCB4YXJncyBwZXJsIC1pfiAtcGUgJ3MvXGJz ZXR1cF9weGVsaW51eF8vc2V0dXBfbmV0Ym9vdF8vZycKCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoK U2lnbmVkLW9mZi1ieTogSWFuIEphY2tzb24gPElhbi5KYWNrc29uQGV1LmNpdHJpeC5jb20+Ci0t LQogT3NzdGVzdC9UZXN0U3VwcG9ydC5wbSB8IDI4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0KIHRzLWhvc3QtaW5zdGFsbCAgICAgICAgfCAgOCArKysrLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAxOCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Pc3N0ZXN0 L1Rlc3RTdXBwb3J0LnBtIGIvT3NzdGVzdC9UZXN0U3VwcG9ydC5wbQppbmRleCA1NGZmNTUyLi45 ZGJmMWE3IDEwMDY0NAotLS0gYS9Pc3N0ZXN0L1Rlc3RTdXBwb3J0LnBtCisrKyBiL09zc3Rlc3Qv VGVzdFN1cHBvcnQucG0KQEAgLTExNSw3ICsxMTUsNyBAQCBCRUdJTiB7CiAKICAgICAgICAgICAg ICAgICAgICAgICBhd2FpdF93ZWJzcGFjZV9mZXRjaF9ieWxlYWYgY3JlYXRlX3dlYmZpbGUKICAg ICAgICAgICAgICAgICAgICAgICBmaWxlX2xpbmtfY29udGVudHMgZ2V0X3RpbWVvdXQKLSAgICAg ICAgICAgICAgICAgICAgICBzZXR1cF9weGVib290X2RpIHNldHVwX3B4ZWJvb3RfbG9jYWwgaG9z dF9uZXRib290X2ZpbGUKKyAgICAgICAgICAgICAgICAgICAgICBzZXR1cF9uZXRib290X2RpIHNl dHVwX25ldGJvb3RfbG9jYWwgaG9zdF9uZXRib290X2ZpbGUKIAogICAgICAgICAgICAgICAgICAg ICAgIGV0aGVyX3ByZWZpeAogCkBAIC0yNDA4LDcgKzI0MDgsNyBAQCBzdWIgaG9zdF9uZXRib290 X2ZpbGUgKCQ7JCkgewogICAgICAgICAoam9pbiAiLCIsIHNvcnQga2V5cyAldikuIiA/IjsKIH0K IAotc3ViIHNldHVwX3B4ZWxpbnV4X2Jvb3RjZmcgKCQkKSB7CitzdWIgc2V0dXBfbmV0Ym9vdF9i b290Y2ZnICgkJCkgewogICAgIG15ICgkaG8sICRib290ZmlsZSkgPSBAXzsKICAgICBteSAkZj0g aG9zdF9uZXRib290X2ZpbGUoJGhvKTsKICAgICBmaWxlX2xpbmtfY29udGVudHMoIiRoby0+e1Rm dHB9e1BhdGh9JGYiLCAkYm9vdGZpbGUsCkBAIC0yNDE2LDEwICsyNDE2LDEwIEBAIHN1YiBzZXR1 cF9weGVsaW51eF9ib290Y2ZnICgkJCkgewogfQogCiAjIFN5c3RlbXMgdXNpbmcgQklPUyBhcmUg Y29uZmlndXJlZCB0byB1c2UgcHhlbGludXgKLXN1YiBzZXR1cF9weGVib290X2RpX2Jpb3MgKCQk JCQkOyUpIHsKK3N1YiBzZXR1cF9uZXRib290X2RpX2Jpb3MgKCQkJCQkOyUpIHsKICAgICBteSAo JGhvLCRrZXJuLCRpbml0cmQsJGRpY21kLCRob2NtZCwleG9wdHMpID0gQF87CiAgICAgbXkgJGR0 YnMgPSAkeG9wdHN7ZHRic30gPyAiZmR0ZGlyICR4b3B0c3tkdGJzfSIgOiAiIjsKLSAgICBzZXR1 cF9weGVsaW51eF9ib290Y2ZnKCRobywgPDxFTkQpOworICAgIHNldHVwX25ldGJvb3RfYm9vdGNm ZygkaG8sIDw8RU5EKTsKICAgICBzZXJpYWwgMCAkY3tCYXVkfQogdGltZW91dCA1CiBsYWJlbCBv dmVyd3JpdGUKQEAgLTI0MzMsOSArMjQzMyw5IEBAIGRlZmF1bHQgb3ZlcndyaXRlCiBFTkQKIH0K IAotc3ViIHNldHVwX3B4ZWJvb3RfbG9jYWxfYmlvcyAoJCkgeworc3ViIHNldHVwX25ldGJvb3Rf bG9jYWxfYmlvcyAoJCkgewogICAgIG15ICgkaG8pID0gQF87Ci0gICAgc2V0dXBfcHhlbGludXhf Ym9vdGNmZygkaG8sIDw8RU5EKTsKKyAgICBzZXR1cF9uZXRib290X2Jvb3RjZmcoJGhvLCA8PEVO RCk7CiBzZXJpYWwgMCAkY3tCYXVkfQogdGltZW91dCA1CiBsYWJlbCBsb2NhbApAQCAtMjQ0NSw4 ICsyNDQ1LDggQEAgRU5ECiB9CiAKICMgdWJvb3QgZW11bGF0ZXMgcHhlbGludXgsIHNvIHJldXNl IEJJT1Mgc3R1ZmYKLXN1YiBzZXR1cF9weGVib290X2RpX3Vib290ICgkJCQkJDslKSB7IHJldHVy biAmc2V0dXBfcHhlYm9vdF9kaV9iaW9zOyB9Ci1zdWIgc2V0dXBfcHhlYm9vdF9sb2NhbF91Ym9v dCAoJCkgeyByZXR1cm4gJnNldHVwX3B4ZWJvb3RfbG9jYWxfYmlvczsgfQorc3ViIHNldHVwX25l dGJvb3RfZGlfdWJvb3QgKCQkJCQkOyUpIHsgcmV0dXJuICZzZXR1cF9uZXRib290X2RpX2Jpb3M7 IH0KK3N1YiBzZXR1cF9uZXRib290X2xvY2FsX3Vib290ICgkKSB7IHJldHVybiAmc2V0dXBfbmV0 Ym9vdF9sb2NhbF9iaW9zOyB9CiAKIHN1YiBzZXR1cF9ncnViX2VmaV9ib290Y2ZnICgkJCkgewog ICAgIG15ICgkaG8sICRib290ZmlsZSkgPSBAXzsKQEAgLTI0NjQsNyArMjQ2NCw3IEBAIHN1YiBz ZXR1cF9ncnViX2VmaV9ib290Y2ZnICgkJCkgewogfQogCiAjIFVFRkkgc3lzdGVtcyBQWEUgYm9v dCB1c2luZyBncnViLmVmaQotc3ViIHNldHVwX3B4ZWJvb3RfZGlfdWVmaSAoJCQkJCQ7JSkgewor c3ViIHNldHVwX25ldGJvb3RfZGlfdWVmaSAoJCQkJCQ7JSkgewogICAgIG15ICgkaG8sJGtlcm4s JGluaXRyZCwkZGljbWQsJGhvY21kLCV4b3B0cykgPSBAXzsKICAgICBzZXR1cF9ncnViX2VmaV9i b290Y2ZnKCRobywgPDxFTkQpOwogc2V0IGRlZmF1bHQ9MApAQCAtMjQ3Niw3ICsyNDc2LDcgQEAg bWVudWVudHJ5ICdvdmVyd3JpdGUnIHsKIEVORAogfQogCi1zdWIgc2V0dXBfcHhlYm9vdF9sb2Nh bF91ZWZpICgkKSB7CitzdWIgc2V0dXBfbmV0Ym9vdF9sb2NhbF91ZWZpICgkKSB7CiAgICAgbXkg KCRobykgPSBAXzsKICAgICBteSAlZWZpX2FyY2hzID0gcXcoYW1kNjQgWDY0CiAgICAgICAgICAg ICAgICAgICAgICAgIGFybTMyIEFSTQpAQCAtMjQ5OSwyMCArMjQ5OSwyMCBAQCBtZW51ZW50cnkg J2xvY2FsJyB7CiBFTkQKIH0KIAotc3ViIHNldHVwX3B4ZWJvb3RfbG9jYWwgKCQpIHsKK3N1YiBz ZXR1cF9uZXRib290X2xvY2FsICgkKSB7CiAgICAgbXkgKCRobykgPSBAXzsKICAgICBteSAkZmly bXdhcmUgPSBnZXRfaG9zdF9wcm9wZXJ0eSgkaG8sICJmaXJtd2FyZSIsICJiaW9zIik7CiAgICAg JGZpcm13YXJlID1+IHMvLS9fL2c7CiAgICAgbm8gc3RyaWN0IHF3KHJlZnMpOwotICAgIHJldHVy biAmeyJzZXR1cF9weGVib290X2xvY2FsXyR7ZmlybXdhcmV9In0oJGhvKTsKKyAgICByZXR1cm4g Jnsic2V0dXBfbmV0Ym9vdF9sb2NhbF8ke2Zpcm13YXJlfSJ9KCRobyk7CiB9CiAKLXN1YiBzZXR1 cF9weGVib290X2RpICgkJCQkJDslKSB7CitzdWIgc2V0dXBfbmV0Ym9vdF9kaSAoJCQkJCQ7JSkg ewogICAgIG15ICgkaG8sJGtlcm4sJGluaXRyZCwkZGljbWQsJGhvY21kLCV4b3B0cykgPSBAXzsK ICAgICBteSAkZmlybXdhcmUgPSBnZXRfaG9zdF9wcm9wZXJ0eSgkaG8sICJmaXJtd2FyZSIsICJi aW9zIik7CiAgICAgJGZpcm13YXJlID1+IHMvLS9fL2c7CiAgICAgbm8gc3RyaWN0IHF3KHJlZnMp OwotICAgIHJldHVybiAmeyJzZXR1cF9weGVib290X2RpXyR7ZmlybXdhcmV9In0oJGhvLCRrZXJu LCRpbml0cmQsCisgICAgcmV0dXJuICZ7InNldHVwX25ldGJvb3RfZGlfJHtmaXJtd2FyZX0ifSgk aG8sJGtlcm4sJGluaXRyZCwKIAkJCQkJICAgICBqb2luKCcgJyxAeyRkaWNtZH0pLAogCQkJCQkg ICAgIGpvaW4oJyAnLEB7JGhvY21kfSksCiAJCQkJCSAgICAgJXhvcHRzKTsKZGlmZiAtLWdpdCBh L3RzLWhvc3QtaW5zdGFsbCBiL3RzLWhvc3QtaW5zdGFsbAppbmRleCA3NzBjNTFiLi5lMTUxYzVi IDEwMDc1NQotLS0gYS90cy1ob3N0LWluc3RhbGwKKysrIGIvdHMtaG9zdC1pbnN0YWxsCkBAIC02 Niw3ICs2Niw3IEBAIGQtaSBuZXRjZmcvZ2V0X2hvc3RuYW1lIHN0cmluZyAkaG8tPntOYW1lfQog ZC1pIG5ldGNmZy9nZXRfaXBhZGRyZXNzIHN0cmluZyAkaG8tPntJcH0KIEVORAogCi0gICAgc2V0 dXBfcHhlYm9vdF9maXJzdGJvb3QoJHBzX3VybCk7CisgICAgc2V0dXBfbmV0Ym9vdF9maXJzdGJv b3QoJHBzX3VybCk7CiAgICAgcG93ZXJfY3ljbGVfc2xlZXAoJGhvKTsKIAogICAgIG15ICRsb2d0 YWlsZXI9IE9zc3Rlc3Q6OkxvZ3RhaWxlci0+bmV3KCRje1dlYnNwYWNlTG9nfSk7CkBAIC04Miw3 ICs4Miw3IEBAIEVORAogCWV4aXQgMDsKICAgICB9CiAKLSAgICBzZXR1cF9weGVib290X2xvY2Fs KCRobyk7CisgICAgc2V0dXBfbmV0Ym9vdF9sb2NhbCgkaG8pOwogCiAgICAgYXdhaXRfdGNwKGdl dF90aW1lb3V0KCRobywncmVib290JywkdGltZW91dHtTc2hkfSksIDE0LCRobyk7CiAKQEAgLTE1 NCw3ICsxNTQsNyBAQCBFTkQKICAgICBsb2dtKCdPSzogaW5zdGFsbCBjb21wbGV0ZWQnKTsKIH0g ICAKIAotc3ViIHNldHVwX3B4ZWJvb3RfZmlyc3Rib290KCQpIHsKK3N1YiBzZXR1cF9uZXRib290 X2ZpcnN0Ym9vdCgkKSB7CiAgICAgbXkgKCRwc191cmwpID0gQF87CiAgICAgCiAgICAgbXkgJGRf aT0gJGhvLT57VGZ0cH17RGlCYXNlfS4nLycuJHJ7YXJjaH0uJy8nLiRoby0+e0RpVmVyc2lvbn0u Jy0nLiRoby0+e1N1aXRlfTsKQEAgLTI3NSw3ICsyNzUsNyBAQCBFTkQKICAgICAgICAgZ2V0X2hv c3RfcHJvcGVydHkoJGhvLCAibGludXgtYm9vdC1hcHBlbmQgJGhvLT57U3VpdGV9ICRye2FyY2h9 IiwgJycpOwogCiAgICAgJHhvcHRze2lwYXBwZW5kfSA9ICRpcGFwcGVuZDsKLSAgICBzZXR1cF9w eGVib290X2RpKCRobywgJGtlcm5lbCwgIi8kaW5pdHJkIiwgXEBkaWNtZGxpbmUsIFxAaG9jbWRs aW5lLAorICAgIHNldHVwX25ldGJvb3RfZGkoJGhvLCAka2VybmVsLCAiLyRpbml0cmQiLCBcQGRp Y21kbGluZSwgXEBob2NtZGxpbmUsCiAJCSAgICAgJXhvcHRzKTsKIH0KIAotLSAKMi4xLjQKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwg bWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK