Kernel cmdline args can be passed to xen pv domains even when a bootloader is specified. The current config-to-sxpr mapping ignores cmdline when bootloader is present. Since the xend sub-driver is used with many xen toolstack versions, this patch takes conservative approach of adding an else block to existing !def->os.bootloader, and only appends sxpr if def->os.cmdline is non-NULL. --- src/xenxs/xen_sxpr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 13ca015..bd770bc 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2261,6 +2261,12 @@ xenFormatSxpr(virConnectPtr conn, } virBufferAddLit(&buf, "))"); + } else { + /* PV domains accept kernel cmdline args */ + if (def->os.cmdline) { + virBufferEscapeSexpr(&buf, "(image (linux (args '%s')))", + def->os.cmdline); + } }

On 07/07/2011 11:31 AM, Daniel P. Berrange wrote: > On Wed, Jul 06, 2011 at 07:36:26PM -0600, Jim Fehlig wrote: >> Kernel cmdline args can be passed to xen pv domains even when a >> bootloader is specified. The current config-to-sxpr mapping >> ignores cmdline when bootloader is present. >> >> Since the xend sub-driver is used with many xen toolstack versions, >> this patch takes conservative approach of adding an else block to >> existing !def->os.bootloader, and only appends sxpr if def->os.cmdline >> is non-NULL. >> --- >> src/xenxs/xen_sxpr.c | 6 ++++++ >> 1 files changed, 6 insertions(+), 0 deletions(-) >> >> diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c >> index 13ca015..bd770bc 100644 >> --- a/src/xenxs/xen_sxpr.c >> +++ b/src/xenxs/xen_sxpr.c >> @@ -2261,6 +2261,12 @@ xenFormatSxpr(virConnectPtr conn, >> } >> >> virBufferAddLit(&buf, "))"); >> + } else { >> + /* PV domains accept kernel cmdline args */ >> + if (def->os.cmdline) { >> + virBufferEscapeSexpr(&buf, "(image (linux (args '%s')))", >> + def->os.cmdline); >> + } >> } > > > ACK, assuming the test cases still pass - I'm surprised this > doesn't require any testcase fixes It should require a new testcases too. :)