From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/2] tools/libxl: Don't prepare or save xc_config when soft resetting a domain Date: Fri, 16 Mar 2018 14:06:40 +0000 Message-ID: <1521209200-15469-3-git-send-email-andrew.cooper3@citrix.com> References: <1521209200-15469-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1521209200-15469-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org eGNfY29uZmlnIGlzIG9ubHkgdXNlZCBieSB4Y19kb21haW5fY3JlYXRlKCksIGJ1dCBieSBjYWxs aW5nCmxpYnhsX19hcmNoX2RvbWFpbl97cHJlcGFyZSxzYXZlfV9jb25maWcoKSB3ZSBjbG9iYmVy IHRoZSByZWFsIHNldHRpbmdzIHdpdGgKdGhlIGRlZmF1bHQgc2V0dGluZ3MuCgpNb3ZlIGFsbCBk YXRhIGFuZCBjYWxscyByZWxhdGluZyB0byB4Y19kb21haW5fY3JlYXRlKCkgaW50byB0aGUgcGF0 aCB3aGljaApjYWxscyBpdC4KCkFzIGZhciBhcyBJIGNhbiB0ZWxsLCBzb2Z0X3Jlc2V0IGhhcyBh bHdheXMgYmVlbiBicm9rZW4gZm9yIEFSTSBkb21haW5zIHVzaW5nCkxJQlhMX0dJQ19WRVJTSU9O X0RFRkFVTFQsIHdoaWNoIGVsaWNpdHMgYSBoYXJkIGVycm9yIG91dCBvZgpsaWJ4bF9fYXJjaF9k b21haW5fc2F2ZV9jb25maWcoKS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJl dy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSWFuIEphY2tzb24gPElhbi5KYWNrc29uQGV1 LmNpdHJpeC5jb20+CkNDOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgoKVGhpcyBwYXRj aCBpcyBmYXIgbW9yZSBlYXNpbHkgcmV2aWV3ZWQgd2l0aCBgZ2l0IGRpZmYgLS1pZ25vcmUtYWxs LXNwYWNlYC4KLS0tCiB0b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYyB8IDQ3ICsrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBp bnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9s aWJ4bF9jcmVhdGUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCmluZGV4IGY5MmMzODMu LjYwYTU1NDIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCisrKyBiL3Rv b2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCkBAIC01NDEsNyArNTQxLDcgQEAgaW50IGxpYnhsX19k b21haW5fbWFrZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZywK ICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgKmRvbWlkKQogewogICAgIGxpYnhsX2N0 eCAqY3R4ID0gbGlieGxfX2djX293bmVyKGdjKTsKLSAgICBpbnQgZmxhZ3MsIHJldCwgcmMsIG5i X3ZtOworICAgIGludCByZXQsIHJjLCBuYl92bTsKICAgICBjb25zdCBjaGFyICpkb21fdHlwZTsK ICAgICBjaGFyICp1dWlkX3N0cmluZzsKICAgICBjaGFyICpkb21fcGF0aCwgKnZtX3BhdGgsICps aWJ4bF9wYXRoOwpAQCAtNTQ5LDkgKzU0OSw3IEBAIGludCBsaWJ4bF9fZG9tYWluX21ha2UobGli eGxfX2djICpnYywgbGlieGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcsCiAgICAgc3RydWN0IHhz X3Blcm1pc3Npb25zIHJ3cGVybVsxXTsKICAgICBzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgbm9wZXJt WzFdOwogICAgIHhzX3RyYW5zYWN0aW9uX3QgdCA9IDA7Ci0gICAgeGVuX2RvbWFpbl9oYW5kbGVf dCBoYW5kbGU7CiAgICAgbGlieGxfdm1pbmZvICp2bV9saXN0OwotICAgIHhjX2RvbWFpbl9jb25m aWd1cmF0aW9uX3QgeGNfY29uZmlnID0ge307CiAKICAgICAvKiBjb252ZW5pZW5jZSBhbGlhc2Vz ICovCiAgICAgbGlieGxfZG9tYWluX2NyZWF0ZV9pbmZvICppbmZvID0gJmRfY29uZmlnLT5jX2lu Zm87CkBAIC01NjIsMjUgKzU2MCwyOCBAQCBpbnQgbGlieGxfX2RvbWFpbl9tYWtlKGxpYnhsX19n YyAqZ2MsIGxpYnhsX2RvbWFpbl9jb25maWcgKmRfY29uZmlnLAogICAgICAgICBnb3RvIG91dDsK ICAgICB9CiAKLSAgICBmbGFncyA9IDA7Ci0gICAgaWYgKGluZm8tPnR5cGUgIT0gTElCWExfRE9N QUlOX1RZUEVfUFYpIHsKLSAgICAgICAgZmxhZ3MgfD0gWEVOX0RPTUNUTF9DREZfaHZtX2d1ZXN0 OwotICAgICAgICBmbGFncyB8PSBsaWJ4bF9kZWZib29sX3ZhbChpbmZvLT5oYXApID8gWEVOX0RP TUNUTF9DREZfaGFwIDogMDsKLSAgICAgICAgZmxhZ3MgfD0gbGlieGxfZGVmYm9vbF92YWwoaW5m by0+b29zKSA/IDAgOiBYRU5fRE9NQ1RMX0NERl9vb3Nfb2ZmOwotICAgIH0KKyAgICAvKiBWYWxp ZCBkb21pZCBoZXJlIG1lYW5zIHdlJ3JlIHNvZnQgcmVzZXR0aW5nLiAqLworICAgIGlmICghbGli eGxfZG9taWRfdmFsaWRfZ3Vlc3QoKmRvbWlkKSkgeworICAgICAgICBpbnQgZmxhZ3MgPSAwOwor ICAgICAgICB4ZW5fZG9tYWluX2hhbmRsZV90IGhhbmRsZTsKKyAgICAgICAgeGNfZG9tYWluX2Nv bmZpZ3VyYXRpb25fdCB4Y19jb25maWcgPSB7fTsKKworICAgICAgICBpZiAoaW5mby0+dHlwZSAh PSBMSUJYTF9ET01BSU5fVFlQRV9QVikgeworICAgICAgICAgICAgZmxhZ3MgfD0gWEVOX0RPTUNU TF9DREZfaHZtX2d1ZXN0OworICAgICAgICAgICAgZmxhZ3MgfD0gbGlieGxfZGVmYm9vbF92YWwo aW5mby0+aGFwKSA/IFhFTl9ET01DVExfQ0RGX2hhcCA6IDA7CisgICAgICAgICAgICBmbGFncyB8 PSBsaWJ4bF9kZWZib29sX3ZhbChpbmZvLT5vb3MpID8gMCA6IFhFTl9ET01DVExfQ0RGX29vc19v ZmY7CisgICAgICAgIH0KIAotICAgIC8qIFVsdGltYXRlbHksIGhhbmRsZSBpcyBhbiBhcnJheSBv ZiAxNiB1aW50OF90LCBzYW1lIGFzIHV1aWQgKi8KLSAgICBsaWJ4bF91dWlkX2NvcHkoY3R4LCAo bGlieGxfdXVpZCAqKWhhbmRsZSwgJmluZm8tPnV1aWQpOworICAgICAgICAvKiBVbHRpbWF0ZWx5 LCBoYW5kbGUgaXMgYW4gYXJyYXkgb2YgMTYgdWludDhfdCwgc2FtZSBhcyB1dWlkICovCisgICAg ICAgIGxpYnhsX3V1aWRfY29weShjdHgsIChsaWJ4bF91dWlkICopaGFuZGxlLCAmaW5mby0+dXVp ZCk7CiAKLSAgICByZXQgPSBsaWJ4bF9fYXJjaF9kb21haW5fcHJlcGFyZV9jb25maWcoZ2MsIGRf Y29uZmlnLCAmeGNfY29uZmlnKTsKLSAgICBpZiAocmV0IDwgMCkgewotICAgICAgICBMT0dFRChF UlJPUiwgKmRvbWlkLCAiZmFpbCB0byBnZXQgZG9tYWluIGNvbmZpZyIpOwotICAgICAgICByYyA9 IEVSUk9SX0ZBSUw7Ci0gICAgICAgIGdvdG8gb3V0OwotICAgIH0KKyAgICAgICAgcmV0ID0gbGli eGxfX2FyY2hfZG9tYWluX3ByZXBhcmVfY29uZmlnKGdjLCBkX2NvbmZpZywgJnhjX2NvbmZpZyk7 CisgICAgICAgIGlmIChyZXQgPCAwKSB7CisgICAgICAgICAgICBMT0dFRChFUlJPUiwgKmRvbWlk LCAiZmFpbCB0byBnZXQgZG9tYWluIGNvbmZpZyIpOworICAgICAgICAgICAgcmMgPSBFUlJPUl9G QUlMOworICAgICAgICAgICAgZ290byBvdXQ7CisgICAgICAgIH0KIAotICAgIC8qIFZhbGlkIGRv bWlkIGhlcmUgbWVhbnMgd2UncmUgc29mdCByZXNldHRpbmcuICovCi0gICAgaWYgKCFsaWJ4bF9k b21pZF92YWxpZF9ndWVzdCgqZG9taWQpKSB7CiAgICAgICAgIHJldCA9IHhjX2RvbWFpbl9jcmVh dGUoY3R4LT54Y2gsIGluZm8tPnNzaWRyZWYsIGhhbmRsZSwgZmxhZ3MsIGRvbWlkLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICZ4Y19jb25maWcpOwogICAgICAgICBpZiAocmV0IDwg MCkgewpAQCAtNTg4LDExICs1ODksMTEgQEAgaW50IGxpYnhsX19kb21haW5fbWFrZShsaWJ4bF9f Z2MgKmdjLCBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZywKICAgICAgICAgICAgIHJjID0g RVJST1JfRkFJTDsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9Ci0gICAgfQogCi0g ICAgcmMgPSBsaWJ4bF9fYXJjaF9kb21haW5fc2F2ZV9jb25maWcoZ2MsIGRfY29uZmlnLCAmeGNf Y29uZmlnKTsKLSAgICBpZiAocmMgPCAwKQotICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgcmMg PSBsaWJ4bF9fYXJjaF9kb21haW5fc2F2ZV9jb25maWcoZ2MsIGRfY29uZmlnLCAmeGNfY29uZmln KTsKKyAgICAgICAgaWYgKHJjIDwgMCkKKyAgICAgICAgICAgIGdvdG8gb3V0OworICAgIH0KIAog ICAgIHJldCA9IHhjX2NwdXBvb2xfbW92ZWRvbWFpbihjdHgtPnhjaCwgaW5mby0+cG9vbGlkLCAq ZG9taWQpOwogICAgIGlmIChyZXQgPCAwKSB7Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=