From: Anthony PERARD Date: Tue, 24 May 2016 14:45:36 +0000 (+0100) Subject: libxl: Avoid advertising about device_model_user config option X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1093 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a11c52af1c40d4a44aba2c2809337e282bee07be;p=xen.git libxl: Avoid advertising about device_model_user config option Running QEMU as non-root user is not ready yet, so replace the warning with a debug message and remove the option from the man page. Also improve the doc to include more potential issue with running QEMU as non-root. Signed-off-by: Anthony PERARD Acked-by: Wei Liu Acked-by: Ian Jackson Release-acked-by: Wei Liu --- diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a4cc1b3b3c..4a8bf51199 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1949,13 +1949,6 @@ Pass additional arbitrary options on the device-model command line for an HVM device model only. Each element in the list is passed as an option to the device-model. -=item B - -Run the device model as user "username", instead of -xen-qemudepriv-domid$domid or xen-qemudepriv-shared or root. -Please note that running QEMU as non-root causes migration and PCI -passthrough not to work properly. - =back =head2 Keymaps diff --git a/docs/misc/qemu-deprivilege.txt b/docs/misc/qemu-deprivilege.txt index 879a98eee6..58b86a3908 100644 --- a/docs/misc/qemu-deprivilege.txt +++ b/docs/misc/qemu-deprivilege.txt @@ -31,5 +31,6 @@ adduser --no-create-home --system xen-qemuuser-shared As a last resort, libxl will start QEMU as root. -Please note that running QEMU as non-root causes migration and PCI -passthrough not to work properly. +Please note that running QEMU as non-root causes several features like +migration and PCI passthrough to not work properly and may prevent the guest +from booting. diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 65dceeeb3b..6bbc7c34f1 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1482,7 +1482,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } user = NULL; - LOG(WARN, "Could not find user %s, starting QEMU as root", + LOG(DEBUG, "Could not find user %s, starting QEMU as root", LIBXL_QEMU_USER_SHARED); end_search: diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 9840f3bcd7..ef614be474 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -468,6 +468,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("device_model", string), ("device_model_ssidref", uint32), ("device_model_ssid_label", string), + # device_model_user is not ready for use yet ("device_model_user", string), # extra parameters pass directly to qemu, NULL terminated