From c44c6ba6953f3544f357bc9887e5f85d8ed7c7fb Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 22 May 2019 09:08:41 +0100 Subject: [PATCH] Revert "libxl: fix libxl_domain_need_memory after 899433f149d" This reverts commit 278c64519c661c851d37e2a929f006fb8a1dcd01. Signed-off-by: Wei Liu --- tools/libxl/libxl_mem.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/libxl/libxl_mem.c b/tools/libxl/libxl_mem.c index 4446754186..448a2af8fd 100644 --- a/tools/libxl/libxl_mem.c +++ b/tools/libxl/libxl_mem.c @@ -457,24 +457,6 @@ int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info_init(b_info); libxl_domain_build_info_copy(ctx, b_info, b_info_in); - /* - * It has become a requirement that to figure out which QEMU to - * use, libxl will need to peek d_config's content. The code has - * been changed such that one will need to call - * libxl__domain_set_device_model before calling - * libxl__domain_build_info_setdefault inside libxl. - * - * This (problematic) public API is the only one which takes a - * b_info. Imposing the same requirement on the users of this - * public API will break them. - * - * Provide a compatibility setting for this function. The - * calculation doesn't really care which QEMU is set here, so we - * go with the upstream default. - */ - if (!b_info->device_model_version) - b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - rc = libxl__domain_build_info_setdefault(gc, b_info); if (rc) goto out; -- 2.30.2