[libvirt] [PATCH 5/8] cleanup: Change datatype of disk->shared to boolean

Osier Yang jyang at redhat.com
Wed Apr 10 16:32:29 UTC 2013


---
 src/conf/domain_conf.c | 2 +-
 src/conf/domain_conf.h | 2 +-
 src/xenxs/xen_sxpr.c   | 2 +-
 src/xenxs/xen_xm.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a54e6ca..c595401 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4732,7 +4732,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
             } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) {
                 def->readonly = 1;
             } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) {
-                def->shared = 1;
+                def->shared = true;
             } else if (xmlStrEqual(cur->name, BAD_CAST "transient")) {
                 def->transient = 1;
             } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 732bacc..2d66b39 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -683,7 +683,7 @@ struct _virDomainDiskDef {
     int snapshot; /* enum virDomainSnapshotLocation, snapshot_conf.h */
     int startupPolicy; /* enum virDomainStartupPolicy */
     unsigned int readonly : 1;
-    unsigned int shared : 1;
+    bool shared;
     unsigned int transient : 1;
     virDomainDeviceInfo info;
     virStorageEncryptionPtr encryption;
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 7ed1482..4bd1f47 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -509,7 +509,7 @@ xenParseSxprDisks(virDomainDefPtr def,
                 disk->readonly = 1;
             if (mode &&
                 strchr(mode, '!'))
-                disk->shared = 1;
+                disk->shared = true;
 
             if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
                 goto no_memory;
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 14e26c3..c68bee0 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -613,7 +613,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
                 disk->readonly = 1;
             else if ((STREQ(head, "w!")) ||
                      (STREQ(head, "!")))
-                disk->shared = 1;
+                disk->shared = true;
 
             /* Maintain list in sorted order according to target device name */
             if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
-- 
1.8.1.4




More information about the libvir-list mailing list