From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.7 3/7] tools/blktap2: Fix array initialisers for tapdisk_disk_{types, drivers}[] Date: Wed, 27 Apr 2016 18:01:22 +0100 Message-ID: <1461776486-31484-4-git-send-email-andrew.cooper3@citrix.com> References: <1461776486-31484-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1461776486-31484-1-git-send-email-andrew.cooper3@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: Andrew Cooper , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org Q2xhbmcgcG9pbnRzIG91dDoKCiAgdGFwZGlzay1kaXNrdHlwZS5jOjExNzoyOiBlcnJvcjogaW5p dGlhbGl6ZXIgb3ZlcnJpZGVzIHByaW9yIGluaXRpYWxpemF0aW9uCiAgb2YgdGhpcyBzdWJvYmpl Y3QgWy1XZXJyb3IsLVdpbml0aWFsaXplci1vdmVycmlkZXNdCiAgICAgICAgICAwLAogICAgICAg ICAgXgogIHRhcGRpc2stZGlza3R5cGUuYzoxMTU6MjM6IG5vdGU6IHByZXZpb3VzIGluaXRpYWxp emF0aW9uIGlzIGhlcmUKICAgICAgICAgIFtESVNLX1RZUEVfVklOREVYXSAgICAgID0gJnZoZF9p bmRleF9kaXNrLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBefn5+fn5+fn5+ fn5+fn4KCk1peGluZyBkaWZmZXJlbnQgaW5pdGlhbGlzZXIgc3R5bGVzIHNob3VsZCBiZSBhdm9p ZGVkOyBUaGUgYWN0dWFsIGJlaGF2aW91ciBpcwpkaWZmZXJlbnQgdG8gdGhlIGV4cGVjdGVkIGJl aGF2aW91ci4gIFRoaXMgc3BlY2lmaWMgZXhhbXBsZSBoYXMgYmVlbiBicm9rZW4Kc2luY2UgaXRz IGludHJvZHVjdGlvbiBpbiBjL3MgN2I0ZGVhNTU0ICJibGt0YXAyOiBGaXggdGFwZGlzayBkaXNr dHlwZSBpc3N1ZXMiCmluIDIwMTAsIGFuZCBpcyBjYXVzZWQgYnkgdGhlICcjaWYgMCcgYmxvY2sg cmVtb3ZpbmcgJnRhcGRpc2tfe3N5bmMsdm1ka30uCgpGaXJzdCBvZiBhbGwsIHJlbW92ZSB3aGF0 IHdlcmUgaW50ZW5kZWQgdG8gYmUgdHJhaWxpbmcgTlVMTCBlbnRyaWVzIGluCnRhcGRpc2tfZGlz a197dHlwZXMsZHJpdmVyc31bXSwgbWFraW5nIGNvbnNpc3RlbnQgdXNlIG9mIERlc2lnbmF0ZWQK SW5pdGlhbGlzZXJzIGZvciB0aGUgaW5pdGlhbGlzYXRpb24uCgpUaGlzIHJlcXVpcmVzIGNoYW5n aW5nIHRoZSBsb29wIGluIHRhcGRpc2tfZGlza3R5cGVfZmluZCgpIHRvIGJlIGJhc2VkIG9uIHRo ZQpudW1iZXIgb2YgZWxlbWVudHMgaW4gdGFwZGlza19kaXNrX3R5cGVzW10sIHJhdGhlciB0aGFu IGxvb2tpbmcgZm9yIHRoZSBmaXJzdApOVUxMLiAgVGhpcyBmaXhlcyBhIGxhdGVudCBidWcsIGFz IHRoZSB1c2Ugb2YgRGVzaWduYXRlZCBJbml0aWFsaXplcnMgY2F1c2VzCnRvIGludGVybWVkaWF0 ZSB6ZXJvIGVudHJpZXMgaWYgbm90IGFsbCBpbmRpY2VzIGFyZSBleHBsaWNpdGx5IHNwZWNpZmll ZC4KClRoZXJlIGlzIGEgc2Vjb25kIGxhdGVudCBidWcgd2hlcmUgdGFwZGlza19kaXNrdHlwZV9m aW5kKCkgYXNzdW1lcyB0aGF0CnRhcGRpc2tfZGlza19kcml2ZXJzW10gaGFzIGF0IGxlYXN0IGFz IG1hbnkgZW50cmllcyBhcyB0YXBkaXNrX2Rpc2tfdHlwZXNbXS4KVGhpcyBpcyBub3QgdGhlIGNh c2UgYW5kIHRhcGRpc2tfZGlza19kcml2ZXJzW10gaGFkIG9uZSBlbnRyeSBmZXdlciB0aGFuCnRh cGRpc2tfZGlza190eXBlc1tdLCBidXQgdGhlIE5VTEwgbG9vcCBib3VuZCBwcmV2ZW50ZWQgYW4g b3V0LW9mLWJvdW5kcyByZWFkCm9mIHRhcGRpc2tfZGlza19kcml2ZXJzW10uICBGaXggdGhlIGlz c3VlIGJ5IGV4cGxpY2l0bHkgZGVjbGFyaW5nCnRhcGRpc2tfZGlza19kcml2ZXJzW10gdG8gaGF2 ZSB0aGUgc2FtZSBudW1iZXIgb2YgZW50cmllcyBhcwp0YXBkaXNrX2Rpc2tfdHlwZXNbXS4KCkZp bmFsbHksIHRoaXMgbGVhZHMgdG8gYSBsaW5rZXIgZXJyb3IuICBJdCB0dXJucyBvdXQgdGhhdCB0 YXBkaXNrX3ZoZF9pbmRleApkb2Vzbid0IGV4aXN0LCBhbmQgSSBjYW4ndCBmaW5kIGFueSBldmlk ZW5jZSBpbiB0aGUgc291cmNlIGhpc3RvcnkgdG8gc3VnZ2VzdAp0aGF0IGl0IGV2ZXIgZGlkLiAg SSBjYW4gb25seSBwcmVzdW1lIHRoYXQgaXQgd291bGQgaGF2ZSBiZWVuICNpZiAwJ2Qgb3V0IGxp a2UKdGFwZGlza19zeW5jIGFuZCB0YXBkaXNrX3ZtZGsgaGFkIGl0IG5vdCBiZWVuIGZvciB0aGlz IGJ1ZyBwcmV2ZW50aW5nIGEgYnVpbGQKZmFpbHVyZS4gIERyb3AgYWxsIHRocmVlLgoKTm8gZnVu Y3Rpb25hbCBjaGFuZ2UsIGJ1dCBvbmx5IGJlY2F1c2Ugb2YgdGhlIHNwZWNpZmljIGxheW91dCBv Zgp0YXBkaXNrX2Rpc2tfdHlwZXNbXS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFu ZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSWFuIEphY2tzb24gPElhbi5KYWNrc29u QGV1LmNpdHJpeC5jb20+CkNDOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgoKUGxlYXNl IGNhbiBzb21lb25lIGNhcmVmdWxseSBjaGVjayBteSAiTm8gZnVuY3Rpb25hbCBjaGFuZ2UiIGFz c2VydGlvbj8gIEkgYW0KZmFpcmx5IHN1cmUgaXQgaXMgY29ycmVjdCwgYnV0IHRoaXMgaXMgYSBn bmFybHkuCi0tLQogdG9vbHMvYmxrdGFwMi9kcml2ZXJzL3RhcGRpc2stZGlza3R5cGUuYyB8IDIw ICsrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAx MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9ibGt0YXAyL2RyaXZlcnMvdGFwZGlz ay1kaXNrdHlwZS5jIGIvdG9vbHMvYmxrdGFwMi9kcml2ZXJzL3RhcGRpc2stZGlza3R5cGUuYwpp bmRleCBlOWE2ODkwLi5lODlkMzY0IDEwMDY0NAotLS0gYS90b29scy9ibGt0YXAyL2RyaXZlcnMv dGFwZGlzay1kaXNrdHlwZS5jCisrKyBiL3Rvb2xzL2Jsa3RhcDIvZHJpdmVycy90YXBkaXNrLWRp c2t0eXBlLmMKQEAgLTMzLDYgKzMzLDggQEAKICNpbmNsdWRlICJ0YXBkaXNrLWRpc2t0eXBlLmgi CiAjaW5jbHVkZSAidGFwZGlzay1tZXNzYWdlLmgiCiAKKyNkZWZpbmUgQVJSQVlfU0laRShhKSAo c2l6ZW9mIChhKSAvIHNpemVvZiAqKGEpKQorCiBzdGF0aWMgY29uc3QgZGlza19pbmZvX3QgYWlv X2Rpc2sgPSB7CiAgICAgICAgImFpbyIsCiAgICAgICAgInJhdyBpbWFnZSAoYWlvKSIsCkBAIC0x MTIsMzUgKzExNCwyNSBAQCBjb25zdCBkaXNrX2luZm9fdCAqdGFwZGlza19kaXNrX3R5cGVzW10g PSB7CiAJW0RJU0tfVFlQRV9MT0ddCT0gJmxvZ19kaXNrLAogCVtESVNLX1RZUEVfVklOREVYXQk9 ICZ2aGRfaW5kZXhfZGlzaywKIAlbRElTS19UWVBFX1JFTVVTXQk9ICZyZW11c19kaXNrLAotCTAs CiB9OwogCiBleHRlcm4gc3RydWN0IHRhcF9kaXNrIHRhcGRpc2tfYWlvOwotZXh0ZXJuIHN0cnVj dCB0YXBfZGlzayB0YXBkaXNrX3N5bmM7Ci1leHRlcm4gc3RydWN0IHRhcF9kaXNrIHRhcGRpc2tf dm1kazsKIGV4dGVybiBzdHJ1Y3QgdGFwX2Rpc2sgdGFwZGlza192aGRzeW5jOwogZXh0ZXJuIHN0 cnVjdCB0YXBfZGlzayB0YXBkaXNrX3ZoZDsKIGV4dGVybiBzdHJ1Y3QgdGFwX2Rpc2sgdGFwZGlz a19yYW07CiBleHRlcm4gc3RydWN0IHRhcF9kaXNrIHRhcGRpc2tfcWNvdzsKIGV4dGVybiBzdHJ1 Y3QgdGFwX2Rpc2sgdGFwZGlza19ibG9ja19jYWNoZTsKLWV4dGVybiBzdHJ1Y3QgdGFwX2Rpc2sg dGFwZGlza192aGRfaW5kZXg7CiBleHRlcm4gc3RydWN0IHRhcF9kaXNrIHRhcGRpc2tfbG9nOwog ZXh0ZXJuIHN0cnVjdCB0YXBfZGlzayB0YXBkaXNrX3JlbXVzOwogCi1jb25zdCBzdHJ1Y3QgdGFw X2Rpc2sgKnRhcGRpc2tfZGlza19kcml2ZXJzW10gPSB7Citjb25zdCBzdHJ1Y3QgdGFwX2Rpc2sg KnRhcGRpc2tfZGlza19kcml2ZXJzW0FSUkFZX1NJWkUodGFwZGlza19kaXNrX3R5cGVzKV0gPSB7 CiAJW0RJU0tfVFlQRV9BSU9dICAgICAgICAgPSAmdGFwZGlza19haW8sCi0jaWYgMAotCVtESVNL X1RZUEVfU1lOQ10gICAgICAgID0gJnRhcGRpc2tfc3luYywKLQlbRElTS19UWVBFX1ZNREtdICAg ICAgICA9ICZ0YXBkaXNrX3ZtZGssCi0jZW5kaWYKIAlbRElTS19UWVBFX1ZIRF0gICAgICAgICA9 ICZ0YXBkaXNrX3ZoZCwKIAlbRElTS19UWVBFX1JBTV0gICAgICAgICA9ICZ0YXBkaXNrX3JhbSwK IAlbRElTS19UWVBFX1FDT1ddICAgICAgICA9ICZ0YXBkaXNrX3Fjb3csCiAJW0RJU0tfVFlQRV9C TE9DS19DQUNIRV0gPSAmdGFwZGlza19ibG9ja19jYWNoZSwKLQlbRElTS19UWVBFX1ZJTkRFWF0g ICAgICA9ICZ0YXBkaXNrX3ZoZF9pbmRleCwKIAlbRElTS19UWVBFX0xPR10gICAgICAgICA9ICZ0 YXBkaXNrX2xvZywKIAlbRElTS19UWVBFX1JFTVVTXSAgICAgICA9ICZ0YXBkaXNrX3JlbXVzLAot CTAsCiB9OwogCiBpbnQKQEAgLTE0OSw3ICsxNDEsMTEgQEAgdGFwZGlza19kaXNrdHlwZV9maW5k KGNvbnN0IGNoYXIgKm5hbWUpCiAJY29uc3QgZGlza19pbmZvX3QgKmluZm87CiAJaW50IGk7CiAK LQlmb3IgKGkgPSAwOyBpbmZvID0gdGFwZGlza19kaXNrX3R5cGVzW2ldLCBpbmZvICE9IE5VTEw7 ICsraSkgeworCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRhcGRpc2tfZGlza190eXBlcyk7 ICsraSkgeworCQlpbmZvID0gdGFwZGlza19kaXNrX3R5cGVzW2ldOworCQlpZiAoIWluZm8pCisJ CQljb250aW51ZTsKKwogCQlpZiAoc3RyY21wKG5hbWUsIGluZm8tPm5hbWUpKQogCQkJY29udGlu dWU7CiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK