From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bosDF-0005A2-Qa for qemu-devel@nongnu.org; Tue, 27 Sep 2016 09:14:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bosDD-0003w1-UI for qemu-devel@nongnu.org; Tue, 27 Sep 2016 09:14:20 -0400 From: "Daniel P. Berrange" Date: Tue, 27 Sep 2016 14:13:18 +0100 Message-Id: <1474982001-20878-17-git-send-email-berrange@redhat.com> In-Reply-To: <1474982001-20878-1-git-send-email-berrange@redhat.com> References: <1474982001-20878-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v14 16/19] block: convert crypto driver to use QObjectInputVisitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Daniel P. Berrange" 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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 7aa7eb5..fee6c99 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,10 @@ 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, &local_err); + if (local_err) { + goto out; + } visit_start_struct(v, NULL, NULL, 0, &local_err); if (local_err) { @@ -252,7 +255,10 @@ 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, &local_err); + if (local_err) { + goto out; + } visit_start_struct(v, NULL, NULL, 0, &local_err); if (local_err) { -- 2.7.4