esx: Switch from name to number checks in the subdrivers

diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 5887ba0a27f201c51cb259d9d62cd79a1042b0bb..d559f96715d0e2f7e5831ac588ed5fa83b7855a3 100644 (file)
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -44,7 +44,7 @@ esxDeviceOpen(virConnectPtr conn,
               virConnectAuthPtr auth ATTRIBUTE_UNUSED,
               int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index d58e3656241901d26094e7bd6f76e0b146646e17..4bac3d5c068932a08d0b190b44455ba4faeca854 100644 (file)
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -44,7 +44,7 @@ esxInterfaceOpen(virConnectPtr conn,
                  virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                  int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 52f5e6599efa549ac92363927045f1e3eaf79afd..a64bb8eeb7fd44519de501afefd03bc66f9bad8b 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -44,7 +44,7 @@ esxNetworkOpen(virConnectPtr conn,
                virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index cc2e73b8a8ef0713ae52723a0e41cae38b7eb91b..a9d046d3658d1760865fb89cf5217fbaea0eed4f 100644 (file)
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -43,7 +43,7 @@ esxNWFilterOpen(virConnectPtr conn,
                 virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                 int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 2d54b3f1b6669ed2c36959e89910a986fd9949db..1ae7ddc35553bd52157f3e2b15a03edd89199c21 100644 (file)
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -42,7 +42,7 @@ static virDrvOpenStatus
 esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
               int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index 44d7d850d57ffcb4368cf61c081b32bfee8f8713..9f25e028219fa71ab42d4f61f3da1ec765e2a7bd 100644 (file)
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -45,7 +45,7 @@ esxStorageOpen(virConnectPtr conn,
                virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                int flags ATTRIBUTE_UNUSED)
 {
-    if (STRNEQ(conn->driver->name, "ESX")) {
+    if (conn->driver->no != VIR_DRV_ESX) {
         return VIR_DRV_OPEN_DECLINED;
     }