On Wed, May 13, 2009 at 03:36:22PM +0100, Daniel P. Berrange wrote:
This patch wires up the new APIs to the remote driver and
libvirtd daemon.
[...]
--- a/qemud/remote_protocol.h Wed May 13 09:54:09 2009 -0400
+++ b/qemud/remote_protocol.h Wed May 13 09:57:11 2009 -0400
[...]
@@ -1429,6 +1453,8 @@ enum remote_procedure {
REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
REMOTE_PROC_NODE_DEVICE_DESTROY = 124,
REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125,
+ REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 125,
+ REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 126,
};
typedef enum remote_procedure remote_procedure;
Hum, that looks like an enum value clash here !
--- a/qemud/remote_protocol.x Wed May 13 09:54:09 2009 -0400
+++ b/qemud/remote_protocol.x Wed May 13 10:02:03 2009 -0400
[...]
@@ -1299,7 +1322,9 @@ enum remote_procedure {
REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
REMOTE_PROC_NODE_DEVICE_DESTROY = 124,
- REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125
+ REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125,
+ REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 126,
+ REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 127
};
But here it looks fine, there is something to double-check !
Otherwise just boring stuff and with char */int args I don't think
there is much risks, ACK once the enum is sorted out.
diff -r 4f46dfd24fdb src/virsh.c
--- a/src/virsh.c Wed May 13 09:54:09 2009 -0400
+++ b/src/virsh.c Wed May 13 09:54:10 2009 -0400
@@ -4189,8 +4189,8 @@ makeCloneXML(char *origxml, char *newnam
makeCloneXML(char *origxml, char *newname) {
xmlDocPtr doc;
- xmlXPathContextPtr ctxt;
- xmlXPathObjectPtr obj;
+ xmlXPathContextPtr ctxt = NULL;
+ xmlXPathObjectPtr obj = NULL;
xmlChar *newxml = NULL;
int size;
Sounds a completely different patch to push independantly, and
yes that's needed ACK ! for an immediate push
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit
http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine
http://rpmfind.net/
http://veillard.com/ | virtualization library
http://libvirt.org/