[libvirt] [PATCH] vz: build fix
Nikolay Shirokovskiy
nshirokovskiy at virtuozzo.com
Wed Apr 18 14:22:57 UTC 2018
On 18.04.2018 17:03, Daniel P. Berrangé wrote:
> On Wed, Apr 18, 2018 at 04:45:31PM +0300, Nikolay Shirokovskiy wrote:
>> Broken by [1] commit - trailing comma instead of semicolon. Fortunately
>> the issue did not get sneak in released 4.2 version. Note that uriSchemes
>> for parallelsConnectDriver should not be allocated on stack.
>>
>> [1] 8e4f9a27: "driver: declare supported URI schemes in virConnectDriver struct"
>> ---
>> src/vz/vz_driver.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>
>
>
>>
>> diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
>> index 4c30ee1..a9ee773 100644
>> --- a/src/vz/vz_driver.c
>> +++ b/src/vz/vz_driver.c
>> @@ -4163,7 +4163,11 @@ static virStateDriver vzStateDriver = {
>>
>> /* Parallels domain type backward compatibility*/
>> static virHypervisorDriver parallelsHypervisorDriver;
>> -static virConnectDriver parallelsConnectDriver;
>> +static virConnectDriver parallelsConnectDriver = {
>> + .localOnly = true,
>> + .uriSchemes = (const char *[]){ "parallels", NULL },
>> + .hypervisorDriver = ¶llelsHypervisorDriver,
>> +};
>>
>> /**
>> * vzRegister:
>> @@ -4186,9 +4190,6 @@ vzRegister(void)
>> /* Backward compatibility with Parallels domain type */
>> parallelsHypervisorDriver = vzHypervisorDriver;
>> parallelsHypervisorDriver.name = "Parallels";
>> - parallelsConnectDriver = vzConnectDriver;
>> - parallelsConnectDriver.hypervisorDriver = ¶llelsHypervisorDriver;
>> - parallelsConnectDriver.uriSchemes = (const char *[]){ "parallels", NULL },
>> if (virRegisterConnectDriver(¶llelsConnectDriver, true) < 0)
>> return -1;
>>
>> --
>> 1.8.3.1
>>
>> --
>> libvir-list mailing list
>> libvir-list at redhat.com
>> https://www.redhat.com/mailman/listinfo/libvir-list
>
> Regards,
> Daniel
>
I'll resend soon. It turns out patch breaks 'make check'.
Nikolay
More information about the libvir-list
mailing list