|
 |
7a3408 |
From 73ef3128010cfa342184fd47c798673b072cecf4 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <73ef3128010cfa342184fd47c798673b072cecf4@dist-git>
|
|
|
7a3408 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
7a3408 |
Date: Tue, 22 Sep 2015 16:59:39 +0200
|
|
|
7a3408 |
Subject: [PATCH] conf: Drop VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST flag
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1252685
|
|
|
7a3408 |
|
|
|
7a3408 |
The flag was used only for formatting the XML and once the parser and
|
|
|
7a3408 |
formatter flags were split in 0ecd6851093945dd5ddc78266c61b577c65394ae
|
|
|
7a3408 |
it doesn't make sense any more to have it.
|
|
|
7a3408 |
|
|
|
7a3408 |
(cherry picked from commit ed94ad9e40a029d552c005a5d5f214af5fc43558)
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/conf/domain_conf.c | 1 -
|
|
|
7a3408 |
src/conf/domain_conf.h | 7 +++----
|
|
|
7a3408 |
tests/qemuxml2xmltest.c | 3 +--
|
|
|
7a3408 |
3 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
7a3408 |
index 2dc5912..3a3c238 100644
|
|
|
7a3408 |
--- a/src/conf/domain_conf.c
|
|
|
7a3408 |
+++ b/src/conf/domain_conf.c
|
|
|
7a3408 |
@@ -22521,7 +22521,6 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_STATUS |
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST |
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS)))
|
|
|
7a3408 |
goto error;
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
7a3408 |
index 902dfb9..e0102db 100644
|
|
|
7a3408 |
--- a/src/conf/domain_conf.h
|
|
|
7a3408 |
+++ b/src/conf/domain_conf.h
|
|
|
7a3408 |
@@ -2600,14 +2600,13 @@ typedef enum {
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES = 1 << 3,
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_ALLOW_ROM = 1 << 4,
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT = 1 << 5,
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST = 1 << 6,
|
|
|
7a3408 |
/* parse only source half of <disk> */
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_DISK_SOURCE = 1 << 7,
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_VALIDATE = 1 << 8,
|
|
|
7a3408 |
+ VIR_DOMAIN_DEF_PARSE_DISK_SOURCE = 1 << 6,
|
|
|
7a3408 |
+ VIR_DOMAIN_DEF_PARSE_VALIDATE = 1 << 7,
|
|
|
7a3408 |
/* don't validate os.type and arch against capabilities. Prevents
|
|
|
7a3408 |
* VMs from disappearing when qemu is removed and libvirtd is restarted
|
|
|
7a3408 |
*/
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 9,
|
|
|
7a3408 |
+ VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8,
|
|
|
7a3408 |
} virDomainDefParseFlags;
|
|
|
7a3408 |
|
|
|
7a3408 |
typedef enum {
|
|
|
7a3408 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
7a3408 |
index d498610..03bfbda 100644
|
|
|
7a3408 |
--- a/tests/qemuxml2xmltest.c
|
|
|
7a3408 |
+++ b/tests/qemuxml2xmltest.c
|
|
|
7a3408 |
@@ -180,8 +180,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque)
|
|
|
7a3408 |
driver.caps, driver.xmlopt,
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_STATUS |
|
|
|
7a3408 |
VIR_DOMAIN_DEF_PARSE_ACTUAL_NET |
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
|
|
|
7a3408 |
- VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST))) {
|
|
|
7a3408 |
+ VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES))) {
|
|
|
7a3408 |
fprintf(stderr, "Failed to parse domain status XML:\n%s", source);
|
|
|
7a3408 |
goto cleanup;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.3
|
|
|
7a3408 |
|