From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Guyader Subject: [xenconsoled] Add syslog (v2) Date: Thu, 24 May 2012 09:33:10 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=bcaec501c52c50c5a504c0c41bbf Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org --bcaec501c52c50c5a504c0c41bbf Content-Type: multipart/alternative; boundary=bcaec501c52c50c59804c0c41bbd --bcaec501c52c50c59804c0c41bbd Content-Type: text/plain; charset=ISO-8859-1 Changes in v2: - Create a new function to clear \r\n and write to syslog - Remove tmp buffer Introduce a new option (-s/--syslog) to make xenconsoled log into syslog. The default behaviour remains the same (log into plain files) From: Eric Chanudet Signed-off-by: Jean Guyader --bcaec501c52c50c59804c0c41bbd Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Changes in v2:
=A0 - Create a new function to clear \r\n and write to sy= slog
=A0 - Remove tmp buffer

Introduce a new option (-s/--syslog) to make xenconsoled lo= g into syslog.
The default behaviour remains the same (log into plain files)

From: Eric Chanudet <eric.ch= anudet@citrix.com>
Signed-off-by: Jean Guyader <j= ean.guyader@gmail.com> --bcaec501c52c50c59804c0c41bbd-- --bcaec501c52c50c5a504c0c41bbf Content-Type: text/x-patch; charset=US-ASCII; name="xenconsoled-syslog.patch" Content-Disposition: attachment; filename="xenconsoled-syslog.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h2lkghzp0 ZGlmZiAtLWdpdCBhL3Rvb2xzL2NvbnNvbGUvZGFlbW9uL2lvLmMgYi90b29scy9jb25zb2xlL2Rh ZW1vbi9pby5jCmluZGV4IGI2ZDQxZGUuLjgyYWQyYmIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2NvbnNv bGUvZGFlbW9uL2lvLmMKKysrIGIvdG9vbHMvY29uc29sZS9kYWVtb24vaW8uYwpAQCAtNjIsNiAr NjIsNyBAQCBleHRlcm4gaW50IGxvZ190aW1lX2h2OwogZXh0ZXJuIGludCBsb2dfdGltZV9ndWVz dDsKIGV4dGVybiBjaGFyICpsb2dfZGlyOwogZXh0ZXJuIGludCBkaXNjYXJkX292ZXJmbG93ZWRf ZGF0YTsKK2V4dGVybiBpbnQgdXNlX3N5c2xvZzsKIAogc3RhdGljIGludCBsb2dfdGltZV9odl9u ZWVkdHMgPSAxOwogc3RhdGljIGludCBsb2dfdGltZV9ndWVzdF9uZWVkdHMgPSAxOwpAQCAtODAs NiArODEsNyBAQCBzdHJ1Y3QgYnVmZmVyIHsKIAogc3RydWN0IGRvbWFpbiB7CiAJaW50IGRvbWlk OworCWNoYXIgKm5hbWU7CiAJaW50IG1hc3Rlcl9mZDsKIAlpbnQgc2xhdmVfZmQ7CiAJaW50IGxv Z19mZDsKQEAgLTExMyw2ICsxMTUsMzYgQEAgc3RhdGljIGludCB3cml0ZV9hbGwoaW50IGZkLCBj b25zdCBjaGFyKiBidWYsIHNpemVfdCBsZW4pCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB2b2lk IHdyaXRlX3N5c2xvZyhzdHJ1Y3QgZG9tYWluICpkb20sIGNvbnN0IGNoYXIgKmRhdGEsIHNpemVf dCBzeikKK3sKKwljaGFyICpidWZmID0gTlVMTDsKKyAgICAgICAgY29uc3QgY2hhciAqc3RhcnQs ICpwOworICAgICAgICBpbnQgaSA9IDA7CisKKwlzdGFydCA9IHAgPSBkYXRhOworICAgICAgICBm b3IgKGkgPSAwOyBpIDwgc3o7IGkrKywgcCsrKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAo KnAgPT0gJ1xyJyB8fCAqcCA9PSAnXG4nKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGJ1ZmYgPSByZWFsbG9jKGJ1ZmYsIHAgLSBzdGFydCArIDEpOworCisgICAgICAgICAgICAgICAg bWVtY3B5KGJ1ZmYsIHN0YXJ0LCBwIC0gc3RhcnQpOworICAgICAgICAgICAgICAgIGJ1ZmZbcCAt IHN0YXJ0XSA9IDA7CisKKyAgICAgICAgICAgICAgICBpZiAoYnVmZlswXSA9PSAwIHx8IGJ1ZmZb MF0gPT0gJ1xuJykKKyAgICAgICAgICAgICAgICAgICAgZ290byBuZXh0OworCisgICAgICAgICAg ICAgICAgaWYgKGRvbSA9PSBOVUxMKSB7CisgICAgICAgICAgICAgICAgICAgIHN5c2xvZyhMT0df SU5GTywgImh5cGVydmlzb3I6ICVzIiwgYnVmZik7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgICAgICAgICAgc3lzbG9nKExPR19JTkZPLCAiZ3Vlc3QtJXMgKCVpKTogJXMi LCBkb20tPm5hbWUsIGRvbS0+ZG9taWQsIGJ1ZmYpOworICAgICAgICAgICAgICAgIH0KK25leHQ6 CisgICAgICAgICAgICAgICAgc3RhcnQgPSBwICsgMTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorfQorCiBzdGF0aWMgaW50IHdyaXRlX3dpdGhfdGltZXN0YW1wKGludCBmZCwgY29uc3QgY2hh ciAqZGF0YSwgc2l6ZV90IHN6LAogCQkJCWludCAqbmVlZHRzKQogewpAQCAtMTUyLDggKzE4NCw4 IEBAIHN0YXRpYyB2b2lkIGJ1ZmZlcl9hcHBlbmQoc3RydWN0IGRvbWFpbiAqZG9tKQogCiAJY29u cyA9IGludGYtPm91dF9jb25zOwogCXByb2QgPSBpbnRmLT5vdXRfcHJvZDsKLQl4ZW5fbWIoKTsK IAorCXhlbl9tYigpOwogCXNpemUgPSBwcm9kIC0gY29uczsKIAlpZiAoKHNpemUgPT0gMCkgfHwg KHNpemUgPiBzaXplb2YoaW50Zi0+b3V0KSkpCiAJCXJldHVybjsKQEAgLTE5Niw2ICsyMjgsOCBA QCBzdGF0aWMgdm9pZCBidWZmZXJfYXBwZW5kKHN0cnVjdCBkb21haW4gKmRvbSkKIAkJCWRvbG9n KExPR19FUlIsICJXcml0ZSB0byBsb2cgZmFpbGVkICIKIAkJCSAgICAgICJvbiBkb21haW4gJWQ6 ICVkICglcylcbiIsCiAJCQkgICAgICBkb20tPmRvbWlkLCBlcnJubywgc3RyZXJyb3IoZXJybm8p KTsKKwl9IGVsc2UgaWYgKHVzZV9zeXNsb2cpIHsKKwkJd3JpdGVfc3lzbG9nKGRvbSwgYnVmZmVy LT5kYXRhICsgYnVmZmVyLT5zaXplIC0gc2l6ZSwgc2l6ZSk7CiAJfQogCiAJaWYgKGRpc2NhcmRf b3ZlcmZsb3dlZF9kYXRhICYmIGJ1ZmZlci0+bWF4X2NhcGFjaXR5ICYmCkBAIC0yOTMsMTQgKzMy NywxNCBAQCBzdGF0aWMgaW50IGNyZWF0ZV9kb21haW5fbG9nKHN0cnVjdCBkb21haW4gKmRvbSkK IAlkYXRhID0geHNfcmVhZCh4cywgWEJUX05VTEwsIG5hbWVwYXRoLCAmbGVuKTsKIAlmcmVlKG5h bWVwYXRoKTsKIAlpZiAoIWRhdGEpCi0JCXJldHVybiAtMTsKKwkJZ290byBvdXQ7CiAJaWYgKCFs ZW4pIHsKIAkJZnJlZShkYXRhKTsKLQkJcmV0dXJuIC0xOworCQlnb3RvIG91dDsKIAl9CiAKKwlk b20tPm5hbWUgPSBkYXRhOwogCXNucHJpbnRmKGxvZ2ZpbGUsIFBBVEhfTUFYLTEsICIlcy9ndWVz dC0lcy5sb2ciLCBsb2dfZGlyLCBkYXRhKTsKLQlmcmVlKGRhdGEpOwogCWxvZ2ZpbGVbUEFUSF9N QVgtMV0gPSAnXDAnOwogCiAJZmQgPSBvcGVuKGxvZ2ZpbGUsIE9fV1JPTkxZfE9fQ1JFQVR8T19B UFBFTkQsIDA2NDQpOwpAQCAtMzE4LDYgKzM1Miw5IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2RvbWFp bl9sb2coc3RydWN0IGRvbWFpbiAqZG9tKQogCQl9CiAJfQogCXJldHVybiBmZDsKK291dDoKKyAg ICAgICAgZG9tLT5uYW1lID0gc3RyZHVwKCJ1bmFtZWQiKTsKKyAgICAgICAgcmV0dXJuIC0xOwog fQogCiBzdGF0aWMgdm9pZCBkb21haW5fY2xvc2VfdHR5KHN0cnVjdCBkb21haW4gKmRvbSkKQEAg LTY1Niw2ICs2OTMsNyBAQCBzdGF0aWMgc3RydWN0IGRvbWFpbiAqY3JlYXRlX2RvbWFpbihpbnQg ZG9taWQpCiAJZG9tLT5yZW1vdGVfcG9ydCA9IC0xOwogCWRvbS0+aW50ZXJmYWNlID0gTlVMTDsK IAlkb20tPnhjZV9oYW5kbGUgPSBOVUxMOworCWRvbS0+bmFtZSA9IE5VTEw7CiAKIAlpZiAoIXdh dGNoX2RvbWFpbihkb20sIHRydWUpKQogCQlnb3RvIG91dDsKQEAgLTcxMiw2ICs3NTAsMTEgQEAg c3RhdGljIHZvaWQgY2xlYW51cF9kb21haW4oc3RydWN0IGRvbWFpbiAqZCkKIAlmcmVlKGQtPmNv bnNwYXRoKTsKIAlkLT5jb25zcGF0aCA9IE5VTEw7CiAKKyAgICAgICAgaWYgKGQtPm5hbWUpIHsK KwkgICAgZnJlZShkLT5uYW1lKTsKKwkgICAgZC0+bmFtZSA9IE5VTEw7CisgICAgICAgIH0KKwog CXJlbW92ZV9kb21haW4oZCk7CiB9CiAKQEAgLTg4OCwxNyArOTMxLDIzIEBAIHN0YXRpYyB2b2lk IGhhbmRsZV9odl9sb2dzKHZvaWQpCiAJCXJldHVybjsKIAogCWlmICh4Y19yZWFkY29uc29sZXJp bmcoeGNoLCBidWZwdHIsICZzaXplLCAwLCAxLCAmaW5kZXgpID09IDAgJiYgc2l6ZSA+IDApIHsK LQkJaW50IGxvZ3JldDsKLQkJaWYgKGxvZ190aW1lX2h2KQotCQkJbG9ncmV0ID0gd3JpdGVfd2l0 aF90aW1lc3RhbXAobG9nX2h2X2ZkLCBidWZmZXIsIHNpemUsCi0JCQkJCQkgICAgICAmbG9nX3Rp bWVfaHZfbmVlZHRzKTsKLQkJZWxzZQotCQkJbG9ncmV0ID0gd3JpdGVfYWxsKGxvZ19odl9mZCwg YnVmZmVyLCBzaXplKTsKKwkJaWYgKGxvZ19odl9mZCAhPSAtMSkgeworCQkJaW50IGxvZ3JldDsK KwkJCWlmIChsb2dfdGltZV9odikKKwkJCQlsb2dyZXQgPSB3cml0ZV93aXRoX3RpbWVzdGFtcChs b2dfaHZfZmQsIGJ1ZmZlciwgc2l6ZSwKKwkJCQkJCQkgICAgICAmbG9nX3RpbWVfaHZfbmVlZHRz KTsKKwkJCWVsc2UKKwkJCQlsb2dyZXQgPSB3cml0ZV9hbGwobG9nX2h2X2ZkLCBidWZmZXIsIHNp emUpOworCisJCQlpZiAobG9ncmV0IDwgMCkKKwkJCQlkb2xvZyhMT0dfRVJSLCAiRmFpbGVkIHRv IHdyaXRlIGh5cGVydmlzb3IgbG9nOiAiCisJCQkJCSAgICAgICAiJWQgKCVzKSIsIGVycm5vLCBz dHJlcnJvcihlcnJubykpOworCQl9CiAKLQkJaWYgKGxvZ3JldCA8IDApCi0JCQlkb2xvZyhMT0df RVJSLCAiRmFpbGVkIHRvIHdyaXRlIGh5cGVydmlzb3IgbG9nOiAiCi0JCQkJICAgICAgICIlZCAo JXMpIiwgZXJybm8sIHN0cmVycm9yKGVycm5vKSk7Ci0JfQorCQlpZiAodXNlX3N5c2xvZykKKwkJ CXdyaXRlX3N5c2xvZyhOVUxMLCBidWZmZXIsIHNpemUpOworCisgICAgICAgIH0KIAogCSh2b2lk KXhjX2V2dGNobl91bm1hc2soeGNlX2hhbmRsZSwgcG9ydCk7CiB9CkBAIC05NDAsOCArOTg5LDYg QEAgdm9pZCBoYW5kbGVfaW8odm9pZCkKIAkJCWdvdG8gb3V0OwogCQl9CiAJCWxvZ19odl9mZCA9 IGNyZWF0ZV9odl9sb2coKTsKLQkJaWYgKGxvZ19odl9mZCA9PSAtMSkKLQkJCWdvdG8gb3V0Owog CQlsb2dfaHZfZXZ0Y2huID0geGNfZXZ0Y2huX2JpbmRfdmlycSh4Y2VfaGFuZGxlLCBWSVJRX0NP Tl9SSU5HKTsKIAkJaWYgKGxvZ19odl9ldnRjaG4gPT0gLTEpIHsKIAkJCWRvbG9nKExPR19FUlIs ICJGYWlsZWQgdG8gYmluZCB0byBWSVJRX0NPTl9SSU5HOiAiCmRpZmYgLS1naXQgYS90b29scy9j b25zb2xlL2RhZW1vbi9tYWluLmMgYi90b29scy9jb25zb2xlL2RhZW1vbi9tYWluLmMKaW5kZXgg Nzg5YmFhNi4uMmM3ZTI2NyAxMDA2NDQKLS0tIGEvdG9vbHMvY29uc29sZS9kYWVtb24vbWFpbi5j CisrKyBiL3Rvb2xzL2NvbnNvbGUvZGFlbW9uL21haW4uYwpAQCAtMzksNiArMzksNyBAQCBpbnQg bG9nX3RpbWVfaHYgPSAwOwogaW50IGxvZ190aW1lX2d1ZXN0ID0gMDsKIGNoYXIgKmxvZ19kaXIg PSBOVUxMOwogaW50IGRpc2NhcmRfb3ZlcmZsb3dlZF9kYXRhID0gMTsKK2ludCB1c2Vfc3lzbG9n ID0gMDsKIAogc3RhdGljIHZvaWQgaGFuZGxlX2h1cChpbnQgc2lnKQogewpAQCAtNDcsNyArNDgs NyBAQCBzdGF0aWMgdm9pZCBoYW5kbGVfaHVwKGludCBzaWcpCiAKIHN0YXRpYyB2b2lkIHVzYWdl KGNoYXIgKm5hbWUpCiB7Ci0JcHJpbnRmKCJVc2FnZTogJXMgWy1oXSBbLVZdIFstdl0gWy1pXSBb LS1sb2c9bm9uZXxndWVzdHxodnxhbGxdIFstLWxvZy1kaXI9RElSXSBbLS1waWQtZmlsZT1QQVRI XSBbLXQsIC0tdGltZXN0YW1wPW5vbmV8Z3Vlc3R8aHZ8YWxsXSBbLW8sIC0tb3ZlcmZsb3ctZGF0 YT1kaXNjYXJkfGtlZXBdXG4iLCBuYW1lKTsKKwlwcmludGYoIlVzYWdlOiAlcyBbLWhdIFstVl0g Wy12XSBbLWldIFstLWxvZz1ub25lfGd1ZXN0fGh2fGFsbF0gWy0tc3lzbG9nXSBbLS1sb2ctZGly PURJUl0gWy0tcGlkLWZpbGU9UEFUSF0gWy10LCAtLXRpbWVzdGFtcD1ub25lfGd1ZXN0fGh2fGFs bF0gWy1vLCAtLW92ZXJmbG93LWRhdGE9ZGlzY2FyZHxrZWVwXVxuIiwgbmFtZSk7CiB9CiAKIHN0 YXRpYyB2b2lkIHZlcnNpb24oY2hhciAqbmFtZSkKQEAgLTY4LDYgKzY5LDcgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCQl7ICJwaWQtZmlsZSIsIDEsIDAsICdwJyB9LAogCQl7 ICJ0aW1lc3RhbXAiLCAxLCAwLCAndCcgfSwKIAkJeyAib3ZlcmZsb3ctZGF0YSIsIDEsIDAsICdv J30sCisJCXsgInN5c2xvZyIsIDAsIDAsICdzJyB9LAogCQl7IDAgfSwKIAl9OwogCWJvb2wgaXNf aW50ZXJhY3RpdmUgPSBmYWxzZTsKQEAgLTEwNiw2ICsxMDgsOSBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAJCQkgICAgICBsb2dfZ3Vlc3QgPSAxOwogCQkJfQogCQkJYnJlYWs7 CisJCWNhc2UgJ3MnOgorICAgICAgICAgICAgICAgICAgICAgICAgdXNlX3N5c2xvZyA9IDE7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKIAkJY2FzZSAncic6CiAJCSAgICAgICAgbG9n X2RpciA9IHN0cmR1cChvcHRhcmcpOwogCQkJYnJlYWs7Cg== --bcaec501c52c50c5a504c0c41bbf Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --bcaec501c52c50c5a504c0c41bbf--