Olaf Hering
b9d38dfc8d
- remove xen.migrate.tools_notify_restore_to_hangup_during_migration_--abort_if_busy.patch It changed migration protocol and upstream wants a different solution - bnc#802221 - fix xenpaging readd xenpaging.qemu.flush-cache.patch - Upstream patches from Jan 26891-x86-S3-Fix-cpu-pool-scheduling-after-suspend-resume.patch 26930-x86-EFI-fix-runtime-call-status-for-compat-mode-Dom0.patch - Additional fix for bnc#816159 CVE-2013-1918-xsa45-followup.patch - bnc#817068 - Xen guest with >1 sr-iov vf won't start xen-managed-pci-device.patch - Update to Xen 4.2.2 c/s 26064 The following recent security patches are included in the tarball CVE-2013-0151-xsa34.patch (bnc#797285) CVE-2012-6075-xsa41.patch (bnc#797523) CVE-2013-1917-xsa44.patch (bnc#813673) CVE-2013-1919-xsa46.patch (bnc#813675) - Upstream patch from Jan 26902-x86-EFI-pass-boot-services-variable-info-to-runtime-code.patch - bnc#816159 - VUL-0: xen: CVE-2013-1918: XSA-45: Several long latency operations are not preemptible CVE-2013-1918-xsa45-1-vcpu-destroy-pagetables-preemptible.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=237
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User Ross Philipson <ross.philipson@citrix.com>
|
|
# Date 1360935136 0
|
|
# Node ID 3124ab7855fd7d4e0f3ea125cb21b60d693e8800
|
|
# Parent 71c15ae0998378b5c117bbd27a48015757685706
|
|
libxl: switch to using the new xc_hvm_build() libxc API.
|
|
|
|
Signed-off-by: Ross Philipson <ross.philipson@citrix.com>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Committed-by: Ian Campbell <ian.campbell@citrix.com>
|
|
|
|
Index: xen-4.2.2-testing/tools/libxl/libxl_dom.c
|
|
===================================================================
|
|
--- xen-4.2.2-testing.orig/tools/libxl/libxl_dom.c
|
|
+++ xen-4.2.2-testing/tools/libxl/libxl_dom.c
|
|
@@ -546,17 +546,24 @@ int libxl__build_hvm(libxl__gc *gc, uint
|
|
libxl__domain_build_state *state)
|
|
{
|
|
libxl_ctx *ctx = libxl__gc_owner(gc);
|
|
+ struct xc_hvm_build_args args = {};
|
|
int ret, rc = ERROR_FAIL;
|
|
const char *firmware = libxl__domain_firmware(gc, info);
|
|
|
|
if (!firmware)
|
|
goto out;
|
|
- ret = xc_hvm_build_target_mem(
|
|
- ctx->xch,
|
|
- domid,
|
|
- (info->max_memkb - info->video_memkb) / 1024,
|
|
- (info->target_memkb - info->video_memkb) / 1024,
|
|
- firmware);
|
|
+
|
|
+ memset(&args, 0, sizeof(struct xc_hvm_build_args));
|
|
+ /* The params from the configuration file are in Mb, which are then
|
|
+ * multiplied by 1 Kb. This was then divided off when calling
|
|
+ * the old xc_hvm_build_target_mem() which then turned them to bytes.
|
|
+ * Do all this in one step here...
|
|
+ */
|
|
+ args.mem_size = (uint64_t)(info->max_memkb - info->video_memkb) << 10;
|
|
+ args.mem_target = (uint64_t)(info->target_memkb - info->video_memkb) << 10;
|
|
+ args.image_file_name = firmware;
|
|
+
|
|
+ ret = xc_hvm_build(ctx->xch, domid, &args);
|
|
if (ret) {
|
|
LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, ret, "hvm building failed");
|
|
goto out;
|