Remove possible infinite loops generating MAC/UUID

Author: crobinso

virtinst/Guest.py

@@ -1449,12 +1449,17 @@ def _set_defaults(self, devlist_func, remove_func):
 
         # Generate UUID
         if self.uuid is None:
-            while 1:
+            found = False
+            for ignore in range(256):
                 self.uuid = _util.uuidToString(_util.randomUUID())
                 if _util.vm_uuid_collision(self.conn, self.uuid):
                     continue
+                found = True
                 break
 
+            if not found:
+                logging.debug("Failed to generate non-conflicting UUID")
+
 
     ###################################
     # Guest Dictionary Helper methods #

virtinst/VirtualNetworkInterface.py

@@ -108,12 +108,17 @@ def _generate_default_bridge(self):
 
     def _generate_random_mac(self):
         if self.conn and not self._random_mac:
-            while 1:
+            found = False
+            for ignore in range(256):
                 self._random_mac = _util.randomMAC(self.conn.getType().lower())
                 ret = self.is_conflict_net(self.conn, self._random_mac)
                 if ret[1] is not None:
                     continue
+                found = True
                 break
+
+            if not found:
+                logging.debug("Failed to generate non-conflicting MAC")
         return self._random_mac
 
     def get_source(self):