On 06/17/2014 09:24 AM, Ian Campbell wrote:
> In addition to extra= xm supported a root= option which was supposed
> to be incorporated into the final command line. Handle that for "virsh
> domxml-from-native xen-xm". Tested with the libxl backend.
>
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> ---
> .gnulib | 2 +-
> src/xenxs/xen_xm.c | 14 +++++++++++++-
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/.gnulib b/.gnulib
> index d55899f..e8e0eb6 160000
> --- a/.gnulib
> +++ b/.gnulib
> @@ -1 +1 @@
> -Subproject commit d55899fd2c5794ac85ecb14d5e2f646a89e4b4dd
> +Subproject commit e8e0eb6bfb728685ec8d5afd924e41b18e9d928d
Was the submodule bump intended?
> diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
> index b2db97d..2cd6d4c 100644
> --- a/src/xenxs/xen_xm.c
> +++ b/src/xenxs/xen_xm.c
> @@ -339,6 +339,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
> def->os.nBootDevs++;
> }
> } else {
> + const char *extra, *root;
> +
> if (xenXMConfigCopyStringOpt(conf, "bootloader", &def->os.bootloader) < 0)
> goto cleanup;
> if (xenXMConfigCopyStringOpt(conf, "bootargs", &def->os.bootloaderArgs) < 0)
> @@ -348,8 +350,18 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
> goto cleanup;
> if (xenXMConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0)
> goto cleanup;
> - if (xenXMConfigCopyStringOpt(conf, "extra", &def->os.cmdline) < 0)
> + if (xenXMConfigGetString(conf, "extra", &extra, NULL) < 0)
> + goto cleanup;
> + if (xenXMConfigGetString(conf, "root", &root, NULL) < 0)
> goto cleanup;
What's the difference between xenXMConfigCopyStringOpt and
xenXMConfigGetString? Once I understand that, then this patch (minus
the .gnulib bump) seems okay.
> +
> + if (root) {
> + if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
> + goto cleanup;
> + } else {
> + if (VIR_STRDUP(def->os.cmdline, extra) < 0)
> + goto cleanup;
> + }
> }
>
> if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon,
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list