[libvirt] [PATCH 2/8] Cleanup: Change datatype of origstate's members into boolean
Osier Yang
jyang at redhat.com
Wed Apr 10 16:32:26 UTC 2013
Members of struct virPCIDevice are changed together.
---
src/conf/domain_conf.c | 6 +++---
src/conf/domain_conf.h | 6 +++---
src/util/virpci.c | 58 +++++++++++++++++++++++++-------------------------
src/util/virpci.h | 6 +++---
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bb9d9f5..a2c3a64 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3571,11 +3571,11 @@ virDomainHostdevSubsysPciOrigStatesDefParseXML(const xmlNodePtr node,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "unbind")) {
- def->states.pci.unbind_from_stub = 1;
+ def->states.pci.unbind_from_stub = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "removeslot")) {
- def->states.pci.remove_slot = 1;
+ def->states.pci.remove_slot = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "reprobe")) {
- def->states.pci.reprobe = 1;
+ def->states.pci.reprobe = true;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unsupported element '%s' of 'origstates'"),
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0df92ef..09ce261 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -345,17 +345,17 @@ struct _virDomainHostdevOrigStates {
/* Does the device need to unbind from stub when
* reattaching to host?
*/
- unsigned int unbind_from_stub : 1;
+ bool unbind_from_stub;
/* Does it need to use remove_slot when reattaching
* the device to host?
*/
- unsigned int remove_slot : 1;
+ bool remove_slot;
/* Does it need to reprobe driver for the device when
* reattaching to host?
*/
- unsigned int reprobe :1;
+ bool reprobe;
} pci;
/* Perhaps 'usb' in future */
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 805a633..d431e81 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -63,14 +63,14 @@ struct _virPCIDevice {
unsigned pcie_cap_pos;
unsigned pci_pm_cap_pos;
- unsigned has_flr : 1;
- unsigned has_pm_reset : 1;
+ bool has_flr;
+ bool has_pm_reset;
bool managed;
/* used by reattach function */
- unsigned unbind_from_stub : 1;
- unsigned remove_slot : 1;
- unsigned reprobe : 1;
+ bool unbind_from_stub;
+ bool remove_slot;
+ bool reprobe;
};
struct _virPCIDeviceList {
@@ -776,8 +776,8 @@ virPCIDeviceInit(virPCIDevicePtr dev, int cfgfd)
flr = virPCIDeviceDetectFunctionLevelReset(dev, cfgfd);
if (flr < 0)
return flr;
- dev->has_flr = flr;
- dev->has_pm_reset = virPCIDeviceDetectPowerManagementReset(dev, cfgfd);
+ dev->has_flr = !!flr;
+ dev->has_pm_reset = !!virPCIDeviceDetectPowerManagementReset(dev, cfgfd);
return 0;
}
@@ -935,7 +935,7 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev, const char *driver)
goto cleanup;
}
}
- dev->unbind_from_stub = 0;
+ dev->unbind_from_stub = false;
remove_slot:
if (!dev->remove_slot)
@@ -952,7 +952,7 @@ remove_slot:
dev->name, driver);
goto cleanup;
}
- dev->remove_slot = 0;
+ dev->remove_slot = false;
reprobe:
if (!dev->reprobe) {
@@ -982,9 +982,9 @@ reprobe:
cleanup:
/* do not do it again */
- dev->unbind_from_stub = 0;
- dev->remove_slot = 0;
- dev->reprobe = 0;
+ dev->unbind_from_stub = false;
+ dev->remove_slot = false;
+ dev->reprobe = false;
VIR_FREE(drvdir);
VIR_FREE(path);
@@ -999,7 +999,7 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *driver)
int result = -1;
char *drvdir = NULL;
char *path = NULL;
- int reprobe = 0;
+ int reprobe = false;
/* check whether the device is already bound to a driver */
if (virPCIDriverDir(&drvdir, driver) < 0 ||
@@ -1013,7 +1013,7 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *driver)
result = 0;
goto cleanup;
}
- reprobe = 1;
+ reprobe = true;
}
/* Add the PCI device ID to the stub's dynamic ID table;
@@ -1044,8 +1044,8 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *driver)
}
if (virFileLinkPointsTo(path, drvdir)) {
- dev->unbind_from_stub = 1;
- dev->remove_slot = 1;
+ dev->unbind_from_stub = true;
+ dev->remove_slot = true;
goto remove_id;
}
@@ -1087,7 +1087,7 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *driver)
dev->name, driver);
goto remove_id;
}
- dev->remove_slot = 1;
+ dev->remove_slot = true;
if (virPCIDriverFile(&path, driver, "bind") < 0) {
goto remove_id;
@@ -1099,7 +1099,7 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *driver)
dev->name, driver);
goto remove_id;
}
- dev->unbind_from_stub = 1;
+ dev->unbind_from_stub = true;
}
remove_id:
@@ -1112,7 +1112,7 @@ remove_id:
VIR_WARN("Could not remove PCI ID '%s' from %s, and the device "
"cannot be probed again.", dev->id, driver);
}
- dev->reprobe = 0;
+ dev->reprobe = false;
goto cleanup;
}
@@ -1126,7 +1126,7 @@ remove_id:
VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device "
"cannot be probed again.", dev->id, driver);
}
- dev->reprobe = 0;
+ dev->reprobe = false;
goto cleanup;
}
@@ -1470,9 +1470,9 @@ virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev)
}
void
-virPCIDeviceSetUnbindFromStub(virPCIDevicePtr dev, unsigned unbind)
+virPCIDeviceSetUnbindFromStub(virPCIDevicePtr dev, bool unbind)
{
- dev->unbind_from_stub = !!unbind;
+ dev->unbind_from_stub = unbind;
}
unsigned
@@ -1482,9 +1482,9 @@ virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev)
}
void
-virPCIDeviceSetRemoveSlot(virPCIDevicePtr dev, unsigned remove_slot)
+virPCIDeviceSetRemoveSlot(virPCIDevicePtr dev, bool remove_slot)
{
- dev->remove_slot = !!remove_slot;
+ dev->remove_slot = remove_slot;
}
unsigned
@@ -1494,9 +1494,9 @@ virPCIDeviceGetReprobe(virPCIDevicePtr dev)
}
void
-virPCIDeviceSetReprobe(virPCIDevicePtr dev, unsigned reprobe)
+virPCIDeviceSetReprobe(virPCIDevicePtr dev, bool reprobe)
{
- dev->reprobe = !!reprobe;
+ dev->reprobe = reprobe;
}
void
@@ -1513,9 +1513,9 @@ virPCIDeviceGetUsedBy(virPCIDevicePtr dev)
void virPCIDeviceReattachInit(virPCIDevicePtr pci)
{
- pci->unbind_from_stub = 1;
- pci->remove_slot = 1;
- pci->reprobe = 1;
+ pci->unbind_from_stub = true;
+ pci->remove_slot = true;
+ pci->reprobe = true;
}
diff --git a/src/util/virpci.h b/src/util/virpci.h
index 9ea721a..0c4a8d2 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -68,13 +68,13 @@ void virPCIDeviceSetUsedBy(virPCIDevice *dev,
const char *virPCIDeviceGetUsedBy(virPCIDevice *dev);
unsigned virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev);
void virPCIDeviceSetUnbindFromStub(virPCIDevice *dev,
- unsigned unbind);
+ bool unbind);
unsigned virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev);
void virPCIDeviceSetRemoveSlot(virPCIDevice *dev,
- unsigned remove_slot);
+ bool remove_slot);
unsigned virPCIDeviceGetReprobe(virPCIDevicePtr dev);
void virPCIDeviceSetReprobe(virPCIDevice *dev,
- unsigned reprobe);
+ bool reprobe);
void virPCIDeviceReattachInit(virPCIDevice *dev);
--
1.8.1.4
More information about the libvir-list
mailing list