[NEW PATCH] BZ#734768 - Handle 'guest' element being missing in libvrit caps (via gerrit-bot)

New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/886

commit 0589ac6f1edda30ecfcf026aca15e3551dbd87fa
Author: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Date:   Wed Aug 31 18:13:23 2011 +0300

    BZ#734768 - Handle 'guest' element being missing in libvrit caps
    
    Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec

diff --git a/vdsm/caps.py b/vdsm/caps.py
index 0a75510..37ffd3e 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -80,9 +80,14 @@ class CpuInfo(object):
 def _getEmulatedMachines():
     c = libvirtconnection.get()
     caps = minidom.parseString(c.getCapabilities())
-    return [ m.firstChild.toxml() for m
-             in caps.getElementsByTagName('guest')[0]
-                    .getElementsByTagName('machine') ]
+    guestTag = caps.getElementsByTagName('guest')
+    # Guest element is missing if kvm modules are not loaded
+    if len(guestTag) == 0:
+        return []
+
+    guestTag = guestTag[0]
+
+    return [ m.firstChild.toxml() for m in
guestTag.getElementsByTagName('machine') ]
 
 @utils.memoized
 def _getCompatibleCpuModels():

Change in vdsm[master]: BZ#734768 - Handle 'guest' element being missing in libvrit ...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#734768 - Handle 'guest' element being missing in libvrit caps
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

blechs, my fault.

--
To view, visit http://gerrit.usersys.redhat.com/886
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

Change in vdsm[master]: BZ#734768 - Handle 'guest' element being missing in libvrit ...

[David Naori]

David Naori has posted comments on this change.

Change subject: BZ#734768 - Handle 'guest' element being missing in libvrit caps
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.usersys.redhat.com/886
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

Change in vdsm[master]: BZ#734768 - Handle 'guest' element being missing in libvrit ...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#734768 - Handle 'guest' element being missing in libvrit caps
......................................................................




--
To view, visit http://gerrit.usersys.redhat.com/886
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

Change in vdsm[master]: BZ#734768 - Handle 'guest' element being missing in libvrit ...

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: BZ#734768 - Handle 'guest' element being missing in libvrit caps
......................................................................


BZ#734768 - Handle 'guest' element being missing in libvrit caps

Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec
---
M vdsm/caps.py
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Dan Kenigsberg: Looks good to me, but someone else must approve
  David Naori: Verified
  Ayal Baron: Looks good to me, approved


--
To view, visit http://gerrit.usersys.redhat.com/886
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia25d6e4abbf33da991bcb09fcb55b5bdbca512ec
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;