mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove glib compatibility code that is not required anymore

Browse Source 
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>
This commit is contained in:
Thomas Huth 2024-04-18 12:10:51 +02:00
parent 0d8caac904
commit 82fe5d08fd
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qga/commands-posix-ssh.c
View File

@ -243,7 +243,6 @@ qmp_guest_ssh_get_authorized_keys(const char *username, Error **errp)
} }
#ifdef QGA_BUILD_UNIT_TEST #ifdef QGA_BUILD_UNIT_TEST
#if GLIB_CHECK_VERSION(2, 60, 0)
static const strList test_key2 = { static const strList test_key2 = {
.value = (char *)"algo key2 comments" .value = (char *)"algo key2 comments"
}; };
@ -439,11 +438,4 @@ int main(int argc, char *argv[])
return g_test_run(); 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 */ #endif /* BUILD_UNIT_TEST */

10
util/error-report.c
View File

@ -172,18 +172,8 @@ static void print_loc(void)
static char * static char *
real_time_iso8601(void) real_time_iso8601(void)
{ {
#if GLIB_CHECK_VERSION(2,62,0)
g_autoptr(GDateTime) dt = g_date_time_new_now_utc(); 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); 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
} }
/* /*