From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunyan Liu Subject: [PATCH V15 3/6] refactor DEFINE_DEVICE_REMOVE to fit for more device types Date: Tue, 1 Mar 2016 16:09:44 +0800 Message-ID: <1456819787-11568-4-git-send-email-cyliu@suse.com> References: <1456819787-11568-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: <1456819787-11568-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 LmNvbT4KLS0tCiB0b29scy9saWJ4bC9saWJ4bC5jICAgICAgICAgIHwgMTggKysrKysrKysrKysr Ky0tLS0tCiB0b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYyAgIHwgMTAgKysrKystLS0tLQogdG9v bHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjAg aW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwv bGlieGwuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKaW5kZXggMmFjOWMwZi4uMmFiNWFkMyAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGwuYworKysgYi90b29scy9saWJ4bC9saWJ4bC5jCkBA IC0zMTM0LDcgKzMxMzQsNyBAQCB2b2lkIGxpYnhsX19kZXZpY2VfZGlza19sb2NhbF9pbml0aWF0 ZV9kZXRhY2gobGlieGxfX2VnYyAqZWdjLAogICAgICAgICBhb2Rldi0+ZGV2ID0gZGV2aWNlOwog ICAgICAgICBhb2Rldi0+Y2FsbGJhY2sgPSBsb2NhbF9kZXZpY2VfZGV0YWNoX2NiOwogICAgICAg ICBhb2Rldi0+Zm9yY2UgPSAwOwotICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92 ZShlZ2MsIGFvZGV2KTsKKyAgICAgICAgbGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3Jl bW92ZShlZ2MsIGFvZGV2KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDEwMyw3ICs0 MTAzLDcgQEAgb3V0OgogICogbGlieGxfZGV2aWNlX3ZmYl9yZW1vdmUKICAqIGxpYnhsX2Rldmlj ZV92ZmJfZGVzdHJveQogICovCi0jZGVmaW5lIERFRklORV9ERVZJQ0VfUkVNT1ZFKHR5cGUsIHJl bW92ZWRlc3Ryb3ksIGYpICAgICAgICAgICAgICAgICAgICBcCisjZGVmaW5lIERFRklORV9ERVZJ Q0VfUkVNT1ZFX0VYVCh0eXBlLCByZW10eXBlLCByZW1vdmVkZXN0cm95LCBmKSAgICAgICAgXAog ICAgIGludCBsaWJ4bF9kZXZpY2VfIyN0eXBlIyNfIyNyZW1vdmVkZXN0cm95KGxpYnhsX2N0eCAq Y3R4LCAgICAgICAgICAgXAogICAgICAgICB1aW50MzJfdCBkb21pZCwgbGlieGxfZGV2aWNlXyMj dHlwZSAqdHlwZSwgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICBjb25zdCBsaWJ4bF9h c3luY29wX2hvdyAqYW9faG93KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApAQCAt NDEyMywxMyArNDEyMywxOSBAQCBvdXQ6CiAgICAgICAgIGFvZGV2LT5kZXYgPSBkZXZpY2U7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIGFvZGV2 LT5jYWxsYmFjayA9IGRldmljZV9hZGRybV9hb2NvbXBsZXRlOyAgICAgICAgICAgICAgICAgICAg ICBcCiAgICAgICAgIGFvZGV2LT5mb3JjZSA9IGY7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGxpYnhsX19pbml0aWF0ZV9kZXZpY2VfcmVt b3ZlKGVnYywgYW9kZXYpOyAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGxpYnhsX19p bml0aWF0ZV9kZXZpY2VfIyNyZW10eXBlIyNfcmVtb3ZlKGVnYywgYW9kZXYpOyAgICAgICAgICBc CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCiAgICAgb3V0OiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGlmIChyYykgcmV0 dXJuIEFPX0NSRUFURV9GQUlMKHJjKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCisgICAgICAgIGlmIChyYykgcmV0dXJuIEFPX0NSRUFURV9GQUlMKHJjKTsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIHJldHVybiBBT19JTlBST0dSRVNTOyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfQogCisjZGVmaW5l IERFRklORV9ERVZJQ0VfUkVNT1ZFKHR5cGUsIHJlbW92ZWRlc3Ryb3ksIGYpIFwKKyAgICBERUZJ TkVfREVWSUNFX1JFTU9WRV9FWFQodHlwZSwgZ2VuZXJpYywgcmVtb3ZlZGVzdHJveSwgZikKKwor I2RlZmluZSBERUZJTkVfREVWSUNFX1JFTU9WRV9DVVNUT00odHlwZSwgcmVtb3ZlZGVzdHJveSwg ZikgIFwKKyAgICBERUZJTkVfREVWSUNFX1JFTU9WRV9FWFQodHlwZSwgdHlwZSwgcmVtb3ZlZGVz dHJveSwgZikKKwogLyogRGVmaW5lIGFsbCByZW1vdmUvZGVzdHJveSBmdW5jdGlvbnMgYW5kIHVu ZGVmIHRoZSBtYWNybyAqLwogCiAvKiBkaXNrICovCkBAIC00MTU4LDYgKzQxNjQsOCBAQCBERUZJ TkVfREVWSUNFX1JFTU9WRSh2dHBtLCBkZXN0cm95LCAxKQogICogMi4gZHluYW1pY2FsbHkgYWRk L3JlbW92ZSBxZW11IGNoYXJkZXZzIHZpYSBxbXAgbWVzc2FnZXMuICovCiAKICN1bmRlZiBERUZJ TkVfREVWSUNFX1JFTU9WRQorI3VuZGVmIERFRklORV9ERVZJQ0VfUkVNT1ZFX0NVU1RPTQorI3Vu ZGVmIERFRklORV9ERVZJQ0VfUkVNT1ZFX0VYVAogCiAvKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwog CkBAIC00MzYyLDcgKzQzNzAsNyBAQCBzdGF0aWMgaW50IHJlbW92ZV9kZXZpY2UobGlieGxfX2Vn YyAqZWdjLCBsaWJ4bF9fYW8gKmFvLAogICAgICAgICBhb2Rldi0+ZGV2ID0gZGV2OwogICAgICAg ICBhb2Rldi0+YWN0aW9uID0gTElCWExfX0RFVklDRV9BQ1RJT05fUkVNT1ZFOwogICAgICAgICBh b2Rldi0+Y2FsbGJhY2sgPSBkZXZpY2VfY29tcGxldGU7Ci0gICAgICAgIGxpYnhsX19pbml0aWF0 ZV9kZXZpY2VfcmVtb3ZlKGVnYywgYW9kZXYpOworICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2 aWNlX2dlbmVyaWNfcmVtb3ZlKGVnYywgYW9kZXYpOwogICAgICAgICBicmVhazsKICAgICBjYXNl IExJQlhMX19ERVZJQ0VfS0lORF9RRElTSzoKICAgICAgICAgaWYgKC0tZGd1ZXN0LT5udW1fcWRp c2tzID09IDApIHsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RldmljZS5jIGIvdG9v bHMvbGlieGwvbGlieGxfZGV2aWNlLmMKaW5kZXggOGJiNWU5My4uYTM1NmUyYSAxMDA2NDQKLS0t IGEvdG9vbHMvbGlieGwvbGlieGxfZGV2aWNlLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfZGV2 aWNlLmMKQEAgLTY3Niw3ICs2NzYsNyBAQCB2b2lkIGxpYnhsX19kZXZpY2VzX2Rlc3Ryb3kobGli eGxfX2VnYyAqZWdjLCBsaWJ4bF9fZGV2aWNlc19yZW1vdmVfc3RhdGUgKmRycykKICAgICAgICAg ICAgICAgICBhb2Rldi0+YWN0aW9uID0gTElCWExfX0RFVklDRV9BQ1RJT05fUkVNT1ZFOwogICAg ICAgICAgICAgICAgIGFvZGV2LT5kZXYgPSBkZXY7CiAgICAgICAgICAgICAgICAgYW9kZXYtPmZv cmNlID0gZHJzLT5mb3JjZTsKLSAgICAgICAgICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNl X3JlbW92ZShlZ2MsIGFvZGV2KTsKKyAgICAgICAgICAgICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2 aWNlX2dlbmVyaWNfcmVtb3ZlKGVnYywgYW9kZXYpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtNzc1LDggKzc3NSw4IEBAIG91dDoKICAgICByZXR1cm47CiB9CiAKLXZvaWQg bGlieGxfX2luaXRpYXRlX2RldmljZV9yZW1vdmUobGlieGxfX2VnYyAqZWdjLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9fYW9fZGV2aWNlICphb2RldikKK3ZvaWQg bGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3JlbW92ZShsaWJ4bF9fZWdjICplZ2MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2FvX2Rldmlj ZSAqYW9kZXYpCiB7CiAgICAgU1RBVEVfQU9fR0MoYW9kZXYtPmFvKTsKICAgICB4c190cmFuc2Fj dGlvbl90IHQgPSAwOwpAQCAtODA2LDcgKzgwNiw3IEBAIHZvaWQgbGlieGxfX2luaXRpYXRlX2Rl dmljZV9yZW1vdmUobGlieGxfX2VnYyAqZWdjLAogICAgICAgICAgICAgKGluZm8ucGF1c2VkIHx8 IGluZm8uZHlpbmcgfHwgaW5mby5zaHV0ZG93bikpIHsKICAgICAgICAgICAgIC8qCiAgICAgICAg ICAgICAgKiBUT0RPOiA0LjIgQm9kZ2UgZHVlIHRvIFFFTVUsIHNlZSBjb21tZW50IG9uIHRvcCBv ZgotICAgICAgICAgICAgICogbGlieGxfX2luaXRpYXRlX2RldmljZV9yZW1vdmUgaW4gbGlieGxf aW50ZXJuYWwuaAorICAgICAgICAgICAgICogbGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmlj X3JlbW92ZSBpbiBsaWJ4bF9pbnRlcm5hbC5oCiAgICAgICAgICAgICAgKi8KICAgICAgICAgICAg IHJjID0gbGlieGxfX2V2X3RpbWVfcmVnaXN0ZXJfcmVsKGFvLCAmYW9kZXYtPnRpbWVvdXQsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXZpY2VfcWVtdV90 aW1lb3V0LApAQCAtOTQyLDcgKzk0Miw3IEBAIHN0YXRpYyB2b2lkIGRldmljZV9iYWNrZW5kX2Nh bGxiYWNrKGxpYnhsX19lZ2MgKmVnYywgbGlieGxfX2V2X2RldnN0YXRlICpkcywKICAgICAgICAg IWFvZGV2LT5mb3JjZSkgewogICAgICAgICBMT0coREVCVUcsICJUaW1lb3V0IHJlYWNoZWQsIGlu aXRpYXRpbmcgZm9yY2VkIHJlbW92ZSIpOwogICAgICAgICBhb2Rldi0+Zm9yY2UgPSAxOwotICAg ICAgICBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShlZ2MsIGFvZGV2KTsKKyAgICAgICAg bGlieGxfX2luaXRpYXRlX2RldmljZV9nZW5lcmljX3JlbW92ZShlZ2MsIGFvZGV2KTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJu YWwuaCBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKaW5kZXggMjFiOWI4Yy4uNDA0Y2U3 ZSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaAorKysgYi90b29scy9s aWJ4bC9saWJ4bF9pbnRlcm5hbC5oCkBAIC0yNjE2LDggKzI2MTYsOCBAQCBfaGlkZGVuIHZvaWQg bGlieGxfX3dhaXRfZGV2aWNlX2Nvbm5lY3Rpb24obGlieGxfX2VnYyosCiAgKgogICogT25jZSBm aW5pc2hlZCwgYW9kZXYtPmNhbGxiYWNrIHdpbGwgYmUgZXhlY3V0ZWQuCiAgKi8KLV9oaWRkZW4g dm9pZCBsaWJ4bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShsaWJ4bF9fZWdjICplZ2MsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2FvX2RldmljZSAq YW9kZXYpOworX2hpZGRlbiB2b2lkIGxpYnhsX19pbml0aWF0ZV9kZXZpY2VfZ2VuZXJpY19yZW1v dmUobGlieGxfX2VnYyAqZWdjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGlieGxfX2FvX2RldmljZSAqYW9kZXYpOwogCiAvKgogICogbGlieGxf X2dldF9ob3RwbHVnX3NjcmlwdF9pbmZvIHJldHVybnMgdGhlIGFyZ3MgYW5kIGVudiB0aGF0IHNo b3VsZAotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=