[libvirt] [PATCH 11/11] domain: conf: Drop expectedVirtTypes

[Michal Privoznik]

On 18.04.2015 03:45, Cole Robinson wrote:
> This needs to specified in way too many places for a simple validation
> check. The ostype/arch/virttype validation checks later in
> DomainDefParseXML should catch most of the cases that this was covering.
> ---
>  src/bhyve/bhyve_driver.c          |  5 ---
>  src/conf/domain_conf.c            | 79 +++++----------------------------------
>  src/conf/domain_conf.h            |  6 ---
>  src/conf/snapshot_conf.c          | 14 ++-----
>  src/conf/snapshot_conf.h          |  2 -
>  src/esx/esx_driver.c              |  4 +-
>  src/libxl/libxl_domain.c          |  1 -
>  src/libxl/libxl_driver.c          |  6 ---
>  src/libxl/libxl_migration.c       |  2 -
>  src/lxc/lxc_controller.c          |  1 -
>  src/lxc/lxc_driver.c              |  5 ---
>  src/openvz/openvz_driver.c        |  3 --
>  src/parallels/parallels_driver.c  |  1 -
>  src/phyp/phyp_driver.c            |  1 -
>  src/qemu/qemu_domain.c            |  1 -
>  src/qemu/qemu_domain.h            |  6 ---
>  src/qemu/qemu_driver.c            | 12 ------
>  src/qemu/qemu_migration.c         |  5 +--
>  src/test/test_driver.c            |  7 ----
>  src/uml/uml_driver.c              |  4 --
>  src/vbox/vbox_common.c            |  4 +-
>  src/vmware/vmware_driver.c        |  2 -
>  src/xen/xen_driver.c              |  3 --
>  tests/domainconftest.c            |  3 +-
>  tests/domainsnapshotxml2xmltest.c |  1 -
>  tests/lxcxml2xmltest.c            |  1 -
>  tests/qemuagenttest.c             |  1 -
>  tests/qemuhotplugtest.c           |  1 -
>  tests/qemuxml2argvtest.c          |  1 -
>  tests/qemuxml2xmltest.c           |  3 +-
>  tests/qemuxmlnstest.c             |  1 -
>  tests/securityselinuxlabeltest.c  |  4 +-
>  tests/xlconfigtest.c              |  1 -
>  tests/xmconfigtest.c              |  1 -
>  tests/xml2sexprtest.c             |  1 -
>  tests/xml2vmxtest.c               |  1 -
>  36 files changed, 19 insertions(+), 175 deletions(-)

This is missing:
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 63b65b9..479b4c2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -36,7 +36,6 @@
 #include "domain_conf.h"
 #include "snapshot_conf.h"
 #include "viralloc.h"
-#include "verify.h"
 #include "virxml.h"
 #include "viruuid.h"
 #include "virbuffer.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 37867cf..35423b5 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -745,7 +745,6 @@ get_definition(vahControl * ctl, const char *xmlStr)
 
     ctl->def = virDomainDefParseString(xmlStr,
                                        ctl->caps, ctl->xmlopt,
-                                       -1,
                                        VIR_DOMAIN_DEF_PARSE_INACTIVE);
     if (ctl->def == NULL) {
         vah_error(ctl, 0, _("could not parse XML"));
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 881f5b2..11f6e91 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -565,7 +565,6 @@ xenapiDomainCreateXML(virConnectPtr conn,
 
     virDomainDefPtr defPtr = virDomainDefParseString(xmlDesc,
                                                      priv->caps, priv->xmlopt,
-                                                     1 << VIR_DOMAIN_VIRT_XEN,
                                                      parse_flags);
     if (!defPtr)
         return NULL;
@@ -1740,7 +1739,6 @@ xenapiDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla
         return NULL;
     virDomainDefPtr defPtr = virDomainDefParseString(xml,
                                                      priv->caps, priv->xmlopt,
-                                                     1 << VIR_DOMAIN_VIRT_XEN,
                                                      parse_flags);
     if (!defPtr)
         return NULL;


Michal