On Tue, Aug 08, 2006 at 11:04:44PM +0100, Daniel P. Berrange wrote: > On Mon, Aug 07, 2006 at 12:11:17PM -0400, Daniel Veillard wrote: > > The XML dump should go though the proxy too for non-root that's something > > Attached is a patch which adds support for XML dump to the proxy. This > code only works if XML doc is < 4k, but I don;t anticpate this being > a problem. yeah that was the only think I was afraid could be a problem, but in practice the size of a doman description really should not be over 4k. > While doing this I also added a tonne more #ifndef PROXY > statements around functions in xend_internal.c since there were a lot > of potentially dangerous functions being compiled into the proxy even > though they were not called. I've run 'nm' on the .o files linked by > the proxy and it looks to have cut down the list of functions quite > significantly. Very good idea ! Patch looks good to me, but: > Index: src/driver.h > =================================================================== > RCS file: /data/cvs/libvirt/src/driver.h,v > retrieving revision 1.10 > diff -c -r1.10 driver.h > *** src/driver.h 8 Aug 2006 22:22:55 -0000 1.10 > --- src/driver.h 8 Aug 2006 22:53:55 -0000 > *************** > *** 104,109 **** > --- 104,112 ---- > typedef int > (*virDrvDomainRestore) (virConnectPtr conn, > const char *from); > + typedef char * > + (*virDrvDomainDumpXML) (virDomainPtr dom, > + int flags); > > typedef int > (*virDrvDomainSetVcpus) (virDomainPtr domain, > *************** > *** 164,169 **** > --- 167,173 ---- > virDrvDomainSetVcpus domainSetVcpus; > virDrvDomainPinVcpu domainPinVcpu; > virDrvDomainGetVcpus domainGetVcpus; > + virDrvDomainDumpXML domainDumpXML; > }; > that and the updates of the driver tables will conflict with the change I just commited to migrate vCPU and affinity functions to the driver system too. Sorry :-) > ! NULL, /* domainGetVcpus */ > ! xenProxyDomainDumpXML, /* domainDumpXML */ > }; usually I drop the coma after the last field of a structure. I force gcc in a very pedantic mode and it complains about this :-) > ! VIR_PROXY_DOMAIN_INFO = 9, > ! VIR_PROXY_DOMAIN_XML = 10, > } virProxyCommand; same. and in the driver tables too. Don't worry about it I will fix the warning when I see them :-) Your patch also includes other changes already commited about TTY and VNC port extraction, maybe you were not working from a CVS fully updated ? but that looks good, the merge may be a bit annoying though :-) Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard@xxxxxxxxxx | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/