diff --git a/ChangeLog b/ChangeLog index 6f47a84ce0a3918018936350623b43e161f986e5..c02429ba0bb5c78be2d84538a0f7d71419b02970 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 13 16:22:00 BST 2008 Richard W.M. Jones + + Build failure fixed. + * src/domain_conf.c: Fix build failure of the Xen proxy. + Sat Oct 11 09:23:18 CEST 2008 Jim Meyering testError format strings: explicitly include domain and network names diff --git a/src/domain_conf.c b/src/domain_conf.c index f57fb2d14650f574cd79bc0be58451fce20591f6..d60cc4f8a4398318286c0ea3458aa8237f89e87a 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -493,7 +493,6 @@ void virDomainRemoveInactive(virDomainObjListPtr doms, } -#ifndef PROXY int virDomainDiskCompare(virDomainDiskDefPtr a, virDomainDiskDefPtr b) { if (a->bus == b->bus) @@ -503,6 +502,7 @@ int virDomainDiskCompare(virDomainDiskDefPtr a, } +#ifndef PROXY /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition */ @@ -1695,6 +1695,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virConnectPtr conn, VIR_FREE(dev); return NULL; } +#endif int virDomainDiskQSort(const void *a, const void *b) { @@ -1704,7 +1705,7 @@ int virDomainDiskQSort(const void *a, const void *b) return virDomainDiskCompare(*da, *db); } - +#ifndef PROXY static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, virCapsPtr caps, xmlXPathContextPtr ctxt)