From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunyan Liu Subject: [PATCH V17 3/6] refactor DEFINE_DEVICE_REMOVE to fit for more device types Date: Wed, 9 Mar 2016 10:10:11 +0800 Message-ID: <1457489414-885-4-git-send-email-cyliu@suse.com> References: <1457489414-885-1-git-send-email-cyliu@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1457489414-885-1-git-send-email-cyliu@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: jgross@suse.com, wei.liu2@citrix.com, ian.campbell@citrix.com, george.dunlap@eu.citrix.com, Ian.Jackson@eu.citrix.com, Chunyan Liu , George Dunlap , jfehlig@suse.com List-Id: xen-devel@lists.xenproject.org Rm9yIHNvbWUgZGV2aWNlIHR5cGUsIGRldmljZSByZW1vdmFsIG9wZXJhdGlvbiBuZWVkcyB0byBi ZQpoYW5kbGVkIHNwZWNpYWxseSwgbGlrZSB1c2JjdHJsLCBpdCBuZWVkcyB0byByZW1vdmUgYWxs IHVzYgpkZXZpY2VzIHVuZGVyIGl0IGZpcnN0LCB0aGVuIHJlbW92ZSB1c2JjdHJsLiBFeHRlbmQK REVGSU5FX0RFVklDRV9SRU1PVkUgdG8gc3VwcG9ydCBnZW5lcmljIGFuZCBjdXN0b20gd2F5CkZv ciB0aG9zZSBuZWVkIHRvIGJlIGhhbmRsZWQgc3BlY2lhbGx5LCBjYWxsCkRFRklORV9ERVZJQ0Vf UkVNT1ZFX0NVU1RPTSwgaXQgcmVxdWlyZXMgdXNlciBkZWZpbmVkCmxpYnhsX19pbml0aWF0ZV9k ZXZpY2VfIyN0eXBlIyNfcmVtb3ZlLiBPdGhlcndpc2UsIGp1c3QKY2FsbCBERUZJTkVfREVWSUNF X1JFTU9WRSBhcyBiZWZvcmUuCgpTaWduZWQtb2ZmLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2Uu ZHVubGFwQGNpdHJpeC5jb20+ClNpZ25lZC1vZmYtYnk6IENodW55YW4gTGl1IDxjeWxpdUBzdXNl LmNvbT4KUmV2aWV3ZWQtYnk6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAY2l0cml4LmNv bT4KLS0tCiB0b29scy9saWJ4bC9saWJ4bC5jICAgICAgICAgIHwgMTggKysrKysrKysrKysrKy0t LS0tCiB0b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYyAgIHwgMTAgKysrKystLS0tLQogdG9vbHMv bGlieGwvbGlieGxfaW50ZXJuYWwuaCB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5z ZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGli eGwuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKaW5kZXggMmFjOWMwZi4uMmFiNWFkMyAxMDA2NDQK LS0tIGEvdG9vbHMvbGlieGwvbGlieGwuYworKysgYi90b29scy9saWJ4bC9saWJ4bC5jCkBAIC0z MTM0LDcgKzMxMzQsNyBAQCB2b2lkIGxpYnhsX19kZXZpY2VfZGlza19sb2NhbF9pbml0aWF0ZV9k ZXRhY2gobGlieGxfX2VnYyAqZWdjLAogICAgICAgICBhb2Rldi0+ZGV2ID0gZGV2aWNlOwogICAg ICAgICBhb2Rldi0+Y2FsbGJhY2sgPSBsb2NhbF9kZXZpY2VfZGV0YWNoX2NiOwogICAgICAgICBh b2Rldi0+Zm9yY2UgPSAwOwotICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShl Z2MsIGFvZGV2KTsKKyAgICAgICAgbGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3JlbW92 ZShlZ2MsIGFvZGV2KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDEwMyw3ICs0MTAz LDcgQEAgb3V0OgogICogbGlieGxfZGV2aWNlX3ZmYl9yZW1vdmUKICAqIGxpYnhsX2RldmljZV92 ZmJfZGVzdHJveQogICovCi0jZGVmaW5lIERFRklORV9ERVZJQ0VfUkVNT1ZFKHR5cGUsIHJlbW92 ZWRlc3Ryb3ksIGYpICAgICAgICAgICAgICAgICAgICBcCisjZGVmaW5lIERFRklORV9ERVZJQ0Vf UkVNT1ZFX0VYVCh0eXBlLCByZW10eXBlLCByZW1vdmVkZXN0cm95LCBmKSAgICAgICAgXAogICAg IGludCBsaWJ4bF9kZXZpY2VfIyN0eXBlIyNfIyNyZW1vdmVkZXN0cm95KGxpYnhsX2N0eCAqY3R4 LCAgICAgICAgICAgXAogICAgICAgICB1aW50MzJfdCBkb21pZCwgbGlieGxfZGV2aWNlXyMjdHlw ZSAqdHlwZSwgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICBjb25zdCBsaWJ4bF9hc3lu Y29wX2hvdyAqYW9faG93KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApAQCAtNDEy MywxMyArNDEyMywxOSBAQCBvdXQ6CiAgICAgICAgIGFvZGV2LT5kZXYgPSBkZXZpY2U7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIGFvZGV2LT5j YWxsYmFjayA9IGRldmljZV9hZGRybV9hb2NvbXBsZXRlOyAgICAgICAgICAgICAgICAgICAgICBc CiAgICAgICAgIGFvZGV2LT5mb3JjZSA9IGY7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGxpYnhsX19pbml0aWF0ZV9kZXZpY2VfcmVtb3Zl KGVnYywgYW9kZXYpOyAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGxpYnhsX19pbml0 aWF0ZV9kZXZpY2VfIyNyZW10eXBlIyNfcmVtb3ZlKGVnYywgYW9kZXYpOyAgICAgICAgICBcCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCiAgICAgb3V0OiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGlmIChyYykgcmV0dXJu IEFPX0NSRUFURV9GQUlMKHJjKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgICAgICAgIGlmIChyYykgcmV0dXJuIEFPX0NSRUFURV9GQUlMKHJjKTsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCiAgICAgICAgIHJldHVybiBBT19JTlBST0dSRVNTOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfQogCisjZGVmaW5lIERF RklORV9ERVZJQ0VfUkVNT1ZFKHR5cGUsIHJlbW92ZWRlc3Ryb3ksIGYpIFwKKyAgICBERUZJTkVf REVWSUNFX1JFTU9WRV9FWFQodHlwZSwgZ2VuZXJpYywgcmVtb3ZlZGVzdHJveSwgZikKKworI2Rl ZmluZSBERUZJTkVfREVWSUNFX1JFTU9WRV9DVVNUT00odHlwZSwgcmVtb3ZlZGVzdHJveSwgZikg IFwKKyAgICBERUZJTkVfREVWSUNFX1JFTU9WRV9FWFQodHlwZSwgdHlwZSwgcmVtb3ZlZGVzdHJv eSwgZikKKwogLyogRGVmaW5lIGFsbCByZW1vdmUvZGVzdHJveSBmdW5jdGlvbnMgYW5kIHVuZGVm IHRoZSBtYWNybyAqLwogCiAvKiBkaXNrICovCkBAIC00MTU4LDYgKzQxNjQsOCBAQCBERUZJTkVf REVWSUNFX1JFTU9WRSh2dHBtLCBkZXN0cm95LCAxKQogICogMi4gZHluYW1pY2FsbHkgYWRkL3Jl bW92ZSBxZW11IGNoYXJkZXZzIHZpYSBxbXAgbWVzc2FnZXMuICovCiAKICN1bmRlZiBERUZJTkVf REVWSUNFX1JFTU9WRQorI3VuZGVmIERFRklORV9ERVZJQ0VfUkVNT1ZFX0NVU1RPTQorI3VuZGVm IERFRklORV9ERVZJQ0VfUkVNT1ZFX0VYVAogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogCkBA IC00MzYyLDcgKzQzNzAsNyBAQCBzdGF0aWMgaW50IHJlbW92ZV9kZXZpY2UobGlieGxfX2VnYyAq ZWdjLCBsaWJ4bF9fYW8gKmFvLAogICAgICAgICBhb2Rldi0+ZGV2ID0gZGV2OwogICAgICAgICBh b2Rldi0+YWN0aW9uID0gTElCWExfX0RFVklDRV9BQ1RJT05fUkVNT1ZFOwogICAgICAgICBhb2Rl di0+Y2FsbGJhY2sgPSBkZXZpY2VfY29tcGxldGU7Ci0gICAgICAgIGxpYnhsX19pbml0aWF0ZV9k ZXZpY2VfcmVtb3ZlKGVnYywgYW9kZXYpOworICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNl X2dlbmVyaWNfcmVtb3ZlKGVnYywgYW9kZXYpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIExJ QlhMX19ERVZJQ0VfS0lORF9RRElTSzoKICAgICAgICAgaWYgKC0tZGd1ZXN0LT5udW1fcWRpc2tz ID09IDApIHsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RldmljZS5jIGIvdG9vbHMv bGlieGwvbGlieGxfZGV2aWNlLmMKaW5kZXggOGJiNWU5My4uYTM1NmUyYSAxMDA2NDQKLS0tIGEv dG9vbHMvbGlieGwvbGlieGxfZGV2aWNlLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfZGV2aWNl LmMKQEAgLTY3Niw3ICs2NzYsNyBAQCB2b2lkIGxpYnhsX19kZXZpY2VzX2Rlc3Ryb3kobGlieGxf X2VnYyAqZWdjLCBsaWJ4bF9fZGV2aWNlc19yZW1vdmVfc3RhdGUgKmRycykKICAgICAgICAgICAg ICAgICBhb2Rldi0+YWN0aW9uID0gTElCWExfX0RFVklDRV9BQ1RJT05fUkVNT1ZFOwogICAgICAg ICAgICAgICAgIGFvZGV2LT5kZXYgPSBkZXY7CiAgICAgICAgICAgICAgICAgYW9kZXYtPmZvcmNl ID0gZHJzLT5mb3JjZTsKLSAgICAgICAgICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3Jl bW92ZShlZ2MsIGFvZGV2KTsKKyAgICAgICAgICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNl X2dlbmVyaWNfcmVtb3ZlKGVnYywgYW9kZXYpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfQpAQCAtNzc1LDggKzc3NSw4IEBAIG91dDoKICAgICByZXR1cm47CiB9CiAKLXZvaWQgbGli eGxfX2luaXRpYXRlX2RldmljZV9yZW1vdmUobGlieGxfX2VnYyAqZWdjLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9fYW9fZGV2aWNlICphb2RldikKK3ZvaWQgbGli eGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3JlbW92ZShsaWJ4bF9fZWdjICplZ2MsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2FvX2RldmljZSAq YW9kZXYpCiB7CiAgICAgU1RBVEVfQU9fR0MoYW9kZXYtPmFvKTsKICAgICB4c190cmFuc2FjdGlv bl90IHQgPSAwOwpAQCAtODA2LDcgKzgwNiw3IEBAIHZvaWQgbGlieGxfX2luaXRpYXRlX2Rldmlj ZV9yZW1vdmUobGlieGxfX2VnYyAqZWdjLAogICAgICAgICAgICAgKGluZm8ucGF1c2VkIHx8IGlu Zm8uZHlpbmcgfHwgaW5mby5zaHV0ZG93bikpIHsKICAgICAgICAgICAgIC8qCiAgICAgICAgICAg ICAgKiBUT0RPOiA0LjIgQm9kZ2UgZHVlIHRvIFFFTVUsIHNlZSBjb21tZW50IG9uIHRvcCBvZgot ICAgICAgICAgICAgICogbGlieGxfX2luaXRpYXRlX2RldmljZV9yZW1vdmUgaW4gbGlieGxfaW50 ZXJuYWwuaAorICAgICAgICAgICAgICogbGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3Jl bW92ZSBpbiBsaWJ4bF9pbnRlcm5hbC5oCiAgICAgICAgICAgICAgKi8KICAgICAgICAgICAgIHJj ID0gbGlieGxfX2V2X3RpbWVfcmVnaXN0ZXJfcmVsKGFvLCAmYW9kZXYtPnRpbWVvdXQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXZpY2VfcWVtdV90aW1l b3V0LApAQCAtOTQyLDcgKzk0Miw3IEBAIHN0YXRpYyB2b2lkIGRldmljZV9iYWNrZW5kX2NhbGxi YWNrKGxpYnhsX19lZ2MgKmVnYywgbGlieGxfX2V2X2RldnN0YXRlICpkcywKICAgICAgICAgIWFv ZGV2LT5mb3JjZSkgewogICAgICAgICBMT0coREVCVUcsICJUaW1lb3V0IHJlYWNoZWQsIGluaXRp YXRpbmcgZm9yY2VkIHJlbW92ZSIpOwogICAgICAgICBhb2Rldi0+Zm9yY2UgPSAxOwotICAgICAg ICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShlZ2MsIGFvZGV2KTsKKyAgICAgICAgbGli eGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3JlbW92ZShlZ2MsIGFvZGV2KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwu aCBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKaW5kZXggNDI5ZWEzMi4uMDgyZjY1NiAx MDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaAorKysgYi90b29scy9saWJ4 bC9saWJ4bF9pbnRlcm5hbC5oCkBAIC0yNjE2LDggKzI2MTYsOCBAQCBfaGlkZGVuIHZvaWQgbGli eGxfX3dhaXRfZGV2aWNlX2Nvbm5lY3Rpb24obGlieGxfX2VnYyosCiAgKgogICogT25jZSBmaW5p c2hlZCwgYW9kZXYtPmNhbGxiYWNrIHdpbGwgYmUgZXhlY3V0ZWQuCiAgKi8KLV9oaWRkZW4gdm9p ZCBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShsaWJ4bF9fZWdjICplZ2MsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2FvX2RldmljZSAqYW9k ZXYpOworX2hpZGRlbiB2b2lkIGxpYnhsX19pbml0aWF0ZV9kZXZpY2VfZ2VuZXJpY19yZW1vdmUo bGlieGxfX2VnYyAqZWdjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbGlieGxfX2FvX2RldmljZSAqYW9kZXYpOwogCiAvKgogICogbGlieGxfX2dl dF9ob3RwbHVnX3NjcmlwdF9pbmZvIHJldHVybnMgdGhlIGFyZ3MgYW5kIGVudiB0aGF0IHNob3Vs ZAotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6 Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=