From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmT6U-0004s0-Ox for qemu-devel@nongnu.org; Tue, 20 Sep 2016 18:01:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmT6Q-0002Jr-Iz for qemu-devel@nongnu.org; Tue, 20 Sep 2016 18:01:25 -0400 Received: from mx5-phx2.redhat.com ([209.132.183.37]:32942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmT6Q-0002Je-6Y for qemu-devel@nongnu.org; Tue, 20 Sep 2016 18:01:22 -0400 Date: Tue, 20 Sep 2016 18:00:39 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <81179735.279206.1474408839927.JavaMail.zimbra@redhat.com> In-Reply-To: <1441973931.277653.1474408728887.JavaMail.zimbra@redhat.com> References: <20160912091913.15831-1-marcandre.lureau@redhat.com> <20160912091913.15831-16-marcandre.lureau@redhat.com> <20160920144844.nzbpfrauczlml3a5@perseus.local> <1441973931.277653.1474408728887.JavaMail.zimbra@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_279204_860627040.1474408839924" Subject: Re: [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alberto Garcia Cc: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-devel@nongnu.org, eblake@redhat.com, armbru@redhat.com ------=_Part_279204_860627040.1474408839924 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ----- Original Message ----- > Hi Alberto >=20 > ----- Original Message ----- > > On Mon, Sep 12, 2016 at 01:19:10PM +0400, Marc-Andr=C3=A9 Lureau wrote: > > > Replace the old manual dispatch and validation code by the generic on= e > > > provided by qapi common code. > > >=20 > > > Note that it is now possible to call the following commands that used= to > > > be disabled by compile-time conditionals: > > > - dump-skeys > > > - query-spice > > > - rtc-reset-reinjection > > > - query-gic-capabilities > > >=20 > > > Their fallback functions return an appropriate "feature disabled" err= or. > > >=20 > > > Signed-off-by: Marc-Andr=C3=A9 Lureau > >=20 > > This patch breaks iotest 085 because the "missing parameter" error is > > now different: > >=20 > > -{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file'= is > > missing"}} > > +{"error": {"class": "GenericError", "desc": "Invalid parameter type fo= r > > 'snapshot-file', expected: string"}} > >=20 > > I was thinking to update the expected output of the iotest, but I > > guess it's better to return a more meaningful error message? >=20 > The change is relatively easy (see attached patch), but there are other t= ests > that expected the current error, see commit fe509ee237307843. I guess we > should decided with one, and I think missing parameter is more appropriat= e. >=20 diff attached ------=_Part_279204_860627040.1474408839924 Content-Type: text/x-patch; name=qapi-missingp.patch Content-Disposition: attachment; filename=qapi-missingp.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3FhcGkvcW1wLWlucHV0LXZpc2l0b3IuYyBiL3FhcGkvcW1wLWlucHV0LXZp c2l0b3IuYwppbmRleCA2NGRkMzkyLi4yMmIxMzJiIDEwMDY0NAotLS0gYS9xYXBpL3FtcC1pbnB1 dC12aXNpdG9yLmMKKysrIGIvcWFwaS9xbXAtaW5wdXQtdmlzaXRvci5jCkBAIC0xNjksNyArMTY5 LDExIEBAIHN0YXRpYyB2b2lkIHFtcF9pbnB1dF9zdGFydF9zdHJ1Y3QoVmlzaXRvciAqdiwgY29u c3QgY2hhciAqbmFtZSwgdm9pZCAqKm9iaiwKICAgICBpZiAob2JqKSB7CiAgICAgICAgICpvYmog PSBOVUxMOwogICAgIH0KLSAgICBpZiAoIXFvYmogfHwgcW9iamVjdF90eXBlKHFvYmopICE9IFFU WVBFX1FESUNUKSB7CisgICAgaWYgKCFxb2JqKSB7CisgICAgICAgIGVycm9yX3NldGcoZXJycCwg UUVSUl9NSVNTSU5HX1BBUkFNRVRFUiwgbmFtZSA/IG5hbWUgOiAibnVsbCIpOworICAgICAgICBy ZXR1cm47CisgICAgfQorICAgIGlmIChxb2JqZWN0X3R5cGUocW9iaikgIT0gUVRZUEVfUURJQ1Qp IHsKICAgICAgICAgZXJyb3Jfc2V0ZyhlcnJwLCBRRVJSX0lOVkFMSURfUEFSQU1FVEVSX1RZUEUs IG5hbWUgPyBuYW1lIDogIm51bGwiLAogICAgICAgICAgICAgICAgICAgICJRRGljdCIpOwogICAg ICAgICByZXR1cm47CkBAIC0xOTQsNyArMTk4LDExIEBAIHN0YXRpYyB2b2lkIHFtcF9pbnB1dF9z dGFydF9saXN0KFZpc2l0b3IgKnYsIGNvbnN0IGNoYXIgKm5hbWUsCiAgICAgUU9iamVjdCAqcW9i aiA9IHFtcF9pbnB1dF9nZXRfb2JqZWN0KHFpdiwgbmFtZSwgdHJ1ZSk7CiAgICAgY29uc3QgUUxp c3RFbnRyeSAqZW50cnk7CiAKLSAgICBpZiAoIXFvYmogfHwgcW9iamVjdF90eXBlKHFvYmopICE9 IFFUWVBFX1FMSVNUKSB7CisgICAgaWYgKCFxb2JqKSB7CisgICAgICAgIGVycm9yX3NldGcoZXJy cCwgUUVSUl9NSVNTSU5HX1BBUkFNRVRFUiwgbmFtZSA/IG5hbWUgOiAibnVsbCIpOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIGlmIChxb2JqZWN0X3R5cGUocW9iaikgIT0gUVRZUEVfUUxJ U1QpIHsKICAgICAgICAgaWYgKGxpc3QpIHsKICAgICAgICAgICAgICpsaXN0ID0gTlVMTDsKICAg ICAgICAgfQpAQCAtMjM0LDggKzI0MiwxMCBAQCBzdGF0aWMgdm9pZCBxbXBfaW5wdXRfc3RhcnRf YWx0ZXJuYXRlKFZpc2l0b3IgKnYsIGNvbnN0IGNoYXIgKm5hbWUsCiAgICAgUW1wSW5wdXRWaXNp dG9yICpxaXYgPSB0b19xaXYodik7CiAgICAgUU9iamVjdCAqcW9iaiA9IHFtcF9pbnB1dF9nZXRf b2JqZWN0KHFpdiwgbmFtZSwgZmFsc2UpOwogCi0gICAgaWYgKCFxb2JqKSB7CisgICAgaWYgKG9i aikgewogICAgICAgICAqb2JqID0gTlVMTDsKKyAgICB9CisgICAgaWYgKCFxb2JqKSB7CiAgICAg ICAgIGVycm9yX3NldGcoZXJycCwgUUVSUl9NSVNTSU5HX1BBUkFNRVRFUiwgbmFtZSA/IG5hbWUg OiAibnVsbCIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjUwLDggKzI2MCwxMyBAQCBz dGF0aWMgdm9pZCBxbXBfaW5wdXRfdHlwZV9pbnQ2NChWaXNpdG9yICp2LCBjb25zdCBjaGFyICpu YW1lLCBpbnQ2NF90ICpvYmosCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFcnJv ciAqKmVycnApCiB7CiAgICAgUW1wSW5wdXRWaXNpdG9yICpxaXYgPSB0b19xaXYodik7Ci0gICAg UUludCAqcWludCA9IHFvYmplY3RfdG9fcWludChxbXBfaW5wdXRfZ2V0X29iamVjdChxaXYsIG5h bWUsIHRydWUpKTsKKyAgICBRT2JqZWN0ICpxb2JqID0gcW1wX2lucHV0X2dldF9vYmplY3QocWl2 LCBuYW1lLCB0cnVlKTsKKyAgICBRSW50ICpxaW50ID0gcW9iamVjdF90b19xaW50KHFvYmopOwog CisgICAgaWYgKCFxb2JqKSB7CisgICAgICAgIGVycm9yX3NldGcoZXJycCwgUUVSUl9NSVNTSU5H X1BBUkFNRVRFUiwgbmFtZSA/IG5hbWUgOiAibnVsbCIpOworICAgICAgICByZXR1cm47CisgICAg fQogICAgIGlmICghcWludCkgewogICAgICAgICBlcnJvcl9zZXRnKGVycnAsIFFFUlJfSU5WQUxJ RF9QQVJBTUVURVJfVFlQRSwgbmFtZSA/IG5hbWUgOiAibnVsbCIsCiAgICAgICAgICAgICAgICAg ICAgImludGVnZXIiKTsKQEAgLTI2Niw4ICsyODEsMTMgQEAgc3RhdGljIHZvaWQgcW1wX2lucHV0 X3R5cGVfdWludDY0KFZpc2l0b3IgKnYsIGNvbnN0IGNoYXIgKm5hbWUsIHVpbnQ2NF90ICpvYmos CiB7CiAgICAgLyogRklYTUU6IHFvYmplY3RfdG9fcWludCBtaXNoYW5kbGVzIHZhbHVlcyBvdmVy IElOVDY0X01BWCAqLwogICAgIFFtcElucHV0VmlzaXRvciAqcWl2ID0gdG9fcWl2KHYpOwotICAg IFFJbnQgKnFpbnQgPSBxb2JqZWN0X3RvX3FpbnQocW1wX2lucHV0X2dldF9vYmplY3QocWl2LCBu YW1lLCB0cnVlKSk7CisgICAgUU9iamVjdCAqcW9iaiA9IHFtcF9pbnB1dF9nZXRfb2JqZWN0KHFp diwgbmFtZSwgdHJ1ZSk7CisgICAgUUludCAqcWludCA9IHFvYmplY3RfdG9fcWludChxb2JqKTsK IAorICAgIGlmICghcW9iaikgeworICAgICAgICBlcnJvcl9zZXRnKGVycnAsIFFFUlJfTUlTU0lO R19QQVJBTUVURVIsIG5hbWUgPyBuYW1lIDogIm51bGwiKTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KICAgICBpZiAoIXFpbnQpIHsKICAgICAgICAgZXJyb3Jfc2V0ZyhlcnJwLCBRRVJSX0lOVkFM SURfUEFSQU1FVEVSX1RZUEUsIG5hbWUgPyBuYW1lIDogIm51bGwiLAogICAgICAgICAgICAgICAg ICAgICJpbnRlZ2VyIik7CkBAIC0yODEsOCArMzAxLDEzIEBAIHN0YXRpYyB2b2lkIHFtcF9pbnB1 dF90eXBlX2Jvb2woVmlzaXRvciAqdiwgY29uc3QgY2hhciAqbmFtZSwgYm9vbCAqb2JqLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFcnJvciAqKmVycnApCiB7CiAgICAgUW1wSW5w dXRWaXNpdG9yICpxaXYgPSB0b19xaXYodik7Ci0gICAgUUJvb2wgKnFib29sID0gcW9iamVjdF90 b19xYm9vbChxbXBfaW5wdXRfZ2V0X29iamVjdChxaXYsIG5hbWUsIHRydWUpKTsKKyAgICBRT2Jq ZWN0ICpxb2JqID0gcW1wX2lucHV0X2dldF9vYmplY3QocWl2LCBuYW1lLCB0cnVlKTsKKyAgICBR Qm9vbCAqcWJvb2wgPSBxb2JqZWN0X3RvX3Fib29sKHFvYmopOwogCisgICAgaWYgKCFxb2JqKSB7 CisgICAgICAgIGVycm9yX3NldGcoZXJycCwgUUVSUl9NSVNTSU5HX1BBUkFNRVRFUiwgbmFtZSA/ IG5hbWUgOiAibnVsbCIpOworICAgICAgICByZXR1cm47CisgICAgfQogICAgIGlmICghcWJvb2wp IHsKICAgICAgICAgZXJyb3Jfc2V0ZyhlcnJwLCBRRVJSX0lOVkFMSURfUEFSQU1FVEVSX1RZUEUs IG5hbWUgPyBuYW1lIDogIm51bGwiLAogICAgICAgICAgICAgICAgICAgICJib29sZWFuIik7CkBA IC0yOTYsOCArMzIxLDE2IEBAIHN0YXRpYyB2b2lkIHFtcF9pbnB1dF90eXBlX3N0cihWaXNpdG9y ICp2LCBjb25zdCBjaGFyICpuYW1lLCBjaGFyICoqb2JqLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEVycm9yICoqZXJycCkKIHsKICAgICBRbXBJbnB1dFZpc2l0b3IgKnFpdiA9IHRv X3Fpdih2KTsKLSAgICBRU3RyaW5nICpxc3RyID0gcW9iamVjdF90b19xc3RyaW5nKHFtcF9pbnB1 dF9nZXRfb2JqZWN0KHFpdiwgbmFtZSwgdHJ1ZSkpOworICAgIFFPYmplY3QgKnFvYmogPSBxbXBf aW5wdXRfZ2V0X29iamVjdChxaXYsIG5hbWUsIHRydWUpOworICAgIFFTdHJpbmcgKnFzdHIgPSBx b2JqZWN0X3RvX3FzdHJpbmcocW9iaik7CiAKKyAgICBpZiAob2JqKSB7CisgICAgICAgICpvYmog PSBOVUxMOworICAgIH0KKyAgICBpZiAoIXFvYmopIHsKKyAgICAgICAgZXJyb3Jfc2V0ZyhlcnJw LCBRRVJSX01JU1NJTkdfUEFSQU1FVEVSLCBuYW1lID8gbmFtZSA6ICJudWxsIik7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAgICAgaWYgKCFxc3RyKSB7CiAgICAgICAgICpvYmogPSBOVUxMOwog ICAgICAgICBlcnJvcl9zZXRnKGVycnAsIFFFUlJfSU5WQUxJRF9QQVJBTUVURVJfVFlQRSwgbmFt ZSA/IG5hbWUgOiAibnVsbCIsCkBAIC0zMTYsNiArMzQ5LDEwIEBAIHN0YXRpYyB2b2lkIHFtcF9p bnB1dF90eXBlX251bWJlcihWaXNpdG9yICp2LCBjb25zdCBjaGFyICpuYW1lLCBkb3VibGUgKm9i aiwKICAgICBRSW50ICpxaW50OwogICAgIFFGbG9hdCAqcWZsb2F0OwogCisgICAgaWYgKCFxb2Jq KSB7CisgICAgICAgIGVycm9yX3NldGcoZXJycCwgUUVSUl9NSVNTSU5HX1BBUkFNRVRFUiwgbmFt ZSA/IG5hbWUgOiAibnVsbCIpOworICAgICAgICByZXR1cm47CisgICAgfQogICAgIHFpbnQgPSBx b2JqZWN0X3RvX3FpbnQocW9iaik7CiAgICAgaWYgKHFpbnQpIHsKICAgICAgICAgKm9iaiA9IHFp bnRfZ2V0X2ludChxb2JqZWN0X3RvX3FpbnQocW9iaikpOwpAQCAtMzM4LDYgKzM3NSwxNCBAQCBz dGF0aWMgdm9pZCBxbXBfaW5wdXRfdHlwZV9hbnkoVmlzaXRvciAqdiwgY29uc3QgY2hhciAqbmFt ZSwgUU9iamVjdCAqKm9iaiwKICAgICBRbXBJbnB1dFZpc2l0b3IgKnFpdiA9IHRvX3Fpdih2KTsK ICAgICBRT2JqZWN0ICpxb2JqID0gcW1wX2lucHV0X2dldF9vYmplY3QocWl2LCBuYW1lLCB0cnVl KTsKIAorICAgIGlmIChvYmopIHsKKyAgICAgICAgKm9iaiA9IE5VTEw7CisgICAgfQorICAgIGlm ICghcW9iaikgeworICAgICAgICBlcnJvcl9zZXRnKGVycnAsIFFFUlJfTUlTU0lOR19QQVJBTUVU RVIsIG5hbWUgPyBuYW1lIDogIm51bGwiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IHFvYmplY3RfaW5jcmVmKHFvYmopOwogICAgICpvYmogPSBxb2JqOwogfQpAQCAtMzQ3LDYgKzM5 MiwxMCBAQCBzdGF0aWMgdm9pZCBxbXBfaW5wdXRfdHlwZV9udWxsKFZpc2l0b3IgKnYsIGNvbnN0 IGNoYXIgKm5hbWUsIEVycm9yICoqZXJycCkKICAgICBRbXBJbnB1dFZpc2l0b3IgKnFpdiA9IHRv X3Fpdih2KTsKICAgICBRT2JqZWN0ICpxb2JqID0gcW1wX2lucHV0X2dldF9vYmplY3QocWl2LCBu YW1lLCB0cnVlKTsKIAorICAgIGlmICghcW9iaikgeworICAgICAgICBlcnJvcl9zZXRnKGVycnAs IFFFUlJfTUlTU0lOR19QQVJBTUVURVIsIG5hbWUgPyBuYW1lIDogIm51bGwiKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KICAgICBpZiAocW9iamVjdF90eXBlKHFvYmopICE9IFFUWVBFX1FOVUxM KSB7CiAgICAgICAgIGVycm9yX3NldGcoZXJycCwgUUVSUl9JTlZBTElEX1BBUkFNRVRFUl9UWVBF LCBuYW1lID8gbmFtZSA6ICJudWxsIiwKICAgICAgICAgICAgICAgICAgICAibnVsbCIpOwo= ------=_Part_279204_860627040.1474408839924--