From 43a90eb7e81a73fe43a296dc3b38092455d5ffcc Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Fri, 30 Jun 2017 16:09:06 +0200 Subject: [PATCH] conf: Drop unused VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU The only real usage of this flag was removed by "cpu_conf: Drop updateCPU from virCPUDefFormat". Signed-off-by: Jiri Denemark --- src/conf/domain_conf.c | 3 --- src/conf/domain_conf.h | 15 +++++++-------- src/conf/snapshot_conf.c | 3 +-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f4c2f26ff8..e3e9fc748a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -87,7 +87,6 @@ struct _virDomainXMLOption { #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ VIR_DOMAIN_DEF_FORMAT_INACTIVE | \ - VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU | \ VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, @@ -25998,8 +25997,6 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags) formatFlags |= VIR_DOMAIN_DEF_FORMAT_SECURE; if (flags & VIR_DOMAIN_XML_INACTIVE) formatFlags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; - if (flags & VIR_DOMAIN_XML_UPDATE_CPU) - formatFlags |= VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU; if (flags & VIR_DOMAIN_XML_MIGRATABLE) formatFlags |= VIR_DOMAIN_DEF_FORMAT_MIGRATABLE; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0c3c..e11ae52478 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2857,17 +2857,16 @@ typedef enum { typedef enum { VIR_DOMAIN_DEF_FORMAT_SECURE = 1 << 0, VIR_DOMAIN_DEF_FORMAT_INACTIVE = 1 << 1, - VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU = 1 << 2, - VIR_DOMAIN_DEF_FORMAT_MIGRATABLE = 1 << 3, + VIR_DOMAIN_DEF_FORMAT_MIGRATABLE = 1 << 2, /* format internal domain status information */ - VIR_DOMAIN_DEF_FORMAT_STATUS = 1 << 4, + VIR_DOMAIN_DEF_FORMAT_STATUS = 1 << 3, /* format element */ - VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET = 1 << 5, + VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET = 1 << 4, /* format original states of host PCI device */ - VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES = 1 << 6, - VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM = 1 << 7, - VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT = 1 << 8, - VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST = 1 << 9, + VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES = 1 << 5, + VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM = 1 << 6, + VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT = 1 << 7, + VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST = 1 << 8, } virDomainDefFormatFlags; /* Use these flags to skip specific domain ABI consistency checks done diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 5a07d3734a..07706e0b26 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -703,8 +703,7 @@ virDomainSnapshotDefFormat(const char *domain_uuid, virBuffer buf = VIR_BUFFER_INITIALIZER; size_t i; - virCheckFlags(VIR_DOMAIN_DEF_FORMAT_SECURE | - VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU, NULL); + virCheckFlags(VIR_DOMAIN_DEF_FORMAT_SECURE, NULL); flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; -- 2.39.5