Re: [libvirt] [PATCH 8/8] Removing probing of secondary drivers

On 20.01.2015 17:37, Daniel P. Berrange wrote: Instead of finding a needle in haystack (read pointing out line in the diff that needs to be fixed), I'm pasting diff that you need to squash in. I'm sure you'll get the idea why: diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 5531d6d..b569160 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -262,7 +262,9 @@ parallelsConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - if ((ret = parallelsOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS) + if ((ret = parallelsOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS || + (ret = parallelsStorageOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS || + (ret = parallelsNetworkOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS) return ret; return VIR_DRV_OPEN_SUCCESS; @@ -273,6 +275,9 @@ parallelsConnectClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + parallelsNetworkClose(conn); + parallelsStorageClose(conn); + parallelsDriverLock(privconn); prlsdkUnsubscribeFromPCSEvents(privconn); virObjectUnref(privconn->caps); @@ -952,7 +957,6 @@ parallelsDomainUndefine(virDomainPtr domain) } static virHypervisorDriver parallelsDriver = { - .no = VIR_DRV_PARALLELS, .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ .connectClose = parallelsConnectClose, /* 0.10.0 */ @@ -995,6 +999,12 @@ static virHypervisorDriver parallelsDriver = { .connectIsAlive = parallelsConnectIsAlive, /* 1.2.5 */ }; +static virConnectDriver parallelsConnectDriver = { + .hypervisorDriver = &parallelsDriver, + .storageDriver = &parallelsStorageDriver, + .networkDriver = &parallelsNetworkDriver, +}; + /** * parallelsRegister: * @@ -1013,11 +1023,7 @@ parallelsRegister(void) VIR_FREE(prlctl_path); - if (virRegisterHypervisorDriver(&parallelsDriver) < 0) - return -1; - if (parallelsStorageRegister()) - return -1; - if (parallelsNetworkRegister()) + if (virRegisterConnectDriver(&parallelsConnectDriver, false) < 0) return -1; return 0; diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 90217df..3e7087d 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -318,9 +318,8 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn) return ret; } -static virDrvOpenStatus +virDrvOpenStatus parallelsNetworkOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -334,7 +333,7 @@ parallelsNetworkOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int parallelsNetworkClose(virConnectPtr conn) +int parallelsNetworkClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; parallelsDriverLock(privconn); @@ -597,10 +596,9 @@ static int parallelsNetworkGetAutostart(virNetworkPtr net, virNetworkObjUnlock(network); return ret; } -static virNetworkDriver parallelsNetworkDriver = { - "Parallels", - .networkOpen = parallelsNetworkOpen, /* 1.0.1 */ - .networkClose = parallelsNetworkClose, /* 1.0.1 */ + +virNetworkDriver parallelsNetworkDriver = { + .name = "Parallels", .connectNumOfNetworks = parallelsConnectNumOfNetworks, /* 1.0.1 */ .connectListNetworks = parallelsConnectListNetworks, /* 1.0.1 */ .connectNumOfDefinedNetworks = parallelsConnectNumOfDefinedNetworks, /* 1.0.1 */ @@ -613,12 +611,3 @@ static virNetworkDriver parallelsNetworkDriver = { .networkIsActive = parallelsNetworkIsActive, /* 1.0.1 */ .networkIsPersistent = parallelsNetworkIsPersistent, /* 1.0.1 */ }; - -int -parallelsNetworkRegister(void) -{ - if (virRegisterNetworkDriver(&parallelsNetworkDriver) < 0) - return -1; - - return 0; -} diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index e916e0f..d2c5bf2 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -67,7 +67,7 @@ parallelsStorageUnlock(virStorageDriverStatePtr driver) virMutexUnlock(&driver->lock); } -static int +int parallelsStorageClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; @@ -456,9 +456,8 @@ static int parallelsLoadPools(virConnectPtr conn) return -1; } -static virDrvOpenStatus +virDrvOpenStatus parallelsStorageOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { parallelsConnPtr privconn = conn->privateData; @@ -1612,10 +1611,8 @@ parallelsStorageVolGetPath(virStorageVolPtr vol) return ret; } -static virStorageDriver parallelsStorageDriver = { +virStorageDriver parallelsStorageDriver = { .name = "Parallels", - .storageOpen = parallelsStorageOpen, /* 0.10.0 */ - .storageClose = parallelsStorageClose, /* 0.10.0 */ .connectNumOfStoragePools = parallelsConnectNumOfStoragePools, /* 0.10.0 */ .connectListStoragePools = parallelsConnectListStoragePools, /* 0.10.0 */ @@ -1648,12 +1645,3 @@ static virStorageDriver parallelsStorageDriver = { .storagePoolIsActive = parallelsStoragePoolIsActive, /* 0.10.0 */ .storagePoolIsPersistent = parallelsStoragePoolIsPersistent, /* 0.10.0 */ }; - -int -parallelsStorageRegister(void) -{ - if (virRegisterStorageDriver(&parallelsStorageDriver) < 0) - return -1; - - return 0; -} diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index b5aa209..bebf841 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -75,8 +75,13 @@ struct parallelsDomObj { typedef struct parallelsDomObj *parallelsDomObjPtr; -int parallelsStorageRegister(void); -int parallelsNetworkRegister(void); +virDrvOpenStatus parallelsStorageOpen(virConnectPtr conn, unsigned int flags); +int parallelsStorageClose(virConnectPtr conn); +extern virStorageDriver parallelsStorageDriver; + +virDrvOpenStatus parallelsNetworkOpen(virConnectPtr conn, unsigned int flags); +int parallelsNetworkClose(virConnectPtr conn); +extern virNetworkDriver parallelsNetworkDriver; virJSONValuePtr parallelsParseOutput(const char *binary, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 3ea91de..eefe9ab 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -2045,7 +2045,7 @@ static virConnectDriver xenapiConnectDriver = { int xenapiRegister(void) { - return virRegisterConnectDriver(&xenapiConnectDriver); + return virRegisterConnectDriver(&xenapiConnectDriver, true); } /* Michal