From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH] libxl: Handle deprecation of QEMU's -usbdevice Date: Thu, 19 Jul 2018 18:29:29 +0100 Message-ID: <20180719172929.20866-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]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fgCkh-0002zg-Qs for xen-devel@lists.xenproject.org; Thu, 19 Jul 2018 17:30:07 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Anthony PERARD , Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org LXVzYmRldmljZSBpcyBkZXByZWNhdGVkIGFzIG9mIFFFTVUgMi4xMC4KClRoaXMgcGF0Y2ggcmVw bGFjZSB0aGUgZmV3IG9wdGlvbnMgZG9jdW1lbnRlZCBpbiB4bC5jZmcoNSkgYnkgdGhlCnJlY29t bWFuZGVkIHN5bnRheC4gQW5kIGlmIHRoZSBvcHRpb24gaXNuJ3QgcmVjb2duaXplLCBzaW1wbHkg dXNlCi11c2JkZXZpY2Ugd2l0aCBhIHdhcm5pbmcsIHRoZSBvcHRpb25zIGlzbid0IGVudGlyZWx5 IHJlbW92ZWQgZnJvbSBRRU1VCnVwc3RyZWFtLgoKQWxzbywgcmVtb3ZlIGZyb20gdGhlIG1hbnVh bCB0aGUgc2VudGVuY2UgaW52aXRpbmcgdG8gcmVhZCBRRU1VJ3MKZG9jdW1lbnRhdGlvbi4KClNp Z25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBlcmFyZEBjaXRyaXguY29tPgot LS0KIGRvY3MvbWFuL3hsLmNmZy5wb2QuNS5pbiB8ICAzIC0tCiB0b29scy9saWJ4bC9saWJ4bF9k bS5jICAgfCA2NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZG9jcy9tYW4veGwuY2ZnLnBvZC41LmluIGIvZG9jcy9tYW4veGwuY2ZnLnBvZC41LmluCmlu ZGV4IDA5OWEyOGRjN2EuLjc0Mzc1ZTAyMjUgMTAwNjQ0Ci0tLSBhL2RvY3MvbWFuL3hsLmNmZy5w b2QuNS5pbgorKysgYi9kb2NzL21hbi94bC5jZmcucG9kLjUuaW4KQEAgLTI0NjgsOSArMjQ2OCw2 IEBAIHdyaXRlICJob3N0OjguMiIuCiAKIFRoZSBmb3JtIHVzYmRldmljZT1ERVZJQ0UgaXMgYWxz byBhY2NlcHRlZCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCiAKLU1vcmUgdmFsaWQgb3B0 aW9ucyBjYW4gYmUgZm91bmQgaW4gdGhlICJ1c2JkZXZpY2UiIHNlY3Rpb24gb2YgdGhlIFFFTVUK LWRvY3VtZW50YXRpb24uCi0KID1pdGVtIEI8dmVuZG9yX2RldmljZT0iVkVORE9SX0RFVklDRSI+ CiAKIFNlbGVjdHMgd2hpY2ggdmFyaWFudCBvZiB0aGUgUUVNVSB4ZW4tcHZkZXZpY2Ugc2hvdWxk IGJlIHVzZWQgZm9yIHRoaXMKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMgYi90 b29scy9saWJ4bC9saWJ4bF9kbS5jCmluZGV4IGJkMTg3NDYzZWMuLjM2YTc3OGYyMDAgMTAwNjQ0 Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfZG0u YwpAQCAtOTEwLDYgKzkxMCw2MiBAQCBzdGF0aWMgY2hhciAqcWVtdV9kaXNrX2lkZV9kcml2ZV9z dHJpbmcobGlieGxfX2djICpnYywgY29uc3QgY2hhciAqdGFyZ2V0X3BhdGgsCiAgICAgcmV0dXJu IGRyaXZlOwogfQogCitzdGF0aWMgaW50IHFlbXVfc2V0X3VzYmRldmljZV9hcmcobGlieGxfX2dj ICpnYywgaW50IGRvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsZXhh cnJheV90ICpkbV9hcmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXIg KnVzYmRldmljZSkKK3sKKyAgICAvKgorICAgICAqIC11c2JkZXZpY2UgaXMgZGVwcmVjYXRlZCBz aW5jZSBRRU1VIDIuMTAsIHJlcGxhY2UgaXQgYnkgYW4gZXF1aXZhbGVudCBpZgorICAgICAqIHRo ZSBvcHRpb24gaXMgcmVjb2duaXplZCwgb3RoZXJ3aXNlIHVzZSB0aGUgZGVwcmVjYXRlZCAtdXNi ZGV2aWNlIGFuZAorICAgICAqIGhvcGUgUUVNVSBkaWRuJ3QgcmVtb3ZlIGl0IHlldC4KKyAgICAg Ki8KKworICAgIGlmICghc3RyY21wKHVzYmRldmljZSwgInRhYmxldCIpKSB7CisgICAgICAgIGZs ZXhhcnJheV9hcHBlbmRfcGFpcihkbV9hcmdzLCAiLWRldmljZSIsICJ1c2ItdGFibGV0Iik7Cisg ICAgICAgIHJldHVybiAwOworICAgIH0gZWxzZSBpZiAoIXN0cm5jbXAodXNiZGV2aWNlLCAiaG9z dDoiLCA1KSkgeworICAgICAgICBjb25zdCBjaGFyICpwYXJhbXM7CisgICAgICAgIGNvbnN0IGNo YXIgKnA7CisKKyAgICAgICAgcGFyYW1zID0gc3RyY2hyKHVzYmRldmljZSwgJzonKTsKKyAgICAg ICAgaWYgKCFwYXJhbXMpCisgICAgICAgICAgICBnb3RvIG91dDsKKworICAgICAgICBwYXJhbXMr KzsKKworICAgICAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsICItZGV2aWNlIik7CisKKyAg ICAgICAgcCA9IHN0cmNocihwYXJhbXMsICcuJyk7CisgICAgICAgIGlmIChwKSB7CisgICAgICAg ICAgICB1aW50MzJfdCBidXNfbnVtID0gc3RydG91bChwYXJhbXMsIE5VTEwsIDApOworICAgICAg ICAgICAgdWludDMyX3QgYWRkciAgICA9IHN0cnRvdWwocCArIDEsIE5VTEwsIDApOworICAgICAg ICAgICAgZmxleGFycmF5X2FwcGVuZChkbV9hcmdzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHQ1NQUklOVEYoInVzYi1ob3N0LGhvc3RidXM9JWQsaG9zdGFkZHI9JWQiLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVzX251bSwgYWRkcikpOworICAgICAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBwID0gc3RyY2hy KHBhcmFtcywgJzonKTsKKyAgICAgICAgICAgIGlmIChwKSB7CisgICAgICAgICAgICAgICAgdWlu dDMyX3QgdmVuZG9yX2lkICA9IHN0cnRvdWwocGFyYW1zLCBOVUxMLCAxNik7CisgICAgICAgICAg ICAgICAgdWludDMyX3QgcHJvZHVjdF9pZCA9IHN0cnRvdWwocCArIDEsIE5VTEwsIDE2KTsKKyAg ICAgICAgICAgICAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdDU1BSSU5URigidXNiLWhvc3QsdmVuZG9yaWQ9MHgleCxwcm9kdWN0aWQ9 MHgleCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZW5kb3JfaWQs IHByb2R1Y3RfaWQpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIC8qIGZhbGxiYWNrICovCisgICAgICAg IExPR0QoV0FSTiwgZG9taWQsICJBdHRlbXB0IHRvIHVzZSBkZXByZWNhdGVkIC11c2JkZXZpY2Ug UUVNVSBvcHRpb24iKTsKKyAgICAgICAgZmxleGFycmF5X2FwcGVuZF9wYWlyKGRtX2FyZ3MsICIt dXNiZGV2aWNlIiwgdXNiZGV2aWNlKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCitvdXQ6 CisgICAgTE9HRChFUlJPUiwgZG9taWQsICJGYWlsZWQgdG8gcGFyc2UgdXNiZGV2aWNlPSBvcHRp b24gJyVzJyIsIHVzYmRldmljZSk7CisgICAgcmV0dXJuIEVSUk9SX0lOVkFMOworfQorCiBzdGF0 aWMgaW50IGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWxfYXJnc19uZXcobGlieGxfX2djICpnYywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpkbSwg aW50IGd1ZXN0X2RvbWlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGxpYnhsX2RvbWFpbl9jb25maWcgKmd1ZXN0X2NvbmZpZywKQEAgLTExNzEsMTYgKzEy MjcsMTYgQEAgc3RhdGljIGludCBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxp YnhsX19nYyAqZ2MsCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBmbGV4YXJyYXlfYXBwZW5k KGRtX2FyZ3MsICItdXNiIik7CiAgICAgICAgICAgICBpZiAoYl9pbmZvLT51Lmh2bS51c2JkZXZp Y2UpIHsKLSAgICAgICAgICAgICAgICBmbGV4YXJyYXlfdmFwcGVuZChkbV9hcmdzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICItdXNiZGV2aWNlIiwgYl9pbmZvLT51Lmh2bS51 c2JkZXZpY2UsIE5VTEwpOworICAgICAgICAgICAgICAgIGlmIChxZW11X3NldF91c2JkZXZpY2Vf YXJnKGdjLCBndWVzdF9kb21pZCwgZG1fYXJncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBiX2luZm8tPnUuaHZtLnVzYmRldmljZSkpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoYl9pbmZv LT51Lmh2bS51c2JkZXZpY2VfbGlzdCkgewogICAgICAgICAgICAgICAgIGNoYXIgKipwOwogICAg ICAgICAgICAgICAgIGZvciAocCA9IGJfaW5mby0+dS5odm0udXNiZGV2aWNlX2xpc3Q7CiAgICAg ICAgICAgICAgICAgICAgICAqcDsKICAgICAgICAgICAgICAgICAgICAgIHArKykgewotICAgICAg ICAgICAgICAgICAgICBmbGV4YXJyYXlfdmFwcGVuZChkbV9hcmdzLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiLXVzYmRldmljZSIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICpwLCBOVUxMKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHFl bXVfc2V0X3VzYmRldmljZV9hcmcoZ2MsIGd1ZXN0X2RvbWlkLCBkbV9hcmdzLCAqcCkpCisgICAg ICAgICAgICAgICAgICAgICAgICByZXR1cm4gRVJST1JfSU5WQUw7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGJfaW5mby0+dS5odm0udXNidmVy c2lvbikgewotLSAKQW50aG9ueSBQRVJBUkQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs