From patchwork Fri Sep 30 14:45:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 677077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3slvcL1XGzz9s4n for ; Sat, 1 Oct 2016 00:54:58 +1000 (AEST) Received: from localhost ([::1]:45034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzDC-0003df-Qq for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2016 10:54:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpz5P-0004TQ-Aa for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:46:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpz5N-0003Nn-7w for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:46:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpz5K-0003KC-Nd; Fri, 30 Sep 2016 10:46:46 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 202FE4481F; Fri, 30 Sep 2016 14:46:46 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-125.ams2.redhat.com [10.36.6.125]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8UEjolp014070; Fri, 30 Sep 2016 10:46:43 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2016 15:45:41 +0100 Message-Id: <1475246744-29302-19-git-send-email-berrange@redhat.com> In-Reply-To: <1475246744-29302-1-git-send-email-berrange@redhat.com> References: <1475246744-29302-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 30 Sep 2016 14:46:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 18/21] block: convert crypto driver to use QObjectInputVisitor 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: qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The crypto block driver currently uses OptsVisitor to convert from the block driver open/create options into QCryptoBlockOpenOptions/QCryptoBlockCreateOptions. This is easily replaced by use of QObjectInputVisitor with no need to enable any compatibility options, since the structs dealt with contain only scalars. Signed-off-by: Daniel P. Berrange --- block/crypto.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 7aa7eb5..12b0b9f 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -23,7 +23,7 @@ #include "block/block_int.h" #include "sysemu/block-backend.h" #include "crypto/block.h" -#include "qapi/opts-visitor.h" +#include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h" @@ -206,7 +206,11 @@ block_crypto_open_opts_init(QCryptoBlockFormat format, ret = g_new0(QCryptoBlockOpenOptions, 1); ret->format = format; - v = opts_visitor_new(opts); + v = qobject_input_visitor_new_opts(opts, false, 0, false, false, + &local_err); + if (local_err) { + goto out; + } visit_start_struct(v, NULL, NULL, 0, &local_err); if (local_err) { @@ -252,7 +256,11 @@ block_crypto_create_opts_init(QCryptoBlockFormat format, ret = g_new0(QCryptoBlockCreateOptions, 1); ret->format = format; - v = opts_visitor_new(opts); + v = qobject_input_visitor_new_opts(opts, false, 0, false, false, + &local_err); + if (local_err) { + goto out; + } visit_start_struct(v, NULL, NULL, 0, &local_err); if (local_err) {