From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH] xen: fix qdisk BLKIF_OP_DISCARD for 32/64 word size mix Date: Thu, 16 Jun 2016 12:02:00 +0200 Message-ID: <1466071320-10964-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: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Cc: anthony.perard@citrix.com, Juergen Gross , sstabellini@kernel.org, kraxel@redhat.com List-Id: xen-devel@lists.xenproject.org SW4gY2FzZSB0aGUgd29yZCBzaXplIG9mIHRoZSBkb21VIGFuZCBxZW11IHJ1bm5pbmcgdGhlIHFk aXNrIGJhY2tlbmQKZGlmZmVyIEJMS0lGX09QX0RJU0NBUkQgd2lsbCBub3Qgd29yayByZWxpYWJs eSwgYXMgdGhlIHJlcXVlc3QKc3RydWN0dXJlIGluIHRoZSByaW5nIGhhdmUgZGlmZmVyZW50IGxh eW91dHMgZm9yIGRpZmZlcmVudCB3b3JkIHNpemUuCgpDb3JyZWN0IHRoaXMgYnkgY29weWluZyB0 aGUgcmVxdWVzdCBzdHJ1Y3R1cmUgaW4gY2FzZSBvZiBkaWZmZXJlbnQKd29yZCBzaXplIGVsZW1l bnQgYnkgZWxlbWVudCBpbiB0aGUgQkxLSUZfT1BfRElTQ0FSRCBjYXNlLCB0b28uCgpTaWduZWQt b2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Ci0tLQogaHcvYmxvY2sveGVu X2Jsa2lmLmggfCAyMCArKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDE4IGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvYmxvY2sveGVuX2Js a2lmLmggYi9ody9ibG9jay94ZW5fYmxraWYuaAppbmRleCBlM2IxMzNiLi45NjkxMTJmIDEwMDY0 NAotLS0gYS9ody9ibG9jay94ZW5fYmxraWYuaAorKysgYi9ody9ibG9jay94ZW5fYmxraWYuaApA QCAtMjYsNiArMjYsMTQgQEAgc3RydWN0IGJsa2lmX3g4Nl8zMl9yZXF1ZXN0IHsKIAlibGtpZl9z ZWN0b3JfdCBzZWN0b3JfbnVtYmVyOy8qIHN0YXJ0IHNlY3RvciBpZHggb24gZGlzayAoci93IG9u bHkpICAqLwogCXN0cnVjdCBibGtpZl9yZXF1ZXN0X3NlZ21lbnQgc2VnW0JMS0lGX01BWF9TRUdN RU5UU19QRVJfUkVRVUVTVF07CiB9Oworc3RydWN0IGJsa2lmX3g4Nl8zMl9yZXF1ZXN0X2Rpc2Nh cmQgeworICAgIHVpbnQ4X3QgICAgICAgIG9wZXJhdGlvbjsgICAgLyogQkxLSUZfT1BfRElTQ0FS RCAgICAgICAgICAgICAgICAgICAgICovCisgICAgdWludDhfdCAgICAgICAgZmxhZzsgICAgICAg ICAvKiBucl9zZWdtZW50cyBpbiByZXF1ZXN0IHN0cnVjdCAgICAgICAgKi8KKyAgICBibGtpZl92 ZGV2X3QgICBoYW5kbGU7ICAgICAgIC8qIG9ubHkgZm9yIHJlYWQvd3JpdGUgcmVxdWVzdHMgICAg ICAgICAqLworICAgIHVpbnQ2NF90ICAgICAgIGlkOyAgICAgICAgICAgLyogcHJpdmF0ZSBndWVz dCB2YWx1ZSwgZWNob2VkIGluIHJlc3AgICovCisgICAgYmxraWZfc2VjdG9yX3Qgc2VjdG9yX251 bWJlcjsvKiBzdGFydCBzZWN0b3IgaWR4IG9uIGRpc2sgKHIvdyBvbmx5KSAgKi8KKyAgICB1aW50 NjRfdCAgICAgICBucl9zZWN0b3JzOyAgIC8qICMgb2YgY29udGlndW91cyBzZWN0b3JzIHRvIGRp c2NhcmQgICAqLworfTsKIHN0cnVjdCBibGtpZl94ODZfMzJfcmVzcG9uc2UgewogCXVpbnQ2NF90 ICAgICAgICBpZDsgICAgICAgICAgICAgIC8qIGNvcGllZCBmcm9tIHJlcXVlc3QgKi8KIAl1aW50 OF90ICAgICAgICAgb3BlcmF0aW9uOyAgICAgICAvKiBjb3BpZWQgZnJvbSByZXF1ZXN0ICovCkBA IC00NCw2ICs1MiwxNCBAQCBzdHJ1Y3QgYmxraWZfeDg2XzY0X3JlcXVlc3QgewogCWJsa2lmX3Nl Y3Rvcl90IHNlY3Rvcl9udW1iZXI7Lyogc3RhcnQgc2VjdG9yIGlkeCBvbiBkaXNrIChyL3cgb25s eSkgICovCiAJc3RydWN0IGJsa2lmX3JlcXVlc3Rfc2VnbWVudCBzZWdbQkxLSUZfTUFYX1NFR01F TlRTX1BFUl9SRVFVRVNUXTsKIH07CitzdHJ1Y3QgYmxraWZfeDg2XzY0X3JlcXVlc3RfZGlzY2Fy ZCB7CisgICAgdWludDhfdCAgICAgICAgb3BlcmF0aW9uOyAgICAvKiBCTEtJRl9PUF9ESVNDQVJE ICAgICAgICAgICAgICAgICAgICAgKi8KKyAgICB1aW50OF90ICAgICAgICBmbGFnOyAgICAgICAg IC8qIG5yX3NlZ21lbnRzIGluIHJlcXVlc3Qgc3RydWN0ICAgICAgICAqLworICAgIGJsa2lmX3Zk ZXZfdCAgIGhhbmRsZTsgICAgICAgLyogb25seSBmb3IgcmVhZC93cml0ZSByZXF1ZXN0cyAgICAg ICAgICovCisgICAgdWludDY0X3QgICAgICAgX19hdHRyaWJ1dGVfXygoX19hbGlnbmVkX18oOCkp KSBpZDsKKyAgICBibGtpZl9zZWN0b3JfdCBzZWN0b3JfbnVtYmVyOy8qIHN0YXJ0IHNlY3RvciBp ZHggb24gZGlzayAoci93IG9ubHkpICAqLworICAgIHVpbnQ2NF90ICAgICAgIG5yX3NlY3RvcnM7 ICAgLyogIyBvZiBjb250aWd1b3VzIHNlY3RvcnMgdG8gZGlzY2FyZCAgICovCit9Owogc3RydWN0 IGJsa2lmX3g4Nl82NF9yZXNwb25zZSB7CiAJdWludDY0X3QgICAgICAgX19hdHRyaWJ1dGVfXygo X19hbGlnbmVkX18oOCkpKSBpZDsKIAl1aW50OF90ICAgICAgICAgb3BlcmF0aW9uOyAgICAgICAv KiBjb3BpZWQgZnJvbSByZXF1ZXN0ICovCkBAIC04Miw3ICs5OCw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBibGtpZl9nZXRfeDg2XzMyX3JlcShibGtpZl9yZXF1ZXN0X3QgKmRzdCwgYmxraWZfeDg2 XzMyX3JlcXVlCiAJLyogUHJldmVudCB0aGUgY29tcGlsZXIgZnJvbSB1c2luZyBzcmMtPi4uLiBp bnN0ZWFkLiAqLwogCWJhcnJpZXIoKTsKIAlpZiAoZHN0LT5vcGVyYXRpb24gPT0gQkxLSUZfT1Bf RElTQ0FSRCkgewotCQlzdHJ1Y3QgYmxraWZfcmVxdWVzdF9kaXNjYXJkICpzID0gKHZvaWQgKilz cmM7CisgICAgICAgICAgICAgICAgc3RydWN0IGJsa2lmX3g4Nl8zMl9yZXF1ZXN0X2Rpc2NhcmQg KnMgPSAodm9pZCAqKXNyYzsKIAkJc3RydWN0IGJsa2lmX3JlcXVlc3RfZGlzY2FyZCAqZCA9ICh2 b2lkICopZHN0OwogCQlkLT5ucl9zZWN0b3JzID0gcy0+bnJfc2VjdG9yczsKIAkJcmV0dXJuOwpA QCAtMTA1LDcgKzEyMSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBibGtpZl9nZXRfeDg2XzY0X3Jl cShibGtpZl9yZXF1ZXN0X3QgKmRzdCwgYmxraWZfeDg2XzY0X3JlcXVlCiAJLyogUHJldmVudCB0 aGUgY29tcGlsZXIgZnJvbSB1c2luZyBzcmMtPi4uLiBpbnN0ZWFkLiAqLwogCWJhcnJpZXIoKTsK IAlpZiAoZHN0LT5vcGVyYXRpb24gPT0gQkxLSUZfT1BfRElTQ0FSRCkgewotCQlzdHJ1Y3QgYmxr aWZfcmVxdWVzdF9kaXNjYXJkICpzID0gKHZvaWQgKilzcmM7CisgICAgICAgICAgICAgICAgc3Ry dWN0IGJsa2lmX3g4Nl82NF9yZXF1ZXN0X2Rpc2NhcmQgKnMgPSAodm9pZCAqKXNyYzsKIAkJc3Ry dWN0IGJsa2lmX3JlcXVlc3RfZGlzY2FyZCAqZCA9ICh2b2lkICopZHN0OwogCQlkLT5ucl9zZWN0 b3JzID0gcy0+bnJfc2VjdG9yczsKIAkJcmV0dXJuOwotLSAKMi42LjYKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=