[libvirt] [PATCH] esx: Switch from name to number checks in the subdrivers

[Daniel Veillard]

On Mon, Jul 26, 2010 at 03:12:50AM +0200, Matthias Bolte wrote:
> ---
>  src/esx/esx_device_monitor.c   |    2 +-
>  src/esx/esx_interface_driver.c |    2 +-
>  src/esx/esx_network_driver.c   |    2 +-
>  src/esx/esx_nwfilter_driver.c  |    2 +-
>  src/esx/esx_secret_driver.c    |    2 +-
>  src/esx/esx_storage_driver.c   |    2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
> index 5887ba0..d559f96 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 d58e365..4bac3d5 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 52f5e65..a64bb8e 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 cc2e73b..a9d046d 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 2d54b3f..1ae7ddc 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 44d7d85..9f25e02 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;
>      }

  Nicer, ACK,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/