From patchwork Thu Mar 2 16:24:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 9600903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7870B60453 for ; Thu, 2 Mar 2017 16:26:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69E96285BA for ; Thu, 2 Mar 2017 16:26:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D639285BD; Thu, 2 Mar 2017 16:26:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 93D1E285BA for ; Thu, 2 Mar 2017 16:26:07 +0000 (UTC) Received: from localhost ([::1]:53204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjTYM-0005uw-N1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 02 Mar 2017 11:26:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjTWn-0004uU-NZ for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:24:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjTWj-0000ZY-Lw for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:24:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55588) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjTWj-0000ZK-Cy for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:24:25 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6316A80488; Thu, 2 Mar 2017 16:24:25 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-103.phx2.redhat.com [10.3.117.103]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v22GOMBw009910; Thu, 2 Mar 2017 11:24:23 -0500 To: "Michael S. Tsirkin" , Ben Warren References: <1488435591-17882-1-git-send-email-mst@redhat.com> <1488435591-17882-6-git-send-email-mst@redhat.com> <87a894m72h.fsf@dusky.pond.sub.org> <15694a65-6ac4-9387-1cc2-89d5bb8660b9@redhat.com> <87poi0hxxg.fsf@dusky.pond.sub.org> <7938f647-6b1d-f8dd-feed-5ae7ce3c84cb@redhat.com> <20170302173116-mutt-send-email-mst@kernel.org> From: Laszlo Ersek Message-ID: Date: Thu, 2 Mar 2017 17:24:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170302173116-mutt-send-email-mst@kernel.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 02 Mar 2017 16:24:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PULL 05/15] qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-devel@nongnu.org, Markus Armbruster , "Dr. David Alan Gilbert" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 03/02/17 16:32, Michael S. Tsirkin wrote: > On Thu, Mar 02, 2017 at 06:50:45AM -0800, Ben Warren wrote: >> I >>> On Mar 2, 2017, at 5:15 AM, Laszlo Ersek wrote: >>> >>> On 03/02/17 09:42, Markus Armbruster wrote: >>>> Laszlo Ersek writes: >>>> >>>>> On 03/02/17 09:11, Markus Armbruster wrote: >>>>>> Crash bug, I'm afraid... >>>>>> >>>>>> "Michael S. Tsirkin" writes: >>>>>> >>>>>>> From: Igor Mammedov >>>>>>> >>>>>>> Add commands to query Virtual Machine Generation ID counter. >>>>>>> >>>>>>> QMP command example: >>>>>>> { "execute": "query-vm-generation-id" } >>>>>>> >>>>>>> HMP command example: >>>>>>> info vm-generation-id >>>>>>> >>>>>>> Signed-off-by: Igor Mammedov >>>>>>> Reviewed-by: Eric Blake >>>>>>> Signed-off-by: Ben Warren >>>>>>> Reviewed-by: Laszlo Ersek >>>>>>> Tested-by: Laszlo Ersek >>>>>>> Reviewed-by: Michael S. Tsirkin >>>>>>> Signed-off-by: Michael S. Tsirkin >>>>>>> --- >>>>>>> qapi-schema.json | 20 ++++++++++++++++++++ >>>>>>> hmp.h | 1 + >>>>>>> hmp.c | 9 +++++++++ >>>>>>> hw/acpi/vmgenid.c | 16 ++++++++++++++++ >>>>>>> stubs/vmgenid.c | 9 +++++++++ >>>>>>> hmp-commands-info.hx | 14 ++++++++++++++ >>>>>>> stubs/Makefile.objs | 1 + >>>>>>> 7 files changed, 70 insertions(+) >>>>>>> create mode 100644 stubs/vmgenid.c >>>>>>> >>>>>>> diff --git a/qapi-schema.json b/qapi-schema.json >>>>>>> index d6186d4..84692da 100644 >>>>>>> --- a/qapi-schema.json >>>>>>> +++ b/qapi-schema.json >>>>>>> @@ -6188,3 +6188,23 @@ >>>>>>> # >>>>>>> ## >>>>>>> { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } >>>>>>> + >>>>>>> +## >>>>>>> +# @GuidInfo: >>>>>>> +# >>>>>>> +# GUID information. >>>>>>> +# >>>>>>> +# @guid: the globally unique identifier >>>>>>> +# >>>>>>> +# Since: 2.9 >>>>>>> +## >>>>>>> +{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} } >>>>>>> + >>>>>>> +## >>>>>>> +# @query-vm-generation-id: >>>>>>> +# >>>>>>> +# Show Virtual Machine Generation ID >>>>>>> +# >>>>>>> +# Since 2.9 >>>>>>> +## >>>>>>> +{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } >>>>>> [...] >>>>>>> diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c >>>>>>> index c8465df..744f284 100644 >>>>>>> --- a/hw/acpi/vmgenid.c >>>>>>> +++ b/hw/acpi/vmgenid.c >>>>>>> @@ -240,3 +240,19 @@ static void vmgenid_register_types(void) >>>>>>> } >>>>>>> >>>>>>> type_init(vmgenid_register_types) >>>>>>> + >>>>>>> +GuidInfo *qmp_query_vm_generation_id(Error **errp) >>>>>>> +{ >>>>>>> + GuidInfo *info; >>>>>>> + VmGenIdState *vms; >>>>>>> + Object *obj = find_vmgenid_dev(); >>>>>>> + >>>>>>> + if (!obj) { >>>>>>> + return NULL; >>>>>>> + } >>>>>>> + vms = VMGENID(obj); >>>>>>> + >>>>>>> + info = g_malloc0(sizeof(*info)); >>>>>>> + info->guid = qemu_uuid_unparse_strdup(&vms->guid); >>>>>>> + return info; >>>>>>> +} >>>>>> >>>>>> This either returns a GuidInfo or NULL. >>>>>> >>>>>> If it returns NULL, the generated qmp_marshal_output_GuidInfo() will >>>>>> crash like this: >>>>>> >>>>>> #0 0x00007fffdb4c7765 in raise () at /lib64/libc.so.6 >>>>>> #1 0x00007fffdb4c936a in abort () at /lib64/libc.so.6 >>>>>> #2 0x00007fffdb4bff97 in __assert_fail_base () at /lib64/libc.so.6 >>>>>> #3 0x00007fffdb4c0042 in () at /lib64/libc.so.6 >>>>>> #4 0x0000555555c800a0 in visit_start_struct (v= >>>>>> 0x555557727000, name=0x555555cf29e8 "unused", obj=0x7fffffffc7c8, size=8, errp=0x7fffffffc790) at /work/armbru/qemu/qapi/qapi-visit-core.c:49 >>>>>> #5 0x0000555555c5d398 in visit_type_GuidInfo (v= >>>>>> 0x555557727000, name=0x555555cf29e8 "unused", obj=0x7fffffffc7c8, errp=0x7fffffffc7d8) at qapi-visit.c:6038 >>>>>> #6 0x0000555555922fc0 in qmp_marshal_output_GuidInfo (ret_in=0x0, ret_out=0x7fffffffc870, errp=0x7fffffffc820) at qmp-marshal.c:5148 >>>>>> #7 0x0000555555923123 in qmp_marshal_query_vm_generation_id (args=0x555557a67500, ret=0x7fffffffc870, errp=0x7fffffffc868) at qmp-marshal.c:5186 >>>>>> #8 0x0000555555c83a73 in do_qmp_dispatch (request=0x555556ab3200, errp=0x7fffffffc8c0) at /work/armbru/qemu/qapi/qmp-dispatch.c:97 >>>>>> #9 0x0000555555c83ba3 in qmp_dispatch (request=0x555556ab3200) >>>>>> at /work/armbru/qemu/qapi/qmp-dispatch.c:124 >>>>>> #10 0x00005555557bb671 in handle_qmp_command (parser= >>>>>> 0x5555568776b0, tokens=0x555556858520) at /work/armbru/qemu/monitor.c:3789 >>>>>> #11 0x0000555555c8af2f in json_message_process_token (lexer=0x5555568776b8, input=0x5555568582e0, type=JSON_RCURLY, x=48, y=1) >>>>>> at /work/armbru/qemu/qobject/json-streamer.c:105 >>>>>> >>>>>> Sorry for not having reviewed this earlier. On the other hand, how come >>>>>> this survived testing? >>>>> >>>>> We primarily focused on testing the functionality, not the failure / >>>>> corner cases, I think. >>>> >>>> That's as natural as it is wrong :) >>>> >>>> I'm a lackluster tester myself. The only way I can bring myself to test >>>> systematically is write automated tests. Fortunately, our >>>> infrastructure for that is much better than it used to be. Our habits >>>> still seem to be trailing the infrastructure, though. >>>> >>>> See also "New QMP command without a test -> automatic NAK", Message-ID: >>>> <871sugkrw5.fsf@dusky.pond.sub.org>. >>>> >>>>> (There are at least two other known startup >>>>> scenarios that are not handled correctly just yet, although they don't >>>>> crash -- multiple vmgenid devices, and vmgenid on machtypes without >>>>> writeable fw_cfg.) >>>>> >>>>> Also, in my testing I only called the monitor command via HMP (from >>>>> virsh), and AFAICS that one doesn't crash even if the device is missing. >>>> >>>> Correct. >>>> >>>>> Nonetheless, qmp_query_vm_generation_id() should set an error when it >>>>> returns NULL, yes. >>>> >>>> That's the obvious fix. It's a one-liner. >>>> >>>>> I think Ben wants to post a followup series with those fixes mentioned >>>>> above, in time for 2.9, perhaps this crash can be addressed in there >>>>> too. Ben? >>>> >>>> Since the fix is a one-liner, I'd like you guys to consider respinning >>>> this pull request with the fix. >>> >>> If Ben & Michael send out a new pull with the above fixed, I'd like to >>> point out that the updated SeaBIOS blob is now in the tree (see commit >>> 8779fccbef0c, "seabios: update to 1.10.2 release", 2017-02-28), so the >>> unit test patch can be included as well. >>> >> Yes, the SeaBIOS image is now pulled in, so it’d be great to pull in the unit tests too. What do I do here - send a patch with the fix, or a re-spin of the single original patch without the bug, or a re-spin of the patch series? >>> Thanks >>> Laszlo >>> >>> >> —Ben >> > > Send the fix first of all pls. Ben, once you add error_setg() to the "return NULL" branch in qmp_query_vm_generation_id(), please remember to print and also release that error object in hmp_info_vm_generation_id() as well. Sth like (not even build tested): } > > Can you send pointer to the test patches pls? I have some version on a > branch but I'd rather not guess. > subject: [Qemu-devel] [PATCH v8 7/8] tests: Add unit tests for the VM Generation ID feature message-id: <5353279f68be14c63f049bc34902675290e45b1d.1487286467.git.ben@skyportsystems.com> URLs: https://www.mail-archive.com/qemu-devel@nongnu.org/msg430491.html http://lists.nongnu.org/archive/html/qemu-devel/2017-02/msg03781.html diff --git a/hmp.c b/hmp.c index 0ed1157c2c3a..c057be49a5ce 100644 --- a/hmp.c +++ b/hmp.c @@ -2580,9 +2580,11 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict) { - GuidInfo *info = qmp_query_vm_generation_id(NULL); + Error *err = NULL; + GuidInfo *info = qmp_query_vm_generation_id(&err); if (info) { monitor_printf(mon, "%s\n", info->guid); } + hmp_handle_error(mon, &err); qapi_free_GuidInfo(info);