[v1] vz: fix vz driver compilation

[libvirt] [PATCH] vz: fix vz driver compilation

Posted by Mikhail Feoktistov 6 years, 10 months ago

- add argument xmlopt for virDomainDefCheckABIStability
- nseclabels is moved to virDomainChrSourceDefPtr
---
 src/vz/vz_driver.c | 2 +-
 src/vz/vz_sdk.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index d47774c..6f4aee3 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -872,7 +872,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
              * So forbid this operation, if config is changed. If it's
              * not changed - just do nothing. */
 
-            if (!virDomainDefCheckABIStability(dom->def, def)) {
+            if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) {
                 virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                                _("Can't change domain configuration "
                                  "in managed save state"));
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index a62b310..0aa1a30 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2894,7 +2894,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr)
         return -1;
     }
 
-    if (chr->nseclabels > 0) {
+    if (chr->source->nseclabels > 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Setting security labels is not "
                          "supported by vz driver."));
-- 
1.8.3.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] vz: fix vz driver compilation

Posted by John Ferlan 6 years, 10 months ago


On 06/28/2017 09:02 AM, Mikhail Feoktistov wrote:
> - add argument xmlopt for virDomainDefCheckABIStability
> - nseclabels is moved to virDomainChrSourceDefPtr
> ---
>  src/vz/vz_driver.c | 2 +-
>  src/vz/vz_sdk.c    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: John Ferlan <jferlan@redhat.com>

This would seemingly fall into the build breaker classification and
gives you the "justification" to push for your driver... Your call on
splitting them apart since they are the result of two different commit
changes that did not also change the vz sources

John

> diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
> index d47774c..6f4aee3 100644
> --- a/src/vz/vz_driver.c
> +++ b/src/vz/vz_driver.c
> @@ -872,7 +872,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
>               * So forbid this operation, if config is changed. If it's
>               * not changed - just do nothing. */
>  
> -            if (!virDomainDefCheckABIStability(dom->def, def)) {
> +            if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) {
>                  virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
>                                 _("Can't change domain configuration "
>                                   "in managed save state"));
> diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
> index a62b310..0aa1a30 100644
> --- a/src/vz/vz_sdk.c
> +++ b/src/vz/vz_sdk.c
> @@ -2894,7 +2894,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr)
>          return -1;
>      }
>  
> -    if (chr->nseclabels > 0) {
> +    if (chr->source->nseclabels > 0) {
>          virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
>                         _("Setting security labels is not "
>                           "supported by vz driver."));
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list