diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2018-05-04 15:34:46 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2018-06-29 12:22:28 +0100 |
| commit | e7b3af81597db1a6b55f2c15d030d703c6b2c6ac (patch) | |
| tree | 0a60dec924a1f4398b2a98df68cbc4a003c398d8 /qga/commands.c | |
| parent | c5f1d0c493f29f0137fbd79a2c6653f8546f2044 (diff) | |
glib: bump min required glib library version to 2.40
Per supported platforms doc[1], the various min glib on relevant distros is:
RHEL-7: 2.50.3
Debian (Stretch): 2.50.3
Debian (Jessie): 2.42.1
OpenBSD (Ports): 2.54.3
FreeBSD (Ports): 2.50.3
OpenSUSE Leap 15: 2.54.3
SLE12-SP2: 2.48.2
Ubuntu (Xenial): 2.48.0
macOS (Homebrew): 2.56.0
This suggests that a minimum glib of 2.42 is a reasonable target.
The GLibC compile farm, however, uses Ubuntu 14.04 (Trusty) which only
has glib 2.40.0, and this is needed for testing during merge. Thus an
exception is made to the documented platform support policy to allow for
all three current LTS releases to be supported.
Docker jobs that not longer satisfy this new min version are removed.
[1] https://qemu.weilnetz.de/doc/qemu-doc.html#Supported-build-platforms
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'qga/commands.c')
| -rw-r--r-- | qga/commands.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/qga/commands.c b/qga/commands.c index cce3010f0f..0c7d1385c2 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -414,10 +414,8 @@ GuestExec *qmp_guest_exec(const char *path, argv = guest_exec_get_args(&arglist, true); envp = has_env ? guest_exec_get_args(env, false) : NULL; - flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD; -#if GLIB_CHECK_VERSION(2, 33, 2) - flags |= G_SPAWN_SEARCH_PATH_FROM_ENVP; -#endif + flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | + G_SPAWN_SEARCH_PATH_FROM_ENVP; if (!has_output) { flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL; } @@ -514,7 +512,6 @@ GuestHostName *qmp_guest_get_host_name(Error **err) GuestTimezone *qmp_guest_get_timezone(Error **errp) { -#if GLIB_CHECK_VERSION(2, 28, 0) GuestTimezone *info = NULL; GTimeZone *tz = NULL; gint64 now = 0; @@ -544,8 +541,4 @@ GuestTimezone *qmp_guest_get_timezone(Error **errp) error: g_free(info); return NULL; -#else - error_setg(errp, QERR_UNSUPPORTED); - return NULL; -#endif } |