From mboxrd@z Thu Jan 1 00:00:00 1970 From: Owen Smith Subject: [PATCH 2/2 v2] xenfb: Allow vkbd to connect without a DisplayState Date: Mon, 3 Jul 2017 13:17:41 +0000 Message-ID: <1499087861-2132-3-git-send-email-owen.smith@citrix.com> References: <1499087861-2132-1-git-send-email-owen.smith@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1499087861-2132-1-git-send-email-owen.smith@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, sstabellini@kernel.org, kraxel@redhat.com, Owen Smith , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org SWYgdGhlIHZrYmQgZGV2aWNlIG1vZGVsIGlzIHJlZ2lzdGVyZWQgYW5kIHRoZSB2ZmIgZGV2aWNl IG1vZGVsCmlzIG5vdCByZWdpc3RlcmVkLCB0aGUgYmFja2VuZCB3aWxsIG5vdCB0cmFuc2l0aW9u IHRvIGNvbm5lY3RlZC4KSWYgdGhlcmUgaXMgbm8gRGlzcGxheVN0YXRlLCB0aGVuIHRoZSBhYnNv bHV0ZSBjb29yZGluYXRlcyBjYW5ub3QKYmUgc2NhbGVkLCBhbmQgd2lsbCByZW1haW4gaW4gdGhl IHJhbmdlIFswLCAweDdmZmZdLgpCYWNrZW5kIHdyaXRlcyAiZmVhdHVyZS1yYXctcG9pbnRlciIg dG8gaW5kaWNhdGUgdGhhdCB0aGUgYmFja2VuZApzdXBwb3J0cyByZXBvcnRpbmcgYWJzb2x1dGUg cG9zaXRpb24gd2l0aG91dCByZXNjYWxpbmcuClRoZSBmcm9udGVuZCB1c2VzICJyZXF1ZXN0LXJh dy1wb2ludGVyIiB0byByZXF1ZXN0IHJhdyB1bnNjYWxlZApwb2ludGVyIHZhbHVlcy4gSWYgdGhl cmUgaXMgbm8gRGlzcGxheVN0YXRlLCB0aGUgYWJzb2x1dGUgdmFsdWVzCmFyZSBhbHdheXMgcmF3 IHVuc2NhbGVkIHZhbHVlcy4KClNpZ25lZC1vZmYtYnk6IE93ZW4gU21pdGggPG93ZW4uc21pdGhA Y2l0cml4LmNvbT4KLS0tCiBody9kaXNwbGF5L3hlbmZiLmMgfCAzNiArKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9kaXNwbGF5L3hlbmZiLmMgYi9ody9kaXNw bGF5L3hlbmZiLmMKaW5kZXggODg4MTVkZi4uZDQwYWY2ZSAxMDA2NDQKLS0tIGEvaHcvZGlzcGxh eS94ZW5mYi5jCisrKyBiL2h3L2Rpc3BsYXkveGVuZmIuYwpAQCAtNTMsNiArNTMsNyBAQCBzdHJ1 Y3QgY29tbW9uIHsKIHN0cnVjdCBYZW5JbnB1dCB7CiAgICAgc3RydWN0IGNvbW1vbiBjOwogICAg IGludCBhYnNfcG9pbnRlcl93YW50ZWQ7IC8qIFdoZXRoZXIgZ3Vlc3Qgc3VwcG9ydHMgYWJzb2x1 dGUgcG9pbnRlciAqLworICAgIGludCByYXdfcG9pbnRlcl93YW50ZWQ7IC8qIFdoZXRoZXIgZ3Vl c3Qgc3VwcG9ydHMgdW5zY2FsZWQgcG9pbnRlciAqLwogICAgIGludCBidXR0b25fc3RhdGU7ICAg ICAgIC8qIExhc3Qgc2VlbiBwb2ludGVyIGJ1dHRvbiBzdGF0ZSAqLwogICAgIGludCBleHRlbmRl ZDsKICAgICAvKiBrYmQgKi8KQEAgLTMyOSwxOCArMzMwLDIyIEBAIHN0YXRpYyB2b2lkIHhlbmZi X21vdXNlX2V2ZW50KHZvaWQgKm9wYXF1ZSwKIAkJCSAgICAgIGludCBkeCwgaW50IGR5LCBpbnQg ZHosIGludCBidXR0b25fc3RhdGUpCiB7CiAgICAgc3RydWN0IFhlbklucHV0ICp4ZW5mYiA9IG9w YXF1ZTsKLSAgICBEaXNwbGF5U3VyZmFjZSAqc3VyZmFjZSA9IHFlbXVfY29uc29sZV9zdXJmYWNl KHhlbmZiLT5jLmNvbik7Ci0gICAgaW50IGR3ID0gc3VyZmFjZV93aWR0aChzdXJmYWNlKTsKLSAg ICBpbnQgZGggPSBzdXJmYWNlX2hlaWdodChzdXJmYWNlKTsKLSAgICBpbnQgaTsKKyAgICBpbnQg aSwgeCwgeTsKKyAgICBpZiAoeGVuZmItPmMuY29uICYmIHhlbmZiLT5yYXdfcG9pbnRlcl93YW50 ZWQgIT0gMSkgeworICAgICAgICBEaXNwbGF5U3VyZmFjZSAqc3VyZmFjZSA9IHFlbXVfY29uc29s ZV9zdXJmYWNlKHhlbmZiLT5jLmNvbik7CisgICAgICAgIGludCBkdyA9IHN1cmZhY2Vfd2lkdGgo c3VyZmFjZSk7CisgICAgICAgIGludCBkaCA9IHN1cmZhY2VfaGVpZ2h0KHN1cmZhY2UpOworICAg ICAgICB4ID0gZHggKiAoZHcgLSAxKSAvIDB4N2ZmZjsKKyAgICAgICAgeSA9IGR5ICogKGRoIC0g MSkgLyAweDdmZmY7CisgICAgfSBlbHNlIHsKKyAgICAgICAgeCA9IGR4OworICAgICAgICB5ID0g ZHk7CisgICAgfQogCiAgICAgdHJhY2VfeGVuZmJfbW91c2VfZXZlbnQob3BhcXVlLCBkeCwgZHks IGR6LCBidXR0b25fc3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuZmItPmFi c19wb2ludGVyX3dhbnRlZCk7CiAgICAgaWYgKHhlbmZiLT5hYnNfcG9pbnRlcl93YW50ZWQpCi0J eGVuZmJfc2VuZF9wb3NpdGlvbih4ZW5mYiwKLQkJCSAgICBkeCAqIChkdyAtIDEpIC8gMHg3ZmZm LAotCQkJICAgIGR5ICogKGRoIC0gMSkgLyAweDdmZmYsCi0JCQkgICAgZHopOworICAgICAgICB4 ZW5mYl9zZW5kX3Bvc2l0aW9uKHhlbmZiLCB4LCB5LCBkeik7CiAgICAgZWxzZQogCXhlbmZiX3Nl bmRfbW90aW9uKHhlbmZiLCBkeCwgZHksIGR6KTsKIApAQCAtNDIzLDYgKzQyOCw3IEBAIHN0YXRp YyB2b2lkIHhlbmZiX2xlZ2FjeV9tb3VzZV9zeW5jKERldmljZVN0YXRlICpkZXYpCiBzdGF0aWMg aW50IGlucHV0X2luaXQoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQogewogICAgIHhlbnN0b3Jl X3dyaXRlX2JlX2ludCh4ZW5kZXYsICJmZWF0dXJlLWFicy1wb2ludGVyIiwgMSk7CisgICAgeGVu c3RvcmVfd3JpdGVfYmVfaW50KHhlbmRldiwgImZlYXR1cmUtcmF3LXBvaW50ZXIiLCAxKTsKICAg ICByZXR1cm4gMDsKIH0KIApAQCAtNDMyLDggKzQzOCwxNCBAQCBzdGF0aWMgaW50IGlucHV0X2lu aXRpYWxpc2Uoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQogICAgIGludCByYzsKIAogICAgIGlm ICghaW4tPmMuY29uKSB7Ci0gICAgICAgIHhlbl9wdl9wcmludGYoeGVuZGV2LCAxLCAiZHMgbm90 IHNldCAoeWV0KVxuIik7Ci0gICAgICAgIHJldHVybiAtMTsKKyAgICAgICAgY2hhciAqdmZiID0g eGVuc3RvcmVfcmVhZF9zdHIoTlVMTCwgImRldmljZS92ZmIiKTsKKyAgICAgICAgaWYgKHZmYiA9 PSBOVUxMKSB7CisgICAgICAgICAgICAvKiB0aGVyZSBpcyBubyB2ZmIsIHJ1biB2a2JkIG9uIGl0 cyBvd24gKi8KKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGZyZWUodmZiKTsKKyAgICAg ICAgICAgIHhlbl9wdl9wcmludGYoeGVuZGV2LCAxLCAiZHMgbm90IHNldCAoeWV0KVxuIik7Cisg ICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIH0KICAgICB9CiAKICAgICByYyA9IGNvbW1v bl9iaW5kKCZpbi0+Yyk7CkBAIC00NTEsNiArNDYzLDEwIEBAIHN0YXRpYyB2b2lkIGlucHV0X2Nv bm5lY3RlZChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICZpbi0+YWJzX3BvaW50ZXJfd2FudGVkKSA9PSAtMSkgewogICAgICAgICBpbi0+YWJz X3BvaW50ZXJfd2FudGVkID0gMDsKICAgICB9CisgICAgaWYgKHhlbnN0b3JlX3JlYWRfZmVfaW50 KHhlbmRldiwgInJlcXVlc3QtcmF3LXBvaW50ZXIiLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAmaW4tPnJhd19wb2ludGVyX3dhbnRlZCkgPT0gLTEpIHsKKyAgICAgICAgaW4tPnJhd19w b2ludGVyX3dhbnRlZCA9IDA7CisgICAgfQogCiAgICAgaWYgKGluLT5xa2JkKSB7CiAgICAgICAg IHFlbXVfaW5wdXRfaGFuZGxlcl91bnJlZ2lzdGVyKGluLT5xa2JkKTsKLS0gCjIuMS40CgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcv eGVuLWRldmVsCg==