Mailing List Archive

commit 9a73b4e21007cb51057bde55d05a7804a5769113
Author: Jan Beulich <jbeulich@suse.com>
AuthorDate: Thu Apr 25 09:53:55 2024 +0200
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Thu Apr 25 09:53:55 2024 +0200

x86/paging: vCPU host mode is always set

... thanks to paging_vcpu_init() being part of vCPU creation. Further
if paging is enabled on a domain, it's also guaranteed to be either HAP
or shadow. Drop respective unnecessary (parts of) conditionals.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
---
xen/arch/x86/mm/paging.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index 2961ca734d..bca320fffa 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -937,19 +937,12 @@ void paging_dump_vcpu_info(struct vcpu *v)
{
printk(" paging assistance: ");
if ( paging_mode_shadow(v->domain) )
- {
- if ( paging_get_hostmode(v) )
- printk("shadowed %u-on-%u\n",
- paging_get_hostmode(v)->guest_levels,
- paging_get_hostmode(v)->shadow.shadow_levels);
- else
- printk("not shadowed\n");
- }
- else if ( paging_mode_hap(v->domain) && paging_get_hostmode(v) )
+ printk("shadowed %u-on-%u\n",
+ paging_get_hostmode(v)->guest_levels,
+ paging_get_hostmode(v)->shadow.shadow_levels);
+ else
printk("hap, %u levels\n",
paging_get_hostmode(v)->guest_levels);
- else
- printk("none\n");
}
}

--
generated by git-patchbot for /home/xen/git/xen.git#staging