From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 3/3] machine: Use shorter format for GlobalProperty arrays Date: Mon, 7 Jan 2019 17:30:20 -0200 Message-ID: <20190107193020.21744-4-ehabkost@redhat.com> References: <20190107193020.21744-1-ehabkost@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ggabs-0001ps-16 for xen-devel@lists.xenproject.org; Mon, 07 Jan 2019 19:30:52 +0000 In-Reply-To: <20190107193020.21744-1-ehabkost@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Stefano Stabellini , Eduardo Habkost , David Hildenbrand , Cornelia Huck , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Paolo Bonzini , David Gibson , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org SW5zdGVhZCBvZiB2ZXJib3NlIGFycmF5cyB3aXRoIDQgbGluZXMgZm9yIGVhY2ggZW50cnksIG1h a2UgZWFjaAplbnRyeSB0YWtlIG9ubHkgb25lIGxpbmUuICBUaGlzIG1ha2VzIGxvbmcgYXJyYXlz IHRoYXQgY291bGRuJ3QKZml0IGluIHRoZSBzY3JlZW4gYmVjb21lIHNob3J0IGFuZCByZWFkYWJs ZS4KClNpZ25lZC1vZmYtYnk6IEVkdWFyZG8gSGFia29zdCA8ZWhhYmtvc3RAcmVkaGF0LmNvbT4K LS0tCiBpbmNsdWRlL2h3L2kzODYvcGMuaCAgICAgICB8ICAxOCArLQogaHcvY29yZS9tYWNoaW5l LmMgICAgICAgICAgfCAzMzggKysrKy0tLS0tLS0tLS0tLS0KIGh3L2kzODYvcGMuYyAgICAgICAg ICAgICAgIHwgNzIwICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGh3L2kz ODYvcGNfcGlpeC5jICAgICAgICAgIHwgMTkyICsrLS0tLS0tLS0KIGh3L3BwYy9zcGFwci5jICAg ICAgICAgICAgIHwgIDcyICstLS0KIGh3L3MzOTB4L3MzOTAtdmlydGlvLWNjdy5jIHwgIDc1ICst LS0KIGh3L3hlbi94ZW4tY29tbW9uLmMgICAgICAgIHwgIDE4ICstCiA3IGZpbGVzIGNoYW5nZWQs IDI2NSBpbnNlcnRpb25zKCspLCAxMTY4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvaHcvaTM4Ni9wYy5oIGIvaW5jbHVkZS9ody9pMzg2L3BjLmgKaW5kZXggODQ3MjBiZWRlOS4u MGFiYmU0NTYzNyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody9pMzg2L3BjLmgKKysrIGIvaW5jbHVk ZS9ody9pMzg2L3BjLmgKQEAgLTM1NCwyMSArMzU0LDkgQEAgZXh0ZXJuIGNvbnN0IHNpemVfdCBw Y19jb21wYXRfMV80X2xlbjsKICAqIGRlcGVuZGluZyBvbiBRRU1VIHZlcnNpb25zIHVwIHRvIFFF TVUgMi40LgogICovCiAjZGVmaW5lIFBDX0NQVV9NT0RFTF9JRFModikgXAotICAgIHtcCi0gICAg ICAgIC5kcml2ZXIgICA9ICJxZW11MzItIiBUWVBFX1g4Nl9DUFUsXAotICAgICAgICAucHJvcGVy dHkgPSAibW9kZWwtaWQiLFwKLSAgICAgICAgLnZhbHVlICAgID0gIlFFTVUgVmlydHVhbCBDUFUg dmVyc2lvbiAiIHYsXAotICAgIH0sXAotICAgIHtcCi0gICAgICAgIC5kcml2ZXIgICA9ICJxZW11 NjQtIiBUWVBFX1g4Nl9DUFUsXAotICAgICAgICAucHJvcGVydHkgPSAibW9kZWwtaWQiLFwKLSAg ICAgICAgLnZhbHVlICAgID0gIlFFTVUgVmlydHVhbCBDUFUgdmVyc2lvbiAiIHYsXAotICAgIH0s XAotICAgIHtcCi0gICAgICAgIC5kcml2ZXIgICA9ICJhdGhsb24tIiBUWVBFX1g4Nl9DUFUsXAot ICAgICAgICAucHJvcGVydHkgPSAibW9kZWwtaWQiLFwKLSAgICAgICAgLnZhbHVlICAgID0gIlFF TVUgVmlydHVhbCBDUFUgdmVyc2lvbiAiIHYsXAotICAgIH0sCisgICAgeyAicWVtdTMyLSIgVFlQ RV9YODZfQ1BVLCAibW9kZWwtaWQiLCAiUUVNVSBWaXJ0dWFsIENQVSB2ZXJzaW9uICIgdiwgfSxc CisgICAgeyAicWVtdTY0LSIgVFlQRV9YODZfQ1BVLCAibW9kZWwtaWQiLCAiUUVNVSBWaXJ0dWFs IENQVSB2ZXJzaW9uICIgdiwgfSxcCisgICAgeyAiYXRobG9uLSIgVFlQRV9YODZfQ1BVLCAibW9k ZWwtaWQiLCAiUUVNVSBWaXJ0dWFsIENQVSB2ZXJzaW9uICIgdiwgfSwKIAogI2RlZmluZSBERUZJ TkVfUENfTUFDSElORShzdWZmaXgsIG5hbWVzdHIsIGluaXRmbiwgb3B0c2ZuKSBcCiAgICAgc3Rh dGljIHZvaWQgcGNfbWFjaGluZV8jI3N1ZmZpeCMjX2NsYXNzX2luaXQoT2JqZWN0Q2xhc3MgKm9j LCB2b2lkICpkYXRhKSBcCmRpZmYgLS1naXQgYS9ody9jb3JlL21hY2hpbmUuYyBiL2h3L2NvcmUv bWFjaGluZS5jCmluZGV4IDRiNGQ2YzIzZGUuLjU1MzBiNzE5ODEgMTAwNjQ0Ci0tLSBhL2h3L2Nv cmUvbWFjaGluZS5jCisrKyBiL2h3L2NvcmUvbWFjaGluZS5jCkBAIC0yNCwyMyArMjQsMTAgQEAK ICNpbmNsdWRlICJody9wY2kvcGNpLmgiCiAKIEdsb2JhbFByb3BlcnR5IGh3X2NvbXBhdF8zXzFb XSA9IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwY2llLXJvb3QtcG9ydCIsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJ4LXNwZWVkIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjJfNSIsCi0g ICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwY2llLXJvb3QtcG9ydCIsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJ4LXdpZHRoIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjEiLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAibWVtb3J5LWJhY2tlbmQtZmlsZSIsCi0gICAgICAgIC5wcm9w ZXJ0eSA9ICJ4LXVzZS1jYW5vbmljYWwtcGF0aC1mb3ItcmFtYmxvY2staWQiLAotICAgICAgICAu dmFsdWUgICAgPSAidHJ1ZSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJtZW1vcnkt YmFja2VuZC1tZW1mZCIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4LXVzZS1jYW5vbmljYWwtcGF0 aC1mb3ItcmFtYmxvY2staWQiLAotICAgICAgICAudmFsdWUgICAgPSAidHJ1ZSIsCi0gICAgfSwK KyAgICB7ICJwY2llLXJvb3QtcG9ydCIsICJ4LXNwZWVkIiwgIjJfNSIgfSwKKyAgICB7ICJwY2ll LXJvb3QtcG9ydCIsICJ4LXdpZHRoIiwgIjEiIH0sCisgICAgeyAibWVtb3J5LWJhY2tlbmQtZmls ZSIsICJ4LXVzZS1jYW5vbmljYWwtcGF0aC1mb3ItcmFtYmxvY2staWQiLCAidHJ1ZSIgfSwKKyAg ICB7ICJtZW1vcnktYmFja2VuZC1tZW1mZCIsICJ4LXVzZS1jYW5vbmljYWwtcGF0aC1mb3ItcmFt YmxvY2staWQiLCAidHJ1ZSIgfSwKIH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzNfMV9sZW4g PSBHX05fRUxFTUVOVFMoaHdfY29tcGF0XzNfMSk7CiAKQEAgLTQ4LDI2OSArMzUsOTYgQEAgR2xv YmFsUHJvcGVydHkgaHdfY29tcGF0XzNfMFtdID0ge307CiBjb25zdCBzaXplX3QgaHdfY29tcGF0 XzNfMF9sZW4gPSBHX05fRUxFTUVOVFMoaHdfY29tcGF0XzNfMCk7CiAKIEdsb2JhbFByb3BlcnR5 IGh3X2NvbXBhdF8yXzEyW10gPSB7Ci0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAibWlncmF0 aW9uIiwKLSAgICAgICAgLnByb3BlcnR5ID0gImRlY29tcHJlc3MtZXJyb3ItY2hlY2siLAotICAg ICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gImhk YS1hdWRpbyIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ1c2UtdGltZXIiLAotICAgICAgICAudmFs dWUgICAgPSAiZmFsc2UiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiY2lycnVzLXZn YSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJnbG9iYWwtdm1zdGF0ZSIsCi0gICAgICAgIC52YWx1 ZSAgICA9ICJ0cnVlIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIlZHQSIsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJnbG9iYWwtdm1zdGF0ZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJ0 cnVlIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZtd2FyZS1zdmdhIiwKLSAgICAg ICAgLnByb3BlcnR5ID0gImdsb2JhbC12bXN0YXRlIiwKLSAgICAgICAgLnZhbHVlICAgID0gInRy dWUiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAicXhsLXZnYSIsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJnbG9iYWwtdm1zdGF0ZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJ0cnVlIiwK LSAgICB9LAorICAgIHsgIm1pZ3JhdGlvbiIsICJkZWNvbXByZXNzLWVycm9yLWNoZWNrIiwgIm9m ZiIgfSwKKyAgICB7ICJoZGEtYXVkaW8iLCAidXNlLXRpbWVyIiwgImZhbHNlIiB9LAorICAgIHsg ImNpcnJ1cy12Z2EiLCAiZ2xvYmFsLXZtc3RhdGUiLCAidHJ1ZSIgfSwKKyAgICB7ICJWR0EiLCAi Z2xvYmFsLXZtc3RhdGUiLCAidHJ1ZSIgfSwKKyAgICB7ICJ2bXdhcmUtc3ZnYSIsICJnbG9iYWwt dm1zdGF0ZSIsICJ0cnVlIiB9LAorICAgIHsgInF4bC12Z2EiLCAiZ2xvYmFsLXZtc3RhdGUiLCAi dHJ1ZSIgfSwKIH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzJfMTJfbGVuID0gR19OX0VMRU1F TlRTKGh3X2NvbXBhdF8yXzEyKTsKIAogR2xvYmFsUHJvcGVydHkgaHdfY29tcGF0XzJfMTFbXSA9 IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJocGV0IiwKLSAgICAgICAgLnByb3BlcnR5 ID0gImhwZXQtb2Zmc2V0LXNhdmVkIiwKLSAgICAgICAgLnZhbHVlICAgID0gImZhbHNlIiwKLSAg ICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1ibGstcGNpIiwKLSAgICAgICAgLnBy b3BlcnR5ID0gInZlY3RvcnMiLAotICAgICAgICAudmFsdWUgICAgPSAiMiIsCi0gICAgfSx7Ci0g ICAgICAgIC5kcml2ZXIgICA9ICJ2aG9zdC11c2VyLWJsay1wY2kiLAotICAgICAgICAucHJvcGVy dHkgPSAidmVjdG9ycyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIyIiwKLSAgICB9LHsKLSAgICAg ICAgLmRyaXZlciAgID0gImUxMDAwIiwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1pZ3JhdGVfdHNv X3Byb3BzIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSwKKyAgICB7ICJocGV0 IiwgImhwZXQtb2Zmc2V0LXNhdmVkIiwgImZhbHNlIiB9LAorICAgIHsgInZpcnRpby1ibGstcGNp IiwgInZlY3RvcnMiLCAiMiIgfSwKKyAgICB7ICJ2aG9zdC11c2VyLWJsay1wY2kiLCAidmVjdG9y cyIsICIyIiB9LAorICAgIHsgImUxMDAwIiwgIm1pZ3JhdGVfdHNvX3Byb3BzIiwgIm9mZiIgfSwK IH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzJfMTFfbGVuID0gR19OX0VMRU1FTlRTKGh3X2Nv bXBhdF8yXzExKTsKIAogR2xvYmFsUHJvcGVydHkgaHdfY29tcGF0XzJfMTBbXSA9IHsKLSAgICB7 Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tbW91c2UtZGV2aWNlIiwKLSAgICAgICAgLnBy b3BlcnR5ID0gIndoZWVsLWF4aXMiLAotICAgICAgICAudmFsdWUgICAgPSAiZmFsc2UiLAotICAg IH0sewotICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLXRhYmxldC1kZXZpY2UiLAotICAgICAg ICAucHJvcGVydHkgPSAid2hlZWwtYXhpcyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJmYWxzZSIs Ci0gICAgfSwKKyAgICB7ICJ2aXJ0aW8tbW91c2UtZGV2aWNlIiwgIndoZWVsLWF4aXMiLCAiZmFs c2UiIH0sCisgICAgeyAidmlydGlvLXRhYmxldC1kZXZpY2UiLCAid2hlZWwtYXhpcyIsICJmYWxz ZSIgfSwKIH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzJfMTBfbGVuID0gR19OX0VMRU1FTlRT KGh3X2NvbXBhdF8yXzEwKTsKIAogR2xvYmFsUHJvcGVydHkgaHdfY29tcGF0XzJfOVtdID0gewot ICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gInBjaS1icmlkZ2UiLAotICAgICAgICAucHJvcGVy dHkgPSAic2hwYyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAg ICAuZHJpdmVyICAgPSAiaW50ZWwtaW9tbXUiLAotICAgICAgICAucHJvcGVydHkgPSAicHQiLAot ICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0g InZpcnRpby1uZXQtZGV2aWNlIiwKLSAgICAgICAgLnByb3BlcnR5ID0gIngtbXR1LWJ5cGFzcy1i YWNrZW5kIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0gICAgICAgIC5k cml2ZXIgICA9ICJwY2llLXJvb3QtcG9ydCIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4LW1pZ3Jh dGUtbXNpeCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJmYWxzZSIsCi0gICAgfSwKKyAgICB7ICJw Y2ktYnJpZGdlIiwgInNocGMiLCAib2ZmIiB9LAorICAgIHsgImludGVsLWlvbW11IiwgInB0Iiwg Im9mZiIgfSwKKyAgICB7ICJ2aXJ0aW8tbmV0LWRldmljZSIsICJ4LW10dS1ieXBhc3MtYmFja2Vu ZCIsICJvZmYiIH0sCisgICAgeyAicGNpZS1yb290LXBvcnQiLCAieC1taWdyYXRlLW1zaXgiLCAi ZmFsc2UiIH0sCiB9OwogY29uc3Qgc2l6ZV90IGh3X2NvbXBhdF8yXzlfbGVuID0gR19OX0VMRU1F TlRTKGh3X2NvbXBhdF8yXzkpOwogCiBHbG9iYWxQcm9wZXJ0eSBod19jb21wYXRfMl84W10gPSB7 Ci0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAiZndfY2ZnX21lbSIsCi0gICAgICAgIC5wcm9w ZXJ0eSA9ICJ4LWZpbGUtc2xvdHMiLAotICAgICAgICAudmFsdWUgICAgPSAiMHgxMCIsCi0gICAg fSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJmd19jZmdfaW8iLAotICAgICAgICAucHJvcGVydHkg PSAieC1maWxlLXNsb3RzIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4MTAiLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAicGZsYXNoX2NmaTAxIiwKLSAgICAgICAgLnByb3BlcnR5ID0g Im9sZC1tdWx0aXBsZS1jaGlwLWhhbmRsaW5nIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwK LSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInBjaS1icmlkZ2UiLAotICAgICAgICAucHJv cGVydHkgPSAic2hwYyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSx7Ci0gICAg ICAgIC5kcml2ZXIgICA9IFRZUEVfUENJX0RFVklDRSwKLSAgICAgICAgLnByb3BlcnR5ID0gIngt cGNpZS1leHRjYXAtaW5pdCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLXBjaSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4 LXBjaWUtZGV2ZXJyLWluaXQiLAotICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsK LSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1wY2kiLAotICAgICAgICAucHJvcGVydHkgPSAi eC1wY2llLWxua2N0bC1pbml0IiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7 Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tcGNpIiwKLSAgICAgICAgLnByb3BlcnR5ID0g IngtcGNpZS1wbS1pbml0IiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0g ICAgICAgIC5kcml2ZXIgICA9ICJjaXJydXMtdmdhIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInZn YW1lbV9tYiIsCi0gICAgICAgIC52YWx1ZSAgICA9ICI4IiwKLSAgICB9LHsKLSAgICAgICAgLmRy aXZlciAgID0gImlzYS1jaXJydXMtdmdhIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInZnYW1lbV9t YiIsCi0gICAgICAgIC52YWx1ZSAgICA9ICI4IiwKLSAgICB9LAorICAgIHsgImZ3X2NmZ19tZW0i LCAieC1maWxlLXNsb3RzIiwgIjB4MTAiIH0sCisgICAgeyAiZndfY2ZnX2lvIiwgIngtZmlsZS1z bG90cyIsICIweDEwIiB9LAorICAgIHsgInBmbGFzaF9jZmkwMSIsICJvbGQtbXVsdGlwbGUtY2hp cC1oYW5kbGluZyIsICJvbiIgfSwKKyAgICB7ICJwY2ktYnJpZGdlIiwgInNocGMiLCAib24iIH0s CisgICAgeyBUWVBFX1BDSV9ERVZJQ0UsICJ4LXBjaWUtZXh0Y2FwLWluaXQiLCAib2ZmIiB9LAor ICAgIHsgInZpcnRpby1wY2kiLCAieC1wY2llLWRldmVyci1pbml0IiwgIm9mZiIgfSwKKyAgICB7 ICJ2aXJ0aW8tcGNpIiwgIngtcGNpZS1sbmtjdGwtaW5pdCIsICJvZmYiIH0sCisgICAgeyAidmly dGlvLXBjaSIsICJ4LXBjaWUtcG0taW5pdCIsICJvZmYiIH0sCisgICAgeyAiY2lycnVzLXZnYSIs ICJ2Z2FtZW1fbWIiLCAiOCIgfSwKKyAgICB7ICJpc2EtY2lycnVzLXZnYSIsICJ2Z2FtZW1fbWIi LCAiOCIgfSwKIH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzJfOF9sZW4gPSBHX05fRUxFTUVO VFMoaHdfY29tcGF0XzJfOCk7CiAKIEdsb2JhbFByb3BlcnR5IGh3X2NvbXBhdF8yXzdbXSA9IHsK LSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tcGNpIiwKLSAgICAgICAgLnByb3Bl cnR5ID0gInBhZ2UtcGVyLXZxIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9LHsK LSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1zZXJpYWwtZGV2aWNlIiwKLSAgICAgICAgLnBy b3BlcnR5ID0gImVtZXJnZW5jeS13cml0ZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAot ICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiaW9hcGljIiwKLSAgICAgICAgLnByb3BlcnR5 ID0gInZlcnNpb24iLAotICAgICAgICAudmFsdWUgICAgPSAiMHgxMSIsCi0gICAgfSx7Ci0gICAg ICAgIC5kcml2ZXIgICA9ICJpbnRlbC1pb21tdSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4LWJ1 Z2d5LWVpbSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJ0cnVlIiwKLSAgICB9LHsKLSAgICAgICAg LmRyaXZlciAgID0gInZpcnRpby1wY2kiLAotICAgICAgICAucHJvcGVydHkgPSAieC1pZ25vcmUt YmFja2VuZC1mZWF0dXJlcyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSwKKyAg ICB7ICJ2aXJ0aW8tcGNpIiwgInBhZ2UtcGVyLXZxIiwgIm9uIiB9LAorICAgIHsgInZpcnRpby1z ZXJpYWwtZGV2aWNlIiwgImVtZXJnZW5jeS13cml0ZSIsICJvZmYiIH0sCisgICAgeyAiaW9hcGlj IiwgInZlcnNpb24iLCAiMHgxMSIgfSwKKyAgICB7ICJpbnRlbC1pb21tdSIsICJ4LWJ1Z2d5LWVp bSIsICJ0cnVlIiB9LAorICAgIHsgInZpcnRpby1wY2kiLCAieC1pZ25vcmUtYmFja2VuZC1mZWF0 dXJlcyIsICJvbiIgfSwKIH07CiBjb25zdCBzaXplX3QgaHdfY29tcGF0XzJfN19sZW4gPSBHX05f RUxFTUVOVFMoaHdfY29tcGF0XzJfNyk7CiAKIEdsb2JhbFByb3BlcnR5IGh3X2NvbXBhdF8yXzZb XSA9IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tbW1pbyIsCi0gICAgICAg IC5wcm9wZXJ0eSA9ICJmb3JtYXRfdHJhbnNwb3J0X2FkZHJlc3MiLAotICAgICAgICAudmFsdWUg ICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1wY2kiLAot ICAgICAgICAucHJvcGVydHkgPSAiZGlzYWJsZS1tb2Rlcm4iLAotICAgICAgICAudmFsdWUgICAg PSAib24iLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLXBjaSIsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJkaXNhYmxlLWxlZ2FjeSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJv ZmYiLAotICAgIH0sCisgICAgeyAidmlydGlvLW1taW8iLCAiZm9ybWF0X3RyYW5zcG9ydF9hZGRy ZXNzIiwgIm9mZiIgfSwKKyAgICB7ICJ2aXJ0aW8tcGNpIiwgImRpc2FibGUtbW9kZXJuIiwgIm9u IiB9LAorICAgIHsgInZpcnRpby1wY2kiLCAiZGlzYWJsZS1sZWdhY3kiLCAib2ZmIiB9LAogfTsK IGNvbnN0IHNpemVfdCBod19jb21wYXRfMl82X2xlbiA9IEdfTl9FTEVNRU5UUyhod19jb21wYXRf Ml82KTsKIAogR2xvYmFsUHJvcGVydHkgaHdfY29tcGF0XzJfNVtdID0gewotICAgIHsKLSAgICAg ICAgLmRyaXZlciAgID0gImlzYS1mZGMiLAotICAgICAgICAucHJvcGVydHkgPSAiZmFsbGJhY2si LAotICAgICAgICAudmFsdWUgICAgPSAiMTQ0IiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAg ID0gInB2c2NzaSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4LW9sZC1wY2ktY29uZmlndXJhdGlv biIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIg ICA9ICJwdnNjc2kiLAotICAgICAgICAucHJvcGVydHkgPSAieC1kaXNhYmxlLXBjaWUiLAotICAg ICAgICAudmFsdWUgICAgPSAib24iLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAg PSAidm14bmV0MyIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4LW9sZC1tc2ktb2Zmc2V0cyIsCi0g ICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2 bXhuZXQzIiwKLSAgICAgICAgLnByb3BlcnR5ID0gIngtZGlzYWJsZS1wY2llIiwKLSAgICAgICAg LnZhbHVlICAgID0gIm9uIiwKLSAgICB9LAorICAgIHsgImlzYS1mZGMiLCAiZmFsbGJhY2siLCAi MTQ0IiB9LAorICAgIHsgInB2c2NzaSIsICJ4LW9sZC1wY2ktY29uZmlndXJhdGlvbiIsICJvbiIg fSwKKyAgICB7ICJwdnNjc2kiLCAieC1kaXNhYmxlLXBjaWUiLCAib24iIH0sCisgICAgeyAidm14 bmV0MyIsICJ4LW9sZC1tc2ktb2Zmc2V0cyIsICJvbiIgfSwKKyAgICB7ICJ2bXhuZXQzIiwgIngt ZGlzYWJsZS1wY2llIiwgIm9uIiB9LAogfTsKIGNvbnN0IHNpemVfdCBod19jb21wYXRfMl81X2xl biA9IEdfTl9FTEVNRU5UUyhod19jb21wYXRfMl81KTsKIAogR2xvYmFsUHJvcGVydHkgaHdfY29t cGF0XzJfNFtdID0gewotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1ibGstZGV2 aWNlIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInNjc2kiLAotICAgICAgICAudmFsdWUgICAgPSAi dHJ1ZSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJlMTAwMCIsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJleHRyYV9tYWNfcmVnaXN0ZXJzIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9m ZiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tcGNpIiwKLSAgICAgICAg LnByb3BlcnR5ID0gIngtZGlzYWJsZS1wY2llIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwK LSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1wY2kiLAotICAgICAgICAucHJv cGVydHkgPSAibWlncmF0ZS1leHRyYSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAg IH0sewotICAgICAgICAuZHJpdmVyICAgPSAiZndfY2ZnX21lbSIsCi0gICAgICAgIC5wcm9wZXJ0 eSA9ICJkbWFfZW5hYmxlZCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAiZndfY2ZnX2lvIiwKLSAgICAgICAgLnByb3BlcnR5ID0gImRt YV9lbmFibGVkIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfQorICAgIHsgInZp cnRpby1ibGstZGV2aWNlIiwgInNjc2kiLCAidHJ1ZSIgfSwKKyAgICB7ICJlMTAwMCIsICJleHRy YV9tYWNfcmVnaXN0ZXJzIiwgIm9mZiIgfSwKKyAgICB7ICJ2aXJ0aW8tcGNpIiwgIngtZGlzYWJs ZS1wY2llIiwgIm9uIiB9LAorICAgIHsgInZpcnRpby1wY2kiLCAibWlncmF0ZS1leHRyYSIsICJv ZmYiIH0sCisgICAgeyAiZndfY2ZnX21lbSIsICJkbWFfZW5hYmxlZCIsICJvZmYiIH0sCisgICAg eyAiZndfY2ZnX2lvIiwgImRtYV9lbmFibGVkIiwgIm9mZiIgfQogfTsKIGNvbnN0IHNpemVfdCBo d19jb21wYXRfMl80X2xlbiA9IEdfTl9FTEVNRU5UUyhod19jb21wYXRfMl80KTsKIAogR2xvYmFs UHJvcGVydHkgaHdfY29tcGF0XzJfM1tdID0gewotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0g InZpcnRpby1ibGstcGNpIiwKLSAgICAgICAgLnByb3BlcnR5ID0gImFueV9sYXlvdXQiLAotICAg ICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZp cnRpby1iYWxsb29uLXBjaSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJhbnlfbGF5b3V0IiwKLSAg ICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2 aXJ0aW8tc2VyaWFsLXBjaSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJhbnlfbGF5b3V0IiwKLSAg ICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2 aXJ0aW8tOXAtcGNpIiwKLSAgICAgICAgLnByb3BlcnR5ID0gImFueV9sYXlvdXQiLAotICAgICAg ICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRp by1ybmctcGNpIiwKLSAgICAgICAgLnByb3BlcnR5ID0gImFueV9sYXlvdXQiLAotICAgICAgICAu dmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gVFlQRV9QQ0lf REVWSUNFLAotICAgICAgICAucHJvcGVydHkgPSAieC1wY2llLWxua3N0YS1kbGxsYSIsCi0gICAg ICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAibWln cmF0aW9uIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInNlbmQtY29uZmlndXJhdGlvbiIsCi0gICAg ICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAibWln cmF0aW9uIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInNlbmQtc2VjdGlvbi1mb290ZXIiLAotICAg ICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIm1p Z3JhdGlvbiIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJzdG9yZS1nbG9iYWwtc3RhdGUiLAotICAg ICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LAorICAgIHsgInZpcnRpby1ibGstcGNpIiwg ImFueV9sYXlvdXQiLCAib2ZmIiB9LAorICAgIHsgInZpcnRpby1iYWxsb29uLXBjaSIsICJhbnlf bGF5b3V0IiwgIm9mZiIgfSwKKyAgICB7ICJ2aXJ0aW8tc2VyaWFsLXBjaSIsICJhbnlfbGF5b3V0 IiwgIm9mZiIgfSwKKyAgICB7ICJ2aXJ0aW8tOXAtcGNpIiwgImFueV9sYXlvdXQiLCAib2ZmIiB9 LAorICAgIHsgInZpcnRpby1ybmctcGNpIiwgImFueV9sYXlvdXQiLCAib2ZmIiB9LAorICAgIHsg VFlQRV9QQ0lfREVWSUNFLCAieC1wY2llLWxua3N0YS1kbGxsYSIsICJvZmYiIH0sCisgICAgeyAi bWlncmF0aW9uIiwgInNlbmQtY29uZmlndXJhdGlvbiIsICJvZmYiIH0sCisgICAgeyAibWlncmF0 aW9uIiwgInNlbmQtc2VjdGlvbi1mb290ZXIiLCAib2ZmIiB9LAorICAgIHsgIm1pZ3JhdGlvbiIs ICJzdG9yZS1nbG9iYWwtc3RhdGUiLCAib2ZmIiB9LAogfTsKIGNvbnN0IHNpemVfdCBod19jb21w YXRfMl8zX2xlbiA9IEdfTl9FTEVNRU5UUyhod19jb21wYXRfMl8zKTsKIApAQCAtMzE4LDM1ICsx MzIsMTMgQEAgR2xvYmFsUHJvcGVydHkgaHdfY29tcGF0XzJfMltdID0ge307CiBjb25zdCBzaXpl X3QgaHdfY29tcGF0XzJfMl9sZW4gPSBHX05fRUxFTUVOVFMoaHdfY29tcGF0XzJfMik7CiAKIEds b2JhbFByb3BlcnR5IGh3X2NvbXBhdF8yXzFbXSA9IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIg ICA9ICJpbnRlbC1oZGEiLAotICAgICAgICAucHJvcGVydHkgPSAib2xkX21zaV9hZGRyIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIlZH QSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJxZW11LWV4dGVuZGVkLXJlZ3MiLAotICAgICAgICAu dmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInNlY29uZGFy eS12Z2EiLAotICAgICAgICAucHJvcGVydHkgPSAicWVtdS1leHRlbmRlZC1yZWdzIiwKLSAgICAg ICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0 aW8tc2NzaS1wY2kiLAotICAgICAgICAucHJvcGVydHkgPSAiYW55X2xheW91dCIsCi0gICAgICAg IC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAidXNiLW1v dXNlIiwKLSAgICAgICAgLnByb3BlcnR5ID0gInVzYl92ZXJzaW9uIiwKLSAgICAgICAgLnZhbHVl ICAgID0gIjEiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAidXNiLWtiZCIsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJ1c2JfdmVyc2lvbiIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIxIiwK LSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1wY2kiLAotICAgICAgICAucHJv cGVydHkgPSAidmlydGlvLXBjaS1idXMtbWFzdGVyLWJ1Zy1taWdyYXRpb24iLAotICAgICAgICAu dmFsdWUgICAgPSAib24iLAotICAgIH0sCisgICAgeyAiaW50ZWwtaGRhIiwgIm9sZF9tc2lfYWRk ciIsICJvbiIgfSwKKyAgICB7ICJWR0EiLCAicWVtdS1leHRlbmRlZC1yZWdzIiwgIm9mZiIgfSwK KyAgICB7ICJzZWNvbmRhcnktdmdhIiwgInFlbXUtZXh0ZW5kZWQtcmVncyIsICJvZmYiIH0sCisg ICAgeyAidmlydGlvLXNjc2ktcGNpIiwgImFueV9sYXlvdXQiLCAib2ZmIiB9LAorICAgIHsgInVz Yi1tb3VzZSIsICJ1c2JfdmVyc2lvbiIsICIxIiB9LAorICAgIHsgInVzYi1rYmQiLCAidXNiX3Zl cnNpb24iLCAiMSIgfSwKKyAgICB7ICJ2aXJ0aW8tcGNpIiwgInZpcnRpby1wY2ktYnVzLW1hc3Rl ci1idWctbWlncmF0aW9uIiwgIm9uIiB9LAogfTsKIGNvbnN0IHNpemVfdCBod19jb21wYXRfMl8x X2xlbiA9IEdfTl9FTEVNRU5UUyhod19jb21wYXRfMl8xKTsKIApkaWZmIC0tZ2l0IGEvaHcvaTM4 Ni9wYy5jIGIvaHcvaTM4Ni9wYy5jCmluZGV4IGZmMTRiNmQ0ZGYuLmYyMzg0MjQ0OTkgMTAwNjQ0 Ci0tLSBhL2h3L2kzODYvcGMuYworKysgYi9ody9pMzg2L3BjLmMKQEAgLTExMSwxNzQgKzExMSw2 NyBAQCBzdGF0aWMgdW5zaWduZWQgZTgyMF9lbnRyaWVzOwogc3RydWN0IGhwZXRfZndfY29uZmln IGhwZXRfY2ZnID0gey5jb3VudCA9IFVJTlQ4X01BWH07CiAKIEdsb2JhbFByb3BlcnR5IHBjX2Nv bXBhdF8zXzFbXSA9IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJpbnRlbC1pb21tdSIs Ci0gICAgICAgIC5wcm9wZXJ0eSA9ICJkbWEtZHJhaW4iLAotICAgICAgICAudmFsdWUgICAgPSAi b2ZmIiwKLSAgICB9LAorICAgIHsgImludGVsLWlvbW11IiwgImRtYS1kcmFpbiIsICJvZmYiIH0s CiB9OwogY29uc3Qgc2l6ZV90IHBjX2NvbXBhdF8zXzFfbGVuID0gR19OX0VMRU1FTlRTKHBjX2Nv bXBhdF8zXzEpOwogCiBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfM18wW10gPSB7Ci0gICAgewot ICAgICAgICAuZHJpdmVyICAgPSBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ4 LWh2LXN5bmljLWt2bS1vbmx5IiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9LHsK LSAgICAgICAgLmRyaXZlciAgID0gIlNreWxha2UtU2VydmVyIiAiLSIgVFlQRV9YODZfQ1BVLAot ICAgICAgICAucHJvcGVydHkgPSAicGt1IiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0g ICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJTa3lsYWtlLVNlcnZlci1JQlJTIiAiLSIgVFlQ RV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAicGt1IiwKLSAgICAgICAgLnZhbHVlICAg ID0gIm9mZiIsCi0gICAgfSwKKyAgICB7IFRZUEVfWDg2X0NQVSwgIngtaHYtc3luaWMta3ZtLW9u bHkiLCAib24iIH0sCisgICAgeyAiU2t5bGFrZS1TZXJ2ZXIiICItIiBUWVBFX1g4Nl9DUFUsICJw a3UiLCAib2ZmIiB9LAorICAgIHsgIlNreWxha2UtU2VydmVyLUlCUlMiICItIiBUWVBFX1g4Nl9D UFUsICJwa3UiLCAib2ZmIiB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19jb21wYXRfM18wX2xlbiA9 IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfM18wKTsKIAogR2xvYmFsUHJvcGVydHkgcGNfY29tcGF0 XzJfMTJbXSA9IHsKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9IFRZUEVfWDg2X0NQVSwKLSAg ICAgICAgLnByb3BlcnR5ID0gImxlZ2FjeS1jYWNoZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJv biIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9IFRZUEVfWDg2X0NQVSwKLSAgICAgICAg LnByb3BlcnR5ID0gInRvcG9leHQiLAotICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9 LHsKLSAgICAgICAgLmRyaXZlciAgID0gIkVQWUMtIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJ4bGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCi0g ICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJFUFlDLUlCUEItIiBUWVBFX1g4Nl9DUFUsCi0g ICAgICAgIC5wcm9wZXJ0eSA9ICJ4bGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAw MDAwYSIsCi0gICAgfSwKKyAgICB7IFRZUEVfWDg2X0NQVSwgImxlZ2FjeS1jYWNoZSIsICJvbiIg fSwKKyAgICB7IFRZUEVfWDg2X0NQVSwgInRvcG9leHQiLCAib2ZmIiB9LAorICAgIHsgIkVQWUMt IiBUWVBFX1g4Nl9DUFUsICJ4bGV2ZWwiLCAiMHg4MDAwMDAwYSIgfSwKKyAgICB7ICJFUFlDLUlC UEItIiBUWVBFX1g4Nl9DUFUsICJ4bGV2ZWwiLCAiMHg4MDAwMDAwYSIgfSwKIH07CiBjb25zdCBz aXplX3QgcGNfY29tcGF0XzJfMTJfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8yXzEyKTsK IAogR2xvYmFsUHJvcGVydHkgcGNfY29tcGF0XzJfMTFbXSA9IHsKLSAgICB7Ci0gICAgICAgIC5k cml2ZXIgICA9IFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIngtbWlncmF0ZS1z bWktY291bnQiLAotICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAg LmRyaXZlciAgID0gIlNreWxha2UtU2VydmVyIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAu cHJvcGVydHkgPSAiY2xmbHVzaG9wdCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAg IH0sCisgICAgeyBUWVBFX1g4Nl9DUFUsICJ4LW1pZ3JhdGUtc21pLWNvdW50IiwgIm9mZiIgfSwK KyAgICB7ICJTa3lsYWtlLVNlcnZlciIgIi0iIFRZUEVfWDg2X0NQVSwgImNsZmx1c2hvcHQiLCAi b2ZmIiB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19jb21wYXRfMl8xMV9sZW4gPSBHX05fRUxFTUVO VFMocGNfY29tcGF0XzJfMTEpOwogCiBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl8xMFtdID0g ewotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJv cGVydHkgPSAieC1odi1tYXgtdnBzIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4NDAiLAotICAg IH0sewotICAgICAgICAuZHJpdmVyICAgPSAiaTQ0MEZYLXBjaWhvc3QiLAotICAgICAgICAucHJv cGVydHkgPSAieC1wY2ktaG9sZTY0LWZpeCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAot ICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAicTM1LXBjaWhvc3QiLAotICAgICAgICAucHJv cGVydHkgPSAieC1wY2ktaG9sZTY0LWZpeCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAot ICAgIH0sCisgICAgeyBUWVBFX1g4Nl9DUFUsICJ4LWh2LW1heC12cHMiLCAiMHg0MCIgfSwKKyAg ICB7ICJpNDQwRlgtcGNpaG9zdCIsICJ4LXBjaS1ob2xlNjQtZml4IiwgIm9mZiIgfSwKKyAgICB7 ICJxMzUtcGNpaG9zdCIsICJ4LXBjaS1ob2xlNjQtZml4IiwgIm9mZiIgfSwKIH07CiBjb25zdCBz aXplX3QgcGNfY29tcGF0XzJfMTBfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8yXzEwKTsK IAogR2xvYmFsUHJvcGVydHkgcGNfY29tcGF0XzJfOVtdID0gewotICAgIHsKLSAgICAgICAgLmRy aXZlciAgID0gIm1jaCIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJleHRlbmRlZC10c2VnLW1ieXRl cyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIwIiwKLSAgICB9LAorICAgIHsgIm1jaCIsICJleHRl bmRlZC10c2VnLW1ieXRlcyIsICIwIiB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19jb21wYXRfMl85 X2xlbiA9IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfMl85KTsKIAogR2xvYmFsUHJvcGVydHkgcGNf Y29tcGF0XzJfOFtdID0gewotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gVFlQRV9YODZfQ1BV LAotICAgICAgICAucHJvcGVydHkgPSAidGNnLWNwdWlkIiwKLSAgICAgICAgLnZhbHVlICAgID0g Im9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJrdm1jbG9jayIsCi0g ICAgICAgIC5wcm9wZXJ0eSA9ICJ4LW1hY2gtdXNlLXJlbGlhYmxlLWdldC1jbG9jayIsCi0gICAg ICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAg PSAiSUNIOS1MUEMiLAotICAgICAgICAucHJvcGVydHkgPSAieC1zbWktYnJvYWRjYXN0IiwKLSAg ICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIg ICA9IFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gInZtd2FyZS1jcHVpZC1mcmVx IiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5k cml2ZXIgICA9ICJIYXN3ZWxsLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAi c3RlcHBpbmciLAotICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0gICAgfSwKKyAgICB7IFRZUEVf WDg2X0NQVSwgInRjZy1jcHVpZCIsICJvZmYiIH0sCisgICAgeyAia3ZtY2xvY2siLCAieC1tYWNo LXVzZS1yZWxpYWJsZS1nZXQtY2xvY2siLCAib2ZmIiB9LAorICAgIHsgIklDSDktTFBDIiwgIngt c21pLWJyb2FkY2FzdCIsICJvZmYiIH0sCisgICAgeyBUWVBFX1g4Nl9DUFUsICJ2bXdhcmUtY3B1 aWQtZnJlcSIsICJvZmYiIH0sCisgICAgeyAiSGFzd2VsbC0iIFRZUEVfWDg2X0NQVSwgInN0ZXBw aW5nIiwgIjEiIH0sCiB9OwogY29uc3Qgc2l6ZV90IHBjX2NvbXBhdF8yXzhfbGVuID0gR19OX0VM RU1FTlRTKHBjX2NvbXBhdF8yXzgpOwogCiBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl83W10g PSB7Ci0gICAgewotICAgICAgICAuZHJpdmVyICAgPSBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJsMy1jYWNoZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0s Ci0gICAgewotICAgICAgICAuZHJpdmVyICAgPSBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9w ZXJ0eSA9ICJmdWxsLWNwdWlkLWF1dG8tbGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSAib2Zm IiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gIk9wdGVyb25fRzMiICItIiBU WVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJmYW1pbHkiLAotICAgICAgICAudmFs dWUgICAgPSAiMTUiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAiT3B0ZXJv bl9HMyIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1vZGVsIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIjYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAg PSAiT3B0ZXJvbl9HMyIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gInN0 ZXBwaW5nIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjEiLAotICAgIH0sCi0gICAgewotICAgICAg ICAuZHJpdmVyICAgPSAiaXNhLXBjc3BrIiwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1pZ3JhdGUi LAotICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LAorICAgIHsgVFlQRV9YODZfQ1BV LCAibDMtY2FjaGUiLCAib2ZmIiB9LAorICAgIHsgVFlQRV9YODZfQ1BVLCAiZnVsbC1jcHVpZC1h dXRvLWxldmVsIiwgIm9mZiIgfSwKKyAgICB7ICJPcHRlcm9uX0czIiAiLSIgVFlQRV9YODZfQ1BV LCAiZmFtaWx5IiwgIjE1IiB9LAorICAgIHsgIk9wdGVyb25fRzMiICItIiBUWVBFX1g4Nl9DUFUs ICJtb2RlbCIsICI2IiB9LAorICAgIHsgIk9wdGVyb25fRzMiICItIiBUWVBFX1g4Nl9DUFUsICJz dGVwcGluZyIsICIxIiB9LAorICAgIHsgImlzYS1wY3NwayIsICJtaWdyYXRlIiwgIm9mZiIgfSwK IH07CiBjb25zdCBzaXplX3QgcGNfY29tcGF0XzJfN19sZW4gPSBHX05fRUxFTUVOVFMocGNfY29t cGF0XzJfNyk7CiAKIEdsb2JhbFByb3BlcnR5IHBjX2NvbXBhdF8yXzZbXSA9IHsKLSAgICB7Ci0g ICAgICAgIC5kcml2ZXIgICA9IFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gImNw dWlkLTB4YiIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAgICAu ZHJpdmVyICAgPSAidm14bmV0MyIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJyb21maWxlIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSBU WVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJmaWxsLW10cnItbWFzayIsCi0gICAg ICAgIC52YWx1ZSA9ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAi YXBpYy1jb21tb24iLAotICAgICAgICAucHJvcGVydHkgPSAibGVnYWN5LWluc3RhbmNlLWlkIiwK LSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9CisgICAgeyBUWVBFX1g4Nl9DUFUsICJj cHVpZC0weGIiLCAib2ZmIiB9LAorICAgIHsgInZteG5ldDMiLCAicm9tZmlsZSIsICIiIH0sCisg ICAgeyBUWVBFX1g4Nl9DUFUsICJmaWxsLW10cnItbWFzayIsICJvZmYiIH0sCisgICAgeyAiYXBp Yy1jb21tb24iLCAibGVnYWN5LWluc3RhbmNlLWlkIiwgIm9uIiwgfQogfTsKIGNvbnN0IHNpemVf dCBwY19jb21wYXRfMl82X2xlbiA9IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfMl82KTsKIApAQCAt Mjg3LDQ5OSArMTgwLDE0OCBAQCBjb25zdCBzaXplX3QgcGNfY29tcGF0XzJfNV9sZW4gPSBHX05f RUxFTUVOVFMocGNfY29tcGF0XzJfNSk7CiAKIEdsb2JhbFByb3BlcnR5IHBjX2NvbXBhdF8yXzRb XSA9IHsKICAgICBQQ19DUFVfTU9ERUxfSURTKCIyLjQuMCIpCi0gICAgewotICAgICAgICAuZHJp dmVyICAgPSAiSGFzd2VsbC0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gImFi bSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAu ZHJpdmVyICAgPSAiSGFzd2VsbC1ub1RTWC0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3Bl cnR5ID0gImFibSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0sCi0gICAgewot ICAgICAgICAuZHJpdmVyICAgPSAiQnJvYWR3ZWxsLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAu cHJvcGVydHkgPSAiYWJtIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSwKLSAg ICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJCcm9hZHdlbGwtbm9UU1gtIiBUWVBFX1g4Nl9DUFUs Ci0gICAgICAgIC5wcm9wZXJ0eSA9ICJhYm0iLAotICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwK LSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gImhvc3QiICItIiBUWVBFX1g4Nl9D UFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJob3N0LWNhY2hlLWluZm8iLAotICAgICAgICAudmFs dWUgICAgPSAib24iLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSBUWVBFX1g4 Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJjaGVjayIsCi0gICAgICAgIC52YWx1ZSAgICA9 ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAicWVtdTY0IiAiLSIg VFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAic3NlNGEiLAotICAgICAgICAudmFs dWUgICAgPSAib24iLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAicWVtdTY0 IiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAiYWJtIiwKLSAgICAgICAg LnZhbHVlICAgID0gIm9uIiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gInFl bXU2NCIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gInBvcGNudCIsCi0g ICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIg ICA9ICJxZW11MzIiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJwb3Bj bnQiLAotICAgICAgICAudmFsdWUgICAgPSAib24iLAotICAgIH0sewotICAgICAgICAuZHJpdmVy ICAgPSAiT3B0ZXJvbl9HMiIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0g InJkdHNjcCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgfSx7Ci0gICAgICAgIC5k cml2ZXIgICA9ICJPcHRlcm9uX0czIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVy dHkgPSAicmR0c2NwIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9LHsKLSAgICAg ICAgLmRyaXZlciAgID0gIk9wdGVyb25fRzQiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJyZHRzY3AiLAotICAgICAgICAudmFsdWUgICAgPSAib24iLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAiT3B0ZXJvbl9HNSIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAg ICAgLnByb3BlcnR5ID0gInJkdHNjcCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAg fQorICAgIHsgIkhhc3dlbGwtIiBUWVBFX1g4Nl9DUFUsICJhYm0iLCAib2ZmIiB9LAorICAgIHsg Ikhhc3dlbGwtbm9UU1gtIiBUWVBFX1g4Nl9DUFUsICJhYm0iLCAib2ZmIiB9LAorICAgIHsgIkJy b2Fkd2VsbC0iIFRZUEVfWDg2X0NQVSwgImFibSIsICJvZmYiIH0sCisgICAgeyAiQnJvYWR3ZWxs LW5vVFNYLSIgVFlQRV9YODZfQ1BVLCAiYWJtIiwgIm9mZiIgfSwKKyAgICB7ICJob3N0IiAiLSIg VFlQRV9YODZfQ1BVLCAiaG9zdC1jYWNoZS1pbmZvIiwgIm9uIiB9LAorICAgIHsgVFlQRV9YODZf Q1BVLCAiY2hlY2siLCAib2ZmIiB9LAorICAgIHsgInFlbXU2NCIgIi0iIFRZUEVfWDg2X0NQVSwg InNzZTRhIiwgIm9uIiB9LAorICAgIHsgInFlbXU2NCIgIi0iIFRZUEVfWDg2X0NQVSwgImFibSIs ICJvbiIgfSwKKyAgICB7ICJxZW11NjQiICItIiBUWVBFX1g4Nl9DUFUsICJwb3BjbnQiLCAib24i IH0sCisgICAgeyAicWVtdTMyIiAiLSIgVFlQRV9YODZfQ1BVLCAicG9wY250IiwgIm9uIiB9LAor ICAgIHsgIk9wdGVyb25fRzIiICItIiBUWVBFX1g4Nl9DUFUsICJyZHRzY3AiLCAib24iIH0sCisg ICAgeyAiT3B0ZXJvbl9HMyIgIi0iIFRZUEVfWDg2X0NQVSwgInJkdHNjcCIsICJvbiIgfSwKKyAg ICB7ICJPcHRlcm9uX0c0IiAiLSIgVFlQRV9YODZfQ1BVLCAicmR0c2NwIiwgIm9uIiB9LAorICAg IHsgIk9wdGVyb25fRzUiICItIiBUWVBFX1g4Nl9DUFUsICJyZHRzY3AiLCAib24iLCB9CiB9Owog Y29uc3Qgc2l6ZV90IHBjX2NvbXBhdF8yXzRfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8y XzQpOwogCiBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl8zW10gPSB7CiAgICAgUENfQ1BVX01P REVMX0lEUygiMi4zLjAiKQotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gVFlQRV9YODZfQ1BV LAotICAgICAgICAucHJvcGVydHkgPSAiYXJhdCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYi LAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAicWVtdTY0IiAiLSIgVFlQRV9YODZfQ1BV LAotICAgICAgICAucHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0g IjQiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAia3ZtNjQiICItIiBUWVBFX1g4Nl9D UFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFsdWUgICAg PSAiNSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwZW50aXVtMyIgIi0iIFRZUEVf WDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1pbi1sZXZlbCIsCi0gICAgICAgIC52YWx1 ZSAgICA9ICIyIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIm4yNzAiICItIiBUWVBF X1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFs dWUgICAgPSAiNSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJDb25yb2UiICItIiBU WVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAu dmFsdWUgICAgPSAiNCIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJQZW5yeW4iICIt IiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAg ICAudmFsdWUgICAgPSAiNCIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJOZWhhbGVt IiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIjQiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAibjI3 MCIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1pbi14bGV2ZWwiLAot ICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2 ZXIgICA9ICJQZW5yeW4iICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJt aW4teGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAotICAgIH0sewot ICAgICAgICAuZHJpdmVyICAgPSAiQ29ucm9lIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAu cHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIweDgwMDAwMDBh IiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIk5laGFsZW0iICItIiBUWVBFX1g4Nl9D UFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAg ID0gIjB4ODAwMDAwMGEiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiV2VzdG1lcmUi ICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxldmVsIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAotICAgIH0sewotICAgICAgICAuZHJpdmVy ICAgPSAiU2FuZHlCcmlkZ2UiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9 ICJtaW4teGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAotICAgIH0s ewotICAgICAgICAuZHJpdmVyICAgPSAiSXZ5QnJpZGdlIiAiLSIgVFlQRV9YODZfQ1BVLAotICAg ICAgICAucHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIweDgw MDAwMDBhIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gIkhhc3dlbGwiICItIiBUWVBF X1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxldmVsIiwKLSAgICAgICAgLnZh bHVlICAgID0gIjB4ODAwMDAwMGEiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiSGFz d2VsbC1ub1RTWCIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1pbi14 bGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCi0gICAgfSx7Ci0gICAg ICAgIC5kcml2ZXIgICA9ICJCcm9hZHdlbGwiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJtaW4teGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEi LAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiQnJvYWR3ZWxsLW5vVFNYIiAiLSIgVFlQ RV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52 YWx1ZSAgICA9ICIweDgwMDAwMDBhIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciA9IFRZUEVf WDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gImt2bS1uby1zbWktbWlncmF0aW9uIiwKLSAg ICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICB9LAorICAgIHsgVFlQRV9YODZfQ1BVLCAiYXJh dCIsICJvZmYiIH0sCisgICAgeyAicWVtdTY0IiAiLSIgVFlQRV9YODZfQ1BVLCAibWluLWxldmVs IiwgIjQiIH0sCisgICAgeyAia3ZtNjQiICItIiBUWVBFX1g4Nl9DUFUsICJtaW4tbGV2ZWwiLCAi NSIgfSwKKyAgICB7ICJwZW50aXVtMyIgIi0iIFRZUEVfWDg2X0NQVSwgIm1pbi1sZXZlbCIsICIy IiB9LAorICAgIHsgIm4yNzAiICItIiBUWVBFX1g4Nl9DUFUsICJtaW4tbGV2ZWwiLCAiNSIgfSwK KyAgICB7ICJDb25yb2UiICItIiBUWVBFX1g4Nl9DUFUsICJtaW4tbGV2ZWwiLCAiNCIgfSwKKyAg ICB7ICJQZW5yeW4iICItIiBUWVBFX1g4Nl9DUFUsICJtaW4tbGV2ZWwiLCAiNCIgfSwKKyAgICB7 ICJOZWhhbGVtIiAiLSIgVFlQRV9YODZfQ1BVLCAibWluLWxldmVsIiwgIjQiIH0sCisgICAgeyAi bjI3MCIgIi0iIFRZUEVfWDg2X0NQVSwgIm1pbi14bGV2ZWwiLCAiMHg4MDAwMDAwYSIgfSwKKyAg ICB7ICJQZW5yeW4iICItIiBUWVBFX1g4Nl9DUFUsICJtaW4teGxldmVsIiwgIjB4ODAwMDAwMGEi IH0sCisgICAgeyAiQ29ucm9lIiAiLSIgVFlQRV9YODZfQ1BVLCAibWluLXhsZXZlbCIsICIweDgw MDAwMDBhIiB9LAorICAgIHsgIk5laGFsZW0iICItIiBUWVBFX1g4Nl9DUFUsICJtaW4teGxldmVs IiwgIjB4ODAwMDAwMGEiIH0sCisgICAgeyAiV2VzdG1lcmUiICItIiBUWVBFX1g4Nl9DUFUsICJt aW4teGxldmVsIiwgIjB4ODAwMDAwMGEiIH0sCisgICAgeyAiU2FuZHlCcmlkZ2UiICItIiBUWVBF X1g4Nl9DUFUsICJtaW4teGxldmVsIiwgIjB4ODAwMDAwMGEiIH0sCisgICAgeyAiSXZ5QnJpZGdl IiAiLSIgVFlQRV9YODZfQ1BVLCAibWluLXhsZXZlbCIsICIweDgwMDAwMDBhIiB9LAorICAgIHsg Ikhhc3dlbGwiICItIiBUWVBFX1g4Nl9DUFUsICJtaW4teGxldmVsIiwgIjB4ODAwMDAwMGEiIH0s CisgICAgeyAiSGFzd2VsbC1ub1RTWCIgIi0iIFRZUEVfWDg2X0NQVSwgIm1pbi14bGV2ZWwiLCAi MHg4MDAwMDAwYSIgfSwKKyAgICB7ICJCcm9hZHdlbGwiICItIiBUWVBFX1g4Nl9DUFUsICJtaW4t eGxldmVsIiwgIjB4ODAwMDAwMGEiIH0sCisgICAgeyAiQnJvYWR3ZWxsLW5vVFNYIiAiLSIgVFlQ RV9YODZfQ1BVLCAibWluLXhsZXZlbCIsICIweDgwMDAwMDBhIiB9LAorICAgIHsgVFlQRV9YODZf Q1BVLCAia3ZtLW5vLXNtaS1taWdyYXRpb24iLCAib24iIH0sCiB9OwogY29uc3Qgc2l6ZV90IHBj X2NvbXBhdF8yXzNfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8yXzMpOwogCiBHbG9iYWxQ cm9wZXJ0eSBwY19jb21wYXRfMl8yW10gPSB7CiAgICAgUENfQ1BVX01PREVMX0lEUygiMi4yLjAi KQotICAgIHsKLSAgICAgICAgLmRyaXZlciA9ICJrdm02NCIgIi0iIFRZUEVfWDg2X0NQVSwKLSAg ICAgICAgLnByb3BlcnR5ID0gInZtZSIsCi0gICAgICAgIC52YWx1ZSA9ICJvZmYiLAotICAgIH0s Ci0gICAgewotICAgICAgICAuZHJpdmVyID0gImt2bTMyIiAiLSIgVFlQRV9YODZfQ1BVLAotICAg ICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgfSwK LSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiQ29ucm9lIiAiLSIgVFlQRV9YODZfQ1BVLAotICAg ICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgfSwK LSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiUGVucnluIiAiLSIgVFlQRV9YODZfQ1BVLAotICAg ICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgfSwK LSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiTmVoYWxlbSIgIi0iIFRZUEVfWDg2X0NQVSwKLSAg ICAgICAgLnByb3BlcnR5ID0gInZtZSIsCi0gICAgICAgIC52YWx1ZSA9ICJvZmYiLAotICAgIH0s Ci0gICAgewotICAgICAgICAuZHJpdmVyID0gIldlc3RtZXJlIiAiLSIgVFlQRV9YODZfQ1BVLAot ICAgICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAg fSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiU2FuZHlCcmlkZ2UiICItIiBUWVBFX1g4Nl9D UFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ2bWUiLAotICAgICAgICAudmFsdWUgPSAib2ZmIiwK LSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciA9ICJIYXN3ZWxsIiAiLSIgVFlQRV9YODZf Q1BVLAotICAgICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIs Ci0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiQnJvYWR3ZWxsIiAiLSIgVFlQRV9Y ODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAgLnZhbHVlID0gIm9m ZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiT3B0ZXJvbl9HMSIgIi0iIFRZ UEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gInZtZSIsCi0gICAgICAgIC52YWx1ZSA9 ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyID0gIk9wdGVyb25fRzIiICIt IiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ2bWUiLAotICAgICAgICAudmFs dWUgPSAib2ZmIiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciA9ICJPcHRlcm9uX0cz IiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAidm1lIiwKLSAgICAgICAg LnZhbHVlID0gIm9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiT3B0ZXJv bl9HNCIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gInZtZSIsCi0gICAg ICAgIC52YWx1ZSA9ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyID0gIk9w dGVyb25fRzUiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJ2bWUiLAot ICAgICAgICAudmFsdWUgPSAib2ZmIiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciA9 ICJIYXN3ZWxsIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAiZjE2YyIs Ci0gICAgICAgIC52YWx1ZSA9ICJvZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVy ID0gIkhhc3dlbGwiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJyZHJh bmQiLAotICAgICAgICAudmFsdWUgPSAib2ZmIiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRy aXZlciA9ICJCcm9hZHdlbGwiICItIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9 ICJmMTZjIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAg IC5kcml2ZXIgPSAiQnJvYWR3ZWxsIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVy dHkgPSAicmRyYW5kIiwKLSAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgfSwKKyAgICB7ICJr dm02NCIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAia3ZtMzIiICIt IiBUWVBFX1g4Nl9DUFUsICJ2bWUiLCAib2ZmIiB9LAorICAgIHsgIkNvbnJvZSIgIi0iIFRZUEVf WDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAiUGVucnluIiAiLSIgVFlQRV9YODZfQ1BV LCAidm1lIiwgIm9mZiIgfSwKKyAgICB7ICJOZWhhbGVtIiAiLSIgVFlQRV9YODZfQ1BVLCAidm1l IiwgIm9mZiIgfSwKKyAgICB7ICJXZXN0bWVyZSIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJv ZmYiIH0sCisgICAgeyAiU2FuZHlCcmlkZ2UiICItIiBUWVBFX1g4Nl9DUFUsICJ2bWUiLCAib2Zm IiB9LAorICAgIHsgIkhhc3dlbGwiICItIiBUWVBFX1g4Nl9DUFUsICJ2bWUiLCAib2ZmIiB9LAor ICAgIHsgIkJyb2Fkd2VsbCIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAg eyAiT3B0ZXJvbl9HMSIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAi T3B0ZXJvbl9HMiIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAiT3B0 ZXJvbl9HMyIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAiT3B0ZXJv bl9HNCIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAiT3B0ZXJvbl9H NSIgIi0iIFRZUEVfWDg2X0NQVSwgInZtZSIsICJvZmYiIH0sCisgICAgeyAiSGFzd2VsbCIgIi0i IFRZUEVfWDg2X0NQVSwgImYxNmMiLCAib2ZmIiB9LAorICAgIHsgIkhhc3dlbGwiICItIiBUWVBF X1g4Nl9DUFUsICJyZHJhbmQiLCAib2ZmIiB9LAorICAgIHsgIkJyb2Fkd2VsbCIgIi0iIFRZUEVf WDg2X0NQVSwgImYxNmMiLCAib2ZmIiB9LAorICAgIHsgIkJyb2Fkd2VsbCIgIi0iIFRZUEVfWDg2 X0NQVSwgInJkcmFuZCIsICJvZmYiIH0sCiB9OwogY29uc3Qgc2l6ZV90IHBjX2NvbXBhdF8yXzJf bGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8yXzIpOwogCiBHbG9iYWxQcm9wZXJ0eSBwY19j b21wYXRfMl8xW10gPSB7CiAgICAgUENfQ1BVX01PREVMX0lEUygiMi4xLjAiKQotICAgIHsKLSAg ICAgICAgLmRyaXZlciA9ICJjb3JlZHVvIiAiLSIgVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJv cGVydHkgPSAidm14IiwKLSAgICAgICAgLnZhbHVlID0gIm9uIiwKLSAgICB9LAotICAgIHsKLSAg ICAgICAgLmRyaXZlciA9ICJjb3JlMmR1byIgIi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnBy b3BlcnR5ID0gInZteCIsCi0gICAgICAgIC52YWx1ZSA9ICJvbiIsCi0gICAgfSwKKyAgICB7ICJj b3JlZHVvIiAiLSIgVFlQRV9YODZfQ1BVLCAidm14IiwgIm9uIiB9LAorICAgIHsgImNvcmUyZHVv IiAiLSIgVFlQRV9YODZfQ1BVLCAidm14IiwgIm9uIiB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19j b21wYXRfMl8xX2xlbiA9IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfMl8xKTsKIAogR2xvYmFsUHJv cGVydHkgcGNfY29tcGF0XzJfMFtdID0gewogICAgIFBDX0NQVV9NT0RFTF9JRFMoIjIuMC4wIikK LSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2NzaS1wY2kiLAotICAgICAgICAu cHJvcGVydHkgPSAiYW55X2xheW91dCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAg IH0sewotICAgICAgICAuZHJpdmVyICAgPSAiUElJWDRfUE0iLAotICAgICAgICAucHJvcGVydHkg PSAibWVtb3J5LWhvdHBsdWctc3VwcG9ydCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAot ICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAiYXBpYyIsCi0gICAgICAgIC5wcm9w ZXJ0eSA9ICJ2ZXJzaW9uIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjB4MTEiLAotICAgIH0sCi0g ICAgewotICAgICAgICAuZHJpdmVyICAgPSAibmVjLXVzYi14aGNpIiwKLSAgICAgICAgLnByb3Bl cnR5ID0gInN1cGVyc3BlZWQtcG9ydHMtZmlyc3QiLAotICAgICAgICAudmFsdWUgICAgPSAib2Zm IiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gIm5lYy11c2IteGhjaSIsCi0g ICAgICAgIC5wcm9wZXJ0eSA9ICJmb3JjZS1wY2llLWVuZGNhcCIsCi0gICAgICAgIC52YWx1ZSAg ICA9ICJvbiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwY2ktc2VyaWFs IiwKLSAgICAgICAgLnByb3BlcnR5ID0gInByb2dfaWYiLAotICAgICAgICAudmFsdWUgICAgPSAi MCIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwY2ktc2VyaWFsLTJ4IiwK LSAgICAgICAgLnByb3BlcnR5ID0gInByb2dfaWYiLAotICAgICAgICAudmFsdWUgICAgPSAiMCIs Ci0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJwY2ktc2VyaWFsLTR4IiwKLSAg ICAgICAgLnByb3BlcnR5ID0gInByb2dfaWYiLAotICAgICAgICAudmFsdWUgICAgPSAiMCIsCi0g ICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tbmV0LXBjaSIsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJndWVzdF9hbm5vdW5jZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJv ZmYiLAotICAgIH0sCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAiSUNIOS1MUEMiLAotICAg ICAgICAucHJvcGVydHkgPSAibWVtb3J5LWhvdHBsdWctc3VwcG9ydCIsCi0gICAgICAgIC52YWx1 ZSAgICA9ICJvZmYiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAieGlvMzEzMC1kb3du c3RyZWFtIiwKLSAgICAgICAgLnByb3BlcnR5ID0gQ09NUEFUX1BST1BfUENQLAotICAgICAgICAu dmFsdWUgICAgPSAib2ZmIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gImlvaDM0MjAi LAotICAgICAgICAucHJvcGVydHkgPSBDT01QQVRfUFJPUF9QQ1AsCi0gICAgICAgIC52YWx1ZSAg ICA9ICJvZmYiLAotICAgIH0sCisgICAgeyAidmlydGlvLXNjc2ktcGNpIiwgImFueV9sYXlvdXQi LCAib2ZmIiB9LAorICAgIHsgIlBJSVg0X1BNIiwgIm1lbW9yeS1ob3RwbHVnLXN1cHBvcnQiLCAi b2ZmIiB9LAorICAgIHsgImFwaWMiLCAidmVyc2lvbiIsICIweDExIiB9LAorICAgIHsgIm5lYy11 c2IteGhjaSIsICJzdXBlcnNwZWVkLXBvcnRzLWZpcnN0IiwgIm9mZiIgfSwKKyAgICB7ICJuZWMt dXNiLXhoY2kiLCAiZm9yY2UtcGNpZS1lbmRjYXAiLCAib24iIH0sCisgICAgeyAicGNpLXNlcmlh bCIsICJwcm9nX2lmIiwgIjAiIH0sCisgICAgeyAicGNpLXNlcmlhbC0yeCIsICJwcm9nX2lmIiwg IjAiIH0sCisgICAgeyAicGNpLXNlcmlhbC00eCIsICJwcm9nX2lmIiwgIjAiIH0sCisgICAgeyAi dmlydGlvLW5ldC1wY2kiLCAiZ3Vlc3RfYW5ub3VuY2UiLCAib2ZmIiB9LAorICAgIHsgIklDSDkt TFBDIiwgIm1lbW9yeS1ob3RwbHVnLXN1cHBvcnQiLCAib2ZmIiB9LAorICAgIHsgInhpbzMxMzAt ZG93bnN0cmVhbSIsIENPTVBBVF9QUk9QX1BDUCwgIm9mZiIgfSwKKyAgICB7ICJpb2gzNDIwIiwg Q09NUEFUX1BST1BfUENQLCAib2ZmIiB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19jb21wYXRfMl8w X2xlbiA9IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfMl8wKTsKIAogR2xvYmFsUHJvcGVydHkgcGNf Y29tcGF0XzFfN1tdID0gewogICAgIFBDX0NQVV9NT0RFTF9JRFMoIjEuNy4wIikKLSAgICB7Ci0g ICAgICAgIC5kcml2ZXIgICA9IFRZUEVfVVNCX0RFVklDRSwKLSAgICAgICAgLnByb3BlcnR5ID0g Im1zb3MtZGVzYyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJubyIsCi0gICAgfSwKLSAgICB7Ci0g ICAgICAgIC5kcml2ZXIgICA9ICJQSUlYNF9QTSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJhY3Bp LXBjaS1ob3RwbHVnLXdpdGgtYnJpZGdlLXN1cHBvcnQiLAotICAgICAgICAudmFsdWUgICAgPSAi b2ZmIiwKLSAgICB9LAotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gImhwZXQiLAotICAgICAg ICAucHJvcGVydHkgPSBIUEVUX0lOVENBUCwKLSAgICAgICAgLnZhbHVlICAgID0gIjQiLAotICAg IH0sCisgICAgeyBUWVBFX1VTQl9ERVZJQ0UsICJtc29zLWRlc2MiLCAibm8iIH0sCisgICAgeyAi UElJWDRfUE0iLCAiYWNwaS1wY2ktaG90cGx1Zy13aXRoLWJyaWRnZS1zdXBwb3J0IiwgIm9mZiIg fSwKKyAgICB7ICJocGV0IiwgSFBFVF9JTlRDQVAsICI0IiB9LAogfTsKIGNvbnN0IHNpemVfdCBw Y19jb21wYXRfMV83X2xlbiA9IEdfTl9FTEVNRU5UUyhwY19jb21wYXRfMV83KTsKIAogR2xvYmFs UHJvcGVydHkgcGNfY29tcGF0XzFfNltdID0gewogICAgIFBDX0NQVV9NT0RFTF9JRFMoIjEuNi4w IikKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJlMTAwMCIsCi0gICAgICAgIC5wcm9wZXJ0 eSA9ICJtaXRpZ2F0aW9uIiwKLSAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0g ICAgICAgIC5kcml2ZXIgICA9ICJxZW11NjQtIiBUWVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9w ZXJ0eSA9ICJtb2RlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIyIiwKLSAgICB9LHsKLSAgICAg ICAgLmRyaXZlciAgID0gInFlbXUzMi0iIFRZUEVfWDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5 ID0gIm1vZGVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjMiLAotICAgIH0sewotICAgICAgICAu ZHJpdmVyICAgPSAiaTQ0MEZYLXBjaWhvc3QiLAotICAgICAgICAucHJvcGVydHkgPSAic2hvcnRf cm9vdF9idXMiLAotICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0gICAgfSx7Ci0gICAgICAgIC5k cml2ZXIgICA9ICJxMzUtcGNpaG9zdCIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJzaG9ydF9yb290 X2J1cyIsCi0gICAgICAgIC52YWx1ZSAgICA9ICIxIiwKLSAgICB9LAorICAgIHsgImUxMDAwIiwg Im1pdGlnYXRpb24iLCAib2ZmIiB9LAorICAgIHsgInFlbXU2NC0iIFRZUEVfWDg2X0NQVSwgIm1v ZGVsIiwgIjIiIH0sCisgICAgeyAicWVtdTMyLSIgVFlQRV9YODZfQ1BVLCAibW9kZWwiLCAiMyIg fSwKKyAgICB7ICJpNDQwRlgtcGNpaG9zdCIsICJzaG9ydF9yb290X2J1cyIsICIxIiB9LAorICAg IHsgInEzNS1wY2lob3N0IiwgInNob3J0X3Jvb3RfYnVzIiwgIjEiIH0sCiB9OwogY29uc3Qgc2l6 ZV90IHBjX2NvbXBhdF8xXzZfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8xXzYpOwogCiBH bG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMV81W10gPSB7CiAgICAgUENfQ1BVX01PREVMX0lEUygi MS41LjAiKQotICAgIHsKLSAgICAgICAgLmRyaXZlciAgID0gIkNvbnJvZS0iIFRZUEVfWDg2X0NQ VSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1vZGVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjIi LAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiQ29ucm9lLSIgVFlQRV9YODZfQ1BVLAot ICAgICAgICAucHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjIi LAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiUGVucnluLSIgVFlQRV9YODZfQ1BVLAot ICAgICAgICAucHJvcGVydHkgPSAibW9kZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMiIsCi0g ICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJQZW5yeW4tIiBUWVBFX1g4Nl9DUFUsCi0gICAg ICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMiIsCi0g ICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJOZWhhbGVtLSIgVFlQRV9YODZfQ1BVLAotICAg ICAgICAucHJvcGVydHkgPSAibW9kZWwiLAotICAgICAgICAudmFsdWUgICAgPSAiMiIsCi0gICAg fSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJOZWhhbGVtLSIgVFlQRV9YODZfQ1BVLAotICAgICAg ICAucHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gIjIiLAotICAg IH0sewotICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLW5ldC1wY2kiLAotICAgICAgICAucHJv cGVydHkgPSAiYW55X2xheW91dCIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgIH0s ewotICAgICAgICAuZHJpdmVyID0gVFlQRV9YODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAi cG11IiwKLSAgICAgICAgLnZhbHVlID0gIm9uIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAg ID0gImk0NDBGWC1wY2lob3N0IiwKLSAgICAgICAgLnByb3BlcnR5ID0gInNob3J0X3Jvb3RfYnVz IiwKLSAgICAgICAgLnZhbHVlICAgID0gIjAiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAg PSAicTM1LXBjaWhvc3QiLAotICAgICAgICAucHJvcGVydHkgPSAic2hvcnRfcm9vdF9idXMiLAot ICAgICAgICAudmFsdWUgICAgPSAiMCIsCi0gICAgfSwKKyAgICB7ICJDb25yb2UtIiBUWVBFX1g4 Nl9DUFUsICJtb2RlbCIsICIyIiB9LAorICAgIHsgIkNvbnJvZS0iIFRZUEVfWDg2X0NQVSwgIm1p bi1sZXZlbCIsICIyIiB9LAorICAgIHsgIlBlbnJ5bi0iIFRZUEVfWDg2X0NQVSwgIm1vZGVsIiwg IjIiIH0sCisgICAgeyAiUGVucnluLSIgVFlQRV9YODZfQ1BVLCAibWluLWxldmVsIiwgIjIiIH0s CisgICAgeyAiTmVoYWxlbS0iIFRZUEVfWDg2X0NQVSwgIm1vZGVsIiwgIjIiIH0sCisgICAgeyAi TmVoYWxlbS0iIFRZUEVfWDg2X0NQVSwgIm1pbi1sZXZlbCIsICIyIiB9LAorICAgIHsgInZpcnRp by1uZXQtcGNpIiwgImFueV9sYXlvdXQiLCAib2ZmIiB9LAorICAgIHsgVFlQRV9YODZfQ1BVLCAi cG11IiwgIm9uIiB9LAorICAgIHsgImk0NDBGWC1wY2lob3N0IiwgInNob3J0X3Jvb3RfYnVzIiwg IjAiIH0sCisgICAgeyAicTM1LXBjaWhvc3QiLCAic2hvcnRfcm9vdF9idXMiLCAiMCIgfSwKIH07 CiBjb25zdCBzaXplX3QgcGNfY29tcGF0XzFfNV9sZW4gPSBHX05fRUxFTUVOVFMocGNfY29tcGF0 XzFfNSk7CiAKIEdsb2JhbFByb3BlcnR5IHBjX2NvbXBhdF8xXzRbXSA9IHsKICAgICBQQ19DUFVf TU9ERUxfSURTKCIxLjQuMCIpCi0gICAgewotICAgICAgICAuZHJpdmVyICAgPSAic2NzaS1oZCIs Ci0gICAgICAgIC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZh bHVlICAgID0gIjAiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAic2NzaS1jZCIsCi0g ICAgICAgIC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVl ICAgID0gIjAiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAic2NzaS1kaXNrIiwKLSAg ICAgICAgLnByb3BlcnR5ID0gImRpc2NhcmRfZ3JhbnVsYXJpdHkiLAotICAgICAgICAudmFsdWUg ICAgPSAiMCIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJpZGUtaGQiLAotICAgICAg ICAucHJvcGVydHkgPSAiZGlzY2FyZF9ncmFudWxhcml0eSIsCi0gICAgICAgIC52YWx1ZSAgICA9 ICIwIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gImlkZS1jZCIsCi0gICAgICAgIC5w cm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVlICAgID0gIjAi LAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiaWRlLWRyaXZlIiwKLSAgICAgICAgLnBy b3BlcnR5ID0gImRpc2NhcmRfZ3JhbnVsYXJpdHkiLAotICAgICAgICAudmFsdWUgICAgPSAiMCIs Ci0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tYmxrLXBjaSIsCi0gICAgICAg IC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVlICAgID0g IjAiLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLXNlcmlhbC1wY2kiLAot ICAgICAgICAucHJvcGVydHkgPSAidmVjdG9ycyIsCi0gICAgICAgIC8qIERFVl9OVkVDVE9SU19V TlNQRUNJRklFRCBhcyBhIHVpbnQzMl90IHN0cmluZyAqLwotICAgICAgICAudmFsdWUgICAgPSAi MHhGRkZGRkZGRiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tbmV0LXBj aSIsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJjdHJsX2d1ZXN0X29mZmxvYWRzIiwKLSAgICAgICAg LnZhbHVlICAgID0gIm9mZiIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJlMTAwMCIs Ci0gICAgICAgIC5wcm9wZXJ0eSA9ICJyb21maWxlIiwKLSAgICAgICAgLnZhbHVlICAgID0gInB4 ZS1lMTAwMC5yb20iLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAibmUya19wY2kiLAot ICAgICAgICAucHJvcGVydHkgPSAicm9tZmlsZSIsCi0gICAgICAgIC52YWx1ZSAgICA9ICJweGUt bmUya19wY2kucm9tIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInBjbmV0IiwKLSAg ICAgICAgLnByb3BlcnR5ID0gInJvbWZpbGUiLAotICAgICAgICAudmFsdWUgICAgPSAicHhlLXBj bmV0LnJvbSIsCi0gICAgfSx7Ci0gICAgICAgIC5kcml2ZXIgICA9ICJydGw4MTM5IiwKLSAgICAg ICAgLnByb3BlcnR5ID0gInJvbWZpbGUiLAotICAgICAgICAudmFsdWUgICAgPSAicHhlLXJ0bDgx Mzkucm9tIiwKLSAgICB9LHsKLSAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1uZXQtcGNpIiwK LSAgICAgICAgLnByb3BlcnR5ID0gInJvbWZpbGUiLAotICAgICAgICAudmFsdWUgICAgPSAicHhl LXZpcnRpby5yb20iLAotICAgIH0sewotICAgICAgICAuZHJpdmVyICAgPSAiNDg2LSIgVFlQRV9Y ODZfQ1BVLAotICAgICAgICAucHJvcGVydHkgPSAibW9kZWwiLAotICAgICAgICAudmFsdWUgICAg PSAiMCIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAibjI3MCIgIi0iIFRZUEVf WDg2X0NQVSwKLSAgICAgICAgLnByb3BlcnR5ID0gIm1vdmJlIiwKLSAgICAgICAgLnZhbHVlID0g Im9mZiIsCi0gICAgfSwKLSAgICB7Ci0gICAgICAgIC5kcml2ZXIgPSAiV2VzdG1lcmUiICItIiBU WVBFX1g4Nl9DUFUsCi0gICAgICAgIC5wcm9wZXJ0eSA9ICJwY2xtdWxxZHEiLAotICAgICAgICAu dmFsdWUgPSAib2ZmIiwKLSAgICB9LAorICAgIHsgInNjc2ktaGQiLCAiZGlzY2FyZF9ncmFudWxh cml0eSIsICIwIiB9LAorICAgIHsgInNjc2ktY2QiLCAiZGlzY2FyZF9ncmFudWxhcml0eSIsICIw IiB9LAorICAgIHsgInNjc2ktZGlzayIsICJkaXNjYXJkX2dyYW51bGFyaXR5IiwgIjAiIH0sCisg ICAgeyAiaWRlLWhkIiwgImRpc2NhcmRfZ3JhbnVsYXJpdHkiLCAiMCIgfSwKKyAgICB7ICJpZGUt Y2QiLCAiZGlzY2FyZF9ncmFudWxhcml0eSIsICIwIiB9LAorICAgIHsgImlkZS1kcml2ZSIsICJk aXNjYXJkX2dyYW51bGFyaXR5IiwgIjAiIH0sCisgICAgeyAidmlydGlvLWJsay1wY2kiLCAiZGlz Y2FyZF9ncmFudWxhcml0eSIsICIwIiB9LAorICAgIC8qIERFVl9OVkVDVE9SU19VTlNQRUNJRklF RCBhcyBhIHVpbnQzMl90IHN0cmluZzogKi8KKyAgICB7ICJ2aXJ0aW8tc2VyaWFsLXBjaSIsICJ2 ZWN0b3JzIiwgIjB4RkZGRkZGRkYiIH0sCisgICAgeyAidmlydGlvLW5ldC1wY2kiLCAiY3RybF9n dWVzdF9vZmZsb2FkcyIsICJvZmYiIH0sCisgICAgeyAiZTEwMDAiLCAicm9tZmlsZSIsICJweGUt ZTEwMDAucm9tIiB9LAorICAgIHsgIm5lMmtfcGNpIiwgInJvbWZpbGUiLCAicHhlLW5lMmtfcGNp LnJvbSIgfSwKKyAgICB7ICJwY25ldCIsICJyb21maWxlIiwgInB4ZS1wY25ldC5yb20iIH0sCisg ICAgeyAicnRsODEzOSIsICJyb21maWxlIiwgInB4ZS1ydGw4MTM5LnJvbSIgfSwKKyAgICB7ICJ2 aXJ0aW8tbmV0LXBjaSIsICJyb21maWxlIiwgInB4ZS12aXJ0aW8ucm9tIiB9LAorICAgIHsgIjQ4 Ni0iIFRZUEVfWDg2X0NQVSwgIm1vZGVsIiwgIjAiIH0sCisgICAgeyAibjI3MCIgIi0iIFRZUEVf WDg2X0NQVSwgIm1vdmJlIiwgIm9mZiIgfSwKKyAgICB7ICJXZXN0bWVyZSIgIi0iIFRZUEVfWDg2 X0NQVSwgInBjbG11bHFkcSIsICJvZmYiIH0sCiB9OwogY29uc3Qgc2l6ZV90IHBjX2NvbXBhdF8x XzRfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8xXzQpOwogCmRpZmYgLS1naXQgYS9ody9p Mzg2L3BjX3BpaXguYyBiL2h3L2kzODYvcGNfcGlpeC5jCmluZGV4IGZkMjAyMjdhZjMuLjUwODhl MmY0OTIgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvcGNfcGlpeC5jCisrKyBiL2h3L2kzODYvcGNfcGlp eC5jCkBAIC02OTQsMjMgKzY5NCwxMCBAQCBzdGF0aWMgdm9pZCBwY19pNDQwZnhfMV8zX21hY2hp bmVfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm0pCiB7CiAgICAgc3RhdGljIEdsb2JhbFByb3BlcnR5 IGNvbXBhdFtdID0gewogICAgICAgICBQQ19DUFVfTU9ERUxfSURTKCIxLjMuMCIpCi0gICAgICAg IHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ1c2ItdGFibGV0IiwKLSAgICAgICAgICAgIC5w cm9wZXJ0eSA9ICJ1c2JfdmVyc2lvbiIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0g ICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1uZXQtcGNpIiwKLSAg ICAgICAgICAgIC5wcm9wZXJ0eSA9ICJjdHJsX21hY19hZGRyIiwKLSAgICAgICAgICAgIC52YWx1 ZSAgICA9ICJvZmYiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0 aW8tbmV0LXBjaSIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAibXEiLAotICAgICAgICAgICAg LnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sIHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9 ICJlMTAwMCIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAiYXV0b25lZ290aWF0aW9uIiwKLSAg ICAgICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgICAgICB9LAorICAgICAgICB7ICJ1c2It dGFibGV0IiwgInVzYl92ZXJzaW9uIiwgIjEiIH0sCisgICAgICAgIHsgInZpcnRpby1uZXQtcGNp IiwgImN0cmxfbWFjX2FkZHIiLCAib2ZmIiB9LAorICAgICAgICB7ICJ2aXJ0aW8tbmV0LXBjaSIs ICJtcSIsICJvZmYiIH0sCisgICAgICAgIHsgImUxMDAwIiwgImF1dG9uZWdvdGlhdGlvbiIsICJv ZmYiIH0sCiAgICAgfTsKIAogICAgIHBjX2k0NDBmeF8xXzRfbWFjaGluZV9vcHRpb25zKG0pOwpA QCAtNzI2LDMxICs3MTMsMTIgQEAgc3RhdGljIHZvaWQgcGNfaTQ0MGZ4XzFfMl9tYWNoaW5lX29w dGlvbnMoTWFjaGluZUNsYXNzICptKQogewogICAgIHN0YXRpYyBHbG9iYWxQcm9wZXJ0eSBjb21w YXRbXSA9IHsKICAgICAgICAgUENfQ1BVX01PREVMX0lEUygiMS4yLjAiKQotICAgICAgICB7Ci0g ICAgICAgICAgICAuZHJpdmVyICAgPSAibmVjLXVzYi14aGNpIiwKLSAgICAgICAgICAgIC5wcm9w ZXJ0eSA9ICJtc2kiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0s ewotICAgICAgICAgICAgLmRyaXZlciAgID0gIm5lYy11c2IteGhjaSIsCi0gICAgICAgICAgICAu cHJvcGVydHkgPSAibXNpeCIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICAg ICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAiaXZzaG1lbSIsCi0gICAgICAgICAgICAu cHJvcGVydHkgPSAidXNlNjQiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIjAiLAotICAgICAg ICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJxeGwiLAotICAgICAgICAgICAgLnByb3Bl cnR5ID0gInJldmlzaW9uIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICIzIiwKLSAgICAgICAg fSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAicXhsLXZnYSIsCi0gICAgICAgICAgICAucHJv cGVydHkgPSAicmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIjMiLAotICAgICAg ICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJWR0EiLAotICAgICAgICAgICAgLnByb3Bl cnR5ID0gIm1taW8iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0s CisgICAgICAgIHsgIm5lYy11c2IteGhjaSIsICJtc2kiLCAib2ZmIiB9LAorICAgICAgICB7ICJu ZWMtdXNiLXhoY2kiLCAibXNpeCIsICJvZmYiIH0sCisgICAgICAgIHsgIml2c2htZW0iLCAidXNl NjQiLCAiMCIgfSwKKyAgICAgICAgeyAicXhsIiwgInJldmlzaW9uIiwgIjMiIH0sCisgICAgICAg IHsgInF4bC12Z2EiLCAicmV2aXNpb24iLCAiMyIgfSwKKyAgICAgICAgeyAiVkdBIiwgIm1taW8i LCAib2ZmIiB9LAogICAgIH07CiAKICAgICBwY19pNDQwZnhfMV8zX21hY2hpbmVfb3B0aW9ucyht KTsKQEAgLTc2NiwzNSArNzM0LDEzIEBAIHN0YXRpYyB2b2lkIHBjX2k0NDBmeF8xXzFfbWFjaGlu ZV9vcHRpb25zKE1hY2hpbmVDbGFzcyAqbSkKIHsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVydHkg Y29tcGF0W10gPSB7CiAgICAgICAgIFBDX0NQVV9NT0RFTF9JRFMoIjEuMS4wIikKLSAgICAgICAg ewotICAgICAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1zY3NpLXBjaSIsCi0gICAgICAgICAg ICAucHJvcGVydHkgPSAiaG90cGx1ZyIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwK LSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLXNjc2ktcGNpIiwK LSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJwYXJhbV9jaGFuZ2UiLAotICAgICAgICAgICAgLnZh bHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0gIlZH QSIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAidmdhbWVtX21iIiwKLSAgICAgICAgICAgIC52 YWx1ZSAgICA9ICI4IiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAidm13 YXJlLXN2Z2EiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInZnYW1lbV9tYiIsCi0gICAgICAg ICAgICAudmFsdWUgICAgPSAiOCIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAg ID0gInF4bC12Z2EiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInZnYW1lbV9tYiIsCi0gICAg ICAgICAgICAudmFsdWUgICAgPSAiOCIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZl ciAgID0gInF4bCIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAidmdhbWVtX21iIiwKLSAgICAg ICAgICAgIC52YWx1ZSAgICA9ICI4IiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVy ICAgPSAidmlydGlvLWJsay1wY2kiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gImNvbmZpZy13 Y2UiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sCisgICAgICAg IHsgInZpcnRpby1zY3NpLXBjaSIsICJob3RwbHVnIiwgIm9mZiIgfSwKKyAgICAgICAgeyAidmly dGlvLXNjc2ktcGNpIiwgInBhcmFtX2NoYW5nZSIsICJvZmYiIH0sCisgICAgICAgIHsgIlZHQSIs ICJ2Z2FtZW1fbWIiLCAiOCIgfSwKKyAgICAgICAgeyAidm13YXJlLXN2Z2EiLCAidmdhbWVtX21i IiwgIjgiIH0sCisgICAgICAgIHsgInF4bC12Z2EiLCAidmdhbWVtX21iIiwgIjgiIH0sCisgICAg ICAgIHsgInF4bCIsICJ2Z2FtZW1fbWIiLCAiOCIgfSwKKyAgICAgICAgeyAidmlydGlvLWJsay1w Y2kiLCAiY29uZmlnLXdjZSIsICJvZmYiIH0sCiAgICAgfTsKIAogICAgIHBjX2k0NDBmeF8xXzJf bWFjaGluZV9vcHRpb25zKG0pOwpAQCAtODA5LDIzICs3NTUsMTAgQEAgc3RhdGljIHZvaWQgcGNf aTQ0MGZ4XzFfMF9tYWNoaW5lX29wdGlvbnMoTWFjaGluZUNsYXNzICptKQogewogICAgIHN0YXRp YyBHbG9iYWxQcm9wZXJ0eSBjb21wYXRbXSA9IHsKICAgICAgICAgUENfQ1BVX01PREVMX0lEUygi MS4wIikKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciAgID0gVFlQRV9JU0FfRkRDLAot ICAgICAgICAgICAgLnByb3BlcnR5ID0gImNoZWNrX21lZGlhX3JhdGUiLAotICAgICAgICAgICAg LnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0g InZpcnRpby1iYWxsb29uLXBjaSIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAiY2xhc3MiLAot ICAgICAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KFBDSV9DTEFTU19NRU1PUllfUkFNKSwK LSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAiYXBpYy1jb21tb24iLAotICAg ICAgICAgICAgLnByb3BlcnR5ID0gInZhcGljIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICJv ZmYiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfVVNCX0RFVklD RSwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJmdWxsLXBhdGgiLAotICAgICAgICAgICAgLnZh bHVlICAgID0gIm5vIiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX0lTQV9GREMsICJjaGVj a19tZWRpYV9yYXRlIiwgIm9mZiIgfSwKKyAgICAgICAgeyAidmlydGlvLWJhbGxvb24tcGNpIiwg ImNsYXNzIiwgc3RyaW5naWZ5KFBDSV9DTEFTU19NRU1PUllfUkFNKSB9LAorICAgICAgICB7ICJh cGljLWNvbW1vbiIsICJ2YXBpYyIsICJvZmYiIH0sCisgICAgICAgIHsgVFlQRV9VU0JfREVWSUNF LCAiZnVsbC1wYXRoIiwgIm5vIiB9LAogICAgIH07CiAKICAgICBwY19pNDQwZnhfMV8xX21hY2hp bmVfb3B0aW9ucyhtKTsKQEAgLTg1NywzMSArNzkwLDEyIEBAIHN0YXRpYyB2b2lkIHBjX2k0NDBm eF8wXzE0X21hY2hpbmVfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm0pCiB7CiAgICAgc3RhdGljIEds b2JhbFByb3BlcnR5IGNvbXBhdFtdID0gewogICAgICAgICBQQ19DUFVfTU9ERUxfSURTKCIwLjE0 IikKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1ibGstcGNpIiwK LSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJldmVudF9pZHgiLAotICAgICAgICAgICAgLnZhbHVl ICAgID0gIm9mZiIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0gInZpcnRp by1zZXJpYWwtcGNpIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJldmVudF9pZHgiLAotICAg ICAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRy aXZlciAgID0gInZpcnRpby1uZXQtcGNpIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJldmVu dF9pZHgiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9mZiIsCi0gICAgICAgIH0sewotICAg ICAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1iYWxsb29uLXBjaSIsCi0gICAgICAgICAgICAu cHJvcGVydHkgPSAiZXZlbnRfaWR4IiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAot ICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJxeGwiLAotICAgICAgICAgICAg LnByb3BlcnR5ID0gInJldmlzaW9uIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICIyIiwKLSAg ICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAicXhsLXZnYSIsCi0gICAgICAgICAg ICAucHJvcGVydHkgPSAicmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIjIiLAot ICAgICAgICB9LAorICAgICAgICB7ICJ2aXJ0aW8tYmxrLXBjaSIsICJldmVudF9pZHgiLCAib2Zm IiB9LAorICAgICAgICB7ICJ2aXJ0aW8tc2VyaWFsLXBjaSIsICJldmVudF9pZHgiLCAib2ZmIiB9 LAorICAgICAgICB7ICJ2aXJ0aW8tbmV0LXBjaSIsICJldmVudF9pZHgiLCAib2ZmIiB9LAorICAg ICAgICB7ICJ2aXJ0aW8tYmFsbG9vbi1wY2kiLCAiZXZlbnRfaWR4IiwgIm9mZiIgfSwKKyAgICAg ICAgeyAicXhsIiwgInJldmlzaW9uIiwgIjIiIH0sCisgICAgICAgIHsgInF4bC12Z2EiLCAicmV2 aXNpb24iLCAiMiIgfSwKICAgICB9OwogCiAgICAgcGNfaTQ0MGZ4XzBfMTVfbWFjaGluZV9vcHRp b25zKG0pOwpAQCAtODk3LDI3ICs4MTEsMTEgQEAgc3RhdGljIHZvaWQgcGNfaTQ0MGZ4XzBfMTNf bWFjaGluZV9vcHRpb25zKE1hY2hpbmVDbGFzcyAqbSkKICAgICBQQ01hY2hpbmVDbGFzcyAqcGNt YyA9IFBDX01BQ0hJTkVfQ0xBU1MobSk7CiAgICAgc3RhdGljIEdsb2JhbFByb3BlcnR5IGNvbXBh dFtdID0gewogICAgICAgICBQQ19DUFVfTU9ERUxfSURTKCIwLjEzIikKLSAgICAgICAgewotICAg ICAgICAgICAgLmRyaXZlciAgID0gVFlQRV9QQ0lfREVWSUNFLAotICAgICAgICAgICAgLnByb3Bl cnR5ID0gImNvbW1hbmRfc2Vycl9lbmFibGUiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9m ZiIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0gIkFDOTciLAotICAgICAg ICAgICAgLnByb3BlcnR5ID0gInVzZV9icm9rZW5faWQiLAotICAgICAgICAgICAgLnZhbHVlICAg ID0gIjEiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tOXAt cGNpIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJ2ZWN0b3JzIiwKLSAgICAgICAgICAgIC52 YWx1ZSAgICA9ICIwIiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAiVkdB IiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJyb21iYXIiLAotICAgICAgICAgICAgLnZhbHVl ICAgID0gIjAiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2bXdhcmUt c3ZnYSIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAicm9tYmFyIiwKLSAgICAgICAgICAgIC52 YWx1ZSAgICA9ICIwIiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX1BDSV9ERVZJQ0UsICJj b21tYW5kX3NlcnJfZW5hYmxlIiwgIm9mZiIgfSwKKyAgICAgICAgeyAiQUM5NyIsICJ1c2VfYnJv a2VuX2lkIiwgIjEiIH0sCisgICAgICAgIHsgInZpcnRpby05cC1wY2kiLCAidmVjdG9ycyIsICIw IiB9LAorICAgICAgICB7ICJWR0EiLCAicm9tYmFyIiwgIjAiIH0sCisgICAgICAgIHsgInZtd2Fy ZS1zdmdhIiwgInJvbWJhciIsICIwIiB9LAogICAgIH07CiAKICAgICBwY19pNDQwZnhfMF8xNF9t YWNoaW5lX29wdGlvbnMobSk7CkBAIC05MzMsMjcgKzgzMSwxMSBAQCBzdGF0aWMgdm9pZCBwY19p NDQwZnhfMF8xMl9tYWNoaW5lX29wdGlvbnMoTWFjaGluZUNsYXNzICptKQogewogICAgIHN0YXRp YyBHbG9iYWxQcm9wZXJ0eSBjb21wYXRbXSA9IHsKICAgICAgICAgUENfQ1BVX01PREVMX0lEUygi MC4xMiIpCi0gICAgICAgIHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2VyaWFs LXBjaSIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAibWF4X3BvcnRzIiwKLSAgICAgICAgICAg IC52YWx1ZSAgICA9ICIxIiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAi dmlydGlvLXNlcmlhbC1wY2kiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInZlY3RvcnMiLAot ICAgICAgICAgICAgLnZhbHVlICAgID0gIjAiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5k cml2ZXIgICA9ICJ1c2ItbW91c2UiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInNlcmlhbCIs Ci0gICAgICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0gICAgICAgIH0sewotICAgICAgICAgICAg LmRyaXZlciAgID0gInVzYi10YWJsZXQiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInNlcmlh bCIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0gICAgICAgIH0sewotICAgICAgICAg ICAgLmRyaXZlciAgID0gInVzYi1rYmQiLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInNlcmlh bCIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAiMSIsCi0gICAgICAgIH0sCisgICAgICAgIHsg InZpcnRpby1zZXJpYWwtcGNpIiwgIm1heF9wb3J0cyIsICIxIiB9LAorICAgICAgICB7ICJ2aXJ0 aW8tc2VyaWFsLXBjaSIsICJ2ZWN0b3JzIiwgIjAiIH0sCisgICAgICAgIHsgInVzYi1tb3VzZSIs ICJzZXJpYWwiLCAiMSIgfSwKKyAgICAgICAgeyAidXNiLXRhYmxldCIsICJzZXJpYWwiLCAiMSIg fSwKKyAgICAgICAgeyAidXNiLWtiZCIsICJzZXJpYWwiLCAiMSIgfSwKICAgICB9OwogCiAgICAg cGNfaTQ0MGZ4XzBfMTNfbWFjaGluZV9vcHRpb25zKG0pOwpkaWZmIC0tZ2l0IGEvaHcvcHBjL3Nw YXByLmMgYi9ody9wcGMvc3BhcHIuYwppbmRleCBkN2Q4N2IwYWU4Li42OTdmYWE5OWU5IDEwMDY0 NAotLS0gYS9ody9wcGMvc3BhcHIuYworKysgYi9ody9wcGMvc3BhcHIuYwpAQCAtNDA1MywxNiAr NDA1Myw4IEBAIHN0YXRpYyB2b2lkIHNwYXByX21hY2hpbmVfMl8xMl9jbGFzc19vcHRpb25zKE1h Y2hpbmVDbGFzcyAqbWMpCiB7CiAgICAgc1BBUFJNYWNoaW5lQ2xhc3MgKnNtYyA9IFNQQVBSX01B Q0hJTkVfQ0xBU1MobWMpOwogICAgIHN0YXRpYyBHbG9iYWxQcm9wZXJ0eSBjb21wYXRbXSA9IHsK LSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciA9IFRZUEVfUE9XRVJQQ19DUFUsCi0gICAg ICAgICAgICAucHJvcGVydHkgPSAicHJlLTMuMC1taWdyYXRpb24iLAotICAgICAgICAgICAgLnZh bHVlICAgID0gIm9uIiwKLSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZl ciA9IFRZUEVfU1BBUFJfQ1BVX0NPUkUsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAicHJlLTMu MC1taWdyYXRpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICAgICAgfSwK KyAgICAgICAgeyBUWVBFX1BPV0VSUENfQ1BVLCAicHJlLTMuMC1taWdyYXRpb24iLCAib24iIH0s CisgICAgICAgIHsgVFlQRV9TUEFQUl9DUFVfQ09SRSwgInByZS0zLjAtbWlncmF0aW9uIiwgIm9u IiB9LAogICAgIH07CiAKICAgICBzcGFwcl9tYWNoaW5lXzNfMF9jbGFzc19vcHRpb25zKG1jKTsK QEAgLTQxMjYsMTEgKzQxMTgsNyBAQCBzdGF0aWMgdm9pZCBzcGFwcl9tYWNoaW5lXzJfOV9jbGFz c19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMpCiB7CiAgICAgc1BBUFJNYWNoaW5lQ2xhc3MgKnNt YyA9IFNQQVBSX01BQ0hJTkVfQ0xBU1MobWMpOwogICAgIHN0YXRpYyBHbG9iYWxQcm9wZXJ0eSBj b21wYXRbXSA9IHsKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciA9IFRZUEVfUE9XRVJQ Q19DUFUsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAicHJlLTIuMTAtbWlncmF0aW9uIiwKLSAg ICAgICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgICAgIH0sCisgICAgICAgIHsgVFlQRV9Q T1dFUlBDX0NQVSwgInByZS0yLjEwLW1pZ3JhdGlvbiIsICJvbiIgfSwKICAgICB9OwogCiAgICAg c3BhcHJfbWFjaGluZV8yXzEwX2NsYXNzX29wdGlvbnMobWMpOwpAQCAtNDE1MCwxMSArNDEzOCw3 IEBAIERFRklORV9TUEFQUl9NQUNISU5FKDJfOSwgIjIuOSIsIGZhbHNlKTsKIHN0YXRpYyB2b2lk IHNwYXByX21hY2hpbmVfMl84X2NsYXNzX29wdGlvbnMoTWFjaGluZUNsYXNzICptYykKIHsKICAg ICBzdGF0aWMgR2xvYmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsKLSAgICAgICAg ICAgIC5kcml2ZXIgICA9IFRZUEVfU1BBUFJfUENJX0hPU1RfQlJJREdFLAotICAgICAgICAgICAg LnByb3BlcnR5ID0gInBjaWUtZXh0ZW5kZWQtY29uZmlndXJhdGlvbi1zcGFjZSIsCi0gICAgICAg ICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX1NQQVBS X1BDSV9IT1NUX0JSSURHRSwgInBjaWUtZXh0ZW5kZWQtY29uZmlndXJhdGlvbi1zcGFjZSIsICJv ZmYiIH0sCiAgICAgfTsKIAogICAgIHNwYXByX21hY2hpbmVfMl85X2NsYXNzX29wdGlvbnMobWMp OwpAQCAtNDIyMiwyNiArNDIwNiwxMCBAQCBzdGF0aWMgdm9pZCBzcGFwcl9tYWNoaW5lXzJfN19j bGFzc19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMpCiB7CiAgICAgc1BBUFJNYWNoaW5lQ2xhc3Mg KnNtYyA9IFNQQVBSX01BQ0hJTkVfQ0xBU1MobWMpOwogICAgIHN0YXRpYyBHbG9iYWxQcm9wZXJ0 eSBjb21wYXRbXSA9IHsKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciAgID0gVFlQRV9T UEFQUl9QQ0lfSE9TVF9CUklER0UsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAibWVtX3dpbl9z aXplIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICIweGY4MDAwMDAwMCIsCi0gICAgICAgIH0s Ci0gICAgICAgIHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfU1BBUFJfUENJX0hPU1Rf QlJJREdFLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gIm1lbTY0X3dpbl9zaXplIiwKLSAgICAg ICAgICAgIC52YWx1ZSAgICA9ICIwIiwKLSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAg ICAgLmRyaXZlciA9IFRZUEVfUE9XRVJQQ19DUFUsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAi cHJlLTIuOC1taWdyYXRpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9uIiwKLSAgICAg ICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciA9IFRZUEVfU1BBUFJfUENJX0hP U1RfQlJJREdFLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gInByZS0yLjgtbWlncmF0aW9uIiwK LSAgICAgICAgICAgIC52YWx1ZSAgICA9ICJvbiIsCi0gICAgICAgIH0sCisgICAgICAgIHsgVFlQ RV9TUEFQUl9QQ0lfSE9TVF9CUklER0UsICJtZW1fd2luX3NpemUiLCAiMHhmODAwMDAwMDAiLCB9 LAorICAgICAgICB7IFRZUEVfU1BBUFJfUENJX0hPU1RfQlJJREdFLCAibWVtNjRfd2luX3NpemUi LCAiMCIsIH0sCisgICAgICAgIHsgVFlQRV9QT1dFUlBDX0NQVSwgInByZS0yLjgtbWlncmF0aW9u IiwgIm9uIiwgfSwKKyAgICAgICAgeyBUWVBFX1NQQVBSX1BDSV9IT1NUX0JSSURHRSwgInByZS0y LjgtbWlncmF0aW9uIiwgIm9uIiwgfSwKICAgICB9OwogCiAgICAgc3BhcHJfbWFjaGluZV8yXzhf Y2xhc3Nfb3B0aW9ucyhtYyk7CkBAIC00MjYxLDExICs0MjI5LDcgQEAgREVGSU5FX1NQQVBSX01B Q0hJTkUoMl83LCAiMi43IiwgZmFsc2UpOwogc3RhdGljIHZvaWQgc3BhcHJfbWFjaGluZV8yXzZf Y2xhc3Nfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm1jKQogewogICAgIHN0YXRpYyBHbG9iYWxQcm9w ZXJ0eSBjb21wYXRbXSA9IHsKLSAgICAgICAgewotICAgICAgICAgICAgLmRyaXZlciAgID0gVFlQ RV9TUEFQUl9QQ0lfSE9TVF9CUklER0UsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAiZGR3IiwK LSAgICAgICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAotICAgICAgICB9LAorICAgICAgICB7IFRZ UEVfU1BBUFJfUENJX0hPU1RfQlJJREdFLCAiZGR3IiwgIm9mZiIgfSwKICAgICB9OwogCiAgICAg c3BhcHJfbWFjaGluZV8yXzdfY2xhc3Nfb3B0aW9ucyhtYyk7CkBAIC00Mjg0LDExICs0MjQ4LDcg QEAgc3RhdGljIHZvaWQgc3BhcHJfbWFjaGluZV8yXzVfY2xhc3Nfb3B0aW9ucyhNYWNoaW5lQ2xh c3MgKm1jKQogewogICAgIHNQQVBSTWFjaGluZUNsYXNzICpzbWMgPSBTUEFQUl9NQUNISU5FX0NM QVNTKG1jKTsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAg IHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJzcGFwci12bGFuIiwKLSAgICAgICAgICAgIC5w cm9wZXJ0eSA9ICJ1c2UtcngtYnVmZmVyLXBvb2xzIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9 ICJvZmYiLAotICAgICAgICB9LAorICAgICAgICB7ICJzcGFwci12bGFuIiwgInVzZS1yeC1idWZm ZXItcG9vbHMiLCAib2ZmIiB9LAogICAgIH07CiAKICAgICBzcGFwcl9tYWNoaW5lXzJfNl9jbGFz c19vcHRpb25zKG1jKTsKQEAgLTQzMjEsMTEgKzQyODEsNyBAQCBERUZJTkVfU1BBUFJfTUFDSElO RSgyXzQsICIyLjQiLCBmYWxzZSk7CiBzdGF0aWMgdm9pZCBzcGFwcl9tYWNoaW5lXzJfM19jbGFz c19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMpCiB7CiAgICAgc3RhdGljIEdsb2JhbFByb3BlcnR5 IGNvbXBhdFtdID0gewotICAgICAgICB7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAic3BhcHIt cGNpLWhvc3QtYnJpZGdlIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJkeW5hbWljLXJlY29u ZmlndXJhdGlvbiIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICAgICAgfSwK KyAgICAgICAgeyAic3BhcHItcGNpLWhvc3QtYnJpZGdlIiwgImR5bmFtaWMtcmVjb25maWd1cmF0 aW9uIiwgIm9mZiIgfSwKICAgICB9OwogICAgIHNwYXByX21hY2hpbmVfMl80X2NsYXNzX29wdGlv bnMobWMpOwogICAgIGNvbXBhdF9wcm9wc19hZGQobWMtPmNvbXBhdF9wcm9wcywgaHdfY29tcGF0 XzJfMywgaHdfY29tcGF0XzJfM19sZW4pOwpAQCAtNDM0MCwxMSArNDI5Niw3IEBAIERFRklORV9T UEFQUl9NQUNISU5FKDJfMywgIjIuMyIsIGZhbHNlKTsKIHN0YXRpYyB2b2lkIHNwYXByX21hY2hp bmVfMl8yX2NsYXNzX29wdGlvbnMoTWFjaGluZUNsYXNzICptYykKIHsKICAgICBzdGF0aWMgR2xv YmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsKLSAgICAgICAgICAgIC5kcml2ZXIg ICA9IFRZUEVfU1BBUFJfUENJX0hPU1RfQlJJREdFLAotICAgICAgICAgICAgLnByb3BlcnR5ID0g Im1lbV93aW5fc2l6ZSIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAiMHgyMDAwMDAwMCIsCi0g ICAgICAgIH0sCisgICAgICAgIHsgVFlQRV9TUEFQUl9QQ0lfSE9TVF9CUklER0UsICJtZW1fd2lu X3NpemUiLCAiMHgyMDAwMDAwMCIgfSwKICAgICB9OwogCiAgICAgc3BhcHJfbWFjaGluZV8yXzNf Y2xhc3Nfb3B0aW9ucyhtYyk7CmRpZmYgLS1naXQgYS9ody9zMzkweC9zMzkwLXZpcnRpby1jY3cu YyBiL2h3L3MzOTB4L3MzOTAtdmlydGlvLWNjdy5jCmluZGV4IGM3Mzc1MDcwNTMuLjgxMWZkZjkx M2QgMTAwNjQ0Ci0tLSBhL2h3L3MzOTB4L3MzOTAtdmlydGlvLWNjdy5jCisrKyBiL2h3L3MzOTB4 L3MzOTAtdmlydGlvLWNjdy5jCkBAIC03MTIsMTEgKzcxMiw3IEBAIHN0YXRpYyB2b2lkIGNjd19t YWNoaW5lXzJfMTFfaW5zdGFuY2Vfb3B0aW9ucyhNYWNoaW5lU3RhdGUgKm1hY2hpbmUpCiBzdGF0 aWMgdm9pZCBjY3dfbWFjaGluZV8yXzExX2NsYXNzX29wdGlvbnMoTWFjaGluZUNsYXNzICptYykK IHsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsKLSAg ICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfU0NMUF9FVkVOVF9GQUNJTElUWSwKLSAgICAgICAg ICAgIC5wcm9wZXJ0eSA9ICJhbGxvd19hbGxfbWFza19zaXplcyIsCi0gICAgICAgICAgICAudmFs dWUgICAgPSAib2ZmIiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX1NDTFBfRVZFTlRfRkFD SUxJVFksICJhbGxvd19hbGxfbWFza19zaXplcyIsICJvZmYiLCB9LAogICAgIH07CiAKICAgICBj Y3dfbWFjaGluZV8yXzEyX2NsYXNzX29wdGlvbnMobWMpOwpAQCAtNzUxLDExICs3NDcsNyBAQCBz dGF0aWMgdm9pZCBjY3dfbWFjaGluZV8yXzlfY2xhc3Nfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm1j KQogewogICAgIFMzOTBDY3dNYWNoaW5lQ2xhc3MgKnMzOTBtYyA9IFMzOTBfTUFDSElORV9DTEFT UyhtYyk7CiAgICAgc3RhdGljIEdsb2JhbFByb3BlcnR5IGNvbXBhdFtdID0gewotICAgICAgICB7 Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSBUWVBFX1MzOTBfU1RBVFRSSUIsCi0gICAgICAgICAg ICAucHJvcGVydHkgPSAibWlncmF0aW9uLWVuYWJsZWQiLAotICAgICAgICAgICAgLnZhbHVlICAg ID0gIm9mZiIsCi0gICAgICAgIH0sCisgICAgICAgIHsgVFlQRV9TMzkwX1NUQVRUUklCLCAibWln cmF0aW9uLWVuYWJsZWQiLCAib2ZmIiwgfSwKICAgICB9OwogCiAgICAgY2N3X21hY2hpbmVfMl8x MF9jbGFzc19vcHRpb25zKG1jKTsKQEAgLTc3MywxMSArNzY1LDcgQEAgc3RhdGljIHZvaWQgY2N3 X21hY2hpbmVfMl84X2luc3RhbmNlX29wdGlvbnMoTWFjaGluZVN0YXRlICptYWNoaW5lKQogc3Rh dGljIHZvaWQgY2N3X21hY2hpbmVfMl84X2NsYXNzX29wdGlvbnMoTWFjaGluZUNsYXNzICptYykK IHsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsKLSAg ICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfUzM5MF9GTElDX0NPTU1PTiwKLSAgICAgICAgICAg IC5wcm9wZXJ0eSA9ICJhZGFwdGVyX3JvdXRlc19tYXhfYmF0Y2giLAotICAgICAgICAgICAgLnZh bHVlICAgID0gIjY0IiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX1MzOTBfRkxJQ19DT01N T04sICJhZGFwdGVyX3JvdXRlc19tYXhfYmF0Y2giLCAiNjQiLCB9LAogICAgIH07CiAKICAgICBj Y3dfbWFjaGluZV8yXzlfY2xhc3Nfb3B0aW9ucyhtYyk7CkBAIC04MTAsMTUgKzc5OCw4IEBAIHN0 YXRpYyB2b2lkIGNjd19tYWNoaW5lXzJfNl9jbGFzc19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMp CiB7CiAgICAgUzM5MENjd01hY2hpbmVDbGFzcyAqczM5MG1jID0gUzM5MF9NQUNISU5FX0NMQVNT KG1jKTsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVydHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsK LSAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfUzM5MF9JUEwsCi0gICAgICAgICAgICAucHJv cGVydHkgPSAiaXBsYmV4dF9taWdyYXRpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIm9m ZiIsCi0gICAgICAgIH0sIHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfVklSVFVBTF9D U1NfQlJJREdFLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gImNzc19kZXZfcGF0aCIsCi0gICAg ICAgICAgICAudmFsdWUgICAgPSAib2ZmIiwKLSAgICAgICAgfSwKKyAgICAgICAgeyBUWVBFX1Mz OTBfSVBMLCAiaXBsYmV4dF9taWdyYXRpb24iLCAib2ZmIiwgfSwKKyAgICAgICAgIHsgVFlQRV9W SVJUVUFMX0NTU19CUklER0UsICJjc3NfZGV2X3BhdGgiLCAib2ZmIiwgfSwKICAgICB9OwogCiAg ICAgczM5MG1jLT5yaV9hbGxvd2VkID0gZmFsc2U7CkBAIC04NDgsNDMgKzgyOSwxNSBAQCBzdGF0 aWMgdm9pZCBjY3dfbWFjaGluZV8yXzRfaW5zdGFuY2Vfb3B0aW9ucyhNYWNoaW5lU3RhdGUgKm1h Y2hpbmUpCiBzdGF0aWMgdm9pZCBjY3dfbWFjaGluZV8yXzRfY2xhc3Nfb3B0aW9ucyhNYWNoaW5l Q2xhc3MgKm1jKQogewogICAgIHN0YXRpYyBHbG9iYWxQcm9wZXJ0eSBjb21wYXRbXSA9IHsKLSAg ICAgICAgewotICAgICAgICAgICAgLmRyaXZlciAgID0gVFlQRV9TMzkwX1NLRVlTLAotICAgICAg ICAgICAgLnByb3BlcnR5ID0gIm1pZ3JhdGlvbi1lbmFibGVkIiwKLSAgICAgICAgICAgIC52YWx1 ZSAgICA9ICJvZmYiLAotICAgICAgICB9LHsKLSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0 aW8tYmxrLWNjdyIsCi0gICAgICAgICAgICAucHJvcGVydHkgPSAibWF4X3JldmlzaW9uIiwKLSAg ICAgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJp dmVyICAgPSAidmlydGlvLWJhbGxvb24tY2N3IiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJt YXhfcmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIjAiLAotICAgICAgICB9LHsK LSAgICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2VyaWFsLWNjdyIsCi0gICAgICAgICAg ICAucHJvcGVydHkgPSAibWF4X3JldmlzaW9uIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9ICIw IiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAidmlydGlvLTlwLWNjdyIs Ci0gICAgICAgICAgICAucHJvcGVydHkgPSAibWF4X3JldmlzaW9uIiwKLSAgICAgICAgICAgIC52 YWx1ZSAgICA9ICIwIiwKLSAgICAgICAgfSx7Ci0gICAgICAgICAgICAuZHJpdmVyICAgPSAidmly dGlvLXJuZy1jY3ciLAotICAgICAgICAgICAgLnByb3BlcnR5ID0gIm1heF9yZXZpc2lvbiIsCi0g ICAgICAgICAgICAudmFsdWUgICAgPSAiMCIsCi0gICAgICAgIH0sewotICAgICAgICAgICAgLmRy aXZlciAgID0gInZpcnRpby1uZXQtY2N3IiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJtYXhf cmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gIjAiLAotICAgICAgICB9LHsKLSAg ICAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2NzaS1jY3ciLAotICAgICAgICAgICAgLnBy b3BlcnR5ID0gIm1heF9yZXZpc2lvbiIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSAiMCIsCi0g ICAgICAgIH0sewotICAgICAgICAgICAgLmRyaXZlciAgID0gInZob3N0LXNjc2ktY2N3IiwKLSAg ICAgICAgICAgIC5wcm9wZXJ0eSA9ICJtYXhfcmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVl ICAgID0gIjAiLAotICAgICAgICB9LAorICAgICAgICB7IFRZUEVfUzM5MF9TS0VZUywgIm1pZ3Jh dGlvbi1lbmFibGVkIiwgIm9mZiIsIH0sCisgICAgICAgIHsgInZpcnRpby1ibGstY2N3IiwgIm1h eF9yZXZpc2lvbiIsICIwIiwgfSwKKyAgICAgICAgeyAidmlydGlvLWJhbGxvb24tY2N3IiwgIm1h eF9yZXZpc2lvbiIsICIwIiwgfSwKKyAgICAgICAgeyAidmlydGlvLXNlcmlhbC1jY3ciLCAibWF4 X3JldmlzaW9uIiwgIjAiLCB9LAorICAgICAgICB7ICJ2aXJ0aW8tOXAtY2N3IiwgIm1heF9yZXZp c2lvbiIsICIwIiwgfSwKKyAgICAgICAgeyAidmlydGlvLXJuZy1jY3ciLCAibWF4X3JldmlzaW9u IiwgIjAiLCB9LAorICAgICAgICB7ICJ2aXJ0aW8tbmV0LWNjdyIsICJtYXhfcmV2aXNpb24iLCAi MCIsIH0sCisgICAgICAgIHsgInZpcnRpby1zY3NpLWNjdyIsICJtYXhfcmV2aXNpb24iLCAiMCIs IH0sCisgICAgICAgIHsgInZob3N0LXNjc2ktY2N3IiwgIm1heF9yZXZpc2lvbiIsICIwIiwgfSwK ICAgICB9OwogCiAgICAgY2N3X21hY2hpbmVfMl81X2NsYXNzX29wdGlvbnMobWMpOwpkaWZmIC0t Z2l0IGEvaHcveGVuL3hlbi1jb21tb24uYyBiL2h3L3hlbi94ZW4tY29tbW9uLmMKaW5kZXggZDUx MTQ4YjZiMy4uMThhOTA0NTU1NiAxMDA2NDQKLS0tIGEvaHcveGVuL3hlbi1jb21tb24uYworKysg Yi9ody94ZW4veGVuLWNvbW1vbi5jCkBAIC0xNjMsMjEgKzE2Myw5IEBAIHN0YXRpYyB2b2lkIHhl bl9hY2NlbF9jbGFzc19pbml0KE9iamVjdENsYXNzICpvYywgdm9pZCAqZGF0YSkKIHsKICAgICBB Y2NlbENsYXNzICphYyA9IEFDQ0VMX0NMQVNTKG9jKTsKICAgICBzdGF0aWMgR2xvYmFsUHJvcGVy dHkgY29tcGF0W10gPSB7Ci0gICAgICAgIHsKLSAgICAgICAgICAgIC5kcml2ZXIgPSAibWlncmF0 aW9uIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJzdG9yZS1nbG9iYWwtc3RhdGUiLAotICAg ICAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgICAgIH0sCi0gICAgICAgIHsKLSAgICAgICAg ICAgIC5kcml2ZXIgPSAibWlncmF0aW9uIiwKLSAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJzZW5k LWNvbmZpZ3VyYXRpb24iLAotICAgICAgICAgICAgLnZhbHVlID0gIm9mZiIsCi0gICAgICAgIH0s Ci0gICAgICAgIHsKLSAgICAgICAgICAgIC5kcml2ZXIgPSAibWlncmF0aW9uIiwKLSAgICAgICAg ICAgIC5wcm9wZXJ0eSA9ICJzZW5kLXNlY3Rpb24tZm9vdGVyIiwKLSAgICAgICAgICAgIC52YWx1 ZSA9ICJvZmYiLAotICAgICAgICB9CisgICAgICAgIHsgIm1pZ3JhdGlvbiIsICJzdG9yZS1nbG9i YWwtc3RhdGUiLCAib2ZmIiB9LAorICAgICAgICB7ICJtaWdyYXRpb24iLCAic2VuZC1jb25maWd1 cmF0aW9uIiwgIm9mZiIgfSwKKyAgICAgICAgeyAibWlncmF0aW9uIiwgInNlbmQtc2VjdGlvbi1m b290ZXIiLCAib2ZmIiB9LAogICAgIH07CiAKICAgICBhYy0+bmFtZSA9ICJYZW4iOwotLSAKMi4x OC4wLnJjMS4xLmczZjFmZjIxNDAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5w cm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8v eGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggabz-0008W2-TU for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:31:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggabv-0000uq-BR for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:30:59 -0500 From: Eduardo Habkost Date: Mon, 7 Jan 2019 17:30:20 -0200 Message-Id: <20190107193020.21744-4-ehabkost@redhat.com> In-Reply-To: <20190107193020.21744-1-ehabkost@redhat.com> References: <20190107193020.21744-1-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] machine: Use shorter format for GlobalProperty arrays List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Hildenbrand , Paolo Bonzini , Christian Borntraeger , Cornelia Huck , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , David Gibson , qemu-s390x@nongnu.org, Halil Pasic , Anthony Perard , Eduardo Habkost , Marcel Apfelbaum , Stefano Stabellini , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, xen-devel@lists.xenproject.org Instead of verbose arrays with 4 lines for each entry, make each entry take only one line. This makes long arrays that couldn't fit in the screen become short and readable. Signed-off-by: Eduardo Habkost --- include/hw/i386/pc.h | 18 +- hw/core/machine.c | 338 ++++------------- hw/i386/pc.c | 720 +++++++------------------------------ hw/i386/pc_piix.c | 192 ++-------- hw/ppc/spapr.c | 72 +--- hw/s390x/s390-virtio-ccw.c | 75 +--- hw/xen/xen-common.c | 18 +- 7 files changed, 265 insertions(+), 1168 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 84720bede9..0abbe45637 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -354,21 +354,9 @@ extern const size_t pc_compat_1_4_len; * depending on QEMU versions up to QEMU 2.4. */ #define PC_CPU_MODEL_IDS(v) \ - {\ - .driver = "qemu32-" TYPE_X86_CPU,\ - .property = "model-id",\ - .value = "QEMU Virtual CPU version " v,\ - },\ - {\ - .driver = "qemu64-" TYPE_X86_CPU,\ - .property = "model-id",\ - .value = "QEMU Virtual CPU version " v,\ - },\ - {\ - .driver = "athlon-" TYPE_X86_CPU,\ - .property = "model-id",\ - .value = "QEMU Virtual CPU version " v,\ - }, + { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ + { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ + { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ diff --git a/hw/core/machine.c b/hw/core/machine.c index 4b4d6c23de..5530b71981 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -24,23 +24,10 @@ #include "hw/pci/pci.h" GlobalProperty hw_compat_3_1[] = { - { - .driver = "pcie-root-port", - .property = "x-speed", - .value = "2_5", - },{ - .driver = "pcie-root-port", - .property = "x-width", - .value = "1", - },{ - .driver = "memory-backend-file", - .property = "x-use-canonical-path-for-ramblock-id", - .value = "true", - },{ - .driver = "memory-backend-memfd", - .property = "x-use-canonical-path-for-ramblock-id", - .value = "true", - }, + { "pcie-root-port", "x-speed", "2_5" }, + { "pcie-root-port", "x-width", "1" }, + { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true" }, + { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "true" }, }; const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1); @@ -48,269 +35,96 @@ GlobalProperty hw_compat_3_0[] = {}; const size_t hw_compat_3_0_len = G_N_ELEMENTS(hw_compat_3_0); GlobalProperty hw_compat_2_12[] = { - { - .driver = "migration", - .property = "decompress-error-check", - .value = "off", - },{ - .driver = "hda-audio", - .property = "use-timer", - .value = "false", - },{ - .driver = "cirrus-vga", - .property = "global-vmstate", - .value = "true", - },{ - .driver = "VGA", - .property = "global-vmstate", - .value = "true", - },{ - .driver = "vmware-svga", - .property = "global-vmstate", - .value = "true", - },{ - .driver = "qxl-vga", - .property = "global-vmstate", - .value = "true", - }, + { "migration", "decompress-error-check", "off" }, + { "hda-audio", "use-timer", "false" }, + { "cirrus-vga", "global-vmstate", "true" }, + { "VGA", "global-vmstate", "true" }, + { "vmware-svga", "global-vmstate", "true" }, + { "qxl-vga", "global-vmstate", "true" }, }; const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12); GlobalProperty hw_compat_2_11[] = { - { - .driver = "hpet", - .property = "hpet-offset-saved", - .value = "false", - },{ - .driver = "virtio-blk-pci", - .property = "vectors", - .value = "2", - },{ - .driver = "vhost-user-blk-pci", - .property = "vectors", - .value = "2", - },{ - .driver = "e1000", - .property = "migrate_tso_props", - .value = "off", - }, + { "hpet", "hpet-offset-saved", "false" }, + { "virtio-blk-pci", "vectors", "2" }, + { "vhost-user-blk-pci", "vectors", "2" }, + { "e1000", "migrate_tso_props", "off" }, }; const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11); GlobalProperty hw_compat_2_10[] = { - { - .driver = "virtio-mouse-device", - .property = "wheel-axis", - .value = "false", - },{ - .driver = "virtio-tablet-device", - .property = "wheel-axis", - .value = "false", - }, + { "virtio-mouse-device", "wheel-axis", "false" }, + { "virtio-tablet-device", "wheel-axis", "false" }, }; const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); GlobalProperty hw_compat_2_9[] = { - { - .driver = "pci-bridge", - .property = "shpc", - .value = "off", - },{ - .driver = "intel-iommu", - .property = "pt", - .value = "off", - },{ - .driver = "virtio-net-device", - .property = "x-mtu-bypass-backend", - .value = "off", - },{ - .driver = "pcie-root-port", - .property = "x-migrate-msix", - .value = "false", - }, + { "pci-bridge", "shpc", "off" }, + { "intel-iommu", "pt", "off" }, + { "virtio-net-device", "x-mtu-bypass-backend", "off" }, + { "pcie-root-port", "x-migrate-msix", "false" }, }; const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); GlobalProperty hw_compat_2_8[] = { - { - .driver = "fw_cfg_mem", - .property = "x-file-slots", - .value = "0x10", - },{ - .driver = "fw_cfg_io", - .property = "x-file-slots", - .value = "0x10", - },{ - .driver = "pflash_cfi01", - .property = "old-multiple-chip-handling", - .value = "on", - },{ - .driver = "pci-bridge", - .property = "shpc", - .value = "on", - },{ - .driver = TYPE_PCI_DEVICE, - .property = "x-pcie-extcap-init", - .value = "off", - },{ - .driver = "virtio-pci", - .property = "x-pcie-deverr-init", - .value = "off", - },{ - .driver = "virtio-pci", - .property = "x-pcie-lnkctl-init", - .value = "off", - },{ - .driver = "virtio-pci", - .property = "x-pcie-pm-init", - .value = "off", - },{ - .driver = "cirrus-vga", - .property = "vgamem_mb", - .value = "8", - },{ - .driver = "isa-cirrus-vga", - .property = "vgamem_mb", - .value = "8", - }, + { "fw_cfg_mem", "x-file-slots", "0x10" }, + { "fw_cfg_io", "x-file-slots", "0x10" }, + { "pflash_cfi01", "old-multiple-chip-handling", "on" }, + { "pci-bridge", "shpc", "on" }, + { TYPE_PCI_DEVICE, "x-pcie-extcap-init", "off" }, + { "virtio-pci", "x-pcie-deverr-init", "off" }, + { "virtio-pci", "x-pcie-lnkctl-init", "off" }, + { "virtio-pci", "x-pcie-pm-init", "off" }, + { "cirrus-vga", "vgamem_mb", "8" }, + { "isa-cirrus-vga", "vgamem_mb", "8" }, }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); GlobalProperty hw_compat_2_7[] = { - { - .driver = "virtio-pci", - .property = "page-per-vq", - .value = "on", - },{ - .driver = "virtio-serial-device", - .property = "emergency-write", - .value = "off", - },{ - .driver = "ioapic", - .property = "version", - .value = "0x11", - },{ - .driver = "intel-iommu", - .property = "x-buggy-eim", - .value = "true", - },{ - .driver = "virtio-pci", - .property = "x-ignore-backend-features", - .value = "on", - }, + { "virtio-pci", "page-per-vq", "on" }, + { "virtio-serial-device", "emergency-write", "off" }, + { "ioapic", "version", "0x11" }, + { "intel-iommu", "x-buggy-eim", "true" }, + { "virtio-pci", "x-ignore-backend-features", "on" }, }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); GlobalProperty hw_compat_2_6[] = { - { - .driver = "virtio-mmio", - .property = "format_transport_address", - .value = "off", - },{ - .driver = "virtio-pci", - .property = "disable-modern", - .value = "on", - },{ - .driver = "virtio-pci", - .property = "disable-legacy", - .value = "off", - }, + { "virtio-mmio", "format_transport_address", "off" }, + { "virtio-pci", "disable-modern", "on" }, + { "virtio-pci", "disable-legacy", "off" }, }; const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); GlobalProperty hw_compat_2_5[] = { - { - .driver = "isa-fdc", - .property = "fallback", - .value = "144", - },{ - .driver = "pvscsi", - .property = "x-old-pci-configuration", - .value = "on", - },{ - .driver = "pvscsi", - .property = "x-disable-pcie", - .value = "on", - }, - { - .driver = "vmxnet3", - .property = "x-old-msi-offsets", - .value = "on", - },{ - .driver = "vmxnet3", - .property = "x-disable-pcie", - .value = "on", - }, + { "isa-fdc", "fallback", "144" }, + { "pvscsi", "x-old-pci-configuration", "on" }, + { "pvscsi", "x-disable-pcie", "on" }, + { "vmxnet3", "x-old-msi-offsets", "on" }, + { "vmxnet3", "x-disable-pcie", "on" }, }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); GlobalProperty hw_compat_2_4[] = { - { - .driver = "virtio-blk-device", - .property = "scsi", - .value = "true", - },{ - .driver = "e1000", - .property = "extra_mac_registers", - .value = "off", - },{ - .driver = "virtio-pci", - .property = "x-disable-pcie", - .value = "on", - },{ - .driver = "virtio-pci", - .property = "migrate-extra", - .value = "off", - },{ - .driver = "fw_cfg_mem", - .property = "dma_enabled", - .value = "off", - },{ - .driver = "fw_cfg_io", - .property = "dma_enabled", - .value = "off", - } + { "virtio-blk-device", "scsi", "true" }, + { "e1000", "extra_mac_registers", "off" }, + { "virtio-pci", "x-disable-pcie", "on" }, + { "virtio-pci", "migrate-extra", "off" }, + { "fw_cfg_mem", "dma_enabled", "off" }, + { "fw_cfg_io", "dma_enabled", "off" } }; const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); GlobalProperty hw_compat_2_3[] = { - { - .driver = "virtio-blk-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "virtio-balloon-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "virtio-serial-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "virtio-9p-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "virtio-rng-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = TYPE_PCI_DEVICE, - .property = "x-pcie-lnksta-dllla", - .value = "off", - },{ - .driver = "migration", - .property = "send-configuration", - .value = "off", - },{ - .driver = "migration", - .property = "send-section-footer", - .value = "off", - },{ - .driver = "migration", - .property = "store-global-state", - .value = "off", - }, + { "virtio-blk-pci", "any_layout", "off" }, + { "virtio-balloon-pci", "any_layout", "off" }, + { "virtio-serial-pci", "any_layout", "off" }, + { "virtio-9p-pci", "any_layout", "off" }, + { "virtio-rng-pci", "any_layout", "off" }, + { TYPE_PCI_DEVICE, "x-pcie-lnksta-dllla", "off" }, + { "migration", "send-configuration", "off" }, + { "migration", "send-section-footer", "off" }, + { "migration", "store-global-state", "off" }, }; const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3); @@ -318,35 +132,13 @@ GlobalProperty hw_compat_2_2[] = {}; const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2); GlobalProperty hw_compat_2_1[] = { - { - .driver = "intel-hda", - .property = "old_msi_addr", - .value = "on", - },{ - .driver = "VGA", - .property = "qemu-extended-regs", - .value = "off", - },{ - .driver = "secondary-vga", - .property = "qemu-extended-regs", - .value = "off", - },{ - .driver = "virtio-scsi-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "usb-mouse", - .property = "usb_version", - .value = "1", - },{ - .driver = "usb-kbd", - .property = "usb_version", - .value = "1", - },{ - .driver = "virtio-pci", - .property = "virtio-pci-bus-master-bug-migration", - .value = "on", - }, + { "intel-hda", "old_msi_addr", "on" }, + { "VGA", "qemu-extended-regs", "off" }, + { "secondary-vga", "qemu-extended-regs", "off" }, + { "virtio-scsi-pci", "any_layout", "off" }, + { "usb-mouse", "usb_version", "1" }, + { "usb-kbd", "usb_version", "1" }, + { "virtio-pci", "virtio-pci-bus-master-bug-migration", "on" }, }; const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ff14b6d4df..f238424499 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -111,174 +111,67 @@ static unsigned e820_entries; struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; GlobalProperty pc_compat_3_1[] = { - { - .driver = "intel-iommu", - .property = "dma-drain", - .value = "off", - }, + { "intel-iommu", "dma-drain", "off" }, }; const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1); GlobalProperty pc_compat_3_0[] = { - { - .driver = TYPE_X86_CPU, - .property = "x-hv-synic-kvm-only", - .value = "on", - },{ - .driver = "Skylake-Server" "-" TYPE_X86_CPU, - .property = "pku", - .value = "off", - },{ - .driver = "Skylake-Server-IBRS" "-" TYPE_X86_CPU, - .property = "pku", - .value = "off", - }, + { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" }, + { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" }, + { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" }, }; const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0); GlobalProperty pc_compat_2_12[] = { - { - .driver = TYPE_X86_CPU, - .property = "legacy-cache", - .value = "on", - },{ - .driver = TYPE_X86_CPU, - .property = "topoext", - .value = "off", - },{ - .driver = "EPYC-" TYPE_X86_CPU, - .property = "xlevel", - .value = "0x8000000a", - },{ - .driver = "EPYC-IBPB-" TYPE_X86_CPU, - .property = "xlevel", - .value = "0x8000000a", - }, + { TYPE_X86_CPU, "legacy-cache", "on" }, + { TYPE_X86_CPU, "topoext", "off" }, + { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, + { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, }; const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12); GlobalProperty pc_compat_2_11[] = { - { - .driver = TYPE_X86_CPU, - .property = "x-migrate-smi-count", - .value = "off", - },{ - .driver = "Skylake-Server" "-" TYPE_X86_CPU, - .property = "clflushopt", - .value = "off", - }, + { TYPE_X86_CPU, "x-migrate-smi-count", "off" }, + { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" }, }; const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11); GlobalProperty pc_compat_2_10[] = { - { - .driver = TYPE_X86_CPU, - .property = "x-hv-max-vps", - .value = "0x40", - },{ - .driver = "i440FX-pcihost", - .property = "x-pci-hole64-fix", - .value = "off", - },{ - .driver = "q35-pcihost", - .property = "x-pci-hole64-fix", - .value = "off", - }, + { TYPE_X86_CPU, "x-hv-max-vps", "0x40" }, + { "i440FX-pcihost", "x-pci-hole64-fix", "off" }, + { "q35-pcihost", "x-pci-hole64-fix", "off" }, }; const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10); GlobalProperty pc_compat_2_9[] = { - { - .driver = "mch", - .property = "extended-tseg-mbytes", - .value = "0", - }, + { "mch", "extended-tseg-mbytes", "0" }, }; const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9); GlobalProperty pc_compat_2_8[] = { - { - .driver = TYPE_X86_CPU, - .property = "tcg-cpuid", - .value = "off", - }, - { - .driver = "kvmclock", - .property = "x-mach-use-reliable-get-clock", - .value = "off", - }, - { - .driver = "ICH9-LPC", - .property = "x-smi-broadcast", - .value = "off", - }, - { - .driver = TYPE_X86_CPU, - .property = "vmware-cpuid-freq", - .value = "off", - }, - { - .driver = "Haswell-" TYPE_X86_CPU, - .property = "stepping", - .value = "1", - }, + { TYPE_X86_CPU, "tcg-cpuid", "off" }, + { "kvmclock", "x-mach-use-reliable-get-clock", "off" }, + { "ICH9-LPC", "x-smi-broadcast", "off" }, + { TYPE_X86_CPU, "vmware-cpuid-freq", "off" }, + { "Haswell-" TYPE_X86_CPU, "stepping", "1" }, }; const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); GlobalProperty pc_compat_2_7[] = { - { - .driver = TYPE_X86_CPU, - .property = "l3-cache", - .value = "off", - }, - { - .driver = TYPE_X86_CPU, - .property = "full-cpuid-auto-level", - .value = "off", - }, - { - .driver = "Opteron_G3" "-" TYPE_X86_CPU, - .property = "family", - .value = "15", - }, - { - .driver = "Opteron_G3" "-" TYPE_X86_CPU, - .property = "model", - .value = "6", - }, - { - .driver = "Opteron_G3" "-" TYPE_X86_CPU, - .property = "stepping", - .value = "1", - }, - { - .driver = "isa-pcspk", - .property = "migrate", - .value = "off", - }, + { TYPE_X86_CPU, "l3-cache", "off" }, + { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, + { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, + { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, + { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, + { "isa-pcspk", "migrate", "off" }, }; const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); GlobalProperty pc_compat_2_6[] = { - { - .driver = TYPE_X86_CPU, - .property = "cpuid-0xb", - .value = "off", - },{ - .driver = "vmxnet3", - .property = "romfile", - .value = "", - }, - { - .driver = TYPE_X86_CPU, - .property = "fill-mtrr-mask", - .value = "off", - }, - { - .driver = "apic-common", - .property = "legacy-instance-id", - .value = "on", - } + { TYPE_X86_CPU, "cpuid-0xb", "off" }, + { "vmxnet3", "romfile", "" }, + { TYPE_X86_CPU, "fill-mtrr-mask", "off" }, + { "apic-common", "legacy-instance-id", "on", } }; const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); @@ -287,499 +180,148 @@ const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); GlobalProperty pc_compat_2_4[] = { PC_CPU_MODEL_IDS("2.4.0") - { - .driver = "Haswell-" TYPE_X86_CPU, - .property = "abm", - .value = "off", - }, - { - .driver = "Haswell-noTSX-" TYPE_X86_CPU, - .property = "abm", - .value = "off", - }, - { - .driver = "Broadwell-" TYPE_X86_CPU, - .property = "abm", - .value = "off", - }, - { - .driver = "Broadwell-noTSX-" TYPE_X86_CPU, - .property = "abm", - .value = "off", - }, - { - .driver = "host" "-" TYPE_X86_CPU, - .property = "host-cache-info", - .value = "on", - }, - { - .driver = TYPE_X86_CPU, - .property = "check", - .value = "off", - }, - { - .driver = "qemu64" "-" TYPE_X86_CPU, - .property = "sse4a", - .value = "on", - }, - { - .driver = "qemu64" "-" TYPE_X86_CPU, - .property = "abm", - .value = "on", - }, - { - .driver = "qemu64" "-" TYPE_X86_CPU, - .property = "popcnt", - .value = "on", - }, - { - .driver = "qemu32" "-" TYPE_X86_CPU, - .property = "popcnt", - .value = "on", - },{ - .driver = "Opteron_G2" "-" TYPE_X86_CPU, - .property = "rdtscp", - .value = "on", - },{ - .driver = "Opteron_G3" "-" TYPE_X86_CPU, - .property = "rdtscp", - .value = "on", - },{ - .driver = "Opteron_G4" "-" TYPE_X86_CPU, - .property = "rdtscp", - .value = "on", - },{ - .driver = "Opteron_G5" "-" TYPE_X86_CPU, - .property = "rdtscp", - .value = "on", - } + { "Haswell-" TYPE_X86_CPU, "abm", "off" }, + { "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" }, + { "Broadwell-" TYPE_X86_CPU, "abm", "off" }, + { "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" }, + { "host" "-" TYPE_X86_CPU, "host-cache-info", "on" }, + { TYPE_X86_CPU, "check", "off" }, + { "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" }, + { "qemu64" "-" TYPE_X86_CPU, "abm", "on" }, + { "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" }, + { "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" }, + { "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" }, + { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" }, + { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" }, + { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", } }; const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); GlobalProperty pc_compat_2_3[] = { PC_CPU_MODEL_IDS("2.3.0") - { - .driver = TYPE_X86_CPU, - .property = "arat", - .value = "off", - },{ - .driver = "qemu64" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "4", - },{ - .driver = "kvm64" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "5", - },{ - .driver = "pentium3" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "2", - },{ - .driver = "n270" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "5", - },{ - .driver = "Conroe" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "4", - },{ - .driver = "Penryn" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "4", - },{ - .driver = "Nehalem" "-" TYPE_X86_CPU, - .property = "min-level", - .value = "4", - },{ - .driver = "n270" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Penryn" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Conroe" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Nehalem" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Westmere" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "SandyBridge" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "IvyBridge" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Haswell" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Haswell-noTSX" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Broadwell" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = "Broadwell-noTSX" "-" TYPE_X86_CPU, - .property = "min-xlevel", - .value = "0x8000000a", - },{ - .driver = TYPE_X86_CPU, - .property = "kvm-no-smi-migration", - .value = "on", - }, + { TYPE_X86_CPU, "arat", "off" }, + { "qemu64" "-" TYPE_X86_CPU, "min-level", "4" }, + { "kvm64" "-" TYPE_X86_CPU, "min-level", "5" }, + { "pentium3" "-" TYPE_X86_CPU, "min-level", "2" }, + { "n270" "-" TYPE_X86_CPU, "min-level", "5" }, + { "Conroe" "-" TYPE_X86_CPU, "min-level", "4" }, + { "Penryn" "-" TYPE_X86_CPU, "min-level", "4" }, + { "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" }, + { "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, + { TYPE_X86_CPU, "kvm-no-smi-migration", "on" }, }; const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); GlobalProperty pc_compat_2_2[] = { PC_CPU_MODEL_IDS("2.2.0") - { - .driver = "kvm64" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "kvm32" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Conroe" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Penryn" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Nehalem" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Westmere" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "SandyBridge" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Haswell" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Broadwell" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Opteron_G1" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Opteron_G2" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Opteron_G3" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Opteron_G4" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Opteron_G5" "-" TYPE_X86_CPU, - .property = "vme", - .value = "off", - }, - { - .driver = "Haswell" "-" TYPE_X86_CPU, - .property = "f16c", - .value = "off", - }, - { - .driver = "Haswell" "-" TYPE_X86_CPU, - .property = "rdrand", - .value = "off", - }, - { - .driver = "Broadwell" "-" TYPE_X86_CPU, - .property = "f16c", - .value = "off", - }, - { - .driver = "Broadwell" "-" TYPE_X86_CPU, - .property = "rdrand", - .value = "off", - }, + { "kvm64" "-" TYPE_X86_CPU, "vme", "off" }, + { "kvm32" "-" TYPE_X86_CPU, "vme", "off" }, + { "Conroe" "-" TYPE_X86_CPU, "vme", "off" }, + { "Penryn" "-" TYPE_X86_CPU, "vme", "off" }, + { "Nehalem" "-" TYPE_X86_CPU, "vme", "off" }, + { "Westmere" "-" TYPE_X86_CPU, "vme", "off" }, + { "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" }, + { "Haswell" "-" TYPE_X86_CPU, "vme", "off" }, + { "Broadwell" "-" TYPE_X86_CPU, "vme", "off" }, + { "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" }, + { "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" }, + { "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" }, + { "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" }, + { "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" }, + { "Haswell" "-" TYPE_X86_CPU, "f16c", "off" }, + { "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" }, + { "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" }, + { "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" }, }; const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); GlobalProperty pc_compat_2_1[] = { PC_CPU_MODEL_IDS("2.1.0") - { - .driver = "coreduo" "-" TYPE_X86_CPU, - .property = "vmx", - .value = "on", - }, - { - .driver = "core2duo" "-" TYPE_X86_CPU, - .property = "vmx", - .value = "on", - }, + { "coreduo" "-" TYPE_X86_CPU, "vmx", "on" }, + { "core2duo" "-" TYPE_X86_CPU, "vmx", "on" }, }; const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1); GlobalProperty pc_compat_2_0[] = { PC_CPU_MODEL_IDS("2.0.0") - { - .driver = "virtio-scsi-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = "PIIX4_PM", - .property = "memory-hotplug-support", - .value = "off", - }, - { - .driver = "apic", - .property = "version", - .value = "0x11", - }, - { - .driver = "nec-usb-xhci", - .property = "superspeed-ports-first", - .value = "off", - }, - { - .driver = "nec-usb-xhci", - .property = "force-pcie-endcap", - .value = "on", - }, - { - .driver = "pci-serial", - .property = "prog_if", - .value = "0", - }, - { - .driver = "pci-serial-2x", - .property = "prog_if", - .value = "0", - }, - { - .driver = "pci-serial-4x", - .property = "prog_if", - .value = "0", - }, - { - .driver = "virtio-net-pci", - .property = "guest_announce", - .value = "off", - }, - { - .driver = "ICH9-LPC", - .property = "memory-hotplug-support", - .value = "off", - },{ - .driver = "xio3130-downstream", - .property = COMPAT_PROP_PCP, - .value = "off", - },{ - .driver = "ioh3420", - .property = COMPAT_PROP_PCP, - .value = "off", - }, + { "virtio-scsi-pci", "any_layout", "off" }, + { "PIIX4_PM", "memory-hotplug-support", "off" }, + { "apic", "version", "0x11" }, + { "nec-usb-xhci", "superspeed-ports-first", "off" }, + { "nec-usb-xhci", "force-pcie-endcap", "on" }, + { "pci-serial", "prog_if", "0" }, + { "pci-serial-2x", "prog_if", "0" }, + { "pci-serial-4x", "prog_if", "0" }, + { "virtio-net-pci", "guest_announce", "off" }, + { "ICH9-LPC", "memory-hotplug-support", "off" }, + { "xio3130-downstream", COMPAT_PROP_PCP, "off" }, + { "ioh3420", COMPAT_PROP_PCP, "off" }, }; const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0); GlobalProperty pc_compat_1_7[] = { PC_CPU_MODEL_IDS("1.7.0") - { - .driver = TYPE_USB_DEVICE, - .property = "msos-desc", - .value = "no", - }, - { - .driver = "PIIX4_PM", - .property = "acpi-pci-hotplug-with-bridge-support", - .value = "off", - }, - { - .driver = "hpet", - .property = HPET_INTCAP, - .value = "4", - }, + { TYPE_USB_DEVICE, "msos-desc", "no" }, + { "PIIX4_PM", "acpi-pci-hotplug-with-bridge-support", "off" }, + { "hpet", HPET_INTCAP, "4" }, }; const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7); GlobalProperty pc_compat_1_6[] = { PC_CPU_MODEL_IDS("1.6.0") - { - .driver = "e1000", - .property = "mitigation", - .value = "off", - },{ - .driver = "qemu64-" TYPE_X86_CPU, - .property = "model", - .value = "2", - },{ - .driver = "qemu32-" TYPE_X86_CPU, - .property = "model", - .value = "3", - },{ - .driver = "i440FX-pcihost", - .property = "short_root_bus", - .value = "1", - },{ - .driver = "q35-pcihost", - .property = "short_root_bus", - .value = "1", - }, + { "e1000", "mitigation", "off" }, + { "qemu64-" TYPE_X86_CPU, "model", "2" }, + { "qemu32-" TYPE_X86_CPU, "model", "3" }, + { "i440FX-pcihost", "short_root_bus", "1" }, + { "q35-pcihost", "short_root_bus", "1" }, }; const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6); GlobalProperty pc_compat_1_5[] = { PC_CPU_MODEL_IDS("1.5.0") - { - .driver = "Conroe-" TYPE_X86_CPU, - .property = "model", - .value = "2", - },{ - .driver = "Conroe-" TYPE_X86_CPU, - .property = "min-level", - .value = "2", - },{ - .driver = "Penryn-" TYPE_X86_CPU, - .property = "model", - .value = "2", - },{ - .driver = "Penryn-" TYPE_X86_CPU, - .property = "min-level", - .value = "2", - },{ - .driver = "Nehalem-" TYPE_X86_CPU, - .property = "model", - .value = "2", - },{ - .driver = "Nehalem-" TYPE_X86_CPU, - .property = "min-level", - .value = "2", - },{ - .driver = "virtio-net-pci", - .property = "any_layout", - .value = "off", - },{ - .driver = TYPE_X86_CPU, - .property = "pmu", - .value = "on", - },{ - .driver = "i440FX-pcihost", - .property = "short_root_bus", - .value = "0", - },{ - .driver = "q35-pcihost", - .property = "short_root_bus", - .value = "0", - }, + { "Conroe-" TYPE_X86_CPU, "model", "2" }, + { "Conroe-" TYPE_X86_CPU, "min-level", "2" }, + { "Penryn-" TYPE_X86_CPU, "model", "2" }, + { "Penryn-" TYPE_X86_CPU, "min-level", "2" }, + { "Nehalem-" TYPE_X86_CPU, "model", "2" }, + { "Nehalem-" TYPE_X86_CPU, "min-level", "2" }, + { "virtio-net-pci", "any_layout", "off" }, + { TYPE_X86_CPU, "pmu", "on" }, + { "i440FX-pcihost", "short_root_bus", "0" }, + { "q35-pcihost", "short_root_bus", "0" }, }; const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5); GlobalProperty pc_compat_1_4[] = { PC_CPU_MODEL_IDS("1.4.0") - { - .driver = "scsi-hd", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "scsi-cd", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "scsi-disk", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "ide-hd", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "ide-cd", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "ide-drive", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "virtio-blk-pci", - .property = "discard_granularity", - .value = "0", - },{ - .driver = "virtio-serial-pci", - .property = "vectors", - /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */ - .value = "0xFFFFFFFF", - },{ - .driver = "virtio-net-pci", - .property = "ctrl_guest_offloads", - .value = "off", - },{ - .driver = "e1000", - .property = "romfile", - .value = "pxe-e1000.rom", - },{ - .driver = "ne2k_pci", - .property = "romfile", - .value = "pxe-ne2k_pci.rom", - },{ - .driver = "pcnet", - .property = "romfile", - .value = "pxe-pcnet.rom", - },{ - .driver = "rtl8139", - .property = "romfile", - .value = "pxe-rtl8139.rom", - },{ - .driver = "virtio-net-pci", - .property = "romfile", - .value = "pxe-virtio.rom", - },{ - .driver = "486-" TYPE_X86_CPU, - .property = "model", - .value = "0", - }, - { - .driver = "n270" "-" TYPE_X86_CPU, - .property = "movbe", - .value = "off", - }, - { - .driver = "Westmere" "-" TYPE_X86_CPU, - .property = "pclmulqdq", - .value = "off", - }, + { "scsi-hd", "discard_granularity", "0" }, + { "scsi-cd", "discard_granularity", "0" }, + { "scsi-disk", "discard_granularity", "0" }, + { "ide-hd", "discard_granularity", "0" }, + { "ide-cd", "discard_granularity", "0" }, + { "ide-drive", "discard_granularity", "0" }, + { "virtio-blk-pci", "discard_granularity", "0" }, + /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string: */ + { "virtio-serial-pci", "vectors", "0xFFFFFFFF" }, + { "virtio-net-pci", "ctrl_guest_offloads", "off" }, + { "e1000", "romfile", "pxe-e1000.rom" }, + { "ne2k_pci", "romfile", "pxe-ne2k_pci.rom" }, + { "pcnet", "romfile", "pxe-pcnet.rom" }, + { "rtl8139", "romfile", "pxe-rtl8139.rom" }, + { "virtio-net-pci", "romfile", "pxe-virtio.rom" }, + { "486-" TYPE_X86_CPU, "model", "0" }, + { "n270" "-" TYPE_X86_CPU, "movbe", "off" }, + { "Westmere" "-" TYPE_X86_CPU, "pclmulqdq", "off" }, }; const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fd20227af3..5088e2f492 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -694,23 +694,10 @@ static void pc_i440fx_1_3_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("1.3.0") - { - .driver = "usb-tablet", - .property = "usb_version", - .value = "1", - },{ - .driver = "virtio-net-pci", - .property = "ctrl_mac_addr", - .value = "off", - },{ - .driver = "virtio-net-pci", - .property = "mq", - .value = "off", - }, { - .driver = "e1000", - .property = "autonegotiation", - .value = "off", - }, + { "usb-tablet", "usb_version", "1" }, + { "virtio-net-pci", "ctrl_mac_addr", "off" }, + { "virtio-net-pci", "mq", "off" }, + { "e1000", "autonegotiation", "off" }, }; pc_i440fx_1_4_machine_options(m); @@ -726,31 +713,12 @@ static void pc_i440fx_1_2_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("1.2.0") - { - .driver = "nec-usb-xhci", - .property = "msi", - .value = "off", - },{ - .driver = "nec-usb-xhci", - .property = "msix", - .value = "off", - },{ - .driver = "ivshmem", - .property = "use64", - .value = "0", - },{ - .driver = "qxl", - .property = "revision", - .value = "3", - },{ - .driver = "qxl-vga", - .property = "revision", - .value = "3", - },{ - .driver = "VGA", - .property = "mmio", - .value = "off", - }, + { "nec-usb-xhci", "msi", "off" }, + { "nec-usb-xhci", "msix", "off" }, + { "ivshmem", "use64", "0" }, + { "qxl", "revision", "3" }, + { "qxl-vga", "revision", "3" }, + { "VGA", "mmio", "off" }, }; pc_i440fx_1_3_machine_options(m); @@ -766,35 +734,13 @@ static void pc_i440fx_1_1_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("1.1.0") - { - .driver = "virtio-scsi-pci", - .property = "hotplug", - .value = "off", - },{ - .driver = "virtio-scsi-pci", - .property = "param_change", - .value = "off", - },{ - .driver = "VGA", - .property = "vgamem_mb", - .value = "8", - },{ - .driver = "vmware-svga", - .property = "vgamem_mb", - .value = "8", - },{ - .driver = "qxl-vga", - .property = "vgamem_mb", - .value = "8", - },{ - .driver = "qxl", - .property = "vgamem_mb", - .value = "8", - },{ - .driver = "virtio-blk-pci", - .property = "config-wce", - .value = "off", - }, + { "virtio-scsi-pci", "hotplug", "off" }, + { "virtio-scsi-pci", "param_change", "off" }, + { "VGA", "vgamem_mb", "8" }, + { "vmware-svga", "vgamem_mb", "8" }, + { "qxl-vga", "vgamem_mb", "8" }, + { "qxl", "vgamem_mb", "8" }, + { "virtio-blk-pci", "config-wce", "off" }, }; pc_i440fx_1_2_machine_options(m); @@ -809,23 +755,10 @@ static void pc_i440fx_1_0_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("1.0") - { - .driver = TYPE_ISA_FDC, - .property = "check_media_rate", - .value = "off", - },{ - .driver = "virtio-balloon-pci", - .property = "class", - .value = stringify(PCI_CLASS_MEMORY_RAM), - },{ - .driver = "apic-common", - .property = "vapic", - .value = "off", - },{ - .driver = TYPE_USB_DEVICE, - .property = "full-path", - .value = "no", - }, + { TYPE_ISA_FDC, "check_media_rate", "off" }, + { "virtio-balloon-pci", "class", stringify(PCI_CLASS_MEMORY_RAM) }, + { "apic-common", "vapic", "off" }, + { TYPE_USB_DEVICE, "full-path", "no" }, }; pc_i440fx_1_1_machine_options(m); @@ -857,31 +790,12 @@ static void pc_i440fx_0_14_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("0.14") - { - .driver = "virtio-blk-pci", - .property = "event_idx", - .value = "off", - },{ - .driver = "virtio-serial-pci", - .property = "event_idx", - .value = "off", - },{ - .driver = "virtio-net-pci", - .property = "event_idx", - .value = "off", - },{ - .driver = "virtio-balloon-pci", - .property = "event_idx", - .value = "off", - },{ - .driver = "qxl", - .property = "revision", - .value = "2", - },{ - .driver = "qxl-vga", - .property = "revision", - .value = "2", - }, + { "virtio-blk-pci", "event_idx", "off" }, + { "virtio-serial-pci", "event_idx", "off" }, + { "virtio-net-pci", "event_idx", "off" }, + { "virtio-balloon-pci", "event_idx", "off" }, + { "qxl", "revision", "2" }, + { "qxl-vga", "revision", "2" }, }; pc_i440fx_0_15_machine_options(m); @@ -897,27 +811,11 @@ static void pc_i440fx_0_13_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("0.13") - { - .driver = TYPE_PCI_DEVICE, - .property = "command_serr_enable", - .value = "off", - },{ - .driver = "AC97", - .property = "use_broken_id", - .value = "1", - },{ - .driver = "virtio-9p-pci", - .property = "vectors", - .value = "0", - },{ - .driver = "VGA", - .property = "rombar", - .value = "0", - },{ - .driver = "vmware-svga", - .property = "rombar", - .value = "0", - }, + { TYPE_PCI_DEVICE, "command_serr_enable", "off" }, + { "AC97", "use_broken_id", "1" }, + { "virtio-9p-pci", "vectors", "0" }, + { "VGA", "rombar", "0" }, + { "vmware-svga", "rombar", "0" }, }; pc_i440fx_0_14_machine_options(m); @@ -933,27 +831,11 @@ static void pc_i440fx_0_12_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("0.12") - { - .driver = "virtio-serial-pci", - .property = "max_ports", - .value = "1", - },{ - .driver = "virtio-serial-pci", - .property = "vectors", - .value = "0", - },{ - .driver = "usb-mouse", - .property = "serial", - .value = "1", - },{ - .driver = "usb-tablet", - .property = "serial", - .value = "1", - },{ - .driver = "usb-kbd", - .property = "serial", - .value = "1", - }, + { "virtio-serial-pci", "max_ports", "1" }, + { "virtio-serial-pci", "vectors", "0" }, + { "usb-mouse", "serial", "1" }, + { "usb-tablet", "serial", "1" }, + { "usb-kbd", "serial", "1" }, }; pc_i440fx_0_13_machine_options(m); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d7d87b0ae8..697faa99e9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4053,16 +4053,8 @@ static void spapr_machine_2_12_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = TYPE_POWERPC_CPU, - .property = "pre-3.0-migration", - .value = "on", - }, - { - .driver = TYPE_SPAPR_CPU_CORE, - .property = "pre-3.0-migration", - .value = "on", - }, + { TYPE_POWERPC_CPU, "pre-3.0-migration", "on" }, + { TYPE_SPAPR_CPU_CORE, "pre-3.0-migration", "on" }, }; spapr_machine_3_0_class_options(mc); @@ -4126,11 +4118,7 @@ static void spapr_machine_2_9_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = TYPE_POWERPC_CPU, - .property = "pre-2.10-migration", - .value = "on", - }, + { TYPE_POWERPC_CPU, "pre-2.10-migration", "on" }, }; spapr_machine_2_10_class_options(mc); @@ -4150,11 +4138,7 @@ DEFINE_SPAPR_MACHINE(2_9, "2.9", false); static void spapr_machine_2_8_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "pcie-extended-configuration-space", - .value = "off", - }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "pcie-extended-configuration-space", "off" }, }; spapr_machine_2_9_class_options(mc); @@ -4222,26 +4206,10 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "mem_win_size", - .value = "0xf80000000", - }, - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "mem64_win_size", - .value = "0", - }, - { - .driver = TYPE_POWERPC_CPU, - .property = "pre-2.8-migration", - .value = "on", - }, - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "pre-2.8-migration", - .value = "on", - }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0xf80000000", }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem64_win_size", "0", }, + { TYPE_POWERPC_CPU, "pre-2.8-migration", "on", }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "pre-2.8-migration", "on", }, }; spapr_machine_2_8_class_options(mc); @@ -4261,11 +4229,7 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false); static void spapr_machine_2_6_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "ddw", - .value = "off", - }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "ddw", "off" }, }; spapr_machine_2_7_class_options(mc); @@ -4284,11 +4248,7 @@ static void spapr_machine_2_5_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = "spapr-vlan", - .property = "use-rx-buffer-pools", - .value = "off", - }, + { "spapr-vlan", "use-rx-buffer-pools", "off" }, }; spapr_machine_2_6_class_options(mc); @@ -4321,11 +4281,7 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false); static void spapr_machine_2_3_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = "spapr-pci-host-bridge", - .property = "dynamic-reconfiguration", - .value = "off", - }, + { "spapr-pci-host-bridge", "dynamic-reconfiguration", "off" }, }; spapr_machine_2_4_class_options(mc); compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len); @@ -4340,11 +4296,7 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); static void spapr_machine_2_2_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, - .property = "mem_win_size", - .value = "0x20000000", - }, + { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0x20000000" }, }; spapr_machine_2_3_class_options(mc); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c737507053..811fdf913d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -712,11 +712,7 @@ static void ccw_machine_2_11_instance_options(MachineState *machine) static void ccw_machine_2_11_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_SCLP_EVENT_FACILITY, - .property = "allow_all_mask_sizes", - .value = "off", - }, + { TYPE_SCLP_EVENT_FACILITY, "allow_all_mask_sizes", "off", }, }; ccw_machine_2_12_class_options(mc); @@ -751,11 +747,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc) { S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = TYPE_S390_STATTRIB, - .property = "migration-enabled", - .value = "off", - }, + { TYPE_S390_STATTRIB, "migration-enabled", "off", }, }; ccw_machine_2_10_class_options(mc); @@ -773,11 +765,7 @@ static void ccw_machine_2_8_instance_options(MachineState *machine) static void ccw_machine_2_8_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_S390_FLIC_COMMON, - .property = "adapter_routes_max_batch", - .value = "64", - }, + { TYPE_S390_FLIC_COMMON, "adapter_routes_max_batch", "64", }, }; ccw_machine_2_9_class_options(mc); @@ -810,15 +798,8 @@ static void ccw_machine_2_6_class_options(MachineClass *mc) { S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - { - .driver = TYPE_S390_IPL, - .property = "iplbext_migration", - .value = "off", - }, { - .driver = TYPE_VIRTUAL_CSS_BRIDGE, - .property = "css_dev_path", - .value = "off", - }, + { TYPE_S390_IPL, "iplbext_migration", "off", }, + { TYPE_VIRTUAL_CSS_BRIDGE, "css_dev_path", "off", }, }; s390mc->ri_allowed = false; @@ -848,43 +829,15 @@ static void ccw_machine_2_4_instance_options(MachineState *machine) static void ccw_machine_2_4_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - { - .driver = TYPE_S390_SKEYS, - .property = "migration-enabled", - .value = "off", - },{ - .driver = "virtio-blk-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-balloon-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-serial-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-9p-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-rng-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-net-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "virtio-scsi-ccw", - .property = "max_revision", - .value = "0", - },{ - .driver = "vhost-scsi-ccw", - .property = "max_revision", - .value = "0", - }, + { TYPE_S390_SKEYS, "migration-enabled", "off", }, + { "virtio-blk-ccw", "max_revision", "0", }, + { "virtio-balloon-ccw", "max_revision", "0", }, + { "virtio-serial-ccw", "max_revision", "0", }, + { "virtio-9p-ccw", "max_revision", "0", }, + { "virtio-rng-ccw", "max_revision", "0", }, + { "virtio-net-ccw", "max_revision", "0", }, + { "virtio-scsi-ccw", "max_revision", "0", }, + { "vhost-scsi-ccw", "max_revision", "0", }, }; ccw_machine_2_5_class_options(mc); diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index d51148b6b3..18a9045556 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -163,21 +163,9 @@ static void xen_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); static GlobalProperty compat[] = { - { - .driver = "migration", - .property = "store-global-state", - .value = "off", - }, - { - .driver = "migration", - .property = "send-configuration", - .value = "off", - }, - { - .driver = "migration", - .property = "send-section-footer", - .value = "off", - } + { "migration", "store-global-state", "off" }, + { "migration", "send-configuration", "off" }, + { "migration", "send-section-footer", "off" }, }; ac->name = "Xen"; -- 2.18.0.rc1.1.g3f1ff2140