On Fri, Apr 02, 2010 at 09:46:00PM -0400, Chris Lalancette wrote:
From: Jiri Denemark <jdenemar@redhat.com>
--- src/vbox/vbox_tmpl.c | 988 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 979 insertions(+), 9 deletions(-)
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index dac386d..ede2798 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -5007,6 +5007,976 @@ static int vboxDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, return vboxDomainDetachDevice(dom, xml); } [...] + +#if VBOX_API_VERSION == 2002 + if (VIR_ALLOC(iid) < 0) { + virReportOOMError(); + goto cleanup; + } +#endif
Hum, did that specific allocation really need to occur only on one of the released versions of VBox ? and not before (or we don't support anything older than 2002) Except that and the constant UTF16 / UTF8 conversions which makes code harder to follow, that looks normal, ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/