提交 ed94ad9e 编写于 作者: P Peter Krempa

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 0ecd6851
it doesn't make sense any more to have it.
上级 3fb08198
...@@ -22716,7 +22716,6 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, ...@@ -22716,7 +22716,6 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
VIR_DOMAIN_DEF_PARSE_STATUS | VIR_DOMAIN_DEF_PARSE_STATUS |
VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST |
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS)))
goto error; goto error;
......
...@@ -2639,14 +2639,13 @@ typedef enum { ...@@ -2639,14 +2639,13 @@ typedef enum {
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES = 1 << 3, VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES = 1 << 3,
VIR_DOMAIN_DEF_PARSE_ALLOW_ROM = 1 << 4, VIR_DOMAIN_DEF_PARSE_ALLOW_ROM = 1 << 4,
VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT = 1 << 5, VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT = 1 << 5,
VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST = 1 << 6,
/* parse only source half of <disk> */ /* parse only source half of <disk> */
VIR_DOMAIN_DEF_PARSE_DISK_SOURCE = 1 << 7, VIR_DOMAIN_DEF_PARSE_DISK_SOURCE = 1 << 6,
VIR_DOMAIN_DEF_PARSE_VALIDATE = 1 << 8, VIR_DOMAIN_DEF_PARSE_VALIDATE = 1 << 7,
/* don't validate os.type and arch against capabilities. Prevents /* don't validate os.type and arch against capabilities. Prevents
* VMs from disappearing when qemu is removed and libvirtd is restarted * 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; } virDomainDefParseFlags;
typedef enum { typedef enum {
......
...@@ -180,8 +180,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) ...@@ -180,8 +180,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque)
driver.caps, driver.xmlopt, driver.caps, driver.xmlopt,
VIR_DOMAIN_DEF_PARSE_STATUS | VIR_DOMAIN_DEF_PARSE_STATUS |
VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES))) {
VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST))) {
fprintf(stderr, "Failed to parse domain status XML:\n%s", source); fprintf(stderr, "Failed to parse domain status XML:\n%s", source);
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册