[PATCH] kvm-unittests: Fix apic unittest for latest qemu-kvm

[PATCH] kvm-unittests: Fix apic unittest for latest qemu-kvm

[Joerg Roedel]

Since commit b334ec56 in qemu-kvm the use of irqlines > 15
is not supported anymore. This causes the apic unittest to
fail since this commit. Since the commit-msg explicitly
states that potential users of this needs to be fixed, here
is the fix which uses irq lines 14 and 15 instead in the
unittest.

Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 x86/apic.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x86/apic.c b/x86/apic.c
index 2725b9a..50e77fc 100644
--- a/x86/apic.c
+++ b/x86/apic.c
@@ -139,8 +139,8 @@ static void ioapic_isr_77(isr_regs_t *regs)
 static void test_ioapic_intr(void)
 {
     handle_irq(0x77, ioapic_isr_77);
-    set_ioapic_redir(0x10, 0x77);
-    toggle_irq_line(0x10);
+    set_ioapic_redir(0x0e, 0x77);
+    toggle_irq_line(0x0e);
     asm volatile ("nop");
     report("ioapic interrupt", g_isr_77 == 1);
 }
@@ -168,11 +168,11 @@ static void test_ioapic_simultaneous(void)
 {
     handle_irq(0x78, ioapic_isr_78);
     handle_irq(0x66, ioapic_isr_66);
-    set_ioapic_redir(0x10, 0x78);
-    set_ioapic_redir(0x11, 0x66);
+    set_ioapic_redir(0x0e, 0x78);
+    set_ioapic_redir(0x0f, 0x66);
     irq_disable();
-    toggle_irq_line(0x11);
-    toggle_irq_line(0x10);
+    toggle_irq_line(0x0f);
+    toggle_irq_line(0x0e);
     irq_enable();
     asm volatile ("nop");
     report("ioapic simultaneous interrupt",
-- 
1.7.0.4

Re: [PATCH] kvm-unittests: Fix apic unittest for latest qemu-kvm

[Amos Kong]

On 08/05/12 23:17, Joerg Roedel wrote:
> Since commit b334ec56 in qemu-kvm the use of irqlines>  15
> is not supported anymore. This causes the apic unittest to
> fail since this commit. Since the commit-msg explicitly
> states that potential users of this needs to be fixed, here
> is the fix which uses irq lines 14 and 15 instead in the
> unittest.
>
> Cc: Jan Kiszka<jan.kiszka@siemens.com>
> Signed-off-by: Joerg Roedel<joerg.roedel@amd.com>

Looks correct.

Reviewed-by: Amos Kong <akong@redhat.com>

> ---
>   x86/apic.c |   12 ++++++------
>   1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/x86/apic.c b/x86/apic.c
> index 2725b9a..50e77fc 100644
> --- a/x86/apic.c
> +++ b/x86/apic.c
> @@ -139,8 +139,8 @@ static void ioapic_isr_77(isr_regs_t *regs)
>   static void test_ioapic_intr(void)
>   {
>       handle_irq(0x77, ioapic_isr_77);
> -    set_ioapic_redir(0x10, 0x77);
> -    toggle_irq_line(0x10);
> +    set_ioapic_redir(0x0e, 0x77);
> +    toggle_irq_line(0x0e);
>       asm volatile ("nop");
>       report("ioapic interrupt", g_isr_77 == 1);
>   }
> @@ -168,11 +168,11 @@ static void test_ioapic_simultaneous(void)
>   {
>       handle_irq(0x78, ioapic_isr_78);
>       handle_irq(0x66, ioapic_isr_66);
> -    set_ioapic_redir(0x10, 0x78);
> -    set_ioapic_redir(0x11, 0x66);
> +    set_ioapic_redir(0x0e, 0x78);
> +    set_ioapic_redir(0x0f, 0x66);
>       irq_disable();
> -    toggle_irq_line(0x11);
> -    toggle_irq_line(0x10);
> +    toggle_irq_line(0x0f);
> +    toggle_irq_line(0x0e);
>       irq_enable();
>       asm volatile ("nop");
>       report("ioapic simultaneous interrupt",

-- 
			Amos.

Re: [PATCH] kvm-unittests: Fix apic unittest for latest qemu-kvm

[Avi Kivity]

On 05/08/2012 06:17 PM, Joerg Roedel wrote:
> Since commit b334ec56 in qemu-kvm the use of irqlines > 15
> is not supported anymore. This causes the apic unittest to
> fail since this commit. Since the commit-msg explicitly
> states that potential users of this needs to be fixed, here
> is the fix which uses irq lines 14 and 15 instead in the
> unittest.
>

Thanks, applied.

-- 
error compiling committee.c: too many arguments to function