From patchwork Mon Jun 29 11:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 11630749 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBABF912 for ; Mon, 29 Jun 2020 11:24:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9238223A01 for ; Mon, 29 Jun 2020 11:24:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cQwBUpa5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9238223A01 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jprtd-0002ng-Nn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Jun 2020 07:24:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jprt2-0001WS-N4 for qemu-devel@nongnu.org; Mon, 29 Jun 2020 07:23:44 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jprt0-0002HC-Ek for qemu-devel@nongnu.org; Mon, 29 Jun 2020 07:23:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593429821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpOA8CVliT4Z9ehnjajJ5Q2T2AzoEdhUIroWj4OQ6rM=; b=cQwBUpa5EL7EVDzQOceEMjahSTFklhXComowRxTpxB9lghCiXTo9ZUjEMz3Wl7vcssLKFT m6x/xGkiTB9EKw1SGECAEhc8IIzrCK/uPqncxsKhV7tZgyELTY+tn9uz1bzjcs3sT5mKW2 v4IWsS9MF1SkIS0qx3zdIbY5s8bCJQQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-Z7iMnsnoP8SJKW6vw0fEHw-1; Mon, 29 Jun 2020 07:23:39 -0400 X-MC-Unique: Z7iMnsnoP8SJKW6vw0fEHw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22CB618FE860; Mon, 29 Jun 2020 11:23:38 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id A42405D9DA; Mon, 29 Jun 2020 11:23:33 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, armbru@redhat.com Subject: [PATCH v4 0/3] Avoid abort on QMP attempt to add an object with duplicate id Date: Mon, 29 Jun 2020 13:23:26 +0200 Message-Id: <20200629112329.27611-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=eric.auger@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/29 01:03:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Attempting to add an object through QMP with an id that is already used leads to a qemu abort. This is a regression since d2623129a7de ("qom: Drop parameter @errp of object_property_add() & friends"). The first patch fixes the issue and the second patch adds a test to check the error is gracefully returned to the QMP client. The last patch can be considered independently. It merges all the object-add tests into a single test function and cover new failure cases. Best Regards Eric This series can be found at: https://github.com/eauger/qemu/tree/qom-graceful-v4 History: - v3 -> v4: - addressed style comment from Markus - added patch 3 - v2 -> v3: - don't take the object reference on failure in object_property_try_add_child - add g_assert_nonnull(resp) in 2/2 while keeping Thomas A-b - v1 -> v2: - use the try terminology. - turn object_property_try_add() into a non-static function - add the test Eric Auger (3): qom: Introduce object_property_try_add_child() tests/qmp-cmd-test: Add qmp/object-add-duplicate-id tests/qmp-cmd-test: Add qmp/object-add-failure-modes include/qom/object.h | 26 +++++++++- qom/object.c | 21 ++++++-- qom/object_interfaces.c | 7 ++- tests/qtest/qmp-cmd-test.c | 99 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 140 insertions(+), 13 deletions(-)