[libvirt] [PATCH 4/6] conf: Drop unused VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU

Michal Privoznik mprivozn at redhat.com
Tue Sep 19 07:36:18 UTC 2017


On 09/18/2017 03:35 PM, Jiri Denemark wrote:
> The only real usage of this flag was removed by "cpu_conf: Drop
> updateCPU from virCPUDefFormat".
> 
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/conf/domain_conf.c   | 3 ---
>  src/conf/domain_conf.h   | 1 -
>  src/conf/snapshot_conf.c | 3 +--
>  3 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 35adce95b5..984db98107 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,
> @@ -25974,8 +25973,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..4603e4f97e 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -2857,7 +2857,6 @@ 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,
>      /* format internal domain status information */
>      VIR_DOMAIN_DEF_FORMAT_STATUS          = 1 << 4,

Should we update these so that the flags are consecutive?
VIR_DOMAIN_DEF_FORMAT_MIGRATABLE can be 1 << 2,
VIR_DOMAIN_DEF_FORMAT_STATUS can be 1 << 3, and so on. These are just
internal flags so there would be no ABI brekage if we do that.

Michal




More information about the libvir-list mailing list