[xen master] x86/pvh: also print hardware domain pIRQ limit for PVH

[patchbot@xxxxxxx]

commit 722d93bc9156a8635f42964d2009b562295c625c
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Mon Nov 25 11:33:38 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Nov 25 11:33:38 2024 +0100

    x86/pvh: also print hardware domain pIRQ limit for PVH
    
    Do not return early in the PVH/HVM case, so that the number of pIRQs is also
    printed.  While PVH dom0 doesn't have access to the hypercalls to manage 
pIRQs
    itself, nor the knowledge to do so, pIRQs are still used by Xen to map and
    bind interrupts to a PVH dom0 behind its back.  Hence the pIRQ limit is 
still
    relevant for a PVH dom0.
    
    Fixes: 17f6d398f765 ('cmdline: document and enforce "extra_guest_irqs" 
upper bounds')
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/io_apic.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index bd5ad61c85..d9db2efc4f 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2754,11 +2754,13 @@ unsigned int __hwdom_init arch_hwdom_irqs(const struct 
domain *d)
 
     /* PVH (generally: HVM) can't use PHYSDEVOP_pirq_eoi_gmfn_v{1,2}. */
     if ( is_hvm_domain(d) )
-        return nr_irqs;
-
-    if ( !d->domain_id )
-        n = min(n, dom0_max_vcpus());
-    n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, max_irqs);
+        n = nr_irqs;
+    else
+    {
+        if ( !d->domain_id )
+            n = min(n, dom0_max_vcpus());
+        n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, max_irqs);
+    }
 
     printk("%pd has maximum %u PIRQs\n", d, n);
 
--
generated by git-patchbot for /home/xen/git/xen.git#master