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
85 lines
2.7 KiB
Diff
85 lines
2.7 KiB
Diff
Index: xen-4.2.1-testing/xen/arch/x86/platform_hypercall.c
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/xen/arch/x86/platform_hypercall.c
|
|
+++ xen-4.2.1-testing/xen/arch/x86/platform_hypercall.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <xen/irq.h>
|
|
#include <asm/current.h>
|
|
#include <public/platform.h>
|
|
-#include <acpi/cpufreq/processor_perf.h>
|
|
+#include <acpi/cpufreq/cpufreq.h>
|
|
#include <asm/edd.h>
|
|
#include <asm/mtrr.h>
|
|
#include <asm/io_apic.h>
|
|
@@ -639,6 +639,41 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
|
|
}
|
|
break;
|
|
|
|
+ case XENPF_get_cpu_freq:
|
|
+ case XENPF_get_cpu_freq_min:
|
|
+ case XENPF_get_cpu_freq_max:
|
|
+ {
|
|
+ struct vcpu *v;
|
|
+ const struct cpufreq_policy *policy;
|
|
+
|
|
+ if ( op->u.get_cpu_freq.vcpu >= current->domain->max_vcpus ||
|
|
+ !(v = current->domain->vcpu[op->u.get_cpu_freq.vcpu]) )
|
|
+ {
|
|
+ ret = -EINVAL;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ policy = per_cpu(cpufreq_cpu_policy, v->processor);
|
|
+ switch ( op->cmd & -!!policy )
|
|
+ {
|
|
+ case XENPF_get_cpu_freq:
|
|
+ op->u.get_cpu_freq.freq = policy->cur;
|
|
+ break;
|
|
+ case XENPF_get_cpu_freq_min:
|
|
+ op->u.get_cpu_freq.freq = policy->min;
|
|
+ break;
|
|
+ case XENPF_get_cpu_freq_max:
|
|
+ op->u.get_cpu_freq.freq = policy->max;
|
|
+ break;
|
|
+ default:
|
|
+ op->u.get_cpu_freq.freq = 0;
|
|
+ break;
|
|
+ }
|
|
+ if ( copy_field_to_guest(u_xenpf_op, op, u.get_cpu_freq.freq) )
|
|
+ ret = -EFAULT;
|
|
+ }
|
|
+ break;
|
|
+
|
|
default:
|
|
ret = -ENOSYS;
|
|
break;
|
|
Index: xen-4.2.1-testing/xen/include/public/platform.h
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/xen/include/public/platform.h
|
|
+++ xen-4.2.1-testing/xen/include/public/platform.h
|
|
@@ -505,6 +505,16 @@ struct xenpf_core_parking {
|
|
typedef struct xenpf_core_parking xenpf_core_parking_t;
|
|
DEFINE_XEN_GUEST_HANDLE(xenpf_core_parking_t);
|
|
|
|
+#define XENPF_get_cpu_freq ('N' << 24)
|
|
+#define XENPF_get_cpu_freq_min (XENPF_get_cpu_freq + 1)
|
|
+#define XENPF_get_cpu_freq_max (XENPF_get_cpu_freq_min + 1)
|
|
+struct xenpf_get_cpu_freq {
|
|
+ /* IN variables */
|
|
+ uint32_t vcpu;
|
|
+ /* OUT variables */
|
|
+ uint32_t freq; /* in kHz */
|
|
+};
|
|
+
|
|
/*
|
|
* ` enum neg_errnoval
|
|
* ` HYPERVISOR_platform_op(const struct xen_platform_op*);
|
|
@@ -531,6 +541,7 @@ struct xen_platform_op {
|
|
struct xenpf_cpu_hotadd cpu_add;
|
|
struct xenpf_mem_hotadd mem_add;
|
|
struct xenpf_core_parking core_parking;
|
|
+ struct xenpf_get_cpu_freq get_cpu_freq;
|
|
uint8_t pad[128];
|
|
} u;
|
|
};
|