From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH] pvgrub: use printk() instead of grub_printf() Date: Wed, 28 Sep 2016 10:31:58 +0200 Message-ID: <1475051518-3452-1-git-send-email-jgross@suse.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.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Juergen Gross , samuel.thibault@ens-lyon.org, wei.liu2@citrix.com List-Id: xen-devel@lists.xenproject.org Z3J1Yl9wcmludGYoKSBpcyBzdXBwb3J0aW5nIG9ubHkgYSB2ZXJ5IGxpbWl0ZWQgbnVtYmVyIG9m IGZvcm1hdHMuCkVzcGVjaWFsbHkgc29tZSBlcnJvciBtZXNzYWdlcyBzdWZmZXIgZnJvbSB0aGF0 LCBlLmcuICVseCB3b24ndCB3b3JrLgpTd2l0Y2ggdG8gdXNlIHByaW50aygpIGZvciBlcnJvciBt ZXNzYWdlcyBpbnN0ZWFkLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1 c2UuY29tPgotLS0KIHN0dWJkb20vZ3J1Yi9rZXhlYy5jIHwgMjIgKysrKysrKysrKystLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3N0dWJkb20vZ3J1Yi9rZXhlYy5jIGIvc3R1YmRvbS9ncnViL2tleGVjLmMK aW5kZXggOGZkOWZmOS4uMmVkNGY2YyAxMDA2NDQKLS0tIGEvc3R1YmRvbS9ncnViL2tleGVjLmMK KysrIGIvc3R1YmRvbS9ncnViL2tleGVjLmMKQEAgLTI0NiwyNiArMjQ2LDI2IEBAIHZvaWQga2V4 ZWModm9pZCAqa2VybmVsLCBsb25nIGtlcm5lbF9zaXplLCB2b2lkICptb2R1bGUsIGxvbmcgbW9k dWxlX3NpemUsIGNoYXIKICAgICB0cG1faGFzaDJwY3IoZG9tLCBjbWRsaW5lKTsKIAogICAgIGlm ICggKHJjID0geGNfZG9tX2Jvb3RfeGVuX2luaXQoZG9tLCB4Y19oYW5kbGUsIGRvbWlkKSkgIT0g MCApIHsKLSAgICAgICAgZ3J1Yl9wcmludGYoInhjX2RvbV9ib290X3hlbl9pbml0IHJldHVybmVk ICVkXG4iLCByYyk7CisgICAgICAgIHByaW50aygieGNfZG9tX2Jvb3RfeGVuX2luaXQgcmV0dXJu ZWQgJWRcbiIsIHJjKTsKICAgICAgICAgZXJybnVtID0gRVJSX0JPT1RfRkFJTFVSRTsKICAgICAg ICAgZ290byBvdXQ7CiAgICAgfQogICAgIGlmICggKHJjID0geGNfZG9tX3BhcnNlX2ltYWdlKGRv bSkpICE9IDAgKSB7Ci0gICAgICAgIGdydWJfcHJpbnRmKCJ4Y19kb21fcGFyc2VfaW1hZ2UgcmV0 dXJuZWQgJWRcbiIsIHJjKTsKKyAgICAgICAgcHJpbnRrKCJ4Y19kb21fcGFyc2VfaW1hZ2UgcmV0 dXJuZWQgJWRcbiIsIHJjKTsKICAgICAgICAgZXJybnVtID0gRVJSX0JPT1RfRkFJTFVSRTsKICAg ICAgICAgZ290byBvdXQ7CiAgICAgfQogCiAjaWZkZWYgX19pMzg2X18KICAgICBpZiAoc3RyY21w KGRvbS0+Z3Vlc3RfdHlwZSwgInhlbi0zLjAteDg2XzMycCIpKSB7Ci0gICAgICAgIGdydWJfcHJp bnRmKCJjYW4gb25seSBib290IHg4NiAzMiBQQUUga2VybmVscywgbm90ICVzXG4iLCBkb20tPmd1 ZXN0X3R5cGUpOworICAgICAgICBwcmludGsoImNhbiBvbmx5IGJvb3QgeDg2IDMyIFBBRSBrZXJu ZWxzLCBub3QgJXNcbiIsIGRvbS0+Z3Vlc3RfdHlwZSk7CiAgICAgICAgIGVycm51bSA9IEVSUl9F WEVDX0ZPUk1BVDsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogI2VuZGlmCiAjaWZkZWYgX194 ODZfNjRfXwogICAgIGlmIChzdHJjbXAoZG9tLT5ndWVzdF90eXBlLCAieGVuLTMuMC14ODZfNjQi KSkgewotICAgICAgICBncnViX3ByaW50ZigiY2FuIG9ubHkgYm9vdCB4ODYgNjQga2VybmVscywg bm90ICVzXG4iLCBkb20tPmd1ZXN0X3R5cGUpOworICAgICAgICBwcmludGsoImNhbiBvbmx5IGJv b3QgeDg2IDY0IGtlcm5lbHMsIG5vdCAlc1xuIiwgZG9tLT5ndWVzdF90eXBlKTsKICAgICAgICAg ZXJybnVtID0gRVJSX0VYRUNfRk9STUFUOwogICAgICAgICBnb3RvIG91dDsKICAgICB9CkBAIC0y NzMsNyArMjczLDcgQEAgdm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcga2VybmVsX3NpemUs IHZvaWQgKm1vZHVsZSwgbG9uZyBtb2R1bGVfc2l6ZSwgY2hhcgogCiAgICAgLyogZXF1aXZhbGVu dCBvZiB4Y19kb21fbWVtX2luaXQgKi8KICAgICBpZiAoeGNfZG9tX3NldF9hcmNoX2hvb2tzKGRv bSkpIHsKLSAgICAgICAgZ3J1Yl9wcmludGYoInhjX2RvbV9zZXRfYXJjaF9ob29rcyBmYWlsZWRc biIpOworICAgICAgICBwcmludGsoInhjX2RvbV9zZXRfYXJjaF9ob29rcyBmYWlsZWRcbiIpOwog ICAgICAgICBlcnJudW0gPSBFUlJfRVhFQ19GT1JNQVQ7CiAgICAgICAgIGdvdG8gb3V0OwogICAg IH0KQEAgLTI5MCw3ICsyOTAsNyBAQCB2b2lkIGtleGVjKHZvaWQgKmtlcm5lbCwgbG9uZyBrZXJu ZWxfc2l6ZSwgdm9pZCAqbW9kdWxlLCBsb25nIG1vZHVsZV9zaXplLCBjaGFyCiAgICAgICAgIGRv bS0+cDJtX2hvc3RbaV0gPSBwZm5fdG9fbWZuKGkpOwogCiAgICAgaWYgKCAocmMgPSB4Y19kb21f YnVpbGRfaW1hZ2UoZG9tKSkgIT0gMCApIHsKLSAgICAgICAgZ3J1Yl9wcmludGYoInhjX2RvbV9i dWlsZF9pbWFnZSByZXR1cm5lZCAlZFxuIiwgcmMpOworICAgICAgICBwcmludGsoInhjX2RvbV9i dWlsZF9pbWFnZSByZXR1cm5lZCAlZFxuIiwgcmMpOwogICAgICAgICBlcnJudW0gPSBFUlJfQk9P VF9GQUlMVVJFOwogICAgICAgICBnb3RvIG91dDsKICAgICB9CkBAIC0zMDYsNyArMzA2LDcgQEAg dm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcga2VybmVsX3NpemUsIHZvaWQgKm1vZHVsZSwg bG9uZyBtb2R1bGVfc2l6ZSwgY2hhcgogICAgIGRvbS0+c2hhcmVkX2luZm9fbWZuID0gUEhZU19Q Rk4oc3RhcnRfaW5mby5zaGFyZWRfaW5mbyk7CiAKICAgICBpZiAoIXhjX2RvbV9jb21wYXRfY2hl Y2soZG9tKSkgewotICAgICAgICBncnViX3ByaW50ZigieGNfZG9tX2NvbXBhdF9jaGVjayBmYWls ZWRcbiIpOworICAgICAgICBwcmludGsoInhjX2RvbV9jb21wYXRfY2hlY2sgZmFpbGVkXG4iKTsK ICAgICAgICAgZXJybnVtID0gRVJSX0VYRUNfRk9STUFUOwogICAgICAgICBnb3RvIG91dDsKICAg ICB9CkBAIC0zMjQsMTQgKzMyNCwxNCBAQCB2b2lkIGtleGVjKHZvaWQgKmtlcm5lbCwgbG9uZyBr ZXJuZWxfc2l6ZSwgdm9pZCAqbW9kdWxlLCBsb25nIG1vZHVsZV9zaXplLCBjaGFyCiAgICAgLyog TWFrZSBzdXJlIHRoZSBib290c3RyYXAgcGFnZSB0YWJsZSBkb2VzIG5vdCBSVy1tYXAgYW55IG9m IG91ciBjdXJyZW50CiAgICAgICogcGFnZSB0YWJsZSBmcmFtZXMgKi8KICAgICBpZiAoIChyYyA9 IHhjX2RvbV91cGRhdGVfZ3Vlc3RfcDJtKGRvbSkpKSB7Ci0gICAgICAgIGdydWJfcHJpbnRmKCJ4 Y19kb21fdXBkYXRlX2d1ZXN0X3AybSByZXR1cm5lZCAlZFxuIiwgcmMpOworICAgICAgICBwcmlu dGsoInhjX2RvbV91cGRhdGVfZ3Vlc3RfcDJtIHJldHVybmVkICVkXG4iLCByYyk7CiAgICAgICAg IGVycm51bSA9IEVSUl9CT09UX0ZBSUxVUkU7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAog ICAgIGlmICggZG9tLT5hcmNoX2hvb2tzLT5zZXR1cF9wZ3RhYmxlcyApCiAgICAgICAgIGlmICgg KHJjID0gZG9tLT5hcmNoX2hvb2tzLT5zZXR1cF9wZ3RhYmxlcyhkb20pKSkgewotICAgICAgICAg ICAgZ3J1Yl9wcmludGYoInNldHVwX3BndGFibGVzIHJldHVybmVkICVkXG4iLCByYyk7CisgICAg ICAgICAgICBwcmludGsoInNldHVwX3BndGFibGVzIHJldHVybmVkICVkXG4iLCByYyk7CiAgICAg ICAgICAgICBlcnJudW0gPSBFUlJfQk9PVF9GQUlMVVJFOwogICAgICAgICAgICAgZ290byBvdXQ7 CiAgICAgICAgIH0KQEAgLTM2Miw4ICszNjIsOCBAQCB2b2lkIGtleGVjKHZvaWQgKmtlcm5lbCwg bG9uZyBrZXJuZWxfc2l6ZSwgdm9pZCAqbW9kdWxlLCBsb25nIG1vZHVsZV9zaXplLCBjaGFyCiAj ZW5kaWYKICAgICAgICAgICAgICAgICB4Y19kb21fcDJtKGRvbSwgZG9tLT5wZ3RhYmxlc19zZWcu cGZuKSwKICAgICAgICAgICAgICAgICBkb20tPmd1ZXN0X2RvbWlkKSkgIT0gMCApIHsKLSAgICAg ICAgZ3J1Yl9wcmludGYoInBpbl90YWJsZSglbHgpIHJldHVybmVkICVkXG4iLCB4Y19kb21fcDJt KGRvbSwKLSAgICAgICAgICAgICAgICAgICAgZG9tLT5wZ3RhYmxlc19zZWcucGZuKSwgcmMpOwor ICAgICAgICBwcmludGsoInBpbl90YWJsZSglbHgpIHJldHVybmVkICVkXG4iLCB4Y19kb21fcDJt KGRvbSwKKyAgICAgICAgICAgICAgIGRvbS0+cGd0YWJsZXNfc2VnLnBmbiksIHJjKTsKICAgICAg ICAgZXJybnVtID0gRVJSX0JPT1RfRkFJTFVSRTsKICAgICAgICAgZ290byBvdXRfcmVtYXA7CiAg ICAgfQotLSAKMi42LjYKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK