From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 14 Feb 2013 08:05:36 +0000 (+0100)
Subject: vbox: Don't overwrite errors returned by virDomainDeviceDefParse
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2e5d7798df56621986bddd588b53827e6557687a;p=libvirt.git

vbox: Don't overwrite errors returned by virDomainDeviceDefParse
---

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 00b4d3d50f..cd88579d6e 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -5388,10 +5388,8 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom,
 
     dev = virDomainDeviceDefParse(data->caps, def, xml,
                                   VIR_DOMAIN_XML_INACTIVE);
-    if (dev == NULL) {
-        virReportOOMError();
+    if (dev == NULL)
         goto cleanup;
-    }
 
     vboxIIDFromUUID(&iid, dom->uuid);
     rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine);
@@ -5625,10 +5623,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) {
 
     dev = virDomainDeviceDefParse(data->caps, def, xml,
                                   VIR_DOMAIN_XML_INACTIVE);
-    if (dev == NULL) {
-        virReportOOMError();
+    if (dev == NULL)
         goto cleanup;
-    }
 
     vboxIIDFromUUID(&iid, dom->uuid);
     rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine);