All of lore.kernel.org
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org,
	Jan Kiszka <jan.kiszka@siemens.com>,
	Marcelo Tosatti <mtosatti@redhat.com>
Subject: [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route
Date: Mon, 21 May 2012 19:37:40 +0300	[thread overview]
Message-ID: <1337618267-16669-13-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1337618267-16669-1-git-send-email-avi@redhat.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

We will add kvm_irqchip_add_msi_route, so let's make the difference
clearer.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/pc_piix.c |    8 ++++----
 kvm-all.c    |    2 +-
 kvm.h        |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 6a75718..c17f906 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -63,17 +63,17 @@ static void kvm_piix3_setup_irq_routing(bool pci_enabled)
             if (i == 2) {
                 continue;
             }
-            kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
         }
         for (i = 8; i < 16; ++i) {
-            kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
         }
         if (pci_enabled) {
             for (i = 0; i < 24; ++i) {
                 if (i == 0) {
-                    kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
                 } else if (i != 2) {
-                    kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, i);
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
                 }
             }
         }
diff --git a/kvm-all.c b/kvm-all.c
index 1913d6a..0117837 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -935,7 +935,7 @@ static void kvm_add_routing_entry(KVMState *s,
     set_gsi(s, entry->gsi);
 }
 
-void kvm_irqchip_add_route(KVMState *s, int irq, int irqchip, int pin)
+void kvm_irqchip_add_irq_route(KVMState *s, int irq, int irqchip, int pin)
 {
     struct kvm_irq_routing_entry e;
 
diff --git a/kvm.h b/kvm.h
index 7857dbf..8b061bd 100644
--- a/kvm.h
+++ b/kvm.h
@@ -134,7 +134,7 @@ void kvm_arch_init_irq_routing(KVMState *s);
 int kvm_irqchip_set_irq(KVMState *s, int irq, int level);
 int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
 
-void kvm_irqchip_add_route(KVMState *s, int gsi, int irqchip, int pin);
+void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
 int kvm_irqchip_commit_routes(KVMState *s);
 
 void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
-- 
1.7.10.1


WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route
Date: Mon, 21 May 2012 19:37:40 +0300	[thread overview]
Message-ID: <1337618267-16669-13-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1337618267-16669-1-git-send-email-avi@redhat.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

We will add kvm_irqchip_add_msi_route, so let's make the difference
clearer.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/pc_piix.c |    8 ++++----
 kvm-all.c    |    2 +-
 kvm.h        |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 6a75718..c17f906 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -63,17 +63,17 @@ static void kvm_piix3_setup_irq_routing(bool pci_enabled)
             if (i == 2) {
                 continue;
             }
-            kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
         }
         for (i = 8; i < 16; ++i) {
-            kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
         }
         if (pci_enabled) {
             for (i = 0; i < 24; ++i) {
                 if (i == 0) {
-                    kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
                 } else if (i != 2) {
-                    kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, i);
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
                 }
             }
         }
diff --git a/kvm-all.c b/kvm-all.c
index 1913d6a..0117837 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -935,7 +935,7 @@ static void kvm_add_routing_entry(KVMState *s,
     set_gsi(s, entry->gsi);
 }
 
-void kvm_irqchip_add_route(KVMState *s, int irq, int irqchip, int pin)
+void kvm_irqchip_add_irq_route(KVMState *s, int irq, int irqchip, int pin)
 {
     struct kvm_irq_routing_entry e;
 
diff --git a/kvm.h b/kvm.h
index 7857dbf..8b061bd 100644
--- a/kvm.h
+++ b/kvm.h
@@ -134,7 +134,7 @@ void kvm_arch_init_irq_routing(KVMState *s);
 int kvm_irqchip_set_irq(KVMState *s, int irq, int level);
 int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
 
-void kvm_irqchip_add_route(KVMState *s, int gsi, int irqchip, int pin);
+void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
 int kvm_irqchip_commit_routes(KVMState *s);
 
 void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
-- 
1.7.10.1

  parent reply	other threads:[~2012-05-21 18:11 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-21 16:37 [PULL 00/20 1.2] kvm updates Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 01/19] kvm: Refactor KVMState::max_gsi to gsi_count Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 02/19] Introduce MSIMessage structure Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 03/19] kvm: Introduce basic MSI support for in-kernel irqchips Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 04/19] pc: Enable MSI support at APIC level Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 05/19] kvm: x86: Wire up MSI support for in-kernel irqchip Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 06/19] kvm: Update kernel headers Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 07/19] kvm: Add support for direct MSI injections Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 08/19] kvm: Enable in-kernel irqchip support by default Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 09/19] msix: Factor out msix_get_message Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 10/19] msix: Invoke msix_handle_mask_update on msix_mask_all Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 11/19] msix: Introduce vector notifiers Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` Avi Kivity [this message]
2012-05-21 16:37   ` [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route Avi Kivity
2012-05-21 16:37 ` [PATCH 13/19] kvm: Introduce kvm_irqchip_add_msi_route Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 14/19] kvm: Publicize kvm_irqchip_release_virq Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 15/19] kvm: Make kvm_irqchip_commit_routes an internal service Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 17/19] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 18/19] msix: Add msix_nr_vectors_allocated Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-05-21 16:37 ` [PATCH 19/19] virtio/vhost: Add support for KVM in-kernel MSI injection Avi Kivity
2012-05-21 16:37   ` [Qemu-devel] " Avi Kivity
2012-06-04  5:46 ` [Qemu-devel] [PULL 00/20 1.2] kvm updates Anthony Liguori
2012-06-05  0:52   ` Andreas Färber
2012-06-05  0:52     ` Andreas Färber
2012-06-05  0:52     ` Andreas Färber
2012-06-05  1:58     ` Anthony Liguori
2012-06-05  1:58       ` Anthony Liguori
2012-06-05  1:58       ` Anthony Liguori
2012-06-05  2:26       ` Andreas Färber
2012-06-05  2:26         ` Andreas Färber
2012-06-05  2:26         ` Andreas Färber
2012-06-05  7:42       ` Avi Kivity
2012-06-05  7:42         ` Avi Kivity
2012-06-05  7:42         ` Avi Kivity
2012-06-05  8:10         ` Alexander Graf
2012-06-05  8:10           ` Alexander Graf
2012-06-05  8:10           ` Alexander Graf
2012-06-05  8:32           ` [Qemu-devel] " Jan Kiszka
2012-06-05  8:32             ` Jan Kiszka
2012-06-05  8:32             ` Jan Kiszka
2012-06-05  9:02         ` Anthony Liguori
2012-06-05  9:02           ` Anthony Liguori
2012-06-05  9:11           ` Avi Kivity
2012-06-05  9:11             ` Avi Kivity
2012-06-05  9:11             ` Avi Kivity

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=1337618267-16669-13-git-send-email-avi@redhat.com \
    --to=avi@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=jan.kiszka@siemens.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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.