From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 3/6] xenconsoled: switch guest log to use logfile abstraction Date: Mon, 6 Jun 2016 16:59:38 +0100 Message-ID: <1465228781-22754-4-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 1b9wwM-0007IZ-Ip for xen-devel@lists.xenproject.org; Mon, 06 Jun 2016 15:59:46 +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 Tm90ZSB0aGF0IHRoaXMgY2F1c2VzIHdyaXRlX3dpdGhfdGltZXN0YW1wIHRvIGhhdmUgbm8gY2Fs bGVyLiBNYXJrCml0IGFzIHVudXNlZCBmb3Igbm93IHRvIG1pbmltaXNlIGNvZGUgY2h1cm4uCgpT aWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHRvb2xzL2Nv bnNvbGUvZGFlbW9uL2lvLmMgfCA2NyArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDMyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2NvbnNvbGUvZGFlbW9uL2lvLmMgYi90b29scy9j b25zb2xlL2RhZW1vbi9pby5jCmluZGV4IDIyOGM0YWYuLmMyZjYzZTYgMTAwNjQ0Ci0tLSBhL3Rv b2xzL2NvbnNvbGUvZGFlbW9uL2lvLmMKKysrIGIvdG9vbHMvY29uc29sZS9kYWVtb24vaW8uYwpA QCAtOTUsNyArOTUsNyBAQCBzdHJ1Y3QgZG9tYWluIHsKIAlpbnQgbWFzdGVyX2ZkOwogCWludCBt YXN0ZXJfcG9sbGZkX2lkeDsKIAlpbnQgc2xhdmVfZmQ7Ci0JaW50IGxvZ19mZDsKKwlzdHJ1Y3Qg bG9nZmlsZSAqbG9nOwogCWJvb2wgaXNfZGVhZDsKIAl1bnNpZ25lZCBsYXN0X3NlZW47CiAJc3Ry dWN0IGJ1ZmZlciBidWZmZXI7CkBAIC0xMzcsOCArMTM3LDkgQEAgc3RhdGljIGludCB3cml0ZV9s b2dmaWxlKHN0cnVjdCBsb2dmaWxlICpsb2dmaWxlLCBjb25zdCBjaGFyICpidWYsCiAJcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyBpbnQgd3JpdGVfd2l0aF90aW1lc3RhbXAoaW50IGZkLCBjb25zdCBj aGFyICpkYXRhLCBzaXplX3Qgc3osCi0JCQkJaW50ICpuZWVkdHMpCitzdGF0aWMgIF9fYXR0cmli dXRlX18oKHVudXNlZCkpCitpbnQgd3JpdGVfd2l0aF90aW1lc3RhbXAoaW50IGZkLCBjb25zdCBj aGFyICpkYXRhLCBzaXplX3Qgc3osCisJCQkgaW50ICpuZWVkdHMpCiB7CiAJY2hhciB0c1szMl07 CiAJdGltZV90IG5vdyA9IHRpbWUoTlVMTCk7CkBAIC0yMzUsMTYgKzIzNiwxNiBAQCBzdGF0aWMg dm9pZCBidWZmZXJfYXBwZW5kKHN0cnVjdCBkb21haW4gKmRvbSkKIAkgKiBubyBvbmUgaXMgbGlz dGVuaW5nIG9uIHRoZSBjb25zb2xlIHB0eSB0aGVuIGl0IHdpbGwgZmlsbCB1cAogCSAqIGFuZCBo YW5kbGVfdHR5X3dyaXRlIHdpbGwgc3RvcCBiZWluZyBjYWxsZWQuCiAJICovCi0JaWYgKGRvbS0+ bG9nX2ZkICE9IC0xKSB7CisJaWYgKGRvbS0+bG9nKSB7CiAJCWludCBsb2dyZXQ7CiAJCWlmIChs b2dfdGltZV9ndWVzdCkgewotCQkJbG9ncmV0ID0gd3JpdGVfd2l0aF90aW1lc3RhbXAoCi0JCQkJ ZG9tLT5sb2dfZmQsCisJCQlsb2dyZXQgPSB3cml0ZV9sb2dmaWxlX3dpdGhfdGltZXN0YW1wKAor CQkJCWRvbS0+bG9nLAogCQkJCWJ1ZmZlci0+ZGF0YSArIGJ1ZmZlci0+c2l6ZSAtIHNpemUsCiAJ CQkJc2l6ZSwgJmxvZ190aW1lX2d1ZXN0X25lZWR0cyk7CiAJCX0gZWxzZSB7Ci0JCQlsb2dyZXQg PSB3cml0ZV9hbGwoCi0JCQkJZG9tLT5sb2dfZmQsCisJCQlsb2dyZXQgPSB3cml0ZV9sb2dmaWxl KAorCQkJCWRvbS0+bG9nLAogCQkJCWJ1ZmZlci0+ZGF0YSArIGJ1ZmZlci0+c2l6ZSAtIHNpemUs CiAJCQkJc2l6ZSk7CiAJCX0KQEAgLTMzNiw1MCArMzM3LDUzIEBAIHN0YXRpYyBzdHJ1Y3QgbG9n ZmlsZSAqY3JlYXRlX2h2X2xvZyh2b2lkKQogCXJldHVybiB0bXA7CiB9CiAKLXN0YXRpYyBpbnQg Y3JlYXRlX2RvbWFpbl9sb2coc3RydWN0IGRvbWFpbiAqZG9tKQorc3RhdGljIHN0cnVjdCBsb2dm aWxlICpjcmVhdGVfZG9tYWluX2xvZyhzdHJ1Y3QgZG9tYWluICpkb20pCiB7CiAJY2hhciBsb2dm aWxlW1BBVEhfTUFYXTsKIAljaGFyICpuYW1lcGF0aCwgKmRhdGEsICpzOwotCWludCBmZDsKIAl1 bnNpZ25lZCBpbnQgbGVuOworCXN0cnVjdCBsb2dmaWxlICp0bXA7CiAKIAluYW1lcGF0aCA9IHhz X2dldF9kb21haW5fcGF0aCh4cywgZG9tLT5kb21pZCk7CiAJcyA9IHJlYWxsb2MobmFtZXBhdGgs IHN0cmxlbihuYW1lcGF0aCkgKyA2KTsKIAlpZiAocyA9PSBOVUxMKSB7CiAJCWZyZWUobmFtZXBh dGgpOwotCQlyZXR1cm4gLTE7CisJCXJldHVybiBOVUxMOwogCX0KIAluYW1lcGF0aCA9IHM7CiAJ c3RyY2F0KG5hbWVwYXRoLCAiL25hbWUiKTsKIAlkYXRhID0geHNfcmVhZCh4cywgWEJUX05VTEws IG5hbWVwYXRoLCAmbGVuKTsKIAlmcmVlKG5hbWVwYXRoKTsKIAlpZiAoIWRhdGEpCi0JCXJldHVy biAtMTsKKwkJcmV0dXJuIE5VTEw7CiAJaWYgKCFsZW4pIHsKIAkJZnJlZShkYXRhKTsKLQkJcmV0 dXJuIC0xOworCQlyZXR1cm4gTlVMTDsKIAl9CiAKIAlzbnByaW50Zihsb2dmaWxlLCBQQVRIX01B WC0xLCAiJXMvZ3Vlc3QtJXMubG9nIiwgbG9nX2RpciwgZGF0YSk7CiAJZnJlZShkYXRhKTsKIAls b2dmaWxlW1BBVEhfTUFYLTFdID0gJ1wwJzsKIAotCWZkID0gb3Blbihsb2dmaWxlLCBPX1dST05M WXxPX0NSRUFUfE9fQVBQRU5ELCAwNjQ0KTsKLQlpZiAoZmQgPT0gLTEpCisJdG1wID0gbG9nZmls ZV9uZXcobG9nZmlsZSwgMDY0NCk7CisKKwlpZiAoIXRtcCkKIAkJZG9sb2coTE9HX0VSUiwgIkZh aWxlZCB0byBvcGVuIGxvZyAlczogJWQgKCVzKSIsCiAJCSAgICAgIGxvZ2ZpbGUsIGVycm5vLCBz dHJlcnJvcihlcnJubykpOwotCWlmIChmZCAhPSAtMSAmJiBsb2dfdGltZV9ndWVzdCkgewotCQlp ZiAod3JpdGVfd2l0aF90aW1lc3RhbXAoZmQsICJMb2dmaWxlIE9wZW5lZFxuIiwKLQkJCQkJIHN0 cmxlbigiTG9nZmlsZSBPcGVuZWRcbiIpLAotCQkJCQkgJmxvZ190aW1lX2d1ZXN0X25lZWR0cykg PCAwKSB7CisKKwlpZiAodG1wICYmIGxvZ190aW1lX2d1ZXN0KSB7CisJCWlmICh3cml0ZV9sb2dm aWxlX3dpdGhfdGltZXN0YW1wKHRtcCwgIkxvZ2ZpbGUgT3BlbmVkXG4iLAorCQkJCQkJIHN0cmxl bigiTG9nZmlsZSBPcGVuZWRcbiIpLAorCQkJCQkJICZsb2dfdGltZV9ndWVzdF9uZWVkdHMpIDwg MCkgewogCQkJZG9sb2coTE9HX0VSUiwgIkZhaWxlZCB0byBsb2cgb3BlbmluZyB0aW1lc3RhbXAg IgotCQkJCSAgICAgICAiaW4gJXM6ICVkICglcykiLCBsb2dmaWxlLCBlcnJubywKKwkJCQkgICAg ICAgImluICVzOiAlZCAoJXMpIiwgdG1wLT5iYXNlcGF0aCwgZXJybm8sCiAJCQkJICAgICAgIHN0 cmVycm9yKGVycm5vKSk7Ci0JCQljbG9zZShmZCk7Ci0JCQlyZXR1cm4gLTE7CisJCQlsb2dmaWxl X2ZyZWUodG1wKTsKKwkJCXJldHVybiBOVUxMOwogCQl9CiAJfQotCXJldHVybiBmZDsKKworCXJl dHVybiB0bXA7CiB9CiAKIHN0YXRpYyB2b2lkIGRvbWFpbl9jbG9zZV90dHkoc3RydWN0IGRvbWFp biAqZG9tKQpAQCAtNjY1LDggKzY2OSw4IEBAIHN0YXRpYyBpbnQgZG9tYWluX2NyZWF0ZV9yaW5n KHN0cnVjdCBkb21haW4gKmRvbSkKIAkJfQogCX0KIAotCWlmIChsb2dfZ3Vlc3QgJiYgKGRvbS0+ bG9nX2ZkID09IC0xKSkKLQkJZG9tLT5sb2dfZmQgPSBjcmVhdGVfZG9tYWluX2xvZyhkb20pOwor CWlmIChsb2dfZ3Vlc3QgJiYgIWRvbS0+bG9nKQorCQlkb20tPmxvZyA9IGNyZWF0ZV9kb21haW5f bG9nKGRvbSk7CiAKICBvdXQ6CiAJcmV0dXJuIGVycjsKQEAgLTcyNCw3ICs3MjgsNiBAQCBzdGF0 aWMgc3RydWN0IGRvbWFpbiAqY3JlYXRlX2RvbWFpbihpbnQgZG9taWQpCiAJZG9tLT5tYXN0ZXJf ZmQgPSAtMTsKIAlkb20tPm1hc3Rlcl9wb2xsZmRfaWR4ID0gLTE7CiAJZG9tLT5zbGF2ZV9mZCA9 IC0xOwotCWRvbS0+bG9nX2ZkID0gLTE7CiAJZG9tLT54Y2VfcG9sbGZkX2lkeCA9IC0xOwogCiAJ ZG9tLT5uZXh0X3BlcmlvZCA9ICgobG9uZyBsb25nKXRzLnR2X3NlYyAqIDEwMDApICsgKHRzLnR2 X25zZWMgLyAxMDAwMDAwKSArIFJBVEVfTElNSVRfUEVSSU9EOwpAQCAtNzc3LDkgKzc4MCw5IEBA IHN0YXRpYyB2b2lkIGNsZWFudXBfZG9tYWluKHN0cnVjdCBkb21haW4gKmQpCiB7CiAJZG9tYWlu X2Nsb3NlX3R0eShkKTsKIAotCWlmIChkLT5sb2dfZmQgIT0gLTEpIHsKLQkJY2xvc2UoZC0+bG9n X2ZkKTsKLQkJZC0+bG9nX2ZkID0gLTE7CisJaWYgKGQtPmxvZykgeworCQlsb2dmaWxlX2ZyZWUo ZC0+bG9nKTsKKwkJZC0+bG9nID0gTlVMTDsKIAl9CiAKIAlmcmVlKGQtPmJ1ZmZlci5kYXRhKTsK QEAgLTk5NSw5ICs5OTgsOSBAQCBzdGF0aWMgdm9pZCBoYW5kbGVfbG9nX3JlbG9hZCh2b2lkKQog CWlmIChsb2dfZ3Vlc3QpIHsKIAkJc3RydWN0IGRvbWFpbiAqZDsKIAkJZm9yIChkID0gZG9tX2hl YWQ7IGQ7IGQgPSBkLT5uZXh0KSB7Ci0JCQlpZiAoZC0+bG9nX2ZkICE9IC0xKQotCQkJCWNsb3Nl KGQtPmxvZ19mZCk7Ci0JCQlkLT5sb2dfZmQgPSBjcmVhdGVfZG9tYWluX2xvZyhkKTsKKwkJCWlm IChkLT5sb2cpCisJCQkJbG9nZmlsZV9mcmVlKGQtPmxvZyk7CisJCQlkLT5sb2cgPSBjcmVhdGVf ZG9tYWluX2xvZyhkKTsKIAkJfQogCX0KIAotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=