| Message ID | 20200108103857.77236-3-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix nested interrupt injection on virtual vmexit | expand |
On Wed, Jan 08, 2020 at 11:38:57AM +0100, Roger Pau Monne wrote: > This reverts commit 7b3c5b70a32303b46d0d051e695f18d72cce5ed0 and > re-enables the usage of x2APIC with nested virtualization. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Wei Liu <wl@xen.org> (subject to acceptance of patch 1, of course) > --- > tools/libxc/xc_cpuid_x86.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c > index ac38c1406e..2540aa1e1c 100644 > --- a/tools/libxc/xc_cpuid_x86.c > +++ b/tools/libxc/xc_cpuid_x86.c > @@ -653,17 +653,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, > p->extd.itsc = true; > p->basic.vmx = true; > p->extd.svm = true; > - > - /* > - * BODGE: don't announce x2APIC mode when using nested virtualization, > - * as it doesn't work properly. This should be removed once the > - * underlying bug(s) are fixed. > - */ > - rc = xc_hvm_param_get(xch, domid, HVM_PARAM_NESTEDHVM, &val); > - if ( rc ) > - goto out; > - if ( val ) > - p->basic.x2apic = false; > } > > rc = x86_cpuid_copy_to_buffer(p, leaves, &nr_leaves); > -- > 2.24.1 >
diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index ac38c1406e..2540aa1e1c 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -653,17 +653,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, p->extd.itsc = true; p->basic.vmx = true; p->extd.svm = true; - - /* - * BODGE: don't announce x2APIC mode when using nested virtualization, - * as it doesn't work properly. This should be removed once the - * underlying bug(s) are fixed. - */ - rc = xc_hvm_param_get(xch, domid, HVM_PARAM_NESTEDHVM, &val); - if ( rc ) - goto out; - if ( val ) - p->basic.x2apic = false; } rc = x86_cpuid_copy_to_buffer(p, leaves, &nr_leaves);
This reverts commit 7b3c5b70a32303b46d0d051e695f18d72cce5ed0 and re-enables the usage of x2APIC with nested virtualization. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- tools/libxc/xc_cpuid_x86.c | 11 ----------- 1 file changed, 11 deletions(-)