search for: drive_create_data

On Tuesday 11 March 2014 23:13:46 Richard W.M. Jones wrote: > diff --git a/src/drives.c b/src/drives.c > index 2c85b52..68e37f7 100644 > --- a/src/drives.c > +++ b/src/drives.c > @@ -115,7 +115,8 @@ static struct drive * > create_drive_file (guestfs_h *g, const char *path, > bool readonly, const char *format, > const char *iface,

...* The output disk is being created, so use cache=unsafe here. *) g#add_drive ?format:output_format ~readonly:false ~cachemode:"unsafe" outfile; diff --git a/src/drives.c b/src/drives.c index 34bf63d..3668e29 100644 --- a/src/drives.c +++ b/src/drives.c @@ -63,6 +63,7 @@ struct drive_create_data { const char *cachemode; enum discard discard; bool copyonread; + const char *query; }; COMPILE_REGEXP (re_hostname_port, "(.*):(\\d+)$", 0) @@ -144,6 +145,7 @@ create_drive_non_file (guestfs_h *g, drv->src.username = data->username ? safe_strdup (g, data->userna...

...rmat:output_format ~readonly:false ~cachemode:"unsafe" outfile; diff --git a/src/drives.c b/src/drives.c index 57c2471..4bd8328 100644 --- a/src/drives.c +++ b/src/drives.c @@ -200,11 +200,6 @@ static struct drive * create_drive_curl (guestfs_h *g, const struct drive_create_data *data) { - if (data->secret != NULL) { - error (g, _("curl: you cannot specify a secret with this protocol")); - return NULL; - } - if (data->nr_servers != 1) { error (g, _("curl: you must specify exactly one server")); return NULL; @@ -371,11 +366,6...

Move the creation of iscsi URIs away from make_uri, composing them manually: this is needed because libxml assumes colons (':') to separate user and password for the authority part, while with iscsi URIs the separator is percentage ('%'), which would be percent-encoded by libxml. --- src/launch-direct.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3

...tions(-) diff --git a/lib/drives.c b/lib/drives.c index d3887c1..780b1b2 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -396,6 +396,45 @@ create_drive_iscsi (guestfs_h *g, } #endif /* DISABLED IN RHEL 7 */ +static struct drive * +create_drive_spdk (guestfs_h *g, + const struct drive_create_data *data) +{ + if (data->username != NULL) { + error (g, _("spdk: you cannot specify a username with this protocol")); + return NULL; + } + if (data->secret != NULL) { + error (g, _("spdk: you cannot specify a secret with this protocol")); + return NULL; + } +...

...Int "lblocksize"]; > once_had_no_optargs = true; > blocking = false; > fish_alias = ["add"]; > diff --git a/lib/drives.c b/lib/drives.c > index 5a8d29ab4..bb160cc34 100644 > --- a/lib/drives.c > +++ b/lib/drives.c > @@ -58,6 +58,8 @@ struct drive_create_data { > const char *cachemode; > enum discard discard; > bool copyonread; > + int pblocksize; > + int lblocksize; > }; > > COMPILE_REGEXP (re_hostname_port, "(.*):(\\d+)$", 0) > @@ -114,6 +116,8 @@ create_drive_file (guestfs_h *g, > drv->cach...

...ad"; OInt "pblocksize"; OInt "lblocksize"]; once_had_no_optargs = true; blocking = false; fish_alias = ["add"]; diff --git a/lib/drives.c b/lib/drives.c index 5a8d29ab4..bb160cc34 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -58,6 +58,8 @@ struct drive_create_data { const char *cachemode; enum discard discard; bool copyonread; + int pblocksize; + int lblocksize; }; COMPILE_REGEXP (re_hostname_port, "(.*):(\\d+)$", 0) @@ -114,6 +116,8 @@ create_drive_file (guestfs_h *g, drv->cachemode = data->cachemode ? safe_strdup (g, data-...

...<blocksize> are passed through to +C<guestfs_add_drive_opts>." }; { defaults with name = "journal_get"; added = (1, 23, 11); diff --git a/lib/drives.c b/lib/drives.c index 5a8d29ab4..bba6ff74e 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -58,6 +58,7 @@ struct drive_create_data { const char *cachemode; enum discard discard; bool copyonread; + int blocksize; }; COMPILE_REGEXP (re_hostname_port, "(.*):(\\d+)$", 0) @@ -114,6 +115,7 @@ create_drive_file (guestfs_h *g, drv->cachemode = data->cachemode ? safe_strdup (g, data->cachemode) : NUL...

...<blocksize> are passed through to +C<guestfs_add_drive_opts>." }; { defaults with name = "journal_get"; added = (1, 23, 11); diff --git a/lib/drives.c b/lib/drives.c index 5a8d29ab4..2f7ab566d 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -58,6 +58,7 @@ struct drive_create_data { const char *cachemode; enum discard discard; bool copyonread; + int blocksize; }; COMPILE_REGEXP (re_hostname_port, "(.*):(\\d+)$", 0) @@ -114,6 +115,7 @@ create_drive_file (guestfs_h *g, drv->cachemode = data->cachemode ? safe_strdup (g, data->cachemode) : NUL...

This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. This is now working, after fixing the rather stupid bug in fstrim. I've pushed the ones which were ACKed previously + the fstrim fix. Rich.

...drives.c @@ -729,7 +729,7 @@ parse_servers (guestfs_h *g, char *const *strs, int guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, - const struct guestfs_add_drive_opts_argv *optargs) + const struct guestfs_add_drive_opts_argv *optargs) { struct drive_create_data data; const char *protocol; @@ -954,7 +954,7 @@ guestfs_impl_add_drive_ro (guestfs_h *g, const char *filename) int guestfs_impl_add_drive_with_if (guestfs_h *g, const char *filename, - const char *iface) + const char *iface) { const struct guestfs_add_drive_...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.