From ab8b2bea4793e96a510a8b8f4081e1b366757a9e Mon Sep 17 00:00:00 2001
From: Philipp Hahn <hahn@univention.de>
Date: Thu, 5 Aug 2010 17:07:18 +0200
Subject: [PATCH] bootloader_args is named bootargs in xen-xm

According to <xen-3.4.3/tools/python/xen/xm/create.py:158>
	gopts.var('bootargs', val='NAME',
			  fn=set_value, default=None,
			  use="Arguments to pass to boot loader")
the "bootloader_args" parameter needs to be translated into "bootargs"
when using "virsh domxml-to-native xen-xm".
The reverse direction (domxml-from-native) is already okay.

This patch fixes domxml-to-native and adds two test files to catch this
problem.

Signed-off-by: Philipp Hahn <hahn@univention.de>
---
 src/xen/xm_internal.c                         |  2 +-
 .../xmconfigdata/sexpr2xml-pv-bootloader.cfg  | 11 ++++++++
 .../xmconfigdata/sexpr2xml-pv-bootloader.xml  | 26 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
 create mode 100644 tests/xmconfigdata/sexpr2xml-pv-bootloader.xml

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 20b828d5e9..153c7a525f 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -2346,7 +2346,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
             xenXMConfigSetString(conf, "bootloader", def->os.bootloader) < 0)
             goto no_memory;
         if (def->os.bootloaderArgs &&
-            xenXMConfigSetString(conf, "bootloader_args", def->os.bootloaderArgs) < 0)
+            xenXMConfigSetString(conf, "bootargs", def->os.bootloaderArgs) < 0)
             goto no_memory;
         if (def->os.kernel &&
             xenXMConfigSetString(conf, "kernel", def->os.kernel) < 0)
diff --git a/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
new file mode 100644
index 0000000000..b8570f229d
--- /dev/null
+++ b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
@@ -0,0 +1,11 @@
+name = "pvtest"
+uuid = "596a5d21-71f4-8fb2-e068-e2386a5c413e"
+maxmem = 420
+memory = 420
+vcpus = 2
+bootloader = "/usr/bin/pypxeboot"
+bootargs = "mac=AA:00:86:e2:35:72"
+on_poweroff = "destroy"
+on_reboot = "destroy"
+on_crash = "destroy"
+disk = [ "file:/root/some.img,xvda,w" ]
diff --git a/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml b/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml
new file mode 100644
index 0000000000..920c058275
--- /dev/null
+++ b/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml
@@ -0,0 +1,26 @@
+<domain type='xen' id='6'>
+  <name>pvtest</name>
+  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
+  <bootloader>/usr/bin/pypxeboot</bootloader>
+  <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
+  <os>
+    <type>linux</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <disk type='file' device='disk'>
+      <driver name='file'/>
+      <source file='/root/some.img'/>
+      <target dev='xvda' bus='xen'/>
+    </disk>
+    <console type='pty'>
+      <target type='xen' port='0'/>
+    </console>
+  </devices>
+</domain>