From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH 2/3] libxl: refactor domcreate_attach_pci() to use device type framework Date: Tue, 21 Jun 2016 16:24:50 +0200 Message-ID: <1466519091-29348-3-git-send-email-jgross@suse.com> References: <1466519091-29348-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1466519091-29348-1-git-send-email-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Juergen Gross , wei.liu2@citrix.com, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org U2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgotLS0KIHRvb2xz L2xpYnhsL2xpYnhsX2NyZWF0ZS5jICAgfCA1NCArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCB8ICAxICsKIHRv b2xzL2xpYnhsL2xpYnhsX3BjaS5jICAgICAgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYyBiL3Rvb2xzL2xpYnhsL2xp YnhsX2NyZWF0ZS5jCmluZGV4IGJiMGY1MzUuLmM0ZTg1ZjAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xp YnhsL2xpYnhsX2NyZWF0ZS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCkBAIC03 NDIsMTAgKzc0Miw4IEBAIHN0YXRpYyB2b2lkIGRvbWNyZWF0ZV9ib290bG9hZGVyX2RvbmUobGli eGxfX2VnYyAqZWdjLAogc3RhdGljIHZvaWQgZG9tY3JlYXRlX2xhdW5jaF9kbShsaWJ4bF9fZWdj ICplZ2MsIGxpYnhsX19tdWx0aWRldiAqYW9kZXZzLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgcmV0KTsKIAotc3RhdGljIHZvaWQgZG9tY3JlYXRlX2F0dGFjaF9wY2kobGli eGxfX2VnYyAqZWdjLCBsaWJ4bF9fbXVsdGlkZXYgKmFvZGV2cywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludCByZXQpOwotc3RhdGljIHZvaWQgZG9tY3JlYXRlX2F0dGFjaF9k dGRldihsaWJ4bF9fZWdjICplZ2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxpYnhsX19kb21haW5fY3JlYXRlX3N0YXRlICpkY3MpOworc3RhdGljIHZvaWQgZG9tY3JlYXRl X2F0dGFjaF9kdGRldihsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19tdWx0aWRldiAqbXVsdGlkZXYs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCByZXQpOwogCiBzdGF0aWMg dm9pZCBkb21jcmVhdGVfY29uc29sZV9hdmFpbGFibGUobGlieGxfX2VnYyAqZWdjLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX19kb21haW5fY3JlYXRlX3N0 YXRlICpkY3MpOwpAQCAtMTQwNiw2ICsxNDA0LDcgQEAgc3RhdGljIHN0cnVjdCBsaWJ4bF9kZXZp Y2VfdHlwZSAqZGV2aWNlX3R5cGVfdGJsW10gPSB7CiAgICAgJmxpYnhsX192dHBtX2RldnR5cGUs CiAgICAgJmxpYnhsX191c2JjdHJsX2RldnR5cGUsCiAgICAgJmxpYnhsX191c2JkZXZfZGV2dHlw ZSwKKyAgICAmbGlieGxfX3BjaV9kZXZ0eXBlLAogfTsKIAogc3RhdGljIHZvaWQgZG9tY3JlYXRl X2F0dGFjaF9kZXZpY2VzKGxpYnhsX19lZ2MgKmVnYywKQEAgLTE0NDAsNyArMTQzOSw3IEBAIHN0 YXRpYyB2b2lkIGRvbWNyZWF0ZV9hdHRhY2hfZGV2aWNlcyhsaWJ4bF9fZWdjICplZ2MsCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBkb21jcmVhdGVfYXR0YWNoX3BjaShlZ2MsIG11bHRp ZGV2LCAwKTsKKyAgICBkb21jcmVhdGVfYXR0YWNoX2R0ZGV2KGVnYywgbXVsdGlkZXYsIDApOwog ICAgIHJldHVybjsKIAogZXJyb3Jfb3V0OgpAQCAtMTQ4MCw1MiArMTQ3OSwxMyBAQCBlcnJvcl9v dXQ6CiAgICAgZG9tY3JlYXRlX2NvbXBsZXRlKGVnYywgZGNzLCByZXQpOwogfQogCi1zdGF0aWMg dm9pZCBkb21jcmVhdGVfYXR0YWNoX3BjaShsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19tdWx0aWRl diAqbXVsdGlkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgcmV0KQot ewotICAgIGxpYnhsX19kb21haW5fY3JlYXRlX3N0YXRlICpkY3MgPSBDT05UQUlORVJfT0YobXVs dGlkZXYsICpkY3MsIG11bHRpZGV2KTsKLSAgICBTVEFURV9BT19HQyhkY3MtPmFvKTsKLSAgICBp bnQgaTsKLSAgICBpbnQgZG9taWQgPSBkY3MtPmd1ZXN0X2RvbWlkOwotCi0gICAgLyogY29udmVu aWVuY2UgYWxpYXNlcyAqLwotICAgIGxpYnhsX2RvbWFpbl9jb25maWcgKmNvbnN0IGRfY29uZmln ID0gZGNzLT5ndWVzdF9jb25maWc7Ci0KLSAgICBpZiAocmV0KSB7Ci0gICAgICAgIGdvdG8gZXJy b3Jfb3V0OwotICAgIH0KLQotICAgIGZvciAoaSA9IDA7IGkgPCBkX2NvbmZpZy0+bnVtX3BjaWRl dnM7IGkrKykgewotICAgICAgICByZXQgPSBsaWJ4bF9fZGV2aWNlX3BjaV9hZGQoZ2MsIGRvbWlk LCAmZF9jb25maWctPnBjaWRldnNbaV0sIDEpOwotICAgICAgICBpZiAocmV0IDwgMCkgewotICAg ICAgICAgICAgTE9HKEVSUk9SLCAibGlieGxfZGV2aWNlX3BjaV9hZGQgZmFpbGVkOiAlZCIsIHJl dCk7Ci0gICAgICAgICAgICBnb3RvIGVycm9yX291dDsKLSAgICAgICAgfQotICAgIH0KLQotICAg IGlmIChkX2NvbmZpZy0+bnVtX3BjaWRldnMgPiAwKSB7Ci0gICAgICAgIHJldCA9IGxpYnhsX19j cmVhdGVfcGNpX2JhY2tlbmQoZ2MsIGRvbWlkLCBkX2NvbmZpZy0+cGNpZGV2cywKLSAgICAgICAg ICAgIGRfY29uZmlnLT5udW1fcGNpZGV2cyk7Ci0gICAgICAgIGlmIChyZXQgPCAwKSB7Ci0gICAg ICAgICAgICBMT0coRVJST1IsICJsaWJ4bF9jcmVhdGVfcGNpX2JhY2tlbmQgZmFpbGVkOiAlZCIs IHJldCk7Ci0gICAgICAgICAgICBnb3RvIGVycm9yX291dDsKLSAgICAgICAgfQotICAgIH0KLQot ICAgIGRvbWNyZWF0ZV9hdHRhY2hfZHRkZXYoZWdjLCBkY3MpOwotICAgIHJldHVybjsKLQotZXJy b3Jfb3V0OgotICAgIGFzc2VydChyZXQpOwotICAgIGRvbWNyZWF0ZV9jb21wbGV0ZShlZ2MsIGRj cywgcmV0KTsKLX0KLQogc3RhdGljIHZvaWQgZG9tY3JlYXRlX2F0dGFjaF9kdGRldihsaWJ4bF9f ZWdjICplZ2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX19kb21h aW5fY3JlYXRlX3N0YXRlICpkY3MpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxpYnhsX19tdWx0aWRldiAqbXVsdGlkZXYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCByZXQpCiB7CisgICAgbGlieGxfX2RvbWFpbl9jcmVhdGVfc3RhdGUgKmRjcyA9 IENPTlRBSU5FUl9PRihtdWx0aWRldiwgKmRjcywgbXVsdGlkZXYpOwogICAgIFNUQVRFX0FPX0dD KGRjcy0+YW8pOwogICAgIGludCBpOwotICAgIGludCByZXQ7CiAgICAgaW50IGRvbWlkID0gZGNz LT5ndWVzdF9kb21pZDsKIAogICAgIC8qIGNvbnZlbmllbmNlIGFsaWFzZXMgKi8KZGlmZiAtLWdp dCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmggYi90b29scy9saWJ4bC9saWJ4bF9pbnRl cm5hbC5oCmluZGV4IDI2MDNiMzMuLjU0N2E3OGIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xp YnhsX2ludGVybmFsLmgKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaApAQCAtMzQw MSw2ICszNDAxLDcgQEAgZXh0ZXJuIHN0cnVjdCBsaWJ4bF9kZXZpY2VfdHlwZSBsaWJ4bF9fbmlj X2RldnR5cGU7CiBleHRlcm4gc3RydWN0IGxpYnhsX2RldmljZV90eXBlIGxpYnhsX192dHBtX2Rl dnR5cGU7CiBleHRlcm4gc3RydWN0IGxpYnhsX2RldmljZV90eXBlIGxpYnhsX191c2JjdHJsX2Rl dnR5cGU7CiBleHRlcm4gc3RydWN0IGxpYnhsX2RldmljZV90eXBlIGxpYnhsX191c2JkZXZfZGV2 dHlwZTsKK2V4dGVybiBzdHJ1Y3QgbGlieGxfZGV2aWNlX3R5cGUgbGlieGxfX3BjaV9kZXZ0eXBl OwogLyotLS0tLSBEb21haW4gZGVzdHJ1Y3Rpb24gLS0tLS0qLwogCiAvKiBEb21haW4gZGVzdHJ1 Y3Rpb24gaGFzIGJlZW4gc3BsaXQgaW50byB0d28gZnVuY3Rpb25zOgpkaWZmIC0tZ2l0IGEvdG9v bHMvbGlieGwvbGlieGxfcGNpLmMgYi90b29scy9saWJ4bC9saWJ4bF9wY2kuYwppbmRleCAyMzZi ZGQwLi5mZDI0NWVhIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9wY2kuYworKysgYi90 b29scy9saWJ4bC9saWJ4bF9wY2kuYwpAQCAtMTI5MSw2ICsxMjkxLDM2IEBAIG91dDoKICAgICBy ZXR1cm4gcmM7CiB9CiAKK3N0YXRpYyB2b2lkIGxpYnhsX19hZGRfcGNpcyhsaWJ4bF9fZWdjICpl Z2MsIGxpYnhsX19hbyAqYW8sIHVpbnQzMl90IGRvbWlkLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGxpYnhsX2RvbWFpbl9jb25maWcgKmRfY29uZmlnLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGxpYnhsX19tdWx0aWRldiAqbXVsdGlkZXYpCit7CisgICAgQU9fR0M7CisgICAg bGlieGxfX2FvX2RldmljZSAqYW9kZXYgPSBsaWJ4bF9fbXVsdGlkZXZfcHJlcGFyZShtdWx0aWRl dik7CisgICAgaW50IGksIHJjID0gMDsKKworICAgIGZvciAoaSA9IDA7IGkgPCBkX2NvbmZpZy0+ bnVtX3BjaWRldnM7IGkrKykgeworICAgICAgICByYyA9IGxpYnhsX19kZXZpY2VfcGNpX2FkZChn YywgZG9taWQsICZkX2NvbmZpZy0+cGNpZGV2c1tpXSwgMSk7CisgICAgICAgIGlmIChyYyA8IDAp IHsKKyAgICAgICAgICAgIExPRyhFUlJPUiwgImxpYnhsX2RldmljZV9wY2lfYWRkIGZhaWxlZDog JWQiLCByYyk7CisgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgfQorICAgIH0KKworICAg IGlmIChkX2NvbmZpZy0+bnVtX3BjaWRldnMgPiAwKSB7CisgICAgICAgIHJjID0gbGlieGxfX2Ny ZWF0ZV9wY2lfYmFja2VuZChnYywgZG9taWQsIGRfY29uZmlnLT5wY2lkZXZzLAorICAgICAgICAg ICAgZF9jb25maWctPm51bV9wY2lkZXZzKTsKKyAgICAgICAgaWYgKHJjIDwgMCkgeworICAgICAg ICAgICAgTE9HKEVSUk9SLCAibGlieGxfY3JlYXRlX3BjaV9iYWNrZW5kIGZhaWxlZDogJWQiLCBy Yyk7CisgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgfQorICAgIH0KKworb3V0OgorICAg IGFvZGV2LT5yYyA9IHJjOworICAgIGFvZGV2LT5jYWxsYmFjayhlZ2MsIGFvZGV2KTsKK30KKwog c3RhdGljIGludCBxZW11X3BjaV9yZW1vdmVfeGVuc3RvcmUobGlieGxfX2djICpnYywgdWludDMy X3QgZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9kZXZp Y2VfcGNpICpwY2lkZXYsIGludCBmb3JjZSkKIHsKQEAgLTE2NjgsNiArMTY5OCwxMiBAQCBpbnQg bGlieGxfX2dyYW50X3ZnYV9pb21lbV9wZXJtaXNzaW9uKGxpYnhsX19nYyAqZ2MsIGNvbnN0IHVp bnQzMl90IGRvbWlkLAogICAgIHJldHVybiAwOwogfQogCitzdHJ1Y3QgbGlieGxfZGV2aWNlX3R5 cGUgbGlieGxfX3BjaV9kZXZ0eXBlID0geworICAgIC50eXBlICAgICAgID0gInBjaSIsCisgICAg Lm51bV9vZmZzZXQgPSBvZmZzZXRvZihsaWJ4bF9kb21haW5fY29uZmlnLCBudW1fcGNpZGV2cyks CisgICAgLmFkZCAgICAgICAgPSBsaWJ4bF9fYWRkX3BjaXMsCit9OworCiAvKgogICogTG9jYWwg dmFyaWFibGVzOgogICogbW9kZTogQwotLSAKMi42LjYKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=