From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PULL 1/2] xen-block: only advertize discard to the frontend when it is enabled... Date: Thu, 4 Apr 2019 18:07:21 +0100 Message-ID: <20190404170722.4492-2-anthony.perard@citrix.com> References: <20190404170722.4492-1-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hC5pt-0002qb-91 for xen-devel@lists.xenproject.org; Thu, 04 Apr 2019 17:07:33 +0000 In-Reply-To: <20190404170722.4492-1-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Anthony PERARD , xen-devel@lists.xenproject.org, Peter Maydell List-Id: xen-devel@lists.xenproject.org RnJvbTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KCi4uLmFuZCBwcm9w ZXJseSBlbmFibGUgaXQgd2hlbiBzeW50aGVzaXppbmcgYSBkcml2ZS4KClRoZSBYZW4gdG9vbHN0 YWNrIHNldHMgJ2Rpc2NhcmQtZW5hYmxlJyB0byAnMScgaW4geGVuc3RvcmUgd2hlbiBpdCB3YW50 cwp0byBlbmFibGUgZGlzY2FyZCBvbiBhIHNwZWNpZmllZCBpbWFnZS4gVGhlIGNvZGUgaW4KeGVu X2Jsb2NrX2RyaXZlX2NyZWF0ZSgpIGNvcnJlY3RseSBwYXJzZXMgdGhpcyBhbmQgdXNlcyBpdCB0 byBzZXQKJ2Rpc2NhcmQnIHRvICd1bm1hcCcgZm9yIHRoZSBmaWxlX2xheWVyLCBidXQgZmFpbHMg dG8gZG8gdGhlIHNhbWUgZm9yIHRoZQpkcml2ZXJfbGF5ZXIgKHdoaWNoIGVmZmVjdGl2ZWx5IGRp c2FibGVzIGl0KS4gTWVhbndoaWxlIHRoZSBjb2RlIGluCnhlbl9ibG9ja19yZWFsaXplKCkgYWR2 ZXJ0aXplcyBkaXNjYXJkIHN1cHBvcnQgdG8gdGhlIGZyb250ZW5kIGluIHRoZQpkZWZhdWx0IGNh c2UgKGJlY2F1c2UgY29uZi0+ZGlzY2FyZF9ncmFudWxhcml0eSBkZWZhdWx0cyB0byAtMSksIGV2 ZW4gd2hlbgp0aGUgdW5kZXJseWluZyBpbWFnZSBtYXkgbm90IGhhbmRsZSBpdC4KClRoaXMgcGF0 Y2ggYWRkcyB0aGUgbWlzc2luZyBvcHRpb24gdG8gdGhlIGRyaXZlcl9sYXllciBpbgp4ZW5fYmxv Y2tfZHJpdmVyX2NyZWF0ZSgpIGFuZCBjaGVja3Mgd2hldGhlciBCRFJWX09fVU5NQVAgaXMgYWN0 dWFsbHkKc2V0IG9uIHRoZSBibG9jayBkZXZpY2UgYmVmb3JlIGFkdmVydGl6aW5nIGRpc2NhcmQg dG8gdGhlIGZyb250ZW5kLgpJbiB0aGUgY2FzZSB0aGF0IGRpc2NhcmQgaXMgc3VwcG9ydGVkIGl0 IGFsc28gbWFrZXMgc3VyZSB0aGF0IHRoZQpncmFudWxhcml0eSBpcyBzZXQgdG8gdGhlIHBoeXNp Y2FsIGJsb2NrIHNpemUuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFu dEBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogQW50aG9ueSBQRVJBUkQgPGFudGhvbnkucGVyYXJk QGNpdHJpeC5jb20+Ck1lc3NhZ2UtSWQ6IDwyMDE5MDMyMDE0MjgyNS4yNDU2NS0xLXBhdWwuZHVy cmFudEBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBBbnRob255IFBFUkFSRCA8YW50aG9ueS5w ZXJhcmRAY2l0cml4LmNvbT4KLS0tCiBody9ibG9jay94ZW4tYmxvY2suYyB8IDEyICsrKysrKysr Ky0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9ody9ibG9jay94ZW4tYmxvY2suYyBiL2h3L2Jsb2NrL3hlbi1ibG9jay5jCmlu ZGV4IDljNzIyYjliOTUuLjQ3NWE2Nzg0NWQgMTAwNjQ0Ci0tLSBhL2h3L2Jsb2NrL3hlbi1ibG9j ay5jCisrKyBiL2h3L2Jsb2NrL3hlbi1ibG9jay5jCkBAIC0yMzIsOCArMjMyLDE0IEBAIHN0YXRp YyB2b2lkIHhlbl9ibG9ja19yZWFsaXplKFhlbkRldmljZSAqeGVuZGV2LCBFcnJvciAqKmVycnAp CiAgICAgYmxrX3NldF9kZXZfb3BzKGNvbmYtPmJsaywgJnhlbl9ibG9ja19kZXZfb3BzLCBibG9j a2Rldik7CiAgICAgYmxrX3NldF9ndWVzdF9ibG9ja19zaXplKGNvbmYtPmJsaywgY29uZi0+bG9n aWNhbF9ibG9ja19zaXplKTsKIAotICAgIGlmIChjb25mLT5kaXNjYXJkX2dyYW51bGFyaXR5ID4g MCkgeworICAgIGlmIChjb25mLT5kaXNjYXJkX2dyYW51bGFyaXR5ID09IC0xKSB7CisgICAgICAg IGNvbmYtPmRpc2NhcmRfZ3JhbnVsYXJpdHkgPSBjb25mLT5waHlzaWNhbF9ibG9ja19zaXplOwor ICAgIH0KKworICAgIGlmIChibGtfZ2V0X2ZsYWdzKGNvbmYtPmJsaykgJiBCRFJWX09fVU5NQVAp IHsKICAgICAgICAgeGVuX2RldmljZV9iYWNrZW5kX3ByaW50Zih4ZW5kZXYsICJmZWF0dXJlLWRp c2NhcmQiLCAiJXUiLCAxKTsKKyAgICAgICAgeGVuX2RldmljZV9iYWNrZW5kX3ByaW50Zih4ZW5k ZXYsICJkaXNjYXJkLWdyYW51bGFyaXR5IiwgIiV1IiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25mLT5kaXNjYXJkX2dyYW51bGFyaXR5KTsKICAgICB9CiAKICAgICB4ZW5f ZGV2aWNlX2JhY2tlbmRfcHJpbnRmKHhlbmRldiwgImZlYXR1cmUtZmx1c2gtY2FjaGUiLCAiJXUi LCAxKTsKQEAgLTc1NSw2ICs3NjEsNyBAQCBzdGF0aWMgWGVuQmxvY2tEcml2ZSAqeGVuX2Jsb2Nr X2RyaXZlX2NyZWF0ZShjb25zdCBjaGFyICppZCwKICAgICBkcml2ZS0+aWQgPSBnX3N0cmR1cChp ZCk7CiAKICAgICBmaWxlX2xheWVyID0gcWRpY3RfbmV3KCk7CisgICAgZHJpdmVyX2xheWVyID0g cWRpY3RfbmV3KCk7CiAKICAgICBxZGljdF9wdXRfc3RyKGZpbGVfbGF5ZXIsICJkcml2ZXIiLCAi ZmlsZSIpOwogICAgIHFkaWN0X3B1dF9zdHIoZmlsZV9sYXllciwgImZpbGVuYW1lIiwgZmlsZW5h bWUpOwpAQCAtNzgyLDYgKzc4OSw3IEBAIHN0YXRpYyBYZW5CbG9ja0RyaXZlICp4ZW5fYmxvY2tf ZHJpdmVfY3JlYXRlKGNvbnN0IGNoYXIgKmlkLAogCiAgICAgICAgIGlmICghcWVtdV9zdHJ0b3Vs KGRpc2NhcmRfZW5hYmxlLCBOVUxMLCAyLCAmdmFsdWUpICYmICEhdmFsdWUpIHsKICAgICAgICAg ICAgIHFkaWN0X3B1dF9zdHIoZmlsZV9sYXllciwgImRpc2NhcmQiLCAidW5tYXAiKTsKKyAgICAg ICAgICAgIHFkaWN0X3B1dF9zdHIoZHJpdmVyX2xheWVyLCAiZGlzY2FyZCIsICJ1bm1hcCIpOwog ICAgICAgICB9CiAgICAgfQogCkBAIC03OTEsOCArNzk5LDYgQEAgc3RhdGljIFhlbkJsb2NrRHJp dmUgKnhlbl9ibG9ja19kcml2ZV9jcmVhdGUoY29uc3QgY2hhciAqaWQsCiAgICAgICovCiAgICAg cWRpY3RfcHV0X3N0cihmaWxlX2xheWVyLCAibG9ja2luZyIsICJvZmYiKTsKIAotICAgIGRyaXZl cl9sYXllciA9IHFkaWN0X25ldygpOwotCiAgICAgcWRpY3RfcHV0X3N0cihkcml2ZXJfbGF5ZXIs ICJkcml2ZXIiLCBkcml2ZXIpOwogICAgIGdfZnJlZShkcml2ZXIpOwogCi0tIApBbnRob255IFBF UkFSRAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBz Oi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=