[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v2 2/3] virDomainXMLOption: Introduce virDomainABIStabilityDomain



On Wed, May 24, 2017 at 16:45:56 +0200, Michal Privoznik wrote:
> While checking for ABI stability, drivers might pose additional
> checks that are not valid for general case. For instance, qemu
> driver might check some memory backing attributes because of how
> qemu works. But those attributes may work well in other drivers.
> 
> Signed-off-by: Michal Privoznik <mprivozn redhat com>
> ---

[...]

> diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
> index 5daa8d11a..cdba60b4d 100644
> --- a/src/conf/snapshot_conf.c
> +++ b/src/conf/snapshot_conf.c
> @@ -1194,7 +1194,8 @@ virDomainSnapshotIsExternal(virDomainSnapshotObjPtr snap)
>  }
>  
>  int
> -virDomainSnapshotRedefinePrep(virDomainPtr domain,
> +virDomainSnapshotRedefinePrep(virDomainXMLOptionPtr xmlopt,

xmlopt usually isn't the first argument.

> +                              virDomainPtr domain,
>                                virDomainObjPtr vm,
>                                virDomainSnapshotDefPtr *defptr,
>                                virDomainSnapshotObjPtr *snap,

[...]

> diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
> index 37d1a6fd9..380c3a1de 100644
> --- a/src/xenapi/xenapi_driver.c
> +++ b/src/xenapi/xenapi_driver.c
> @@ -200,7 +200,7 @@ xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
>      }
>  
>      if (!(privP->xmlopt = virDomainXMLOptionNew(&xenapiDomainDefParserConfig,
> -                                                NULL, NULL))) {
> +                                                NULL, NULL, NULL))) {
>          xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
>                                    _("Failed to create XML conf object"));
>          goto error;

You've missed some:

security/virt-aa-helper.c: In function 'get_definition':
security/virt-aa-helper.c:670:25: error: too few arguments to function 'virDomainXMLOptionNew'
     if (!(ctl->xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL))) {
                         ^
In file included from security/security_driver.h:26:0,
                 from security/virt-aa-helper.c:45:
./conf/domain_conf.h:2548:23: note: declared here
 virDomainXMLOptionPtr virDomainXMLOptionNew(virDomainDefParserConfigPtr config,

also

src/vz/vz_driver.c:        !(driver->xmlopt = virDomainXMLOptionNew(&vzDomainDefParserConfig,
src/vz/vz_driver.c-                                                 &vzDomainXMLPrivateDataCallbacksPtr,
src/vz/vz_driver.c-                                                 NULL)) ||
src/vz/vz_driver.c-        !(driver->domains = virDomainObjListNew()) ||

also

tests/bhyveargv2xmltest.c:    if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) == NULL)
tests/bhyveargv2xmltest.c-        return EXIT_FAILURE;
tests/bhyveargv2xmltest.c-
tests/bhyveargv2xmltest.c-# define DO_TEST_FULL(name, flags)                            \

ACK if you put xmlopt to a saner place in the argument list of
virDomainSnapshotRedefinePrep and fix the missing stuff above.

Attachment: signature.asc
Description: PGP signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]