Re: [PATCH for-9.1 4/9] Bump minimum glib version to v2.66

[Thomas Huth <thuth@redhat.com>]

On 12/04/2024 12.16, Paolo Bonzini wrote:
> On Thu, Mar 28, 2024 at 3:06 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> Now that we dropped support for CentOS 8 and Ubuntu 20.04, we can
>> look into bumping the glib version to a new minimum for further
>> clean-ups. According to repology.org, available versions are:
>>
>>   CentOS Stream 9:       2.66.7
>>   Debian 11:             2.66.8
>>   Fedora 38:             2.74.1
>>   Freebsd:               2.78.4
>>   Homebrew:              2.80.0
>>   Openbsd:               2.78.4
>>   OpenSuse leap 15.5:    2.70.5
>>   pkgsrc_current:        2.78.4
>>   Ubuntu 22.04:          2.72.1
>>
>> Thus it should be safe to bump the minimum glib version to 2.66 now.
>> Version 2.66 comes with new functions for URI parsing which will
>> allow further clean-ups in the following patches.
> 
> Missing:
> 
> diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c
> index b0e0b1d674f..cc1f5a708e4 100644
> --- a/qga/commands-posix-ssh.c
> +++ b/qga/commands-posix-ssh.c
> @@ -288,7 +288,6 @@ qmp_guest_ssh_get_authorized_keys(
>   }
> 
>   #ifdef QGA_BUILD_UNIT_TEST
> -#if GLIB_CHECK_VERSION(2, 60, 0)
>   static const strList test_key2 = {
>       .value = (char *)"algo key2 comments"
>   };
> @@ -484,11 +483,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 */

Indeed! And there seems to be another GLIB_CHECK_VERSION(2,62,0) check in 
util/error-report.c which we likely can clean up now, too!

  Thomas