From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 1 Oct 2013 02:13:17 +0000 (-0500)
Subject: VMware: Simplify array walk for driver type
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9e7cfcb7dbfb74201584ae64ac2ad0290896b392;p=libvirt.git

VMware: Simplify array walk for driver type

Rather than walking the possible driver backends by handle, use a helper
function. Additionally I've done a bit of refactoring in the code over
the past few commits so add myself to the copyright line.
---

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 25adb15828..79954e08a5 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (C) 2011-2012 Red Hat, Inc.
  * Copyright 2010, diateam (www.diateam.net)
+ * Copyright (C) 2013. Doug Goldstein <cardoe@cardoe.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -156,13 +157,8 @@ vmwareConnectOpen(virConnectPtr conn,
         goto cleanup;
     }
 
-    driver->type = -1;
-    for (i = 0; i < VMWARE_DRIVER_LAST; i++) {
-        if (STREQ(tmp, vmwareDriverTypeToString(i))) {
-            driver->type = i;
-            break;
-        }
-    }
+    /* Match the non-'vmware' part of the scheme as the driver backend */
+    driver->type = vmwareDriverTypeFromString(tmp);
 
     if (driver->type == -1) {
         virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid "