From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKScZ-00008A-RG for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKScX-0006NS-LF for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:50:46 -0400 Date: Tue, 5 Jul 2016 16:50:34 +0100 From: "Daniel P. Berrange" Message-ID: <20160705155034.GB6553@redhat.com> Reply-To: "Daniel P. Berrange" References: <1467732272-23368-1-git-send-email-clord@redhat.com> <1467732272-23368-7-git-send-email-clord@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1467732272-23368-7-git-send-email-clord@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 06/32] blockdev: Move luks probe to its own file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Colin Lord Cc: qemu-devel@nongnu.org, kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com On Tue, Jul 05, 2016 at 11:24:06AM -0400, Colin Lord wrote: > Isolates the luks probe function as part of the modularization process. > > Signed-off-by: Colin Lord > --- > block/Makefile.objs | 2 +- > block/crypto.c | 21 +-------------------- > block/probe/luks.c | 23 +++++++++++++++++++++++ > include/block/probe.h | 2 ++ > 4 files changed, 27 insertions(+), 21 deletions(-) > create mode 100644 block/probe/luks.c > > diff --git a/block/Makefile.objs b/block/Makefile.objs > index 3b98001..28a7ec3 100644 > --- a/block/Makefile.objs > +++ b/block/Makefile.objs > @@ -24,7 +24,7 @@ block-obj-y += accounting.o dirty-bitmap.o > block-obj-y += write-threshold.o > > block-obj-y += crypto.o > -block-obj-y += probe/bochs.o probe/cloop.o > +block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o > > common-obj-y += stream.o > common-obj-y += commit.o > diff --git a/block/crypto.c b/block/crypto.c > index 758e14e..493dd69 100644 > --- a/block/crypto.c > +++ b/block/crypto.c > @@ -21,6 +21,7 @@ > #include "qemu/osdep.h" > > #include "block/block_int.h" > +#include "block/probe.h" > #include "sysemu/block-backend.h" > #include "crypto/block.h" > #include "qapi/opts-visitor.h" > @@ -41,19 +42,6 @@ struct BlockCrypto { > }; > > > -static int block_crypto_probe_generic(QCryptoBlockFormat format, > - const uint8_t *buf, > - int buf_size, > - const char *filename) > -{ > - if (qcrypto_block_has_format(format, buf, buf_size)) { > - return 100; > - } else { > - return 0; > - } > -} > - > - > static ssize_t block_crypto_read_func(QCryptoBlock *block, > size_t offset, > uint8_t *buf, > @@ -540,13 +528,6 @@ static int64_t block_crypto_getlength(BlockDriverState *bs) > } > > > -static int block_crypto_probe_luks(const uint8_t *buf, > - int buf_size, > - const char *filename) { > - return block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, > - buf, buf_size, filename); > -} > - > static int block_crypto_open_luks(BlockDriverState *bs, > QDict *options, > int flags, > diff --git a/block/probe/luks.c b/block/probe/luks.c > new file mode 100644 > index 0000000..5c6427a > --- /dev/null > +++ b/block/probe/luks.c This should be a crypto.c file, since the same probing logic is intended to work for any crypto format, not just luks, hence why the original file is block/crypto.c, not block/luks.c > @@ -0,0 +1,23 @@ > +#include "qemu/osdep.h" > +#include "qapi-types.h" > +#include "block/probe.h" > +#include "crypto/block.h" > + > +static int block_crypto_probe_generic(QCryptoBlockFormat format, > + const uint8_t *buf, > + int buf_size, > + const char *filename) > +{ > + if (qcrypto_block_has_format(format, buf, buf_size)) { > + return 100; > + } else { > + return 0; > + } > +} > + > +int block_crypto_probe_luks(const uint8_t *buf, > + int buf_size, > + const char *filename) { > + return block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, > + buf, buf_size, filename); > +} > Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|