search for: nbdkit_filter_api_version

...clude/nbdkit-filter.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/nbdkit-filter.h b/include/nbdkit-filter.h index 94f17789..1ebd1cb6 100644 --- a/include/nbdkit-filter.h +++ b/include/nbdkit-filter.h @@ -43,7 +43,7 @@ extern "C" { #endif -#define NBDKIT_FILTER_API_VERSION 2 +#define NBDKIT_FILTER_API_VERSION 5 struct nbdkit_extent { uint64_t offset; @@ -100,8 +100,10 @@ struct nbdkit_filter { */ int _api_version; - /* Because there is no ABI guarantee, new fields may be added - * where logically appropriate. */ + /* Because there is no ABI guarante...

...gin.h and nbdkit-filter.h include? I'm worried that the games we play with NBDKIT_API_VERSION in nbdkit-plugin.h for maintaining back-compat there may someday have awkward interactions in this file. > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#define NBDKIT_FILTER_API_VERSION 1 On the other hand, you're setting NBDKIT_FILTER_API_VERSION separately from NBDKIT_API_VERSION (for plugins), as we could bump one but not the other in a given nbdkit release (and if so, it makes for our next release to have PLUGIN version 2 but FILTER version 1, once filters and FUA flags s...

..., 5 insertions(+), 3 deletions(-) > > diff --git a/include/nbdkit-filter.h b/include/nbdkit-filter.h > index 94f17789..1ebd1cb6 100644 > --- a/include/nbdkit-filter.h > +++ b/include/nbdkit-filter.h > @@ -43,7 +43,7 @@ > extern "C" { > #endif > > -#define NBDKIT_FILTER_API_VERSION 2 > +#define NBDKIT_FILTER_API_VERSION 5 > > struct nbdkit_extent { > uint64_t offset; > @@ -100,8 +100,10 @@ struct nbdkit_filter { > */ > int _api_version; > > - /* Because there is no ABI guarantee, new fields may be added > - * where logically appro...

...ees for filters, other than - * the ABI position of _api_version that will let us diagnose - * mismatch when the API changes. + * the ABI position and API contents of _api_version and _version to + * diagnose mismatch from the current nbdkit version. */ if (filter->_api_version != NBDKIT_FILTER_API_VERSION) { fprintf (stderr, "%s: %s: filter is incompatible with this version of nbdkit " - "(_api_version = %d)\n", - program_name, filename, filter->_api_version); + "(_api_version = %d, need %d)\n", + pro...

This is not intended for v1.14. In fact, we may decide that the second patch is too gross, although the first one still seems like a useful improvement in isolation. I will also point out that all our filters are in-tree, and set the user-controlled field .version to the current release string. We could replace the second patch with a simpler one that just checks ._api_version as an int (as

...opyright (C) 2013-2018 Red Hat Inc. > > + * Copyright (C) 2013-2019 Red Hat Inc. > > * All rights reserved. > > * > > * Redistribution and use in source and binary forms, with or without > > @@ -44,6 +44,18 @@ extern "C" { > > > > #define NBDKIT_FILTER_API_VERSION 2 > > > > +struct nbdkit_extent { > > + uint64_t offset; > > + uint64_t length; > > + uint32_t type; > > +}; > > + > > +extern struct nbdkit_extents *nbdkit_extents_new (uint64_t start); > > +extern void nbdkit_extents_free (struct nbdkit_e...

...+1,5 @@ > /* nbdkit > - * Copyright (C) 2013-2018 Red Hat Inc. > + * Copyright (C) 2013-2019 Red Hat Inc. > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > @@ -44,6 +44,18 @@ extern "C" { > > #define NBDKIT_FILTER_API_VERSION 2 > > +struct nbdkit_extent { > + uint64_t offset; > + uint64_t length; > + uint32_t type; > +}; > + > +extern struct nbdkit_extents *nbdkit_extents_new (uint64_t start); > +extern void nbdkit_extents_free (struct nbdkit_extents *); > +extern size_t nbdkit_extents...

...ec(dllexport) \ + struct nbdkit_filter * \ + filter_init (void) \ + { \ + (filter)._api_version = NBDKIT_FILTER_API_VERSION; \ + (filter)._version = NBDKIT_VERSION_STRING; \ + return &(filter); \ + } \ + NBDKIT_CXX_LANG_C __declspec(dllexport)...

...ABI guarantee, new fields may be added * where logically appropriate. */ @@ -178,7 +177,6 @@ struct nbdkit_filter { filter_init (void) \ { \ (filter)._api_version = NBDKIT_FILTER_API_VERSION; \ - (filter)._thread_model = THREAD_MODEL; \ return &(filter); \ } diff --git a/filters/cow/cow.c b/filters/cow/cow.c index 006007e..ae4a3af 100644 --- a/filters/cow/cow.c +++ b/filters/...

I pushed a few of the msys2 patches upstream. I changed the way that $(SHARED_LDFLAGS) works so it's more to my liking, and the others were pushed unchanged. Three patches remain which I'm posting on the mailing list for proper review. Rich.

...filter.h +++ b/include/nbdkit-filter.h @@ -1,5 +1,5 @@ /* nbdkit - * Copyright (C) 2013-2018 Red Hat Inc. + * Copyright (C) 2013-2019 Red Hat Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,9 @@ extern "C" { #define NBDKIT_FILTER_API_VERSION 2 +extern struct nbdkit_extents_map *nbdkit_extents_new (void); +extern void nbdkit_extents_free (struct nbdkit_extents_map *); + typedef int nbdkit_next_config (void *nxdata, const char *key, const char *value); typedef int nbdkit_next_config_complete (void *nx...

...ilter.h +++ b/include/nbdkit-filter.h @@ -1,5 +1,5 @@ /* nbdkit - * Copyright (C) 2013-2018 Red Hat Inc. + * Copyright (C) 2013-2019 Red Hat Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,18 @@ extern "C" { #define NBDKIT_FILTER_API_VERSION 2 +struct nbdkit_extent { + uint64_t offset; + uint64_t length; + uint32_t type; +}; + +extern struct nbdkit_extents *nbdkit_extents_new (uint64_t start); +extern void nbdkit_extents_free (struct nbdkit_extents *); +extern size_t nbdkit_extents_count (const struct nbdkit_extents *); +extern st...

...ilter.h +++ b/include/nbdkit-filter.h @@ -1,5 +1,5 @@ /* nbdkit - * Copyright (C) 2013-2018 Red Hat Inc. + * Copyright (C) 2013-2019 Red Hat Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,18 @@ extern "C" { #define NBDKIT_FILTER_API_VERSION 2 +struct nbdkit_extent { + uint64_t offset; + uint64_t length; + uint32_t type; +}; + +extern struct nbdkit_extents *nbdkit_extents_new (uint64_t start); +extern void nbdkit_extents_free (struct nbdkit_extents *); +extern size_t nbdkit_extents_size (const struct nbdkit_extents *); +extern str...

I'm not sure which version we're up to now. Anyway I believe this addresses all the points that Eric raised in: https://www.redhat.com/archives/libguestfs/2019-March/msg00038.html https://www.redhat.com/archives/libguestfs/2019-March/msg00040.html In particular: - default state of extents_map is all allocated disk - support hole + non-zero - you can now iterate with bounds -

...ilter.h +++ b/include/nbdkit-filter.h @@ -1,5 +1,5 @@ /* nbdkit - * Copyright (C) 2013-2018 Red Hat Inc. + * Copyright (C) 2013-2019 Red Hat Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,18 @@ extern "C" { #define NBDKIT_FILTER_API_VERSION 2 +struct nbdkit_extent { + uint64_t offset; + uint64_t length; + uint32_t type; +}; + +extern struct nbdkit_extents *nbdkit_extents_new (uint64_t start, uint64_t end); +extern void nbdkit_extents_free (struct nbdkit_extents *); +extern size_t nbdkit_extents_count (const struct nbdkit_extents...

...S SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* See nbdkit-filter(3) for documentation and how to write a filter. */ + +#ifndef NBDKIT_FILTER_H +#define NBDKIT_FILTER_H + +#include <nbdkit-common.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define NBDKIT_FILTER_API_VERSION 1 + +typedef int nbdkit_next_config (void *nxdata, + const char *key, const char *value); +typedef int nbdkit_next_config_complete (void *nxdata); +typedef int nbdkit_next_open (void *nxdata, + int readonly); + +struct nbdkit_next_ops { +...

...write a filter. */ #ifndef NBDKIT_FILTER_H #define NBDKIT_FILTER_H /* This header also defines some useful functions like nbdkit_debug * and nbdkit_parse_size which are appropriate for filters to use. */ #include <nbdkit-plugin.h> #ifdef __cplusplus extern "C" { #endif #define NBDKIT_FILTER_API_VERSION 1 typedef int (*nbdkit_next_config) (void *nxdata, const char *key, const char *value); typedef int (*nbdkit_next_config_complete) (void *nxdata); struct nbdkit_next { int64_t (*get_size) (void *nxdata); int (*can_write) (void *nxdata); int (*can_flush) (...

Being able to programmatically force nbdkit to be less parallel can be useful during testing. I was less sure about patch 3, but if you like it, I'm inclined to instead squash it into patch 1. This patch is written to apply after my NBD_CMD_CACHE work (since I touched the nocache filter); but can be rearranged if we think this series should go in first while that one undergoes any adjustments

Not sure what version we're up to, but this reimplements extents using the new simpler structure described in this thread: https://www.redhat.com/archives/libguestfs/2019-March/msg00077.html I also fixed most of the things that Eric pointed out in the previous review, although I need to go back over his replies and check I've got everything. This needs a bit more testing. However the

Rebased filters patch. Requires current git master + the locks / thread model fix (https://www.redhat.com/archives/libguestfs/2018-January/msg00128.html) So a few changes here since last time: The "introduce filters" and "implement filters" patches are squashed together. I introduced a concept of .prepare and .finalize. These run before and after the data serving phase