diff options
| author | Thomas Huth <thuth@redhat.com> | 2024-04-18 12:10:51 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-05-14 12:46:39 +0200 |
| commit | 82fe5d08fd8b83173e506d266e614d0dca5f2088 (patch) | |
| tree | 84fe3bed0454f7592a71e16783de6be8bae362e2 | |
| parent | 0d8caac9042667edd4198144035cff770b3691cf (diff) | |
| download | qemu-82fe5d08fd8b83173e506d266e614d0dca5f2088.zip qemu-82fe5d08fd8b83173e506d266e614d0dca5f2088.tar.gz qemu-82fe5d08fd8b83173e506d266e614d0dca5f2088.tar.bz2 | |
Remove glib compatibility code that is not required anymore
Now that we bumped the minimum glib version to 2.66, we can drop
the old code.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240418101056.302103-9-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | qga/commands-posix-ssh.c | 8 | ||||
| -rw-r--r-- | util/error-report.c | 10 |
2 files changed, 0 insertions, 18 deletions
diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c index 866afe6..246171d 100644 --- a/qga/commands-posix-ssh.c +++ b/qga/commands-posix-ssh.c @@ -243,7 +243,6 @@ qmp_guest_ssh_get_authorized_keys(const char *username, Error **errp) } #ifdef QGA_BUILD_UNIT_TEST -#if GLIB_CHECK_VERSION(2, 60, 0) static const strList test_key2 = { .value = (char *)"algo key2 comments" }; @@ -439,11 +438,4 @@ int main(int argc, char *argv[]) return g_test_run(); } -#else -int main(int argc, char *argv[]) -{ - g_test_message("test skipped, needs glib >= 2.60"); - return 0; -} -#endif /* GLIB_2_60 */ #endif /* BUILD_UNIT_TEST */ diff --git a/util/error-report.c b/util/error-report.c index 6e44a55..1b17c11 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -172,18 +172,8 @@ static void print_loc(void) static char * real_time_iso8601(void) { -#if GLIB_CHECK_VERSION(2,62,0) g_autoptr(GDateTime) dt = g_date_time_new_now_utc(); - /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return g_date_time_format_iso8601(dt); -#pragma GCC diagnostic pop -#else - GTimeVal tv; - g_get_current_time(&tv); - return g_time_val_to_iso8601(&tv); -#endif } /* |