From 73ebd86d7318960b22c3b0f1262cbbd770265c9c Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Fri, 26 Oct 2012 13:23:56 -0400 Subject: [PATCH] parallels: fix build for some older compilers Found this when building on RHEL5: parallels/parallels_storage.c: In function 'parallelsStorageOpen': parallels/parallels_storage.c:180: error: 'for' loop initial declaration used outside C99 mode (and similar error in parallels_driver.c). This was in spite of configuring with "-Wno-error". --- src/parallels/parallels_driver.c | 6 ++++-- src/parallels/parallels_storage.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index e8af89c2e9..62db626b46 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1256,14 +1256,16 @@ static int parallelsApplySerialParams(virDomainChrDefPtr *oldserials, int nold, virDomainChrDefPtr *newserials, int nnew) { + int i, j; + if (nold != nnew) goto error; - for (int i = 0; i < nold; i++) { + for (i = 0; i < nold; i++) { virDomainChrDefPtr oldserial = oldserials[i]; virDomainChrDefPtr newserial = NULL; - for (int j = 0; j < nnew; j++) { + for (j = 0; j < nnew; j++) { if (newserials[j]->target.port == oldserial->target.port) { newserial = newserials[j]; break; diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 112e288342..76d885c362 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -123,6 +123,8 @@ parallelsStorageOpen(virConnectPtr conn, virStorageDriverStatePtr storageState; int privileged = (geteuid() == 0); parallelsConnPtr privconn = conn->privateData; + size_t i; + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (STRNEQ(conn->driver->name, "Parallels")) @@ -176,7 +178,7 @@ parallelsStorageOpen(virConnectPtr conn, goto error; } - for (size_t i = 0; i < privconn->pools.count; i++) { + for (i = 0; i < privconn->pools.count; i++) { virStoragePoolObjLock(privconn->pools.objs[i]); virStoragePoolObjPtr pool;