External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: hostdev: Move variable declaration inside CHECK_LIST_COUNT()

Browse Source 
The 'actualCount' variable, formerly just 'count', is only used
internally by the macro, so it's better to move its declaration
inside the macro as well: this way, it doesn't have to be declared
by every single user.

The new name is less generic to make clashes less likely.
This commit is contained in:
Andrea Bolognani 2016-03-02 15:23:51 +01:00
parent dd9f8e0292
commit ff087d8dae
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/virhostdevtest.c
View File

@ -37,13 +37,16 @@
VIR_LOG_INIT("tests.hostdevtest");
# define CHECK_LIST_COUNT(list, cnt) \
if ((count = virPCIDeviceListCount(list)) != cnt) { \
virReportError(VIR_ERR_INTERNAL_ERROR, \
"Unexpected count of items in " #list ": %d, " \
"expecting %zu", count, (size_t) cnt); \
goto cleanup; \
}
# define CHECK_LIST_COUNT(list, cnt) \
do { \
int actualCount; \
if ((actualCount = virPCIDeviceListCount(list)) != cnt) { \
virReportError(VIR_ERR_INTERNAL_ERROR, \
"Unexpected count of items in " #list ": %d, " \
"expecting %zu", actualCount, (size_t) cnt); \
goto cleanup; \
} \
} while (0)
# define TEST_STATE_DIR abs_builddir "/hostdevmgr"
static const char *drv_name = "test_driver";
@ -161,7 +164,7 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, active_count, inactive_count;
int active_count, inactive_count;
for (i = 0; i < nhostdevs; i++)
hostdevs[i]->managed = false;
@ -220,7 +223,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, active_count, inactive_count;
int active_count, inactive_count;
for (i = 0; i < nhostdevs; i++) {
if (hostdevs[i]->managed != false) {
@ -254,7 +257,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, active_count;
int active_count;
for (i = 0; i < nhostdevs; i++)
hostdevs[i]->managed = true;
@ -300,7 +303,7 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, active_count;
int active_count;
for (i = 0; i < nhostdevs; i++) {
if (hostdevs[i]->managed != true) {
@ -332,7 +335,7 @@ testVirHostdevDetachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, inactive_count;
int inactive_count;
for (i = 0; i < nhostdevs; i++) {
inactive_count = virPCIDeviceListCount(mgr->inactivePCIHostdevs);
@ -369,7 +372,7 @@ testVirHostdevReAttachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
size_t i;
int count, inactive_count;
int inactive_count;
for (i = 0; i < nhostdevs; i++) {
inactive_count = virPCIDeviceListCount(mgr->inactivePCIHostdevs);
@ -389,7 +392,7 @@ static int
testVirHostdevUpdateActivePCIHostdevs(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
int count, active_count;
int active_count;
active_count = virPCIDeviceListCount(mgr->activePCIHostdevs);