From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v3 12/15] tools: rename 'xc_psr_cat_type' to 'xc_psr_type' Date: Tue, 5 Sep 2017 17:32:34 +0800 Message-ID: <1504603957-5389-13-git-send-email-yi.y.sun@linux.intel.com> References: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAWO-0007SO-DG for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:51:52 +0000 In-Reply-To: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, dgdegra@tycho.nsa.gov, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZW5hbWVzICd4Y19wc3JfY2F0X3R5cGUnIHRvICd4Y19wc3JfdHlwZScgc28g dGhhdAp0aGUgc3RydWN0dXJlIG5hbWUgaXMgY29tbW9uIGZvciBhbGwgYWxsb2NhdGlvbiBmZWF0 dXJlcy4KClNpZ25lZC1vZmYtYnk6IFlpIFN1biA8eWkueS5zdW5AbGludXguaW50ZWwuY29tPgpB Y2tlZC1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IENoYW8g UGVuZyA8Y2hhby5wLnBlbmdAbGludXguaW50ZWwuY29tPgotLS0KdjM6CiAgICAtIGNoYW5nZSAn eGNfcHNyX3ZhbF90eXBlJyB0byAneGNfcHNyX3R5cGUnLgogICAgICAoc3VnZ2VzdGVkIGJ5IFJv Z2VyIFBhdSBNb25uw6kpCi0tLQogdG9vbHMvbGlieGMvaW5jbHVkZS94ZW5jdHJsLmggfCAgOCAr KysrLS0tLQogdG9vbHMvbGlieGMveGNfcHNyLmMgICAgICAgICAgfCAgNCArKy0tCiB0b29scy9s aWJ4bC9saWJ4bF9wc3IuYyAgICAgICB8IDEyICsrKysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAxMiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9s aWJ4Yy9pbmNsdWRlL3hlbmN0cmwuaCBiL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGVuY3RybC5oCmlu ZGV4IGJiZGY4ZTIuLjYzYjkyZDIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGVu Y3RybC5oCisrKyBiL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGVuY3RybC5oCkBAIC0yNDUwLDEzICsy NDUwLDEzIEBAIGVudW0geGNfcHNyX2NtdF90eXBlIHsKIH07CiB0eXBlZGVmIGVudW0geGNfcHNy X2NtdF90eXBlIHhjX3Bzcl9jbXRfdHlwZTsKIAotZW51bSB4Y19wc3JfY2F0X3R5cGUgeworZW51 bSB4Y19wc3JfdHlwZSB7CiAgICAgWENfUFNSX0NBVF9MM19DQk0gICAgICA9IDEsCiAgICAgWENf UFNSX0NBVF9MM19DQk1fQ09ERSA9IDIsCiAgICAgWENfUFNSX0NBVF9MM19DQk1fREFUQSA9IDMs CiAgICAgWENfUFNSX0NBVF9MMl9DQk0gICAgICA9IDQsCiB9OwotdHlwZWRlZiBlbnVtIHhjX3Bz cl9jYXRfdHlwZSB4Y19wc3JfY2F0X3R5cGU7Cit0eXBlZGVmIGVudW0geGNfcHNyX3R5cGUgeGNf cHNyX3R5cGU7CiAKIGVudW0geGNfcHNyX2ZlYXRfdHlwZSB7CiAgICAgWENfUFNSX0ZFQVRfVU5L Tk9XTiwKQEAgLTI0OTksMTAgKzI0OTksMTAgQEAgaW50IHhjX3Bzcl9jbXRfZ2V0X2RhdGEoeGNf aW50ZXJmYWNlICp4Y2gsIHVpbnQzMl90IHJtaWQsIHVpbnQzMl90IGNwdSwKIGludCB4Y19wc3Jf Y210X2VuYWJsZWQoeGNfaW50ZXJmYWNlICp4Y2gpOwogCiBpbnQgeGNfcHNyX2NhdF9zZXRfZG9t YWluX2RhdGEoeGNfaW50ZXJmYWNlICp4Y2gsIHVpbnQzMl90IGRvbWlkLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHhjX3Bzcl9jYXRfdHlwZSB0eXBlLCB1aW50MzJfdCB0YXJnZXQs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGNfcHNyX3R5cGUgdHlwZSwgdWludDMy X3QgdGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IGRhdGEp OwogaW50IHhjX3Bzcl9jYXRfZ2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50 MzJfdCBkb21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4Y19wc3JfY2F0X3R5 cGUgdHlwZSwgdWludDMyX3QgdGFyZ2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHhjX3Bzcl90eXBlIHR5cGUsIHVpbnQzMl90IHRhcmdldCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1aW50NjRfdCAqZGF0YSk7CiBpbnQgeGNfcHNyX2dldF9od19pbmZvKHhjX2lu dGVyZmFjZSAqeGNoLCB1aW50MzJfdCBzb2NrZXQsCiAgICAgICAgICAgICAgICAgICAgICAgIHhj X3Bzcl9mZWF0X3R5cGUgdHlwZSwgeGNfcHNyX2h3X2luZm8gKmh3X2luZm8pOwpkaWZmIC0tZ2l0 IGEvdG9vbHMvbGlieGMveGNfcHNyLmMgYi90b29scy9saWJ4Yy94Y19wc3IuYwppbmRleCBhOGE3 NTBhLi44MDY0MmEyIDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19wc3IuYworKysgYi90b29s cy9saWJ4Yy94Y19wc3IuYwpAQCAtMjQ5LDcgKzI0OSw3IEBAIGludCB4Y19wc3JfY210X2VuYWJs ZWQoeGNfaW50ZXJmYWNlICp4Y2gpCiAgICAgcmV0dXJuIDA7CiB9CiBpbnQgeGNfcHNyX2NhdF9z ZXRfZG9tYWluX2RhdGEoeGNfaW50ZXJmYWNlICp4Y2gsIHVpbnQzMl90IGRvbWlkLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHhjX3Bzcl9jYXRfdHlwZSB0eXBlLCB1aW50MzJfdCB0 YXJnZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGNfcHNyX3R5cGUgdHlwZSwg dWludDMyX3QgdGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90 IGRhdGEpCiB7CiAgICAgREVDTEFSRV9ET01DVEw7CkBAIC0yODQsNyArMjg0LDcgQEAgaW50IHhj X3Bzcl9jYXRfc2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21p ZCwKIH0KIAogaW50IHhjX3Bzcl9jYXRfZ2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNo LCB1aW50MzJfdCBkb21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4Y19wc3Jf Y2F0X3R5cGUgdHlwZSwgdWludDMyX3QgdGFyZ2V0LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHhjX3Bzcl90eXBlIHR5cGUsIHVpbnQzMl90IHRhcmdldCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50NjRfdCAqZGF0YSkKIHsKICAgICBpbnQgcmM7CmRpZmYgLS1n aXQgYS90b29scy9saWJ4bC9saWJ4bF9wc3IuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3Bzci5jCmlu ZGV4IGQ1MzRlYzIuLmM4ZDI5MjEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3Bzci5j CisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3Bzci5jCkBAIC0zMDMsMTEgKzMwMywxMSBAQCBvdXQ6 CiAgICAgcmV0dXJuIHJjOwogfQogCi1zdGF0aWMgaW5saW5lIHhjX3Bzcl9jYXRfdHlwZSBsaWJ4 bF9fcHNyX2NibV90eXBlX3RvX2xpYnhjX3Bzcl9jYXRfdHlwZSgKK3N0YXRpYyBpbmxpbmUgeGNf cHNyX3R5cGUgbGlieGxfX3Bzcl9jYm1fdHlwZV90b19saWJ4Y19wc3JfdHlwZSgKICAgICBsaWJ4 bF9wc3JfY2JtX3R5cGUgdHlwZSkKIHsKLSAgICBCVUlMRF9CVUdfT04oc2l6ZW9mKGxpYnhsX3Bz cl9jYm1fdHlwZSkgIT0gc2l6ZW9mKHhjX3Bzcl9jYXRfdHlwZSkpOwotICAgIHJldHVybiAoeGNf cHNyX2NhdF90eXBlKXR5cGU7CisgICAgQlVJTERfQlVHX09OKHNpemVvZihsaWJ4bF9wc3JfY2Jt X3R5cGUpICE9IHNpemVvZih4Y19wc3JfdHlwZSkpOworICAgIHJldHVybiAoeGNfcHNyX3R5cGUp dHlwZTsKIH0KIAogaW50IGxpYnhsX3Bzcl9jYXRfc2V0X2NibShsaWJ4bF9jdHggKmN0eCwgdWlu dDMyX3QgZG9taWQsCkBAIC0zMjUsMTIgKzMyNSwxMiBAQCBpbnQgbGlieGxfcHNyX2NhdF9zZXRf Y2JtKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKICAgICB9CiAKICAgICBsaWJ4bF9m b3JfZWFjaF9zZXRfYml0KHNvY2tldGlkLCAqdGFyZ2V0X21hcCkgewotICAgICAgICB4Y19wc3Jf Y2F0X3R5cGUgeGNfdHlwZTsKKyAgICAgICAgeGNfcHNyX3R5cGUgeGNfdHlwZTsKIAogICAgICAg ICBpZiAoc29ja2V0aWQgPj0gbnJfc29ja2V0cykKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAg ICAgIHhjX3R5cGUgPSBsaWJ4bF9fcHNyX2NibV90eXBlX3RvX2xpYnhjX3Bzcl9jYXRfdHlwZSh0 eXBlKTsKKyAgICAgICAgeGNfdHlwZSA9IGxpYnhsX19wc3JfY2JtX3R5cGVfdG9fbGlieGNfcHNy X3R5cGUodHlwZSk7CiAgICAgICAgIGlmICh4Y19wc3JfY2F0X3NldF9kb21haW5fZGF0YShjdHgt PnhjaCwgZG9taWQsIHhjX3R5cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzb2NrZXRpZCwgY2JtKSkgewogICAgICAgICAgICAgbGlieGxfX3Bzcl9jYXRfbG9nX2Vy cl9tc2coZ2MsIGVycm5vKTsKQEAgLTM0OSw3ICszNDksNyBAQCBpbnQgbGlieGxfcHNyX2NhdF9n ZXRfY2JtKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKIHsKICAgICBHQ19JTklUKGN0 eCk7CiAgICAgaW50IHJjID0gMDsKLSAgICB4Y19wc3JfY2F0X3R5cGUgeGNfdHlwZSA9IGxpYnhs X19wc3JfY2JtX3R5cGVfdG9fbGlieGNfcHNyX2NhdF90eXBlKHR5cGUpOworICAgIHhjX3Bzcl90 eXBlIHhjX3R5cGUgPSBsaWJ4bF9fcHNyX2NibV90eXBlX3RvX2xpYnhjX3Bzcl90eXBlKHR5cGUp OwogCiAgICAgaWYgKHhjX3Bzcl9jYXRfZ2V0X2RvbWFpbl9kYXRhKGN0eC0+eGNoLCBkb21pZCwg eGNfdHlwZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGFyZ2V0LCBjYm1f cikpIHsKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==