aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Bolte <matthias.bolte@googlemail.com>2010-07-25 19:04:22 +0200
committerMatthias Bolte <matthias.bolte@googlemail.com>2010-07-30 14:42:57 +0200
commitc38e2f7a3994ffe94e519636ba921f440729bbeb (patch)
tree4ba486bb2fbc814449781b3503f57732a75d4921
parentesx: Improve blocked task detection and fix race condition (diff)
downloadlibvirt-c38e2f7a3994ffe94e519636ba921f440729bbeb.tar.gz
libvirt-c38e2f7a3994ffe94e519636ba921f440729bbeb.tar.bz2
libvirt-c38e2f7a3994ffe94e519636ba921f440729bbeb.zip
esx: Switch from name to number checks in the subdrivers
-rw-r--r--src/esx/esx_device_monitor.c2
-rw-r--r--src/esx/esx_interface_driver.c2
-rw-r--r--src/esx/esx_network_driver.c2
-rw-r--r--src/esx/esx_nwfilter_driver.c2
-rw-r--r--src/esx/esx_secret_driver.c2
-rw-r--r--src/esx/esx_storage_driver.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 5887ba0a2..d559f9671 100644
--- 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 d58e36562..4bac3d5c0 100644
--- 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 52f5e6599..a64bb8eeb 100644
--- 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 cc2e73b8a..a9d046d36 100644
--- 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 2d54b3f1b..1ae7ddc35 100644
--- 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 44d7d850d..9f25e0282 100644
--- 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;
}