From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 2/6] xenconsoled: switch hypervisor log to use logfile abstraction Date: Mon, 6 Jun 2016 16:59:37 +0100 Message-ID: <1465228781-22754-3-git-send-email-wei.liu2@citrix.com> References: <1465228781-22754-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b9wwL-0007IO-Of for xen-devel@lists.xenproject.org; Mon, 06 Jun 2016 15:59:45 +0000 In-Reply-To: <1465228781-22754-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org VG8gbWluaW1pc2UgY29kZSBjaHVybiwgY29weSBhbmQgcGFzdGUgYSBzb21lIGV4aXN0aW5nIGZ1 bmN0aW9ucyBhbmQKYWRhcHQgdGhlbSB0byB3cml0ZSB0byBsb2dmaWxlLiBUaGUgZnVuY3Rpb25z IHRvIGRlYWwgd2l0aCBmZCBkaXJlY3RseQp3aWxsIGdvIGF3YXkgZXZlbnR1YWxseS4KClNpZ25l ZC1vZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvY29uc29s ZS9kYWVtb24vaW8uYyB8IDk1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNzEgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvY29uc29sZS9kYWVtb24vaW8uYyBiL3Rvb2xzL2NvbnNv bGUvZGFlbW9uL2lvLmMKaW5kZXggN2U2YTg4Ni4uMjI4YzRhZiAxMDA2NDQKLS0tIGEvdG9vbHMv Y29uc29sZS9kYWVtb24vaW8uYworKysgYi90b29scy9jb25zb2xlL2RhZW1vbi9pby5jCkBAIC0y MSw2ICsyMSw3IEBACiAKICNpbmNsdWRlICJ1dGlscy5oIgogI2luY2x1ZGUgImlvLmgiCisjaW5j bHVkZSAibG9nZmlsZS5oIgogI2luY2x1ZGUgPHhlbmV2dGNobi5oPgogI2luY2x1ZGUgPHhlbmdu dHRhYi5oPgogI2luY2x1ZGUgPHhlbnN0b3JlLmg+CkBAIC03MSw3ICs3Miw3IEBAIGV4dGVybiBp bnQgZGlzY2FyZF9vdmVyZmxvd2VkX2RhdGE7CiAKIHN0YXRpYyBpbnQgbG9nX3RpbWVfaHZfbmVl ZHRzID0gMTsKIHN0YXRpYyBpbnQgbG9nX3RpbWVfZ3Vlc3RfbmVlZHRzID0gMTsKLXN0YXRpYyBp bnQgbG9nX2h2X2ZkID0gLTE7CitzdGF0aWMgc3RydWN0IGxvZ2ZpbGUgKmxvZ19odl9maWxlOwog CiBzdGF0aWMgeGVuZ250dGFiX2hhbmRsZSAqeGd0X2hhbmRsZSA9IE5VTEw7CiAKQEAgLTEyNyw2 ICsxMjgsMTUgQEAgc3RhdGljIGludCB3cml0ZV9hbGwoaW50IGZkLCBjb25zdCBjaGFyKiBidWYs IHNpemVfdCBsZW4pCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgd3JpdGVfbG9nZmlsZShz dHJ1Y3QgbG9nZmlsZSAqbG9nZmlsZSwgY29uc3QgY2hhciAqYnVmLAorCQkJIHNpemVfdCBsZW4p Cit7CisJc3NpemVfdCByID0gbG9nZmlsZV9hcHBlbmQobG9nZmlsZSwgYnVmLCBsZW4pOworCisJ aWYgKHIgPCAwKSByZXR1cm4gLTE7CisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgd3JpdGVf d2l0aF90aW1lc3RhbXAoaW50IGZkLCBjb25zdCBjaGFyICpkYXRhLCBzaXplX3Qgc3osCiAJCQkJ aW50ICpuZWVkdHMpCiB7CkBAIC0xNTgsNiArMTY4LDM4IEBAIHN0YXRpYyBpbnQgd3JpdGVfd2l0 aF90aW1lc3RhbXAoaW50IGZkLCBjb25zdCBjaGFyICpkYXRhLCBzaXplX3Qgc3osCiAJcmV0dXJu IDA7CiB9CiAKK3N0YXRpYyBpbnQgd3JpdGVfbG9nZmlsZV93aXRoX3RpbWVzdGFtcChzdHJ1Y3Qg bG9nZmlsZSAqbG9nZmlsZSwKKwkJCQkJY29uc3QgY2hhciAqZGF0YSwgc2l6ZV90IHN6LAorCQkJ CQlpbnQgKm5lZWR0cykKK3sKKwljaGFyIHRzWzMyXTsKKwl0aW1lX3Qgbm93ID0gdGltZShOVUxM KTsKKwljb25zdCBzdHJ1Y3QgdG0gKnRtbm93ID0gbG9jYWx0aW1lKCZub3cpOworCXNpemVfdCB0 c2xlbiA9IHN0cmZ0aW1lKHRzLCBzaXplb2YodHMpLCAiWyVZLSVtLSVkICVIOiVNOiVTXSAiLCB0 bW5vdyk7CisJY29uc3QgY2hhciAqbGFzdF9ieXRlID0gZGF0YSArIHN6IC0gMTsKKworCXdoaWxl IChkYXRhIDw9IGxhc3RfYnl0ZSkgeworCQljb25zdCBjaGFyICpubCA9IG1lbWNocihkYXRhLCAn XG4nLCBsYXN0X2J5dGUgKyAxIC0gZGF0YSk7CisJCWludCBmb3VuZF9ubCA9IChubCAhPSBOVUxM KTsKKwkJaWYgKCFmb3VuZF9ubCkKKwkJCW5sID0gbGFzdF9ieXRlOworCisJCWlmICgoKm5lZWR0 cyAmJiBsb2dmaWxlX2FwcGVuZChsb2dmaWxlLCB0cywgdHNsZW4pKQorCQkgICAgfHwgbG9nZmls ZV9hcHBlbmQobG9nZmlsZSwgZGF0YSwgbmwgKyAxIC0gZGF0YSkpCisJCQlyZXR1cm4gLTE7CisK KwkJKm5lZWR0cyA9IGZvdW5kX25sOworCQlkYXRhID0gbmwgKyAxOworCQlpZiAoZm91bmRfbmwp IHsKKwkJCS8vIElmIHdlIHByaW50ZWQgYSBuZXdsaW5lLCBzdHJpcCBhbGwgXHIgZm9sbG93aW5n IGl0CisJCQl3aGlsZSAoZGF0YSA8PSBsYXN0X2J5dGUgJiYgKmRhdGEgPT0gJ1xyJykKKwkJCQlk YXRhKys7CisJCX0KKwl9CisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIHZvaWQgYnVmZmVyX2Fw cGVuZChzdHJ1Y3QgZG9tYWluICpkb20pCiB7CiAJc3RydWN0IGJ1ZmZlciAqYnVmZmVyID0gJmRv bS0+YnVmZmVyOwpAQCAtMjY1LDI5ICszMDcsMzMgQEAgc3RhdGljIGJvb2wgZG9tYWluX2lzX3Zh bGlkKGludCBkb21pZCkKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGNyZWF0ZV9odl9s b2codm9pZCkKK3N0YXRpYyBzdHJ1Y3QgbG9nZmlsZSAqY3JlYXRlX2h2X2xvZyh2b2lkKQogewog CWNoYXIgbG9nZmlsZVtQQVRIX01BWF07Ci0JaW50IGZkOworCXN0cnVjdCBsb2dmaWxlICp0bXA7 CisKIAlzbnByaW50Zihsb2dmaWxlLCBQQVRIX01BWC0xLCAiJXMvaHlwZXJ2aXNvci5sb2ciLCBs b2dfZGlyKTsKIAlsb2dmaWxlW1BBVEhfTUFYLTFdID0gJ1wwJzsKIAotCWZkID0gb3Blbihsb2dm aWxlLCBPX1dST05MWXxPX0NSRUFUfE9fQVBQRU5ELCAwNjQ0KTsKLQlpZiAoZmQgPT0gLTEpCisJ dG1wID0gbG9nZmlsZV9uZXcobG9nZmlsZSwgMDY0NCk7CisKKwlpZiAoIXRtcCkKIAkJZG9sb2co TE9HX0VSUiwgIkZhaWxlZCB0byBvcGVuIGxvZyAlczogJWQgKCVzKSIsCiAJCSAgICAgIGxvZ2Zp bGUsIGVycm5vLCBzdHJlcnJvcihlcnJubykpOwotCWlmIChmZCAhPSAtMSAmJiBsb2dfdGltZV9o dikgewotCQlpZiAod3JpdGVfd2l0aF90aW1lc3RhbXAoZmQsICJMb2dmaWxlIE9wZW5lZFxuIiwK LQkJCQkJIHN0cmxlbigiTG9nZmlsZSBPcGVuZWRcbiIpLAotCQkJCQkgJmxvZ190aW1lX2h2X25l ZWR0cykgPCAwKSB7CisKKwlpZiAodG1wICYmIGxvZ190aW1lX2h2KSB7CisJCWlmICh3cml0ZV9s b2dmaWxlX3dpdGhfdGltZXN0YW1wKHRtcCwgIkxvZ2ZpbGUgT3BlbmVkXG4iLAorCQkJCQkJIHN0 cmxlbigiTG9nZmlsZSBPcGVuZWRcbiIpLAorCQkJCQkJICZsb2dfdGltZV9odl9uZWVkdHMpIDwg MCkgewogCQkJZG9sb2coTE9HX0VSUiwgIkZhaWxlZCB0byBsb2cgb3BlbmluZyB0aW1lc3RhbXAg IgotCQkJCSAgICAgICAiaW4gJXM6ICVkICglcykiLCBsb2dmaWxlLCBlcnJubywKKwkJCQkgICAg ICAgImluICVzOiAlZCAoJXMpIiwgdG1wLT5iYXNlcGF0aCwgZXJybm8sCiAJCQkJICAgICAgIHN0 cmVycm9yKGVycm5vKSk7Ci0JCQljbG9zZShmZCk7Ci0JCQlyZXR1cm4gLTE7CisJCQlsb2dmaWxl X2ZyZWUodG1wKTsKKwkJCXJldHVybiBOVUxMOwogCQl9CiAJfQotCXJldHVybiBmZDsKKworCXJl dHVybiB0bXA7CiB9CiAKIHN0YXRpYyBpbnQgY3JlYXRlX2RvbWFpbl9sb2coc3RydWN0IGRvbWFp biAqZG9tKQpAQCAtOTI5LDEwICs5NzUsMTEgQEAgc3RhdGljIHZvaWQgaGFuZGxlX2h2X2xvZ3Mo eGVuZXZ0Y2huX2hhbmRsZSAqeGNlX2hhbmRsZSwgYm9vbCBmb3JjZSkKIAkJCWJyZWFrOwogCiAJ CWlmIChsb2dfdGltZV9odikKLQkJCWxvZ3JldCA9IHdyaXRlX3dpdGhfdGltZXN0YW1wKGxvZ19o dl9mZCwgYnVmZmVyLCBzaXplLAotCQkJCQkJICAgICAgJmxvZ190aW1lX2h2X25lZWR0cyk7CisJ CQlsb2dyZXQgPSB3cml0ZV9sb2dmaWxlX3dpdGhfdGltZXN0YW1wKGxvZ19odl9maWxlLAorCQkJ CQkJCSAgICAgIGJ1ZmZlciwgc2l6ZSwKKwkJCQkJCQkgICAgICAmbG9nX3RpbWVfaHZfbmVlZHRz KTsKIAkJZWxzZQotCQkJbG9ncmV0ID0gd3JpdGVfYWxsKGxvZ19odl9mZCwgYnVmZmVyLCBzaXpl KTsKKwkJCWxvZ3JldCA9IHdyaXRlX2xvZ2ZpbGUobG9nX2h2X2ZpbGUsIGJ1ZmZlciwgc2l6ZSk7 CiAKIAkJaWYgKGxvZ3JldCA8IDApCiAJCQlkb2xvZyhMT0dfRVJSLCAiRmFpbGVkIHRvIHdyaXRl IGh5cGVydmlzb3IgbG9nOiAiCkBAIC05NTUsOSArMTAwMiw5IEBAIHN0YXRpYyB2b2lkIGhhbmRs ZV9sb2dfcmVsb2FkKHZvaWQpCiAJfQogCiAJaWYgKGxvZ19odikgewotCQlpZiAobG9nX2h2X2Zk ICE9IC0xKQotCQkJY2xvc2UobG9nX2h2X2ZkKTsKLQkJbG9nX2h2X2ZkID0gY3JlYXRlX2h2X2xv ZygpOworCQlpZiAobG9nX2h2X2ZpbGUpCisJCQlsb2dmaWxlX2ZyZWUobG9nX2h2X2ZpbGUpOwor CQlsb2dfaHZfZmlsZSA9IGNyZWF0ZV9odl9sb2coKTsKIAl9CiB9CiAKQEAgLTEwMTcsOCArMTA2 NCw4IEBAIHZvaWQgaGFuZGxlX2lvKHZvaWQpCiAJCQkgICAgICBlcnJubywgc3RyZXJyb3IoZXJy bm8pKTsKIAkJCWdvdG8gb3V0OwogCQl9Ci0JCWxvZ19odl9mZCA9IGNyZWF0ZV9odl9sb2coKTsK LQkJaWYgKGxvZ19odl9mZCA9PSAtMSkKKwkJbG9nX2h2X2ZpbGUgPSBjcmVhdGVfaHZfbG9nKCk7 CisJCWlmICghbG9nX2h2X2ZpbGUpCiAJCQlnb3RvIG91dDsKIAkJbG9nX2h2X2V2dGNobiA9IHhl bmV2dGNobl9iaW5kX3ZpcnEoeGNlX2hhbmRsZSwgVklSUV9DT05fUklORyk7CiAJCWlmIChsb2df aHZfZXZ0Y2huID09IC0xKSB7CkBAIC0xMTk5LDkgKzEyNDYsOSBAQCB2b2lkIGhhbmRsZV9pbyh2 b2lkKQogCWN1cnJlbnRfYXJyYXlfc2l6ZSA9IDA7CiAKICBvdXQ6Ci0JaWYgKGxvZ19odl9mZCAh PSAtMSkgewotCQljbG9zZShsb2dfaHZfZmQpOwotCQlsb2dfaHZfZmQgPSAtMTsKKwlpZiAobG9n X2h2X2ZpbGUpIHsKKwkJbG9nZmlsZV9mcmVlKGxvZ19odl9maWxlKTsKKwkJbG9nX2h2X2ZpbGUg PSBOVUxMOwogCX0KIAlpZiAoeGNlX2hhbmRsZSAhPSBOVUxMKSB7CiAJCXhlbmV2dGNobl9jbG9z ZSh4Y2VfaGFuZGxlKTsKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK