646cd8897b
Updated block-dmmd script - fate#310510 - fix xenpaging restore changes to integrate paging into xm/xend xenpaging.autostart.patch xenpaging.doc.patch - bnc#787163 - VUL-0: CVE-2012-4544: xen: Domain builder Out-of- memory due to malicious kernel/ramdisk (XSA 25) CVE-2012-4544-xsa25.patch - bnc#779212 - VUL-0: CVE-2012-4411: XEN / qemu: guest administrator can access qemu monitor console (XSA-19) CVE-2012-4411-xsa19.patch - bnc#786516 - VUL-0: CVE-2012-4535: xen: Timer overflow DoS vulnerability CVE-2012-4535-xsa20.patch - bnc#786518 - VUL-0: CVE-2012-4536: xen: pirq range check DoS vulnerability CVE-2012-4536-xsa21.patch - bnc#786517 - VUL-0: CVE-2012-4537: xen: Memory mapping failure DoS vulnerability CVE-2012-4537-xsa22.patch - bnc#786519 - VUL-0: CVE-2012-4538: xen: Unhooking empty PAE entries DoS vulnerability CVE-2012-4538-xsa23.patch - bnc#786520 - VUL-0: CVE-2012-4539: xen: Grant table hypercall infinite loop DoS vulnerability CVE-2012-4539-xsa24.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=212
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
# HG changeset patch
|
||
# User Dario Faggioli <dario.faggioli@citrix.com>
|
||
# Date 1350990742 25200
|
||
# Node ID 6d54c3338c52ec3a8e671c13284a59a535a3273f
|
||
# Parent 67c27013e191598543ccc1b8f8f1d533c7a5164b
|
||
xen: fix build when 'perfc=y'
|
||
|
||
Which was failing with this:
|
||
|
||
viridian.c: In function ‘wrmsr_viridian_regs’:
|
||
viridian.c:254:1: error: ‘PERFC_mshv_wrmsr_apic_msr’ undeclared
|
||
(first use in this function)
|
||
viridian.c:254:1: note: each undeclared identifier is reported only
|
||
once for each function it appears in
|
||
viridian.c: In function ‘rdmsr_viridian_regs’:
|
||
viridian.c:305:1: error: ‘PERFC_mshv_rdmsr_apic_msr’ undeclared
|
||
(first use in this function)
|
||
|
||
as a consequence of 17b754cab7b0 using but not defining
|
||
the counters.
|
||
|
||
Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
|
||
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
|
||
Committed-by: Keir Fraser <keir@xen.org>
|
||
|
||
--- a/xen/include/asm-x86/perfc_defn.h
|
||
+++ b/xen/include/asm-x86/perfc_defn.h
|
||
@@ -121,6 +121,7 @@ PERFCOUNTER(mshv_rdmsr_vp_index,
|
||
PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr")
|
||
PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr")
|
||
PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist")
|
||
+PERFCOUNTER(mshv_rdmsr_apic_msr, "MS Hv rdmsr APIC msr")
|
||
PERFCOUNTER(mshv_wrmsr_osid, "MS Hv wrmsr Guest OS ID")
|
||
PERFCOUNTER(mshv_wrmsr_hc_page, "MS Hv wrmsr hypercall page")
|
||
PERFCOUNTER(mshv_wrmsr_vp_index, "MS Hv wrmsr vp index")
|
||
@@ -128,6 +129,7 @@ PERFCOUNTER(mshv_wrmsr_icr,
|
||
PERFCOUNTER(mshv_wrmsr_tpr, "MS Hv wrmsr tpr")
|
||
PERFCOUNTER(mshv_wrmsr_eoi, "MS Hv wrmsr eoi")
|
||
PERFCOUNTER(mshv_wrmsr_apic_assist, "MS Hv wrmsr APIC assist")
|
||
+PERFCOUNTER(mshv_wrmsr_apic_msr, "MS Hv wrmsr APIC msr")
|
||
|
||
PERFCOUNTER(realmode_emulations, "realmode instructions emulated")
|
||
PERFCOUNTER(realmode_exits, "vmexits from realmode")
|