search for: guestfs_impl_config

This is just code refactoring. --- src/launch.c | 172 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 109 insertions(+), 63 deletions(-) diff --git a/src/launch.c b/src/launch.c index 46d7ab9..84d5e82 100644 --- a/src/launch.c +++ b/src/launch.c @@ -293,9 +293,7 @@ guestfs_impl_config (guestfs_h *g, #endif #if defined(__aarch64__) -#define EARLYPRINTK " earlyprintk=pl011,0x9000000" -#else -#define EARLYPRINTK "" +#define EARLYPRINTK "earlyprintk=pl011,0x9000000" #endif /** @@ -327,75 +325,123 @@ char * guestfs_int_appliance_command_line (gu...

...eory we could also add earlyprintk=ttyS0,115200 on x86, but I cannot get it to work. --- src/launch.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/launch.c b/src/launch.c index 074ac6f..886041a 100644 --- a/src/launch.c +++ b/src/launch.c @@ -303,6 +303,12 @@ guestfs_impl_config (guestfs_h *g, #define SERIAL_CONSOLE "console=ttyS0" #endif +#if defined(__aarch64__) +#define EARLYPRINTK " earlyprintk=pl011,0x9000000" +#else +#define EARLYPRINTK "" +#endif + char * guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev,...

...3d 100644 --- a/src/launch.c +++ b/src/launch.c @@ -39,6 +39,8 @@ #include <assert.h> #include <libintl.h> +#include "c-ctype.h" + #include "guestfs.h" #include "guestfs-internal.h" #include "guestfs-internal-actions.h" @@ -284,6 +286,28 @@ guestfs_impl_config (guestfs_h *g, return 0; } +/** + * Check that the $TERM environment variable is reasonable before + * we pass it through to the appliance. + */ +static int +valid_term (const char *term) +{ + size_t len = strlen (term); + + if (len == 0 || len > 16) + return 0; + + while (len > 0...

...t; @@ -39,6 +39,8 @@ > #include <assert.h> > #include <libintl.h> > > +#include "c-ctype.h" > + > #include "guestfs.h" > #include "guestfs-internal.h" > #include "guestfs-internal-actions.h" > @@ -284,6 +286,28 @@ guestfs_impl_config (guestfs_h *g, > return 0; > } > > +/** > + * Check that the $TERM environment variable is reasonable before > + * we pass it through to the appliance. > + */ > +static int > +valid_term (const char *term) I guess the return value can be bool. > +{ > + size...

...ons <= 1.0.70, - * but it is now a no-op. +/** + * Implementation of L<guestfs(3)/guestfs_wait_ready>. You had to + * call this function after launch in versions E<le> 1.0.70, but it is + * now an (almost) no-op. */ int guestfs_impl_wait_ready (guestfs_h *g) @@ -251,25 +267,6 @@ guestfs_impl_config (guestfs_h *g, return 0; } -/* Construct the Linux command line passed to the appliance. This is - * used by the 'direct' and 'libvirt' backends, and is simply - * located in this file because it's a convenient place for this - * common code. - * - * The 'appliance_de...

...INE_IS_TCG; + if (dax) + flags |= APPLIANCE_COMMAND_LINE_USE_ACPI; ADD_CMDLINE_STRING_NODUP (guestfs_int_appliance_command_line (g, appliance_dev, flags)); diff --git a/src/launch.c b/src/launch.c index 72a8b29..49f0455 100644 --- a/src/launch.c +++ b/src/launch.c @@ -318,6 +318,10 @@ guestfs_impl_config (guestfs_h *g, * If we are launching a qemu TCG guest (ie. KVM is known to be * disabled or unavailable). If you don't know, don't pass this flag. * + * =item C<APPLIANCE_COMMAND_LINE_USE_ACPI> + * + * Use ACPI in the appliance. Normally disabled because it is slow. + * * =b...

The existing mechanism was clunky, slow and used ~ 10 MB of local disk. Rich.

...command line. */ guestfs_int_end_stringsbuf (g, &cmdline); diff --git a/src/launch.c b/src/launch.c index 27e0a2a..99c5582 100644 --- a/src/launch.c +++ b/src/launch.c @@ -244,16 +244,16 @@ guestfs_impl_get_state (guestfs_h *g) /* Add arbitrary qemu parameters. Useful for testing. */ int guestfs_impl_config (guestfs_h *g, - const char *hv_param, const char *hv_value) + const char *hv_param, const char *hv_value) { struct hv_param *hp; /* XXX For qemu this made sense, but not for uml. - if (hv_param[0] != '-') { + if (hv_param[0] != '-') { er...

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

Lots of changes since v2, too much to remember or summarize. Please ignore patch 11/11, it's just for my testing. Rich.

...NULL) NOT_SUPPORTED (g, -1, - _("the current backend does not support 'get-pid'")); + _("the current backend does not support ‘get-pid’")); return g->backend_ops->get_pid (g, g->backend_data); } @@ -272,7 +272,7 @@ guestfs_impl_config (guestfs_h *g, STREQ (hv_param, "-full-screen") || STREQ (hv_param, "-std-vga") || STREQ (hv_param, "-vnc")) { - error (g, _("parameter '%s' isn't allowed"), hv_param); + error (g, _("parameter ‘%s’ isn't allowe...

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.