From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 15 Sep 2015 12:08:52 +0000 (+0200)
Subject: conf: Drop VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST flag
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ed94ad9e40a029d552c005a5d5f214af5fc43558;p=libvirt.git

conf: Drop VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST flag

The flag was used only for formatting the XML and once the parser and
formatter flags were split in 0ecd6851093945dd5ddc78266c61b577c65394ae
it doesn't make sense any more to have it.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 32430d8458..6936484254 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22716,7 +22716,6 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
                                       VIR_DOMAIN_DEF_PARSE_STATUS |
                                       VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
                                       VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
-                                      VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST |
                                       VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS)))
         goto error;
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cfd2600830..fcb68548bc 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2639,14 +2639,13 @@ typedef enum {
     VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES = 1 << 3,
     VIR_DOMAIN_DEF_PARSE_ALLOW_ROM       = 1 << 4,
     VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT      = 1 << 5,
-    VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST    = 1 << 6,
     /* parse only source half of <disk> */
-    VIR_DOMAIN_DEF_PARSE_DISK_SOURCE     = 1 << 7,
-    VIR_DOMAIN_DEF_PARSE_VALIDATE        = 1 << 8,
+    VIR_DOMAIN_DEF_PARSE_DISK_SOURCE     = 1 << 6,
+    VIR_DOMAIN_DEF_PARSE_VALIDATE        = 1 << 7,
     /* don't validate os.type and arch against capabilities. Prevents
      * VMs from disappearing when qemu is removed and libvirtd is restarted
      */
-    VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 9,
+    VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8,
 } virDomainDefParseFlags;
 
 typedef enum {
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 243f1f16ff..eae153c5e7 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -180,8 +180,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque)
                                       driver.caps, driver.xmlopt,
                                       VIR_DOMAIN_DEF_PARSE_STATUS |
                                       VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
-                                      VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
-                                      VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST))) {
+                                      VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES))) {
         fprintf(stderr, "Failed to parse domain status XML:\n%s", source);
         goto cleanup;
     }