All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org
Subject: [PATCH 03/16] Revert "qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing"
Date: Fri, 13 May 2011 14:13:57 +0200	[thread overview]
Message-ID: <35f91d719f5ca7bbfa603f2c8be0ba9baf1b6120.1305288845.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1305288845.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1305288845.git.jan.kiszka@siemens.com>

This reverts commit fd6bfef3d49a62b36092f131690de3e34f84662d.

It is a nop, and it always was a nop:

    irq0override = !kvm_irqchip || kvm_has_gsi_routing

But this code is only executed when gsi routing is available.

Conflicts:

	qemu-kvm-x86.c

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 qemu-kvm-x86.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 6c3a0a9..c039e16 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -317,9 +317,9 @@ int kvm_arch_init_irq_routing(void)
             }
         }
         for (i = 0; i < 24; ++i) {
-            if (i == 0 && irq0override) {
+            if (i == 0) {
                 r = kvm_add_irq_route(i, KVM_IRQCHIP_IOAPIC, 2);
-            } else if (i != 2 || !irq0override) {
+            } else if (i != 2) {
                 r = kvm_add_irq_route(i, KVM_IRQCHIP_IOAPIC, i);
             }
             if (r < 0) {
-- 
1.7.1


  parent reply	other threads:[~2011-05-13 12:14 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-13 12:13 [PATCH 00/16] qemu-kvm: Cleanup and switch to upstream - Part II Jan Kiszka
2011-05-13 12:13 ` [PATCH 01/16] qemu-kvm: Drop kvm_cpu_register_phys_memory_client wrapper Jan Kiszka
2011-05-13 12:13 ` [PATCH 02/16] qemu-kvm: Drop kvm_inject_interrupt Jan Kiszka
2011-05-13 12:13 ` Jan Kiszka [this message]
2011-05-16 10:24   ` [PATCH 03/16] Revert "qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing" Avi Kivity
2011-05-16 10:33     ` Avi Kivity
2011-05-13 12:13 ` [PATCH 04/16] qemu-kvm: Drop IRQ0 override test from ioapic_set_irq Jan Kiszka
2011-05-16 10:29   ` Avi Kivity
2011-05-13 12:13 ` [PATCH 05/16] qemu-kvm: Clean up IRQ0 override configuration Jan Kiszka
2011-05-13 12:14 ` [PATCH 06/16] qemu-kvm: Refactor irqchip and routing initialization Jan Kiszka
2011-05-13 12:14 ` [PATCH 07/16] qemu-kvm: Fold kvm_get_gsi_count into kvm_create_irqchip Jan Kiszka
2011-05-13 12:14 ` [PATCH 08/16] qemu-kvm: Make some private functions static Jan Kiszka
2011-05-13 12:14 ` [PATCH 09/16] qemu-kvm: Implement kvm_has_pit_state2 in upstream style Jan Kiszka
2011-05-13 12:14 ` [PATCH 10/16] qemu-kvm: Fold kvm_set_irq_level into kvm_set_irq Jan Kiszka
2011-05-13 12:14 ` [PATCH 11/16] qemu-kvm: Remove kvm_context from public interfaces Jan Kiszka
2011-05-13 12:14 ` [PATCH 12/16] qemu-kvm: Fold kvm_set_boot_vcpu_id into kvm_set_boot_cpu_id Jan Kiszka
2011-05-13 12:14 ` [PATCH 13/16] qemu-kvm: Remove handle_io_window Jan Kiszka
2011-05-13 12:14 ` [PATCH 14/16] qemu-kvm: Merge kvm_context into KVMState Jan Kiszka
2011-05-13 12:14 ` [PATCH 15/16] qemu-kvm: Use KVM-optimized interrupt handler Jan Kiszka
2011-05-13 12:14 ` [PATCH 16/16] qemu-kvm: Use upstream kvm_init Jan Kiszka
2011-05-16 10:37 ` [PATCH 00/16] qemu-kvm: Cleanup and switch to upstream - Part II Avi Kivity
2011-05-17 18:47 ` Marcelo Tosatti

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=35f91d719f5ca7bbfa603f2c8be0ba9baf1b6120.1305288845.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.