forked from pool/libvirt
f167ba3466
- apparmor: don't fail on non-apparmor <seclabel> apparmor-errormsg-fix.patch, apparmor-alt-seclabel.patch bsc#1023436 - libxl: fix reporting of domain maximum memory ff225538-libxl-autoballoon-setting.patch, c89a6e78-libxl-physinfo-cleanup.patch, d2b77608-libxl-maxmem-fix.patch, 79692c38-libxl-dom0-maxmem.patch bsc#1017762 - libxl: set disk format to raw if not specified and fix disk detach 321a28c6-libxl-default-disk-format.patch, bd116810-libxl-fix-disk-detach.patch bsc#1003379 - libxl: fix timer configurations 6e4759d0-libxl-timer-fix.patch, 87df87e0-libxl-timer-tsc-emulate.patch, b4386fda-xenconfig-timer-fix.patch, d3970925-timer-tests.patch bsc#1019969 OBS-URL: https://build.opensuse.org/request/show/456194 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=583
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
commit 87df87e06b57dedd39906cd46166842179732668
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Thu Jan 19 16:21:34 2017 -0700
|
|
|
|
libxl: support emulate mode of tsc timer
|
|
|
|
While at it, use members of libxl_tsc_mode enum instead of literal
|
|
int values.
|
|
|
|
Index: libvirt-3.0.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-3.0.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-3.0.0/src/libxl/libxl_conf.c
|
|
@@ -318,13 +318,16 @@ libxlMakeDomBuildInfo(virDomainDefPtr de
|
|
case VIR_DOMAIN_TIMER_NAME_TSC:
|
|
switch (def->clock.timers[i]->mode) {
|
|
case VIR_DOMAIN_TIMER_MODE_NATIVE:
|
|
- b_info->tsc_mode = 2;
|
|
+ b_info->tsc_mode = LIBXL_TSC_MODE_NATIVE;
|
|
break;
|
|
case VIR_DOMAIN_TIMER_MODE_PARAVIRT:
|
|
- b_info->tsc_mode = 3;
|
|
+ b_info->tsc_mode = LIBXL_TSC_MODE_NATIVE_PARAVIRT;
|
|
+ break;
|
|
+ case VIR_DOMAIN_TIMER_MODE_EMULATE:
|
|
+ b_info->tsc_mode = LIBXL_TSC_MODE_ALWAYS_EMULATE;
|
|
break;
|
|
default:
|
|
- b_info->tsc_mode = 1;
|
|
+ b_info->tsc_mode = LIBXL_TSC_MODE_DEFAULT;
|
|
}
|
|
break;
|
|
|