[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] libs/light: pass some infos to qemu

commit c2517364eb64088abe7afba79e13cb1ba5a12585
Author:     Manuel Bouyer <bouyer@xxxxxxxxxx>
AuthorDate: Tue Jan 26 23:47:58 2021 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jan 29 22:50:08 2021 +0000

    libs/light: pass some infos to qemu
    Pass bridge name to qemu as command line option
    When starting qemu, set an environnement variable XEN_DOMAIN_ID,
    to be used by qemu helper scripts
    The only functional difference of using the br parameter is that the
    bridge name gets passed to the QEMU script.
    NetBSD doesn't have the ioctl to rename network interfaces implemented, and
    thus cannot rename the interface from tapX to vifX.Y-emu. Only qemu knowns
    the tap interface name, so we need to use the qemu script from qemu itself.
    Signed-off-by: Manuel Bouyer <bouyer@xxxxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
 tools/libs/light/libxl_dm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c
index 45a0504a2e..291dee9b3f 100644
--- a/tools/libs/light/libxl_dm.c
+++ b/tools/libs/light/libxl_dm.c
@@ -761,6 +761,8 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,
         int nr_set_cpus = 0;
         char *s;
+        flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", 
         if (b_info->kernel) {
             LOGD(ERROR, domid, "HVM direct kernel boot is not supported by "
@@ -1547,8 +1549,10 @@ static int libxl__build_device_model_args_new(libxl__gc 
                 flexarray_append(dm_args, "-netdev");
+                                           "br=%s,"
                                            nics[i].devid, ifname,
+                                           nics[i].bridge,
@@ -1825,6 +1829,8 @@ static int libxl__build_device_model_args_new(libxl__gc 
     flexarray_append(dm_args, GCSPRINTF("%"PRId64, ram_size));
     if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
+        flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", 
         if (b_info->u.hvm.hdtype == LIBXL_HDTYPE_AHCI)
             flexarray_append_pair(dm_args, "-device", "ahci,id=ahci0");
         for (i = 0; i < num_disks; i++) {
generated by git-patchbot for /home/xen/git/xen.git#master



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.