diff options
| author | Andrea Bolognani <abologna@redhat.com> | 2016-03-02 15:23:51 +0100 |
|---|---|---|
| committer | Andrea Bolognani <abologna@redhat.com> | 2016-03-08 10:34:13 +0100 |
| commit | ff087d8daefd6395f600dec27785b79edb662f69 (patch) | |
| tree | 9d0f09cf864b01fdb0bbfb27a0e56a4a1d20ff3a /tests/virhostdevtest.c | |
| parent | dd9f8e0292dbcc44563a1a1adb02c929f60ad28e (diff) | |
| download | libvirt-ff087d8daefd6395f600dec27785b79edb662f69.tar.gz | |
tests: hostdev: Move variable declaration inside CHECK_LIST_COUNT()
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.
Diffstat (limited to 'tests/virhostdevtest.c')
| -rw-r--r-- | tests/virhostdevtest.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index febb2c9911..d9d3664697 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -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); |