From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 2/3] machine: Eliminate unnecessary stringify() usage Date: Mon, 7 Jan 2019 17:30:19 -0200 Message-ID: <20190107193020.21744-3-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 1ggabo-0001og-OJ for xen-devel@lists.xenproject.org; Mon, 07 Jan 2019 19:30:48 +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 c3RyaW5naWZ5KCkgaXMgdXNlZnVsIHdoZW4gd2UgbmVlZCB0byB1c2UgbWFjcm9zIGluIGNvbXBh dF9wcm9wcwoobGlrZSB3aGVuIHdlIHNldCB2aXJ0aW8tYmFsb29uLXBjaS5jbGFzcz1QQ0lfQ0xB U1NfTUVNT1JZX1JBTSBhdApwY19pNDQwZnhfMV8wX21hY2hpbmVfb3B0aW9ucygpKSwgYnV0IGl0 IGlzIHBvaW50bGVzcyB3aGVuIHdlIGFyZQphbHJlYWR5IHByb3ZpZGluZyBhIG51bWJlciBsaXRl cmFsLgoKUmVwbGFjZSBzdHJpbmdpZnkoKSB3aXRoIHN0cmluZyBsaXRlcmFscyB3aGVuIGFwcHJv cHJpYXRlLgoKU2lnbmVkLW9mZi1ieTogRWR1YXJkbyBIYWJrb3N0IDxlaGFia29zdEByZWRoYXQu Y29tPgotLS0KIGh3L2NvcmUvbWFjaGluZS5jIHwgIDggKystLQogaHcvaTM4Ni9wYy5jICAgICAg fCA5NCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaHcv aTM4Ni9wY19waWl4LmMgfCAzMCArKysrKysrLS0tLS0tLS0KIGh3L3BwYy9zcGFwci5jICAgIHwg IDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgNjcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvaHcvY29yZS9tYWNoaW5lLmMgYi9ody9jb3JlL21hY2hpbmUuYwppbmRl eCBmODU2M2VmYjg2Li40YjRkNmMyM2RlIDEwMDY0NAotLS0gYS9ody9jb3JlL21hY2hpbmUuYwor KysgYi9ody9jb3JlL21hY2hpbmUuYwpAQCAtMTM1LDExICsxMzUsMTEgQEAgR2xvYmFsUHJvcGVy dHkgaHdfY29tcGF0XzJfOFtdID0gewogICAgIHsKICAgICAgICAgLmRyaXZlciAgID0gImZ3X2Nm Z19tZW0iLAogICAgICAgICAucHJvcGVydHkgPSAieC1maWxlLXNsb3RzIiwKLSAgICAgICAgLnZh bHVlICAgID0gc3RyaW5naWZ5KDB4MTApLAorICAgICAgICAudmFsdWUgICAgPSAiMHgxMCIsCiAg ICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJmd19jZmdfaW8iLAogICAgICAgICAucHJvcGVy dHkgPSAieC1maWxlLXNsb3RzIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4MTAp LAorICAgICAgICAudmFsdWUgICAgPSAiMHgxMCIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIg ICA9ICJwZmxhc2hfY2ZpMDEiLAogICAgICAgICAucHJvcGVydHkgPSAib2xkLW11bHRpcGxlLWNo aXAtaGFuZGxpbmciLApAQCAtMzM3LDExICszMzcsMTEgQEAgR2xvYmFsUHJvcGVydHkgaHdfY29t cGF0XzJfMVtdID0gewogICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAidXNiLW1vdXNlIiwK ICAgICAgICAgLnByb3BlcnR5ID0gInVzYl92ZXJzaW9uIiwKLSAgICAgICAgLnZhbHVlICAgID0g c3RyaW5naWZ5KDEpLAorICAgICAgICAudmFsdWUgICAgPSAiMSIsCiAgICAgfSx7CiAgICAgICAg IC5kcml2ZXIgICA9ICJ1c2Ita2JkIiwKICAgICAgICAgLnByb3BlcnR5ID0gInVzYl92ZXJzaW9u IiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDEpLAorICAgICAgICAudmFsdWUgICAg PSAiMSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tcGNpIiwKICAgICAg ICAgLnByb3BlcnR5ID0gInZpcnRpby1wY2ktYnVzLW1hc3Rlci1idWctbWlncmF0aW9uIiwKZGlm ZiAtLWdpdCBhL2h3L2kzODYvcGMuYyBiL2h3L2kzODYvcGMuYwppbmRleCA0OTUyZmViNDc2Li5m ZjE0YjZkNGRmIDEwMDY0NAotLS0gYS9ody9pMzg2L3BjLmMKKysrIGIvaHcvaTM4Ni9wYy5jCkBA IC0xNDgsMTEgKzE0OCwxMSBAQCBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl8xMltdID0gewog ICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAiRVBZQy0iIFRZUEVfWDg2X0NQVSwKICAgICAg ICAgLnByb3BlcnR5ID0gInhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgw eDgwMDAwMDBhKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAogICAgIH0sewog ICAgICAgICAuZHJpdmVyICAgPSAiRVBZQy1JQlBCLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAu cHJvcGVydHkgPSAieGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAw MDAwMGEpLAorICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSwKIH07CiBj b25zdCBzaXplX3QgcGNfY29tcGF0XzJfMTJfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8y XzEyKTsKQEAgLTE5MSw3ICsxOTEsNyBAQCBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl85W10g PSB7CiAgICAgewogICAgICAgICAuZHJpdmVyICAgPSAibWNoIiwKICAgICAgICAgLnByb3BlcnR5 ID0gImV4dGVuZGVkLXRzZWctbWJ5dGVzIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5 KDApLAorICAgICAgICAudmFsdWUgICAgPSAiMCIsCiAgICAgfSwKIH07CiBjb25zdCBzaXplX3Qg cGNfY29tcGF0XzJfOV9sZW4gPSBHX05fRUxFTUVOVFMocGNfY29tcGF0XzJfOSk7CkBAIC0zNjUs NzUgKzM2NSw3NSBAQCBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl8zW10gPSB7CiAgICAgfSx7 CiAgICAgICAgIC5kcml2ZXIgICA9ICJxZW11NjQiICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAg IC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnko NCksCisgICAgICAgIC52YWx1ZSAgICA9ICI0IiwKICAgICB9LHsKICAgICAgICAgLmRyaXZlciAg ID0gImt2bTY0IiAiLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJvcGVydHkgPSAibWluLWxl dmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDUpLAorICAgICAgICAudmFsdWUg ICAgPSAiNSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJwZW50aXVtMyIgIi0iIFRZ UEVfWDg2X0NQVSwKICAgICAgICAgLnByb3BlcnR5ID0gIm1pbi1sZXZlbCIsCi0gICAgICAgIC52 YWx1ZSAgICA9IHN0cmluZ2lmeSgyKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjIiLAogICAgIH0s ewogICAgICAgICAuZHJpdmVyICAgPSAibjI3MCIgIi0iIFRZUEVfWDg2X0NQVSwKICAgICAgICAg LnByb3BlcnR5ID0gIm1pbi1sZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSg1 KSwKKyAgICAgICAgLnZhbHVlICAgID0gIjUiLAogICAgIH0sewogICAgICAgICAuZHJpdmVyICAg PSAiQ29ucm9lIiAiLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJvcGVydHkgPSAibWluLWxl dmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDQpLAorICAgICAgICAudmFsdWUg ICAgPSAiNCIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJQZW5yeW4iICItIiBUWVBF X1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFs dWUgICAgPSBzdHJpbmdpZnkoNCksCisgICAgICAgIC52YWx1ZSAgICA9ICI0IiwKICAgICB9LHsK ICAgICAgICAgLmRyaXZlciAgID0gIk5laGFsZW0iICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAg IC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnko NCksCisgICAgICAgIC52YWx1ZSAgICA9ICI0IiwKICAgICB9LHsKICAgICAgICAgLmRyaXZlciAg ID0gIm4yNzAiICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxl dmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAwMDAwMGEpLAorICAgICAg ICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9 ICJQZW5yeW4iICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxl dmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAwMDAwMGEpLAorICAgICAg ICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9 ICJDb25yb2UiICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4teGxl dmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAwMDAwMGEpLAorICAgICAg ICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9 ICJOZWhhbGVtIiAiLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJvcGVydHkgPSAibWluLXhs ZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgweDgwMDAwMDBhKSwKKyAgICAg ICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAogICAgIH0sewogICAgICAgICAuZHJpdmVyICAg PSAiV2VzdG1lcmUiICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4t eGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAwMDAwMGEpLAorICAg ICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIg ICA9ICJTYW5keUJyaWRnZSIgIi0iIFRZUEVfWDg2X0NQVSwKICAgICAgICAgLnByb3BlcnR5ID0g Im1pbi14bGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMHg4MDAwMDAwYSks CisgICAgICAgIC52YWx1ZSAgICA9ICIweDgwMDAwMDBhIiwKICAgICB9LHsKICAgICAgICAgLmRy aXZlciAgID0gIkl2eUJyaWRnZSIgIi0iIFRZUEVfWDg2X0NQVSwKICAgICAgICAgLnByb3BlcnR5 ID0gIm1pbi14bGV2ZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMHg4MDAwMDAw YSksCisgICAgICAgIC52YWx1ZSAgICA9ICIweDgwMDAwMDBhIiwKICAgICB9LHsKICAgICAgICAg LmRyaXZlciAgID0gIkhhc3dlbGwiICItIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0 eSA9ICJtaW4teGxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDB4ODAwMDAw MGEpLAorICAgICAgICAudmFsdWUgICAgPSAiMHg4MDAwMDAwYSIsCiAgICAgfSx7CiAgICAgICAg IC5kcml2ZXIgICA9ICJIYXN3ZWxsLW5vVFNYIiAiLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAu cHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgw eDgwMDAwMDBhKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAogICAgIH0sewog ICAgICAgICAuZHJpdmVyICAgPSAiQnJvYWR3ZWxsIiAiLSIgVFlQRV9YODZfQ1BVLAogICAgICAg ICAucHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lm eSgweDgwMDAwMDBhKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEiLAogICAgIH0s ewogICAgICAgICAuZHJpdmVyICAgPSAiQnJvYWR3ZWxsLW5vVFNYIiAiLSIgVFlQRV9YODZfQ1BV LAogICAgICAgICAucHJvcGVydHkgPSAibWluLXhsZXZlbCIsCi0gICAgICAgIC52YWx1ZSAgICA9 IHN0cmluZ2lmeSgweDgwMDAwMDBhKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjB4ODAwMDAwMGEi LAogICAgIH0sewogICAgICAgICAuZHJpdmVyID0gVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJv cGVydHkgPSAia3ZtLW5vLXNtaS1taWdyYXRpb24iLApAQCAtNTY2LDcgKzU2Niw3IEBAIEdsb2Jh bFByb3BlcnR5IHBjX2NvbXBhdF8yXzBbXSA9IHsKICAgICB7CiAgICAgICAgIC5kcml2ZXIgICA9 ICJhcGljIiwKICAgICAgICAgLnByb3BlcnR5ID0gInZlcnNpb24iLAotICAgICAgICAudmFsdWUg ICAgPSBzdHJpbmdpZnkoMHgxMSksCisgICAgICAgIC52YWx1ZSAgICA9ICIweDExIiwKICAgICB9 LAogICAgIHsKICAgICAgICAgLmRyaXZlciAgID0gIm5lYy11c2IteGhjaSIsCkBAIC01ODEsMTcg KzU4MSwxNyBAQCBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMl8wW10gPSB7CiAgICAgewogICAg ICAgICAuZHJpdmVyICAgPSAicGNpLXNlcmlhbCIsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJwcm9n X2lmIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAorICAgICAgICAudmFsdWUg ICAgPSAiMCIsCiAgICAgfSwKICAgICB7CiAgICAgICAgIC5kcml2ZXIgICA9ICJwY2ktc2VyaWFs LTJ4IiwKICAgICAgICAgLnByb3BlcnR5ID0gInByb2dfaWYiLAotICAgICAgICAudmFsdWUgICAg PSBzdHJpbmdpZnkoMCksCisgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKICAgICB9LAogICAgIHsK ICAgICAgICAgLmRyaXZlciAgID0gInBjaS1zZXJpYWwtNHgiLAogICAgICAgICAucHJvcGVydHkg PSAicHJvZ19pZiIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgwKSwKKyAgICAgICAg LnZhbHVlICAgID0gIjAiLAogICAgIH0sCiAgICAgewogICAgICAgICAuZHJpdmVyICAgPSAidmly dGlvLW5ldC1wY2kiLApAQCAtNjI5LDcgKzYyOSw3IEBAIEdsb2JhbFByb3BlcnR5IHBjX2NvbXBh dF8xXzdbXSA9IHsKICAgICB7CiAgICAgICAgIC5kcml2ZXIgICA9ICJocGV0IiwKICAgICAgICAg LnByb3BlcnR5ID0gSFBFVF9JTlRDQVAsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSg0 KSwKKyAgICAgICAgLnZhbHVlICAgID0gIjQiLAogICAgIH0sCiB9OwogY29uc3Qgc2l6ZV90IHBj X2NvbXBhdF8xXzdfbGVuID0gR19OX0VMRU1FTlRTKHBjX2NvbXBhdF8xXzcpOwpAQCAtNjQzLDE5 ICs2NDMsMTkgQEAgR2xvYmFsUHJvcGVydHkgcGNfY29tcGF0XzFfNltdID0gewogICAgIH0sewog ICAgICAgICAuZHJpdmVyICAgPSAicWVtdTY0LSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJv cGVydHkgPSAibW9kZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMiksCisgICAg ICAgIC52YWx1ZSAgICA9ICIyIiwKICAgICB9LHsKICAgICAgICAgLmRyaXZlciAgID0gInFlbXUz Mi0iIFRZUEVfWDg2X0NQVSwKICAgICAgICAgLnByb3BlcnR5ID0gIm1vZGVsIiwKLSAgICAgICAg LnZhbHVlICAgID0gc3RyaW5naWZ5KDMpLAorICAgICAgICAudmFsdWUgICAgPSAiMyIsCiAgICAg fSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJpNDQwRlgtcGNpaG9zdCIsCiAgICAgICAgIC5wcm9w ZXJ0eSA9ICJzaG9ydF9yb290X2J1cyIsCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgx KSwKKyAgICAgICAgLnZhbHVlICAgID0gIjEiLAogICAgIH0sewogICAgICAgICAuZHJpdmVyICAg PSAicTM1LXBjaWhvc3QiLAogICAgICAgICAucHJvcGVydHkgPSAic2hvcnRfcm9vdF9idXMiLAot ICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMSksCisgICAgICAgIC52YWx1ZSAgICA9ICIx IiwKICAgICB9LAogfTsKIGNvbnN0IHNpemVfdCBwY19jb21wYXRfMV82X2xlbiA9IEdfTl9FTEVN RU5UUyhwY19jb21wYXRfMV82KTsKQEAgLTY2NSwyNyArNjY1LDI3IEBAIEdsb2JhbFByb3BlcnR5 IHBjX2NvbXBhdF8xXzVbXSA9IHsKICAgICB7CiAgICAgICAgIC5kcml2ZXIgICA9ICJDb25yb2Ut IiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtb2RlbCIsCi0gICAgICAgIC52 YWx1ZSAgICA9IHN0cmluZ2lmeSgyKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjIiLAogICAgIH0s ewogICAgICAgICAuZHJpdmVyICAgPSAiQ29ucm9lLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAu cHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDIp LAorICAgICAgICAudmFsdWUgICAgPSAiMiIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9 ICJQZW5yeW4tIiBUWVBFX1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtb2RlbCIsCi0g ICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgyKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjIi LAogICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAiUGVucnluLSIgVFlQRV9YODZfQ1BVLAog ICAgICAgICAucHJvcGVydHkgPSAibWluLWxldmVsIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3Ry aW5naWZ5KDIpLAorICAgICAgICAudmFsdWUgICAgPSAiMiIsCiAgICAgfSx7CiAgICAgICAgIC5k cml2ZXIgICA9ICJOZWhhbGVtLSIgVFlQRV9YODZfQ1BVLAogICAgICAgICAucHJvcGVydHkgPSAi bW9kZWwiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMiksCisgICAgICAgIC52YWx1 ZSAgICA9ICIyIiwKICAgICB9LHsKICAgICAgICAgLmRyaXZlciAgID0gIk5laGFsZW0tIiBUWVBF X1g4Nl9DUFUsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJtaW4tbGV2ZWwiLAotICAgICAgICAudmFs dWUgICAgPSBzdHJpbmdpZnkoMiksCisgICAgICAgIC52YWx1ZSAgICA9ICIyIiwKICAgICB9LHsK ICAgICAgICAgLmRyaXZlciAgID0gInZpcnRpby1uZXQtcGNpIiwKICAgICAgICAgLnByb3BlcnR5 ID0gImFueV9sYXlvdXQiLApAQCAtNjk3LDExICs2OTcsMTEgQEAgR2xvYmFsUHJvcGVydHkgcGNf Y29tcGF0XzFfNVtdID0gewogICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAiaTQ0MEZYLXBj aWhvc3QiLAogICAgICAgICAucHJvcGVydHkgPSAic2hvcnRfcm9vdF9idXMiLAotICAgICAgICAu dmFsdWUgICAgPSBzdHJpbmdpZnkoMCksCisgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKICAgICB9 LHsKICAgICAgICAgLmRyaXZlciAgID0gInEzNS1wY2lob3N0IiwKICAgICAgICAgLnByb3BlcnR5 ID0gInNob3J0X3Jvb3RfYnVzIiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAor ICAgICAgICAudmFsdWUgICAgPSAiMCIsCiAgICAgfSwKIH07CiBjb25zdCBzaXplX3QgcGNfY29t cGF0XzFfNV9sZW4gPSBHX05fRUxFTUVOVFMocGNfY29tcGF0XzFfNSk7CkBAIC03MTEsMzYgKzcx MSwzNiBAQCBHbG9iYWxQcm9wZXJ0eSBwY19jb21wYXRfMV80W10gPSB7CiAgICAgewogICAgICAg ICAuZHJpdmVyICAgPSAic2NzaS1oZCIsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dy YW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAorICAgICAgICAu dmFsdWUgICAgPSAiMCIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJzY3NpLWNkIiwK ICAgICAgICAgLnByb3BlcnR5ID0gImRpc2NhcmRfZ3JhbnVsYXJpdHkiLAotICAgICAgICAudmFs dWUgICAgPSBzdHJpbmdpZnkoMCksCisgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKICAgICB9LHsK ICAgICAgICAgLmRyaXZlciAgID0gInNjc2ktZGlzayIsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJk aXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAor ICAgICAgICAudmFsdWUgICAgPSAiMCIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJp ZGUtaGQiLAogICAgICAgICAucHJvcGVydHkgPSAiZGlzY2FyZF9ncmFudWxhcml0eSIsCi0gICAg ICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgwKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjAiLAog ICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAiaWRlLWNkIiwKICAgICAgICAgLnByb3BlcnR5 ID0gImRpc2NhcmRfZ3JhbnVsYXJpdHkiLAotICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnko MCksCisgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKICAgICB9LHsKICAgICAgICAgLmRyaXZlciAg ID0gImlkZS1kcml2ZSIsCiAgICAgICAgIC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5 IiwKLSAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAorICAgICAgICAudmFsdWUgICAg PSAiMCIsCiAgICAgfSx7CiAgICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tYmxrLXBjaSIsCiAg ICAgICAgIC5wcm9wZXJ0eSA9ICJkaXNjYXJkX2dyYW51bGFyaXR5IiwKLSAgICAgICAgLnZhbHVl ICAgID0gc3RyaW5naWZ5KDApLAorICAgICAgICAudmFsdWUgICAgPSAiMCIsCiAgICAgfSx7CiAg ICAgICAgIC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2VyaWFsLXBjaSIsCiAgICAgICAgIC5wcm9wZXJ0 eSA9ICJ2ZWN0b3JzIiwKICAgICAgICAgLyogREVWX05WRUNUT1JTX1VOU1BFQ0lGSUVEIGFzIGEg dWludDMyX3Qgc3RyaW5nICovCi0gICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgweEZGRkZG RkZGKSwKKyAgICAgICAgLnZhbHVlICAgID0gIjB4RkZGRkZGRkYiLAogICAgIH0sewogICAgICAg ICAuZHJpdmVyICAgPSAidmlydGlvLW5ldC1wY2kiLAogICAgICAgICAucHJvcGVydHkgPSAiY3Ry bF9ndWVzdF9vZmZsb2FkcyIsCkBAIC03NjgsNyArNzY4LDcgQEAgR2xvYmFsUHJvcGVydHkgcGNf Y29tcGF0XzFfNFtdID0gewogICAgIH0sewogICAgICAgICAuZHJpdmVyICAgPSAiNDg2LSIgVFlQ RV9YODZfQ1BVLAogICAgICAgICAucHJvcGVydHkgPSAibW9kZWwiLAotICAgICAgICAudmFsdWUg ICAgPSBzdHJpbmdpZnkoMCksCisgICAgICAgIC52YWx1ZSAgICA9ICIwIiwKICAgICB9LAogICAg IHsKICAgICAgICAgLmRyaXZlciA9ICJuMjcwIiAiLSIgVFlQRV9YODZfQ1BVLApkaWZmIC0tZ2l0 IGEvaHcvaTM4Ni9wY19waWl4LmMgYi9ody9pMzg2L3BjX3BpaXguYwppbmRleCBlZDY5ODQ2Mzhl Li5mZDIwMjI3YWYzIDEwMDY0NAotLS0gYS9ody9pMzg2L3BjX3BpaXguYworKysgYi9ody9pMzg2 L3BjX3BpaXguYwpAQCAtNjk3LDcgKzY5Nyw3IEBAIHN0YXRpYyB2b2lkIHBjX2k0NDBmeF8xXzNf bWFjaGluZV9vcHRpb25zKE1hY2hpbmVDbGFzcyAqbSkKICAgICAgICAgewogICAgICAgICAgICAg LmRyaXZlciAgID0gInVzYi10YWJsZXQiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInVzYl92 ZXJzaW9uIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgxKSwKKyAgICAgICAg ICAgIC52YWx1ZSAgICA9ICIxIiwKICAgICAgICAgfSx7CiAgICAgICAgICAgICAuZHJpdmVyICAg PSAidmlydGlvLW5ldC1wY2kiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gImN0cmxfbWFjX2Fk ZHIiLApAQCAtNzQxLDExICs3NDEsMTEgQEAgc3RhdGljIHZvaWQgcGNfaTQ0MGZ4XzFfMl9tYWNo aW5lX29wdGlvbnMoTWFjaGluZUNsYXNzICptKQogICAgICAgICB9LHsKICAgICAgICAgICAgIC5k cml2ZXIgICA9ICJxeGwiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInJldmlzaW9uIiwKLSAg ICAgICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgzKSwKKyAgICAgICAgICAgIC52YWx1ZSAg ICA9ICIzIiwKICAgICAgICAgfSx7CiAgICAgICAgICAgICAuZHJpdmVyICAgPSAicXhsLXZnYSIs CiAgICAgICAgICAgICAucHJvcGVydHkgPSAicmV2aXNpb24iLAotICAgICAgICAgICAgLnZhbHVl ICAgID0gc3RyaW5naWZ5KDMpLAorICAgICAgICAgICAgLnZhbHVlICAgID0gIjMiLAogICAgICAg ICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9ICJWR0EiLAogICAgICAgICAgICAgLnByb3Bl cnR5ID0gIm1taW8iLApAQCAtNzc3LDE5ICs3NzcsMTkgQEAgc3RhdGljIHZvaWQgcGNfaTQ0MGZ4 XzFfMV9tYWNoaW5lX29wdGlvbnMoTWFjaGluZUNsYXNzICptKQogICAgICAgICB9LHsKICAgICAg ICAgICAgIC5kcml2ZXIgICA9ICJWR0EiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInZnYW1l bV9tYiIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoOCksCisgICAgICAgICAg ICAudmFsdWUgICAgPSAiOCIsCiAgICAgICAgIH0sewogICAgICAgICAgICAgLmRyaXZlciAgID0g InZtd2FyZS1zdmdhIiwKICAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJ2Z2FtZW1fbWIiLAotICAg ICAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDgpLAorICAgICAgICAgICAgLnZhbHVlICAg ID0gIjgiLAogICAgICAgICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9ICJxeGwtdmdhIiwK ICAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJ2Z2FtZW1fbWIiLAotICAgICAgICAgICAgLnZhbHVl ICAgID0gc3RyaW5naWZ5KDgpLAorICAgICAgICAgICAgLnZhbHVlICAgID0gIjgiLAogICAgICAg ICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9ICJxeGwiLAogICAgICAgICAgICAgLnByb3Bl cnR5ID0gInZnYW1lbV9tYiIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoOCks CisgICAgICAgICAgICAudmFsdWUgICAgPSAiOCIsCiAgICAgICAgIH0sewogICAgICAgICAgICAg LmRyaXZlciAgID0gInZpcnRpby1ibGstcGNpIiwKICAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJj b25maWctd2NlIiwKQEAgLTg3NiwxMSArODc2LDExIEBAIHN0YXRpYyB2b2lkIHBjX2k0NDBmeF8w XzE0X21hY2hpbmVfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm0pCiAgICAgICAgIH0sewogICAgICAg ICAgICAgLmRyaXZlciAgID0gInF4bCIsCiAgICAgICAgICAgICAucHJvcGVydHkgPSAicmV2aXNp b24iLAotICAgICAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDIpLAorICAgICAgICAgICAg LnZhbHVlICAgID0gIjIiLAogICAgICAgICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9ICJx eGwtdmdhIiwKICAgICAgICAgICAgIC5wcm9wZXJ0eSA9ICJyZXZpc2lvbiIsCi0gICAgICAgICAg ICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMiksCisgICAgICAgICAgICAudmFsdWUgICAgPSAiMiIs CiAgICAgICAgIH0sCiAgICAgfTsKIApAQCAtOTA0LDE5ICs5MDQsMTkgQEAgc3RhdGljIHZvaWQg cGNfaTQ0MGZ4XzBfMTNfbWFjaGluZV9vcHRpb25zKE1hY2hpbmVDbGFzcyAqbSkKICAgICAgICAg fSx7CiAgICAgICAgICAgICAuZHJpdmVyICAgPSAiQUM5NyIsCiAgICAgICAgICAgICAucHJvcGVy dHkgPSAidXNlX2Jyb2tlbl9pZCIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnko MSksCisgICAgICAgICAgICAudmFsdWUgICAgPSAiMSIsCiAgICAgICAgIH0sewogICAgICAgICAg ICAgLmRyaXZlciAgID0gInZpcnRpby05cC1wY2kiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0g InZlY3RvcnMiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAorICAgICAg ICAgICAgLnZhbHVlICAgID0gIjAiLAogICAgICAgICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIg ICA9ICJWR0EiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInJvbWJhciIsCi0gICAgICAgICAg ICAudmFsdWUgICAgPSBzdHJpbmdpZnkoMCksCisgICAgICAgICAgICAudmFsdWUgICAgPSAiMCIs CiAgICAgICAgIH0sewogICAgICAgICAgICAgLmRyaXZlciAgID0gInZtd2FyZS1zdmdhIiwKICAg ICAgICAgICAgIC5wcm9wZXJ0eSA9ICJyb21iYXIiLAotICAgICAgICAgICAgLnZhbHVlICAgID0g c3RyaW5naWZ5KDApLAorICAgICAgICAgICAgLnZhbHVlICAgID0gIjAiLAogICAgICAgICB9LAog ICAgIH07CiAKQEAgLTkzNiwxMSArOTM2LDExIEBAIHN0YXRpYyB2b2lkIHBjX2k0NDBmeF8wXzEy X21hY2hpbmVfb3B0aW9ucyhNYWNoaW5lQ2xhc3MgKm0pCiAgICAgICAgIHsKICAgICAgICAgICAg IC5kcml2ZXIgICA9ICJ2aXJ0aW8tc2VyaWFsLXBjaSIsCiAgICAgICAgICAgICAucHJvcGVydHkg PSAibWF4X3BvcnRzIiwKLSAgICAgICAgICAgIC52YWx1ZSAgICA9IHN0cmluZ2lmeSgxKSwKKyAg ICAgICAgICAgIC52YWx1ZSAgICA9ICIxIiwKICAgICAgICAgfSx7CiAgICAgICAgICAgICAuZHJp dmVyICAgPSAidmlydGlvLXNlcmlhbC1wY2kiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInZl Y3RvcnMiLAotICAgICAgICAgICAgLnZhbHVlICAgID0gc3RyaW5naWZ5KDApLAorICAgICAgICAg ICAgLnZhbHVlICAgID0gIjAiLAogICAgICAgICB9LHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9 ICJ1c2ItbW91c2UiLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gInNlcmlhbCIsCmRpZmYgLS1n aXQgYS9ody9wcGMvc3BhcHIuYyBiL2h3L3BwYy9zcGFwci5jCmluZGV4IGJmZjQyZjBhZGIuLmQ3 ZDg3YjBhZTggMTAwNjQ0Ci0tLSBhL2h3L3BwYy9zcGFwci5jCisrKyBiL2h3L3BwYy9zcGFwci5j CkBAIC00MjY0LDcgKzQyNjQsNyBAQCBzdGF0aWMgdm9pZCBzcGFwcl9tYWNoaW5lXzJfNl9jbGFz c19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMpCiAgICAgICAgIHsKICAgICAgICAgICAgIC5kcml2 ZXIgICA9IFRZUEVfU1BBUFJfUENJX0hPU1RfQlJJREdFLAogICAgICAgICAgICAgLnByb3BlcnR5 ID0gImRkdyIsCi0gICAgICAgICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkob2ZmKSwKKyAgICAg ICAgICAgIC52YWx1ZSAgICA9ICJvZmYiLAogICAgICAgICB9LAogICAgIH07CiAKLS0gCjIuMTgu MC5yYzEuMS5nM2YxZmYyMTQwCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJv amVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hl bi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggabp-0008PR-VJ for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:30:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggabo-0000eq-ER for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:30:49 -0500 From: Eduardo Habkost Date: Mon, 7 Jan 2019 17:30:19 -0200 Message-Id: <20190107193020.21744-3-ehabkost@redhat.com> In-Reply-To: <20190107193020.21744-1-ehabkost@redhat.com> References: <20190107193020.21744-1-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] machine: Eliminate unnecessary stringify() usage 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 stringify() is useful when we need to use macros in compat_props (like when we set virtio-baloon-pci.class=PCI_CLASS_MEMORY_RAM at pc_i440fx_1_0_machine_options()), but it is pointless when we are already providing a number literal. Replace stringify() with string literals when appropriate. Signed-off-by: Eduardo Habkost --- hw/core/machine.c | 8 ++-- hw/i386/pc.c | 94 +++++++++++++++++++++++------------------------ hw/i386/pc_piix.c | 30 +++++++-------- hw/ppc/spapr.c | 2 +- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index f8563efb86..4b4d6c23de 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -135,11 +135,11 @@ GlobalProperty hw_compat_2_8[] = { { .driver = "fw_cfg_mem", .property = "x-file-slots", - .value = stringify(0x10), + .value = "0x10", },{ .driver = "fw_cfg_io", .property = "x-file-slots", - .value = stringify(0x10), + .value = "0x10", },{ .driver = "pflash_cfi01", .property = "old-multiple-chip-handling", @@ -337,11 +337,11 @@ GlobalProperty hw_compat_2_1[] = { },{ .driver = "usb-mouse", .property = "usb_version", - .value = stringify(1), + .value = "1", },{ .driver = "usb-kbd", .property = "usb_version", - .value = stringify(1), + .value = "1", },{ .driver = "virtio-pci", .property = "virtio-pci-bus-master-bug-migration", diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4952feb476..ff14b6d4df 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -148,11 +148,11 @@ GlobalProperty pc_compat_2_12[] = { },{ .driver = "EPYC-" TYPE_X86_CPU, .property = "xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "EPYC-IBPB-" TYPE_X86_CPU, .property = "xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", }, }; const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12); @@ -191,7 +191,7 @@ GlobalProperty pc_compat_2_9[] = { { .driver = "mch", .property = "extended-tseg-mbytes", - .value = stringify(0), + .value = "0", }, }; const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9); @@ -365,75 +365,75 @@ GlobalProperty pc_compat_2_3[] = { },{ .driver = "qemu64" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(4), + .value = "4", },{ .driver = "kvm64" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(5), + .value = "5", },{ .driver = "pentium3" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(2), + .value = "2", },{ .driver = "n270" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(5), + .value = "5", },{ .driver = "Conroe" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(4), + .value = "4", },{ .driver = "Penryn" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(4), + .value = "4", },{ .driver = "Nehalem" "-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(4), + .value = "4", },{ .driver = "n270" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Penryn" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Conroe" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Nehalem" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Westmere" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "SandyBridge" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "IvyBridge" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Haswell" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Haswell-noTSX" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Broadwell" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = "Broadwell-noTSX" "-" TYPE_X86_CPU, .property = "min-xlevel", - .value = stringify(0x8000000a), + .value = "0x8000000a", },{ .driver = TYPE_X86_CPU, .property = "kvm-no-smi-migration", @@ -566,7 +566,7 @@ GlobalProperty pc_compat_2_0[] = { { .driver = "apic", .property = "version", - .value = stringify(0x11), + .value = "0x11", }, { .driver = "nec-usb-xhci", @@ -581,17 +581,17 @@ GlobalProperty pc_compat_2_0[] = { { .driver = "pci-serial", .property = "prog_if", - .value = stringify(0), + .value = "0", }, { .driver = "pci-serial-2x", .property = "prog_if", - .value = stringify(0), + .value = "0", }, { .driver = "pci-serial-4x", .property = "prog_if", - .value = stringify(0), + .value = "0", }, { .driver = "virtio-net-pci", @@ -629,7 +629,7 @@ GlobalProperty pc_compat_1_7[] = { { .driver = "hpet", .property = HPET_INTCAP, - .value = stringify(4), + .value = "4", }, }; const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7); @@ -643,19 +643,19 @@ GlobalProperty pc_compat_1_6[] = { },{ .driver = "qemu64-" TYPE_X86_CPU, .property = "model", - .value = stringify(2), + .value = "2", },{ .driver = "qemu32-" TYPE_X86_CPU, .property = "model", - .value = stringify(3), + .value = "3", },{ .driver = "i440FX-pcihost", .property = "short_root_bus", - .value = stringify(1), + .value = "1", },{ .driver = "q35-pcihost", .property = "short_root_bus", - .value = stringify(1), + .value = "1", }, }; const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6); @@ -665,27 +665,27 @@ GlobalProperty pc_compat_1_5[] = { { .driver = "Conroe-" TYPE_X86_CPU, .property = "model", - .value = stringify(2), + .value = "2", },{ .driver = "Conroe-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(2), + .value = "2", },{ .driver = "Penryn-" TYPE_X86_CPU, .property = "model", - .value = stringify(2), + .value = "2", },{ .driver = "Penryn-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(2), + .value = "2", },{ .driver = "Nehalem-" TYPE_X86_CPU, .property = "model", - .value = stringify(2), + .value = "2", },{ .driver = "Nehalem-" TYPE_X86_CPU, .property = "min-level", - .value = stringify(2), + .value = "2", },{ .driver = "virtio-net-pci", .property = "any_layout", @@ -697,11 +697,11 @@ GlobalProperty pc_compat_1_5[] = { },{ .driver = "i440FX-pcihost", .property = "short_root_bus", - .value = stringify(0), + .value = "0", },{ .driver = "q35-pcihost", .property = "short_root_bus", - .value = stringify(0), + .value = "0", }, }; const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5); @@ -711,36 +711,36 @@ GlobalProperty pc_compat_1_4[] = { { .driver = "scsi-hd", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "scsi-cd", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "scsi-disk", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "ide-hd", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "ide-cd", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "ide-drive", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "virtio-blk-pci", .property = "discard_granularity", - .value = stringify(0), + .value = "0", },{ .driver = "virtio-serial-pci", .property = "vectors", /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */ - .value = stringify(0xFFFFFFFF), + .value = "0xFFFFFFFF", },{ .driver = "virtio-net-pci", .property = "ctrl_guest_offloads", @@ -768,7 +768,7 @@ GlobalProperty pc_compat_1_4[] = { },{ .driver = "486-" TYPE_X86_CPU, .property = "model", - .value = stringify(0), + .value = "0", }, { .driver = "n270" "-" TYPE_X86_CPU, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ed6984638e..fd20227af3 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -697,7 +697,7 @@ static void pc_i440fx_1_3_machine_options(MachineClass *m) { .driver = "usb-tablet", .property = "usb_version", - .value = stringify(1), + .value = "1", },{ .driver = "virtio-net-pci", .property = "ctrl_mac_addr", @@ -741,11 +741,11 @@ static void pc_i440fx_1_2_machine_options(MachineClass *m) },{ .driver = "qxl", .property = "revision", - .value = stringify(3), + .value = "3", },{ .driver = "qxl-vga", .property = "revision", - .value = stringify(3), + .value = "3", },{ .driver = "VGA", .property = "mmio", @@ -777,19 +777,19 @@ static void pc_i440fx_1_1_machine_options(MachineClass *m) },{ .driver = "VGA", .property = "vgamem_mb", - .value = stringify(8), + .value = "8", },{ .driver = "vmware-svga", .property = "vgamem_mb", - .value = stringify(8), + .value = "8", },{ .driver = "qxl-vga", .property = "vgamem_mb", - .value = stringify(8), + .value = "8", },{ .driver = "qxl", .property = "vgamem_mb", - .value = stringify(8), + .value = "8", },{ .driver = "virtio-blk-pci", .property = "config-wce", @@ -876,11 +876,11 @@ static void pc_i440fx_0_14_machine_options(MachineClass *m) },{ .driver = "qxl", .property = "revision", - .value = stringify(2), + .value = "2", },{ .driver = "qxl-vga", .property = "revision", - .value = stringify(2), + .value = "2", }, }; @@ -904,19 +904,19 @@ static void pc_i440fx_0_13_machine_options(MachineClass *m) },{ .driver = "AC97", .property = "use_broken_id", - .value = stringify(1), + .value = "1", },{ .driver = "virtio-9p-pci", .property = "vectors", - .value = stringify(0), + .value = "0", },{ .driver = "VGA", .property = "rombar", - .value = stringify(0), + .value = "0", },{ .driver = "vmware-svga", .property = "rombar", - .value = stringify(0), + .value = "0", }, }; @@ -936,11 +936,11 @@ static void pc_i440fx_0_12_machine_options(MachineClass *m) { .driver = "virtio-serial-pci", .property = "max_ports", - .value = stringify(1), + .value = "1", },{ .driver = "virtio-serial-pci", .property = "vectors", - .value = stringify(0), + .value = "0", },{ .driver = "usb-mouse", .property = "serial", diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bff42f0adb..d7d87b0ae8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4264,7 +4264,7 @@ static void spapr_machine_2_6_class_options(MachineClass *mc) { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, .property = "ddw", - .value = stringify(off), + .value = "off", }, }; -- 2.18.0.rc1.1.g3f1ff2140