[PATCH] libxl: use b_info->{acpi,acpi} when available

[Jim Fehlig]

On 9/18/20 9:51 AM, Daniel P. Berrangé wrote:
> On Fri, Sep 18, 2020 at 05:41:21PM +0200, Marek Marczykowski-Górecki wrote:
>> On Fri, Sep 18, 2020 at 05:12:52PM +0200, Michal Prívozník wrote:
>>> On 9/18/20 1:31 PM, Daniel P. Berrangé wrote:
>>>> On Wed, Sep 16, 2020 at 11:09:31AM +0200, Michal Privoznik wrote:
>>>>> On 9/10/20 6:18 AM, Marek Marczykowski-Górecki wrote:
>>>>>> b_info->u.hvm.{acpi,apic} are deprecated. But also, on recent libxl
>>>>>> version (4.14) the old one seems to be broken. While libxl part should
>>>>>> be fixed too, update the usage here and at some point drop support for
>>>>>> the old version.
>>>>>> b_info->acpi was added in Xen 4.8
>>>>>> b_info->apic was added in Xen 4.10
>>>>>> Xen 4.10 is the oldest version that still has security support (until
>>>>>> December 2020).
>>>>>>
>>>>>> Signed-off-by: Marek Marczykowski-Górecki <marmarek at invisiblethingslab.com>
>>>>>> ---
>>>>>>     src/libxl/libxl_conf.c                              | 13 +++++++++++++
>>>>>>     tests/libxlxml2domconfigdata/basic-hvm.json         |  4 ++--
>>>>>>     tests/libxlxml2domconfigdata/cpu-shares-hvm.json    |  4 ++--
>>>>>>     .../libxlxml2domconfigdata/fullvirt-acpi-slic.json  |  4 ++--
>>>>>>     .../fullvirt-cpuid-legacy-nest.json                 |  4 ++--
>>>>>>     tests/libxlxml2domconfigdata/fullvirt-cpuid.json    |  4 ++--
>>>>>>     .../max-eventchannels-hvm.json                      |  4 ++--
>>>>>>     tests/libxlxml2domconfigdata/max-gntframes-hvm.json |  4 ++--
>>>>>>     tests/libxlxml2domconfigdata/moredevs-hvm.json      |  4 ++--
>>>>>>     .../libxlxml2domconfigdata/variable-clock-hvm.json  |  4 ++--
>>>>>>     .../vnuma-hvm-legacy-nest.json                      |  4 ++--
>>>>>>     tests/libxlxml2domconfigdata/vnuma-hvm.json         |  4 ++--
>>>>>>     12 files changed, 35 insertions(+), 22 deletions(-)
>>>>>
>>>>> This looks good to me.
>>>>>
>>>>> Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
>>>>>
>>>>> I'll wait a bit with pushing it though in case Jim wants to chime in.
>>>>
>>>> This broke the build on Ubuntu 1804 due to tests failing
>>>>
>>>> TEST: libxlxml2domconfigtest
>>>>         .!!!!.!!!!                               10  FAIL
>>>
>>> Oh, Ubuntu 18.04 has libxen-dev-4.9.2 and I'm not sure about FreeBSD, but
>>> probably something old too. So we can't use xen 4.10 APIs even though it was
>>> released 3 years ago.
>>>
>>> Unfortunately, we will have to support Ubuntu 18.04 for quite some time
>>> because 20.04 was released only a while ago and we have this two year
>>> transition period:
>>>
>>> https://libvirt.org/platforms.html
>>>
>>> Marek, are you okay with me reverting the patch?
>>
>> Technically, the driver code itself should work on both versions (there
>> is an #ifdef for that). It's only an issue with tests, where we don't have
>> #ifdef inside json files...
>>
>> One idea would be to duplicate those affected json files and pick the
>> right one based on the libxenlight version, but it doesn't sound nice...
>> Any alternative ideas?
> 
> I think just duplicating the JSON files is the best solution because it
> is simple, low overhead and keeps test coverage in both versions.

I'm catching up on libvirt mail and could have missed it, but I didn't see a 
follow-up patch to fix the test.

Marek, do you have time for it? If not I'll get to it tomorrow.

Regards,
Jim