From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9ToC-0003lu-FQ for qemu-devel@nongnu.org; Wed, 23 Nov 2016 04:25:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9To7-0006Bb-VQ for qemu-devel@nongnu.org; Wed, 23 Nov 2016 04:25:40 -0500 Received: from mx6-phx2.redhat.com ([209.132.183.39]:46411) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9To7-0006BS-Lr for qemu-devel@nongnu.org; Wed, 23 Nov 2016 04:25:35 -0500 Date: Wed, 23 Nov 2016 04:25:31 -0500 (EST) From: Paolo Bonzini Message-ID: <898038411.1379870.1479893131197.JavaMail.zimbra@redhat.com> In-Reply-To: <1479874588-1969-4-git-send-email-eblake@redhat.com> References: <1479874588-1969-1-git-send-email-eblake@redhat.com> <1479874588-1969-4-git-send-email-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/3] qapi: Drop support for qobject_from_jsonf("%"PRId64) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, programmingkidx@gmail.com, armbru@redhat.com, Michael Roth > The qobject_from_jsonf() function implements a pseudo-printf > language for creating a QObject; however, it is hard-coded to > only parse a subset of formats understood by printf(). In > particular, any use of a 64-bit integer works only if the > system's definition of PRId64 matches what the parser expects; > which works on glibc (%lld) and mingw (%I64d), but not on > Mac OS (%qd). Rather than enhance the parser, we have already > converted almost all clients to use an alternative method; > convert or eliminate the remaining uses in the testsuite, and > rip out this code from the parser. > > Ripping it all out means that we will now uniformly get > failures on all platforms that try to use dynamic JSON with > 64-bit numbers. Ultimately, I plan for later patches to rip > out dynamic JSON altogether, but that is more invasive and > therefore not appropriate for the 2.8 release, while this > patch fixes an actual testsuite failure of check-qjson on > Mac OS. > > Reported by: G 3 > Signed-off-by: Eric Blake This is throwing out the baby with the bathwater. %lld works just fine for long long. Throwing away %I64d is fine though... > @@ -964,7 +964,6 @@ static void vararg_number(void) > QInt *qint; > QFloat *qfloat; > int value = 0x2342; > - int64_t value64 = 0x2342342343LL; > double valuef = 2.323423423; > > obj = qobject_from_jsonf("%d", value); > @@ -976,15 +975,6 @@ static void vararg_number(void) > > QDECREF(qint); > > - obj = qobject_from_jsonf("%" PRId64, value64); > - g_assert(obj != NULL); > - g_assert(qobject_type(obj) == QTYPE_QINT); > - > - qint = qobject_to_qint(obj); > - g_assert(qint_get_int(qint) == value64); > - > - QDECREF(qint); > - > obj = qobject_from_jsonf("%f", valuef); > g_assert(obj != NULL); > g_assert(qobject_type(obj) == QTYPE_QFLOAT); if you change the test to use %lld and long long instead of int64_t. > diff --git a/tests/test-qobject-input-visitor.c > b/tests/test-qobject-input-visitor.c > index 26c5012..945404a 100644 > --- a/tests/test-qobject-input-visitor.c > +++ b/tests/test-qobject-input-visitor.c > @@ -83,10 +83,11 @@ static Visitor > *visitor_input_test_init_raw(TestInputVisitorData *data, > static void test_visitor_in_int(TestInputVisitorData *data, > const void *unused) > { > - int64_t res = 0, value = -42; > + int64_t res = 0; > + int value = -42; > Visitor *v; > > - v = visitor_input_test_init(data, "%" PRId64, value); > + v = visitor_input_test_init(data, "%d", value); > > visit_type_int(v, NULL, &res, &error_abort); > g_assert_cmpint(res, ==, value); > -- > 2.7.4 > > This part is fine I guess. Paolo