From nobody Fri Nov 14 15:20:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588224868; cv=none; d=zohomail.com; s=zohoarc; b=dMSIXmkCwBeqUn5gukAxyBXRg3z9Tln3yX7eoSG1/aUSKOHyR4AHeLULr5OUkovkQUPAfQh7fZs9L87J5TJdq5xqVaD8I8RV8zEqmh+BdW/kBmhUp/H1uYukAoFs2Z+4UaAOU+Ye0I7k0B/N5pIVovfhgP8OIiaOcaGAoMH/c5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588224868; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UgCfMqVczsC75xqPHeLFFg8uxc47tRu7rBRFv6Xgq0M=; b=UCEOeB/hoyDeTQwvlRXr9/zl7Ny5ZGv8IakBIHl29+z+bgvturgkiZCnto3S17AWunc6EHXBfCpM3JjKz7fGi1ZMXTPTEydxzoJzq0ji6vmNz7oGcLgQArSIF3d5YVoCBSIgUJlNnIpZRrP+FmWUT+N+WthJX36IsvYD9DcQ5XQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588224868845292.53850623826213; Wed, 29 Apr 2020 22:34:28 -0700 (PDT) Received: from localhost ([::1]:51644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU1q5-0001x0-F1 for importer@patchew.org; Thu, 30 Apr 2020 01:34:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU1n4-00051S-5c for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU1mz-0002dw-Et for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46566 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jU1my-0002dA-Up for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:13 -0400 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-367-GKCdv2YSPKObioSqfLPc3w-1; Thu, 30 Apr 2020 01:31:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31ACB107ACF6 for ; Thu, 30 Apr 2020 05:31:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01D7B5EDE1; Thu, 30 Apr 2020 05:31:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 02E3E11358C8; Thu, 30 Apr 2020 07:31:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588224671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UgCfMqVczsC75xqPHeLFFg8uxc47tRu7rBRFv6Xgq0M=; b=TLnTG2uPTwOlgp1qYe+8LBeb9YyCOb6x9IMozWMgtTSwIW45iClGnhLShG+LiwaWcWy6YU ZAlsgMzdkVK1eXIeQcR3ayYKcLtkYl6RQEUjEcPXpauFqbEyYdhrju2rXL8maL+WTVwnbz of8iD7ZLJABtW66U28FpypHnAqF92GI= X-MC-Unique: GKCdv2YSPKObioSqfLPc3w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 12/20] qapi: Fix Visitor contract for start_alternate() Date: Thu, 30 Apr 2020 07:30:56 +0200 Message-Id: <20200430053104.32204-13-armbru@redhat.com> In-Reply-To: <20200430053104.32204-1-armbru@redhat.com> References: <20200430053104.32204-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 01:31:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The contract demands v->start_alternate() for input and dealloc visitors, but visit_start_alternate() actually requires it for input and clone visitors. Fix the contract, and delete superfluous qapi_dealloc_start_alternate(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20200424084338.26803-8-armbru@redhat.com> --- include/qapi/visitor-impl.h | 5 ++--- qapi/qapi-dealloc-visitor.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 8ccb3b6c20..252206dc0d 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -67,13 +67,12 @@ struct Visitor /* Must be set */ void (*end_list)(Visitor *v, void **list); =20 - /* Must be set by input and dealloc visitors to visit alternates; - * optional for output visitors. */ + /* Must be set by input and clone visitors to visit alternates */ void (*start_alternate)(Visitor *v, const char *name, GenericAlternate **obj, size_t size, Error **errp); =20 - /* Optional, needed for dealloc visitor */ + /* Optional */ void (*end_alternate)(Visitor *v, void **obj); =20 /* Must be set */ diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index d192724b13..2239fc6417 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -34,12 +34,6 @@ static void qapi_dealloc_end_struct(Visitor *v, void **o= bj) } } =20 -static void qapi_dealloc_start_alternate(Visitor *v, const char *name, - GenericAlternate **obj, size_t si= ze, - Error **errp) -{ -} - static void qapi_dealloc_end_alternate(Visitor *v, void **obj) { if (obj) { @@ -123,7 +117,6 @@ Visitor *qapi_dealloc_visitor_new(void) v->visitor.type =3D VISITOR_DEALLOC; v->visitor.start_struct =3D qapi_dealloc_start_struct; v->visitor.end_struct =3D qapi_dealloc_end_struct; - v->visitor.start_alternate =3D qapi_dealloc_start_alternate; v->visitor.end_alternate =3D qapi_dealloc_end_alternate; v->visitor.start_list =3D qapi_dealloc_start_list; v->visitor.next_list =3D qapi_dealloc_next_list; --=20 2.21.1