| Message ID | 20180914111830.28466-3-anthony.perard@citrix.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Remove Xen PV domain creation in QEMU | expand |
On Fri, 14 Sep 2018, Anthony PERARD wrote: > xend have been replaced by libxenlight (libxl) for many Xen releases > now. > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > hw/xenpv/xen_machine_pv.c | 2 +- > include/hw/xen/xen.h | 2 +- > qemu-options.hx | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c > index 4d03aa59cb..de89b0ee1d 100644 > --- a/hw/xenpv/xen_machine_pv.c > +++ b/hw/xenpv/xen_machine_pv.c > @@ -42,7 +42,7 @@ static void xen_init_pv(MachineState *machine) > > switch (xen_mode) { > case XEN_ATTACH: > - /* nothing to do, xend handles everything */ > + /* nothing to do, libxl handles everything */ > break; > case XEN_EMULATE: > error_report("xen emulation not implemented (yet)"); > diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h > index 978aaa31fb..ba039c146d 100644 > --- a/include/hw/xen/xen.h > +++ b/include/hw/xen/xen.h > @@ -15,7 +15,7 @@ > /* xen-machine.c */ > enum xen_mode { > XEN_EMULATE = 0, // xen emulation, using xenner (default) > - XEN_ATTACH // attach to xen domain created by xend > + XEN_ATTACH // attach to xen domain created by libxl > }; > > extern uint32_t xen_domid; > diff --git a/qemu-options.hx b/qemu-options.hx > index d14a50805a..327bc8c897 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -3400,7 +3400,7 @@ DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid, > "-xen-domid id specify xen guest domain id\n", QEMU_ARCH_ALL) > DEF("xen-attach", 0, QEMU_OPTION_xen_attach, > "-xen-attach attach to existing xen domain\n" > - " xend will use this when starting QEMU\n", > + " libxl will use this when starting QEMU\n", > QEMU_ARCH_ALL) > DEF("xen-domid-restrict", 0, QEMU_OPTION_xen_domid_restrict, > "-xen-domid-restrict restrict set of available xen operations\n" > @@ -3414,7 +3414,7 @@ Specify xen guest domain @var{id} (XEN only). > @item -xen-attach > @findex -xen-attach > Attach to existing xen domain. > -xend will use this when starting QEMU (XEN only). > +libxl will use this when starting QEMU (XEN only). > @findex -xen-domid-restrict > Restrict set of available xen operations to specified domain id (XEN only). > ETEXI > -- > Anthony PERARD >
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 4d03aa59cb..de89b0ee1d 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -42,7 +42,7 @@ static void xen_init_pv(MachineState *machine) switch (xen_mode) { case XEN_ATTACH: - /* nothing to do, xend handles everything */ + /* nothing to do, libxl handles everything */ break; case XEN_EMULATE: error_report("xen emulation not implemented (yet)"); diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 978aaa31fb..ba039c146d 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -15,7 +15,7 @@ /* xen-machine.c */ enum xen_mode { XEN_EMULATE = 0, // xen emulation, using xenner (default) - XEN_ATTACH // attach to xen domain created by xend + XEN_ATTACH // attach to xen domain created by libxl }; extern uint32_t xen_domid; diff --git a/qemu-options.hx b/qemu-options.hx index d14a50805a..327bc8c897 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3400,7 +3400,7 @@ DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid, "-xen-domid id specify xen guest domain id\n", QEMU_ARCH_ALL) DEF("xen-attach", 0, QEMU_OPTION_xen_attach, "-xen-attach attach to existing xen domain\n" - " xend will use this when starting QEMU\n", + " libxl will use this when starting QEMU\n", QEMU_ARCH_ALL) DEF("xen-domid-restrict", 0, QEMU_OPTION_xen_domid_restrict, "-xen-domid-restrict restrict set of available xen operations\n" @@ -3414,7 +3414,7 @@ Specify xen guest domain @var{id} (XEN only). @item -xen-attach @findex -xen-attach Attach to existing xen domain. -xend will use this when starting QEMU (XEN only). +libxl will use this when starting QEMU (XEN only). @findex -xen-domid-restrict Restrict set of available xen operations to specified domain id (XEN only). ETEXI
xend have been replaced by libxenlight (libxl) for many Xen releases now. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- hw/xenpv/xen_machine_pv.c | 2 +- include/hw/xen/xen.h | 2 +- qemu-options.hx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)