From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvHQF-00080D-TE for qemu-devel@nongnu.org; Tue, 06 Oct 2009 17:18:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvHQB-0007xf-Qk for qemu-devel@nongnu.org; Tue, 06 Oct 2009 17:18:15 -0400 Received: from [199.232.76.173] (port=33755 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvHQB-0007xT-KP for qemu-devel@nongnu.org; Tue, 06 Oct 2009 17:18:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61518) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvHQA-00011q-Qm for qemu-devel@nongnu.org; Tue, 06 Oct 2009 17:18:11 -0400 Message-ID: <4ACBB40C.7030209@redhat.com> Date: Tue, 06 Oct 2009 23:18:04 +0200 From: Gerd Hoffmann MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Reorganize option rom (+linux kernel) loading. References: <1254325401-18777-1-git-send-email-kraxel@redhat.com> <4AC4725D.1020009@redhat.com> <4AC5E691.5000909@redhat.com> <4AC61A01.2060800@redhat.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------030302040905000800040604" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------030302040905000800040604 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/02/09 19:58, Blue Swirl wrote: > On Fri, Oct 2, 2009 at 6:19 PM, Gerd Hoffmann wrote: >> On 10/02/09 13:40, Gerd Hoffmann wrote: >>>> >>>> OK, V2 seems to work, except that the command line is not passed: >>>> NET: Registered protocol family 1 >>>> NET: Registered protocol family 17 >>>> Kernel panic - not syncing: VFS: Unable to mount root fs on >>>> unknown-block(1,0) >>>> <0>Press L1-A to return to the boot prom >>> >>> So you are booting sparc via -kernel I guess? >> >> One more question: Fails it on first boot or only after reset? >> In case it fails after reset only: Does that work without the patch? > > First boot, identical result after reset. Without patch: > > NET: Registered protocol family 1 > NET: Registered protocol family 17 > RAMDISK: ext2 filesystem found at block 0 > RAMDISK: Loading 4096KiB [1 disk] into ram disk... done. > VFS: Mounted root (ext2 filesystem) readonly. > Freeing unused kernel memory: 156k freed > sh: can't access tty; job control turned off > # Incremental fix attached. Booting works now. system_reset in monitor works fine too. Will respin the patch tomorrow. cheers, Gerd --------------030302040905000800040604 Content-Type: text/plain; name="0001-fix-sparc.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-fix-sparc.patch" RnJvbSA3MzkyOGY5ODQ2ZmM4NDkzZDU2ZjVhNDJjMjViNjg3MDdmNjY3OWU3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNv bT4KRGF0ZTogVHVlLCA2IE9jdCAyMDA5IDIzOjA5OjUwICswMjAwClN1YmplY3Q6IFtQQVRD SF0gZml4IHNwYXJjLgoKLS0tCiBody9heGlzX2Rldjg4LmMgICAgICAgICAgICAgICB8ICAg IDIgKy0KIGh3L2V0cmF4ZnMuYyAgICAgICAgICAgICAgICAgIHwgICAgMiArLQogaHcvbG9h ZGVyLmMgICAgICAgICAgICAgICAgICAgfCAgIDM4ICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tCiBody9sb2FkZXIuaCAgICAgICAgICAgICAgICAgICB8ICAgIDQg KysrLQogaHcvbWlwc19tYWx0YS5jICAgICAgICAgICAgICAgfCAgICAyICstCiBody9taXBz X3I0ay5jICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGh3L3BjLmMgICAgICAgICAgICAg ICAgICAgICAgIHwgICAgMiArLQogaHcvcGV0YWxvZ2l4X3MzYWRzcDE4MDBfbW11LmMgfCAg ICAyICstCiBody9wcGMuYyAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGh3L3Bw Y19uZXd3b3JsZC5jICAgICAgICAgICAgIHwgICAgMiArLQogaHcvcHBjX29sZHdvcmxkLmMg ICAgICAgICAgICAgfCAgICAyICstCiBody9yMmQuYyAgICAgICAgICAgICAgICAgICAgICB8 ICAgIDIgKy0KIGh3L3N1bjRtLmMgICAgICAgICAgICAgICAgICAgIHwgICAxNCArKysrKysr Ky0tLS0tLQogaHcvc3VuNHUuYyAgICAgICAgICAgICAgICAgICAgfCAgICAyICstCiAxNCBm aWxlcyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9ody9heGlzX2Rldjg4LmMgYi9ody9heGlzX2Rldjg4LmMKaW5kZXggODFhNDFj OS4uMmE3OWQzMyAxMDA2NDQKLS0tIGEvaHcvYXhpc19kZXY4OC5jCisrKyBiL2h3L2F4aXNf ZGV2ODguYwpAQCAtMzY1LDcgKzM2NSw3IEBAIHZvaWQgYXhpc2Rldjg4X2luaXQgKHJhbV9h ZGRyX3QgcmFtX3NpemUsCiAgICAgICAgICAgICAvKiBMZXQgdGhlIGtlcm5lbCBrbm93IHdl IGFyZSBtb2RpZnlpbmcgdGhlIGNtZGxpbmUuICAqLwogICAgICAgICAgICAgZW52LT5yZWdz WzEwXSA9IDB4ODcxMDk1NjM7CiAgICAgICAgICAgICBlbnYtPnJlZ3NbMTFdID0gMHg0MDAw MDAwMDsKLSAgICAgICAgICAgIHBzdHJjcHlfdGFyZ3BoeXMoZW52LT5yZWdzWzExXSwgMjU2 LCBrZXJuZWxfY21kbGluZSk7CisgICAgICAgICAgICBwc3RyY3B5X3RhcmdwaHlzKCJjbWRs aW5lIiwgZW52LT5yZWdzWzExXSwgMjU2LCBrZXJuZWxfY21kbGluZSk7CiAgICAgICAgIH0K ICAgICB9CiAgICAgZW52LT5wYyA9IGJvb3RzdHJhcF9wYzsKZGlmZiAtLWdpdCBhL2h3L2V0 cmF4ZnMuYyBiL2h3L2V0cmF4ZnMuYwppbmRleCA0ZjQ1MWM1Li45MzA0YjE1IDEwMDY0NAot LS0gYS9ody9ldHJheGZzLmMKKysrIGIvaHcvZXRyYXhmcy5jCkBAIC0xNTcsNyArMTU3LDcg QEAgdm9pZCBiYXJlZXRyYXhmc19pbml0IChyYW1fYWRkcl90IHJhbV9zaXplLAogICAgICAg ICAgICAgLyogTGV0IHRoZSBrZXJuZWwga25vdyB3ZSBhcmUgbW9kaWZ5aW5nIHRoZSBjbWRs aW5lLiAgKi8KICAgICAgICAgICAgIGVudi0+cmVnc1sxMF0gPSAweDg3MTA5NTYzOwogICAg ICAgICAgICAgZW52LT5yZWdzWzExXSA9IDB4NDAwMDAwMDA7Ci0gICAgICAgICAgICBwc3Ry Y3B5X3RhcmdwaHlzKGVudi0+cmVnc1sxMV0sIDI1Niwga2VybmVsX2NtZGxpbmUpOworICAg ICAgICAgICAgcHN0cmNweV90YXJncGh5cygiY21kbGluZSIsIGVudi0+cmVnc1sxMV0sIDI1 Niwga2VybmVsX2NtZGxpbmUpOwogICAgICAgICB9CiAgICAgfQogICAgIGVudi0+cGMgPSBi b290c3RyYXBfcGM7CmRpZmYgLS1naXQgYS9ody9sb2FkZXIuYyBiL2h3L2xvYWRlci5jCmlu ZGV4IGM0MzZlYzYuLjQwMTEyYjkgMTAwNjQ0Ci0tLSBhL2h3L2xvYWRlci5jCisrKyBiL2h3 L2xvYWRlci5jCkBAIC0xMDgsMjAgKzEwOCwyMCBAQCBpbnQgbG9hZF9pbWFnZV90YXJncGh5 cyhjb25zdCBjaGFyICpmaWxlbmFtZSwKICAgICByZXR1cm4gc2l6ZTsKIH0KIAotdm9pZCBw c3RyY3B5X3RhcmdwaHlzKHRhcmdldF9waHlzX2FkZHJfdCBkZXN0LCBpbnQgYnVmX3NpemUs Cit2b2lkIHBzdHJjcHlfdGFyZ3BoeXMoY29uc3QgY2hhciAqbmFtZSwgdGFyZ2V0X3BoeXNf YWRkcl90IGRlc3QsIGludCBidWZfc2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBjaGFyICpzb3VyY2UpCiB7Ci0gICAgc3RhdGljIGNvbnN0IHVpbnQ4X3QgbnVsX2J5dGUg PSAwOwogICAgIGNvbnN0IGNoYXIgKm51bHA7CisgICAgY2hhciAqcHRyOwogCiAgICAgaWYg KGJ1Zl9zaXplIDw9IDApIHJldHVybjsKICAgICBudWxwID0gbWVtY2hyKHNvdXJjZSwgMCwg YnVmX3NpemUpOwogICAgIGlmIChudWxwKSB7Ci0JY3B1X3BoeXNpY2FsX21lbW9yeV93cml0 ZV9yb20oZGVzdCwgKHVpbnQ4X3QgKilzb3VyY2UsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChudWxwIC0gc291cmNlKSArIDEpOworICAgICAgICByb21fYWRk X2Jsb2JfZml4ZWQobmFtZSwgc291cmNlLCAobnVscCAtIHNvdXJjZSkgKyAxLCBkZXN0KTsK ICAgICB9IGVsc2UgewotCWNwdV9waHlzaWNhbF9tZW1vcnlfd3JpdGVfcm9tKGRlc3QsICh1 aW50OF90ICopc291cmNlLCBidWZfc2l6ZSAtIDEpOwotCWNwdV9waHlzaWNhbF9tZW1vcnlf d3JpdGVfcm9tKGRlc3QsICZudWxfYnl0ZSwgMSk7CisgICAgICAgIHJvbV9hZGRfYmxvYl9m aXhlZChuYW1lLCBzb3VyY2UsIGJ1Zl9zaXplLCBkZXN0KTsKKyAgICAgICAgcHRyID0gcm9t X3B0cihkZXN0ICsgYnVmX3NpemUgLSAxKTsKKyAgICAgICAgKnB0ciA9IDA7CiAgICAgfQog fQogCkBAIC02NzIsNiArNjcyLDMyIEBAIGludCByb21fbG9hZF9hbGwodm9pZCkKICAgICBy ZXR1cm4gMDsKIH0KIAorc3RhdGljIFJvbSAqZmluZF9yb20odGFyZ2V0X3BoeXNfYWRkcl90 IGFkZHIpCit7CisgICAgUm9tICpyb207CisKKyAgICBRVEFJTFFfRk9SRUFDSChyb20sICZy b21zLCBuZXh0KSB7CisgICAgICAgIGlmIChyb20tPm1heCkKKyAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICBpZiAocm9tLT5taW4gPiBhZGRyKQorICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIGlmIChyb20tPm1pbiArIHJvbS0+cm9tc2l6ZSA8IGFkZHIpCisgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgcmV0dXJuIHJvbTsKKyAgICB9CisgICAgcmV0 dXJuIE5VTEw7Cit9CisKK3ZvaWQgKnJvbV9wdHIodGFyZ2V0X3BoeXNfYWRkcl90IGFkZHIp Cit7CisgICAgUm9tICpyb207CisKKyAgICByb20gPSBmaW5kX3JvbShhZGRyKTsKKyAgICBp ZiAoIXJvbSB8fCAhcm9tLT5kYXRhKQorICAgICAgICByZXR1cm4gTlVMTDsKKyAgICByZXR1 cm4gcm9tLT5kYXRhICsgKGFkZHIgLSByb20tPm1pbik7Cit9CisKIHZvaWQgZG9faW5mb19y b21zKE1vbml0b3IgKm1vbikKIHsKICAgICBSb20gKnJvbTsKZGlmZiAtLWdpdCBhL2h3L2xv YWRlci5oIGIvaHcvbG9hZGVyLmgKaW5kZXggMDMxZTZhZC4uOTQ1YzY2MiAxMDA2NDQKLS0t IGEvaHcvbG9hZGVyLmgKKysrIGIvaHcvbG9hZGVyLmgKQEAgLTE1LDcgKzE1LDggQEAgaW50 IGxvYWRfdWltYWdlKGNvbnN0IGNoYXIgKmZpbGVuYW1lLCB0YXJnZXRfcGh5c19hZGRyX3Qg KmVwLAogCiBpbnQgcmVhZF90YXJncGh5cyhjb25zdCBjaGFyICpuYW1lLAogICAgICAgICAg ICAgICAgICAgaW50IGZkLCB0YXJnZXRfcGh5c19hZGRyX3QgZHN0X2FkZHIsIHNpemVfdCBu Ynl0ZXMpOwotdm9pZCBwc3RyY3B5X3RhcmdwaHlzKHRhcmdldF9waHlzX2FkZHJfdCBkZXN0 LCBpbnQgYnVmX3NpemUsCit2b2lkIHBzdHJjcHlfdGFyZ3BoeXMoY29uc3QgY2hhciAqbmFt ZSwKKyAgICAgICAgICAgICAgICAgICAgICB0YXJnZXRfcGh5c19hZGRyX3QgZGVzdCwgaW50 IGJ1Zl9zaXplLAogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKnNvdXJjZSk7 CiAKIGludCByb21fYWRkX2ZpbGUoY29uc3QgY2hhciAqZmlsZSwKQEAgLTIzLDYgKzI0LDcg QEAgaW50IHJvbV9hZGRfZmlsZShjb25zdCBjaGFyICpmaWxlLAogaW50IHJvbV9hZGRfYmxv Yihjb25zdCBjaGFyICpuYW1lLCBjb25zdCB2b2lkICpibG9iLCBzaXplX3QgbGVuLAogICAg ICAgICAgICAgICAgICB0YXJnZXRfcGh5c19hZGRyX3QgbWluLCB0YXJnZXRfcGh5c19hZGRy X3QgbWF4LCBpbnQgYWxpZ24pOwogaW50IHJvbV9sb2FkX2FsbCh2b2lkKTsKK3ZvaWQgKnJv bV9wdHIodGFyZ2V0X3BoeXNfYWRkcl90IGFkZHIpOwogdm9pZCBkb19pbmZvX3JvbXMoTW9u aXRvciAqbW9uKTsKIAogI2RlZmluZSByb21fYWRkX2ZpbGVfZml4ZWQoX2YsIF9hKSAgICAg ICAgICAgICAgXApkaWZmIC0tZ2l0IGEvaHcvbWlwc19tYWx0YS5jIGIvaHcvbWlwc19tYWx0 YS5jCmluZGV4IGQwMjY2ZDUuLjZiMjI0ZTUgMTAwNjQ0Ci0tLSBhL2h3L21pcHNfbWFsdGEu YworKysgYi9ody9taXBzX21hbHRhLmMKQEAgLTY3OSw3ICs2NzksNyBAQCBzdGF0aWMgdm9p ZCBwcm9tX3NldChpbnQgaW5kZXgsIGNvbnN0IGNoYXIgKnN0cmluZywgLi4uKQogICAgIHZh X3N0YXJ0KGFwLCBzdHJpbmcpOwogICAgIHZzbnByaW50ZihidWYsIEVOVlBfRU5UUllfU0la RSwgc3RyaW5nLCBhcCk7CiAgICAgdmFfZW5kKGFwKTsKLSAgICBwc3RyY3B5X3RhcmdwaHlz KHRhYmxlX2FkZHIgKyBWSVJUX1RPX1BIWVNfQURERU5ELCBFTlZQX0VOVFJZX1NJWkUsIGJ1 Zik7CisgICAgcHN0cmNweV90YXJncGh5cygicHJvbSIsIHRhYmxlX2FkZHIgKyBWSVJUX1RP X1BIWVNfQURERU5ELCBFTlZQX0VOVFJZX1NJWkUsIGJ1Zik7CiB9CiAKIC8qIEtlcm5lbCAq LwpkaWZmIC0tZ2l0IGEvaHcvbWlwc19yNGsuYyBiL2h3L21pcHNfcjRrLmMKaW5kZXggZDdi MzAxYS4uZDUyNWM2MyAxMDA2NDQKLS0tIGEvaHcvbWlwc19yNGsuYworKysgYi9ody9taXBz X3I0ay5jCkBAIC0xMzAsNyArMTMwLDcgQEAgc3RhdGljIHZvaWQgbG9hZF9rZXJuZWwgKENQ VVN0YXRlICplbnYpCiAgICAgfSBlbHNlIHsKICAgICAgICAgcmV0ID0gMDsKICAgICB9Ci0g ICAgcHN0cmNweV90YXJncGh5cygoMTYgPDwgMjApIC0gMjU2ICsgcmV0LCAyNTYsCisgICAg cHN0cmNweV90YXJncGh5cygiY21kbGluZSIsICgxNiA8PCAyMCkgLSAyNTYgKyByZXQsIDI1 NiwKICAgICAgICAgICAgICAgICAgICAgIGxvYWRlcnBhcmFtcy5rZXJuZWxfY21kbGluZSk7 CiAKICAgICBzdGxfcGh5cygoMTYgPDwgMjApIC0gMjYwLCAweDEyMzQ1Njc4KTsKZGlmZiAt LWdpdCBhL2h3L3BjLmMgYi9ody9wYy5jCmluZGV4IGI3MmExYTkuLmQ3YWI0N2QgMTAwNjQ0 Ci0tLSBhL2h3L3BjLmMKKysrIGIvaHcvcGMuYwpAQCAtODY1LDcgKzg2NSw3IEBAIHN0YXRp YyB2b2lkIGxvYWRfbGludXgodm9pZCAqZndfY2ZnLAogICAgIAlpbml0cmRfbWF4ID0gbWF4 X3JhbV9zaXplLUFDUElfREFUQV9TSVpFLTE7CiAKICAgICAvKiBrZXJuZWwgY29tbWFuZCBs aW5lICovCi0gICAgcm9tX2FkZF9ibG9iX2ZpeGVkKCJsaW51eC1jbWRsaW5lIiwga2VybmVs X2NtZGxpbmUsCisgICAgcm9tX2FkZF9ibG9iX2ZpeGVkKCJjbWRsaW5lIiwga2VybmVsX2Nt ZGxpbmUsCiAgICAgICAgICAgICAgICAgICAgICAgIHN0cmxlbihrZXJuZWxfY21kbGluZSkr MSwgY21kbGluZV9hZGRyKTsKIAogICAgIGlmIChwcm90b2NvbCA+PSAweDIwMikgewpkaWZm IC0tZ2l0IGEvaHcvcGV0YWxvZ2l4X3MzYWRzcDE4MDBfbW11LmMgYi9ody9wZXRhbG9naXhf czNhZHNwMTgwMF9tbXUuYwppbmRleCBmMzQzZGJmLi45M2NlODdmIDEwMDY0NAotLS0gYS9o dy9wZXRhbG9naXhfczNhZHNwMTgwMF9tbXUuYworKysgYi9ody9wZXRhbG9naXhfczNhZHNw MTgwMF9tbXUuYwpAQCAtMTc2LDcgKzE3Niw3IEBAIHBldGFsb2dpeF9zM2Fkc3AxODAwX2lu aXQocmFtX2FkZHJfdCByYW1fc2l6ZSwKIAogICAgICAgICBlbnYtPnJlZ3NbNV0gPSBkZHJf YmFzZSArIGtlcm5lbF9zaXplOwogICAgICAgICBpZiAoa2VybmVsX2NtZGxpbmUgJiYgKGtj bWRsaW5lX2xlbiA9IHN0cmxlbihrZXJuZWxfY21kbGluZSkpKSB7Ci0gICAgICAgICAgICBw c3RyY3B5X3RhcmdwaHlzKGVudi0+cmVnc1s1XSwgMjU2LCBrZXJuZWxfY21kbGluZSk7Cisg ICAgICAgICAgICBwc3RyY3B5X3RhcmdwaHlzKCJjbWRsaW5lIiwgZW52LT5yZWdzWzVdLCAy NTYsIGtlcm5lbF9jbWRsaW5lKTsKICAgICAgICAgfQogICAgICAgICBlbnYtPnJlZ3NbNl0g PSAwOwogICAgICAgICAvKiBQcm92aWRlIGEgZGV2aWNlLXRyZWUuICAqLwpkaWZmIC0tZ2l0 IGEvaHcvcHBjLmMgYi9ody9wcGMuYwppbmRleCAwOWVlMmU0Li4yNTAyZTIxIDEwMDY0NAot LS0gYS9ody9wcGMuYworKysgYi9ody9wcGMuYwpAQCAtMTI1Niw3ICsxMjU2LDcgQEAgaW50 IFBQQ19OVlJBTV9zZXRfcGFyYW1zIChudnJhbV90ICpudnJhbSwgdWludDE2X3QgTlZSQU1f c2l6ZSwKICAgICBOVlJBTV9zZXRfbHdvcmQobnZyYW0sICAweDNDLCBrZXJuZWxfc2l6ZSk7 CiAgICAgaWYgKGNtZGxpbmUpIHsKICAgICAgICAgLyogWFhYOiBwdXQgdGhlIGNtZGxpbmUg aW4gTlZSQU0gdG9vID8gKi8KLSAgICAgICAgcHN0cmNweV90YXJncGh5cyhDTURMSU5FX0FE RFIsIFJBTV9zaXplIC0gQ01ETElORV9BRERSLCBjbWRsaW5lKTsKKyAgICAgICAgcHN0cmNw eV90YXJncGh5cygiY21kbGluZSIsIENNRExJTkVfQUREUiwgUkFNX3NpemUgLSBDTURMSU5F X0FERFIsIGNtZGxpbmUpOwogICAgICAgICBOVlJBTV9zZXRfbHdvcmQobnZyYW0sICAweDQw LCBDTURMSU5FX0FERFIpOwogICAgICAgICBOVlJBTV9zZXRfbHdvcmQobnZyYW0sICAweDQ0 LCBzdHJsZW4oY21kbGluZSkpOwogICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9ody9wcGNf bmV3d29ybGQuYyBiL2h3L3BwY19uZXd3b3JsZC5jCmluZGV4IGQxYTgyYmYuLmQ5ZjQ1YjUg MTAwNjQ0Ci0tLSBhL2h3L3BwY19uZXd3b3JsZC5jCisrKyBiL2h3L3BwY19uZXd3b3JsZC5j CkBAIC0zNjQsNyArMzY0LDcgQEAgc3RhdGljIHZvaWQgcHBjX2NvcmU5OV9pbml0IChyYW1f YWRkcl90IHJhbV9zaXplLAogICAgIGZ3X2NmZ19hZGRfaTMyKGZ3X2NmZywgRldfQ0ZHX0tF Uk5FTF9TSVpFLCBrZXJuZWxfc2l6ZSk7CiAgICAgaWYgKGtlcm5lbF9jbWRsaW5lKSB7CiAg ICAgICAgIGZ3X2NmZ19hZGRfaTMyKGZ3X2NmZywgRldfQ0ZHX0tFUk5FTF9DTURMSU5FLCBD TURMSU5FX0FERFIpOwotICAgICAgICBwc3RyY3B5X3RhcmdwaHlzKENNRExJTkVfQUREUiwg VEFSR0VUX1BBR0VfU0laRSwga2VybmVsX2NtZGxpbmUpOworICAgICAgICBwc3RyY3B5X3Rh cmdwaHlzKCJjbWRsaW5lIiwgQ01ETElORV9BRERSLCBUQVJHRVRfUEFHRV9TSVpFLCBrZXJu ZWxfY21kbGluZSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgZndfY2ZnX2FkZF9pMzIoZndf Y2ZnLCBGV19DRkdfS0VSTkVMX0NNRExJTkUsIDApOwogICAgIH0KZGlmZiAtLWdpdCBhL2h3 L3BwY19vbGR3b3JsZC5jIGIvaHcvcHBjX29sZHdvcmxkLmMKaW5kZXggNzlmMTdlOC4uM2Yy MzcxMyAxMDA2NDQKLS0tIGEvaHcvcHBjX29sZHdvcmxkLmMKKysrIGIvaHcvcHBjX29sZHdv cmxkLmMKQEAgLTM4NCw3ICszODQsNyBAQCBzdGF0aWMgdm9pZCBwcGNfaGVhdGhyb3dfaW5p dCAocmFtX2FkZHJfdCByYW1fc2l6ZSwKICAgICBmd19jZmdfYWRkX2kzMihmd19jZmcsIEZX X0NGR19LRVJORUxfU0laRSwga2VybmVsX3NpemUpOwogICAgIGlmIChrZXJuZWxfY21kbGlu ZSkgewogICAgICAgICBmd19jZmdfYWRkX2kzMihmd19jZmcsIEZXX0NGR19LRVJORUxfQ01E TElORSwgQ01ETElORV9BRERSKTsKLSAgICAgICAgcHN0cmNweV90YXJncGh5cyhDTURMSU5F X0FERFIsIFRBUkdFVF9QQUdFX1NJWkUsIGtlcm5lbF9jbWRsaW5lKTsKKyAgICAgICAgcHN0 cmNweV90YXJncGh5cygiY21kbGluZSIsIENNRExJTkVfQUREUiwgVEFSR0VUX1BBR0VfU0la RSwga2VybmVsX2NtZGxpbmUpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGZ3X2NmZ19hZGRf aTMyKGZ3X2NmZywgRldfQ0ZHX0tFUk5FTF9DTURMSU5FLCAwKTsKICAgICB9CmRpZmYgLS1n aXQgYS9ody9yMmQuYyBiL2h3L3IyZC5jCmluZGV4IGY4YTU5NjguLmMwNzRhNmUgMTAwNjQ0 Ci0tLSBhL2h3L3IyZC5jCisrKyBiL2h3L3IyZC5jCkBAIC0yNTAsNyArMjUwLDcgQEAgc3Rh dGljIHZvaWQgcjJkX2luaXQocmFtX2FkZHJfdCByYW1fc2l6ZSwKIAkJCQkgICBTRFJBTV9C QVNFICsgTElOVVhfTE9BRF9PRkZTRVQsCiAJCQkJICAgU0RSQU1fU0laRSAtIExJTlVYX0xP QURfT0ZGU0VUKTsKICAgICAgICAgICBlbnYtPnBjID0gKFNEUkFNX0JBU0UgKyBMSU5VWF9M T0FEX09GRlNFVCkgfCAweGEwMDAwMDAwOwotICAgICAgICAgIHBzdHJjcHlfdGFyZ3BoeXMo U0RSQU1fQkFTRSArIDB4MTAxMDAsIDI1Niwga2VybmVsX2NtZGxpbmUpOworICAgICAgICAg IHBzdHJjcHlfdGFyZ3BoeXMoImNtZGxpbmUiLCBTRFJBTV9CQVNFICsgMHgxMDEwMCwgMjU2 LCBrZXJuZWxfY21kbGluZSk7CiAgICAgICB9IGVsc2UgewogICAgICAgICAgIGtlcm5lbF9z aXplID0gbG9hZF9pbWFnZV90YXJncGh5cyhrZXJuZWxfZmlsZW5hbWUsIFNEUkFNX0JBU0Us IFNEUkFNX1NJWkUpOwogICAgICAgICAgIGVudi0+cGMgPSBTRFJBTV9CQVNFIHwgMHhhMDAw MDAwMDsgLyogU3RhcnQgZnJvbSBQMiBhcmVhICovCmRpZmYgLS1naXQgYS9ody9zdW40bS5j IGIvaHcvc3VuNG0uYwppbmRleCAwMWM3Y2I0Li4xNDRiZWMxIDEwMDY0NAotLS0gYS9ody9z dW40bS5jCisrKyBiL2h3L3N1bjRtLmMKQEAgLTI5OSw2ICsyOTksNyBAQCBzdGF0aWMgdW5z aWduZWQgbG9uZyBzdW40bV9sb2FkX2tlcm5lbChjb25zdCBjaGFyICprZXJuZWxfZmlsZW5h bWUsCiAgICAgaW50IGxpbnV4X2Jvb3Q7CiAgICAgdW5zaWduZWQgaW50IGk7CiAgICAgbG9u ZyBpbml0cmRfc2l6ZSwga2VybmVsX3NpemU7CisgICAgdWludDhfdCAqcHRyOwogCiAgICAg bGludXhfYm9vdCA9IChrZXJuZWxfZmlsZW5hbWUgIT0gTlVMTCk7CiAKQEAgLTM0MSw5ICsz NDIsMTAgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgc3VuNG1fbG9hZF9rZXJuZWwoY29uc3Qg Y2hhciAqa2VybmVsX2ZpbGVuYW1lLAogICAgICAgICB9CiAgICAgICAgIGlmIChpbml0cmRf c2l6ZSA+IDApIHsKICAgICAgICAgICAgIGZvciAoaSA9IDA7IGkgPCA2NCAqIFRBUkdFVF9Q QUdFX1NJWkU7IGkgKz0gVEFSR0VUX1BBR0VfU0laRSkgewotICAgICAgICAgICAgICAgIGlm IChsZGxfcGh5cyhLRVJORUxfTE9BRF9BRERSICsgaSkgPT0gMHg0ODY0NzI1MykgeyAvLyBI ZHJTCi0gICAgICAgICAgICAgICAgICAgIHN0bF9waHlzKEtFUk5FTF9MT0FEX0FERFIgKyBp ICsgMTYsIElOSVRSRF9MT0FEX0FERFIpOwotICAgICAgICAgICAgICAgICAgICBzdGxfcGh5 cyhLRVJORUxfTE9BRF9BRERSICsgaSArIDIwLCBpbml0cmRfc2l6ZSk7CisgICAgICAgICAg ICAgICAgcHRyID0gcm9tX3B0cihLRVJORUxfTE9BRF9BRERSICsgaSk7CisgICAgICAgICAg ICAgICAgaWYgKGxkbF9wKHB0cikgPT0gMHg0ODY0NzI1MykgeyAvLyBIZHJTCisgICAgICAg ICAgICAgICAgICAgIHN0bF9wKHB0ciArIDE2LCBJTklUUkRfTE9BRF9BRERSKTsKKyAgICAg ICAgICAgICAgICAgICAgc3RsX3AocHRyICsgMjAsIGluaXRyZF9zaXplKTsKICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpA QCAtODc1LDcgKzg3Nyw3IEBAIHN0YXRpYyB2b2lkIHN1bjRtX2h3X2luaXQoY29uc3Qgc3Ry dWN0IHN1bjRtX2h3ZGVmICpod2RlZiwgcmFtX2FkZHJfdCBSQU1fc2l6ZSwKICAgICBmd19j ZmdfYWRkX2kzMihmd19jZmcsIEZXX0NGR19LRVJORUxfU0laRSwga2VybmVsX3NpemUpOwog ICAgIGlmIChrZXJuZWxfY21kbGluZSkgewogICAgICAgICBmd19jZmdfYWRkX2kzMihmd19j ZmcsIEZXX0NGR19LRVJORUxfQ01ETElORSwgQ01ETElORV9BRERSKTsKLSAgICAgICAgcHN0 cmNweV90YXJncGh5cyhDTURMSU5FX0FERFIsIFRBUkdFVF9QQUdFX1NJWkUsIGtlcm5lbF9j bWRsaW5lKTsKKyAgICAgICAgcHN0cmNweV90YXJncGh5cygiY21kbGluZSIsIENNRExJTkVf QUREUiwgVEFSR0VUX1BBR0VfU0laRSwga2VybmVsX2NtZGxpbmUpOwogICAgIH0gZWxzZSB7 CiAgICAgICAgIGZ3X2NmZ19hZGRfaTMyKGZ3X2NmZywgRldfQ0ZHX0tFUk5FTF9DTURMSU5F LCAwKTsKICAgICB9CkBAIC0xNDU3LDcgKzE0NTksNyBAQCBzdGF0aWMgdm9pZCBzdW40ZF9o d19pbml0KGNvbnN0IHN0cnVjdCBzdW40ZF9od2RlZiAqaHdkZWYsIHJhbV9hZGRyX3QgUkFN X3NpemUsCiAgICAgZndfY2ZnX2FkZF9pMzIoZndfY2ZnLCBGV19DRkdfS0VSTkVMX1NJWkUs IGtlcm5lbF9zaXplKTsKICAgICBpZiAoa2VybmVsX2NtZGxpbmUpIHsKICAgICAgICAgZndf Y2ZnX2FkZF9pMzIoZndfY2ZnLCBGV19DRkdfS0VSTkVMX0NNRExJTkUsIENNRExJTkVfQURE Uik7Ci0gICAgICAgIHBzdHJjcHlfdGFyZ3BoeXMoQ01ETElORV9BRERSLCBUQVJHRVRfUEFH RV9TSVpFLCBrZXJuZWxfY21kbGluZSk7CisgICAgICAgIHBzdHJjcHlfdGFyZ3BoeXMoImNt ZGxpbmUiLCBDTURMSU5FX0FERFIsIFRBUkdFVF9QQUdFX1NJWkUsIGtlcm5lbF9jbWRsaW5l KTsKICAgICB9IGVsc2UgewogICAgICAgICBmd19jZmdfYWRkX2kzMihmd19jZmcsIEZXX0NG R19LRVJORUxfQ01ETElORSwgMCk7CiAgICAgfQpAQCAtMTY0NSw3ICsxNjQ3LDcgQEAgc3Rh dGljIHZvaWQgc3VuNGNfaHdfaW5pdChjb25zdCBzdHJ1Y3Qgc3VuNGNfaHdkZWYgKmh3ZGVm LCByYW1fYWRkcl90IFJBTV9zaXplLAogICAgIGZ3X2NmZ19hZGRfaTMyKGZ3X2NmZywgRldf Q0ZHX0tFUk5FTF9TSVpFLCBrZXJuZWxfc2l6ZSk7CiAgICAgaWYgKGtlcm5lbF9jbWRsaW5l KSB7CiAgICAgICAgIGZ3X2NmZ19hZGRfaTMyKGZ3X2NmZywgRldfQ0ZHX0tFUk5FTF9DTURM SU5FLCBDTURMSU5FX0FERFIpOwotICAgICAgICBwc3RyY3B5X3RhcmdwaHlzKENNRExJTkVf QUREUiwgVEFSR0VUX1BBR0VfU0laRSwga2VybmVsX2NtZGxpbmUpOworICAgICAgICBwc3Ry Y3B5X3RhcmdwaHlzKCJjbWRsaW5lIiwgQ01ETElORV9BRERSLCBUQVJHRVRfUEFHRV9TSVpF LCBrZXJuZWxfY21kbGluZSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgZndfY2ZnX2FkZF9p MzIoZndfY2ZnLCBGV19DRkdfS0VSTkVMX0NNRExJTkUsIDApOwogICAgIH0KZGlmZiAtLWdp dCBhL2h3L3N1bjR1LmMgYi9ody9zdW40dS5jCmluZGV4IDU4ZDcwOGEuLjMwZjUxMzggMTAw NjQ0Ci0tLSBhL2h3L3N1bjR1LmMKKysrIGIvaHcvc3VuNHUuYwpAQCAtNjUxLDcgKzY1MSw3 IEBAIHN0YXRpYyB2b2lkIHN1bjR1dl9pbml0KHJhbV9hZGRyX3QgUkFNX3NpemUsCiAgICAg ZndfY2ZnX2FkZF9pMzIoZndfY2ZnLCBGV19DRkdfS0VSTkVMX1NJWkUsIGtlcm5lbF9zaXpl KTsKICAgICBpZiAoa2VybmVsX2NtZGxpbmUpIHsKICAgICAgICAgZndfY2ZnX2FkZF9pMzIo ZndfY2ZnLCBGV19DRkdfS0VSTkVMX0NNRExJTkUsIENNRExJTkVfQUREUik7Ci0gICAgICAg IHBzdHJjcHlfdGFyZ3BoeXMoQ01ETElORV9BRERSLCBUQVJHRVRfUEFHRV9TSVpFLCBrZXJu ZWxfY21kbGluZSk7CisgICAgICAgIHBzdHJjcHlfdGFyZ3BoeXMoImNtZGxpbmUiLCBDTURM SU5FX0FERFIsIFRBUkdFVF9QQUdFX1NJWkUsIGtlcm5lbF9jbWRsaW5lKTsKICAgICB9IGVs c2UgewogICAgICAgICBmd19jZmdfYWRkX2kzMihmd19jZmcsIEZXX0NGR19LRVJORUxfQ01E TElORSwgMCk7CiAgICAgfQotLSAKMS42LjIuNQoK --------------030302040905000800040604--