Re: [Qemu-devel] [PULL 00/20] QAPI patches

[Eric Blake]

On 10/12/2015 07:25 AM, Peter Maydell wrote:
> On 9 October 2015 at 16:14, Markus Armbruster <address@hidden> wrote:
>> The following changes since commit b37686f7e84b22cfaf7fd01ac5133f2617cc3027:
>>
>>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
>> into staging (2015-10-09 12:18:14 +0100)
>>
>> are available in the git repository at:
>>
>>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-10-09
>>
>> for you to fetch changes up to 51c605bab50f1b9e0766aa9ed14c1abe58eb7f48:
>>
>>   qapi: Simplify gen_visit_fields() error handling (2015-10-09 16:44:10 
>> +0200)
>>
>> ----------------------------------------------------------------
>> QAPI patches
>>
>> ----------------------------------------------------------------
> 
> Hi. I see a clang compile failure due to this warning (OSX and Linux):
> 
> /Users/pm215/src/qemu-for-merges/tests/test-qmp-input-visitor.c:500:33:
> warning: implicit conversion from 'double' to 'gint64' (aka 'long')
> changes value from 42.5 to 42 [-Wliteral-conversion]
> 

Copy-and-paste strikes me again :(

Markus, you could squash this into "qapi: Test use of 'number' within
alternates" for the obvious fix (line numbers may be off).

diff --git i/tests/test-qmp-input-visitor.c w/tests/test-qmp-input-visitor.c
index 5f4f45b..57617ac 100644
--- i/tests/test-qmp-input-visitor.c
+++ w/tests/test-qmp-input-visitor.c
@@ -409,7 +409,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
     v = visitor_input_test_init(data, "42.5");
     visit_type_AltNumInt(v, &ani, NULL, &error_abort);
     g_assert_cmpint(ani->type, ==, QTYPE_QFLOAT);
-    g_assert_cmpint(ani->n, ==, 42.5);
+    g_assert_cmpfloat(ani->n, ==, 42.5);
     qapi_free_AltNumInt(ani);
 }


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature