qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, agraf@suse.de, thuth@redhat.com,
	pmorel@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com,
	Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PATCH RFC 6/7] s390x/kvm: msi route fixup for non-pci
Date: Fri,  7 Jul 2017 14:21:58 +0200	[thread overview]
Message-ID: <20170707122159.24714-7-cohuck@redhat.com> (raw)
In-Reply-To: <20170707122159.24714-1-cohuck@redhat.com>

On non-pci builds, we cannot have a pci device for which we
have to translate to adapter routes: just return -ENODEV.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/kvm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index c5c7c27a21..911b6da3f0 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2351,6 +2351,7 @@ int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)
 int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
                              uint64_t address, uint32_t data, PCIDevice *dev)
 {
+#ifdef CONFIG_PCI
     S390PCIBusDevice *pbdev;
     uint32_t idx = data >> ZPCI_MSI_VEC_BITS;
     uint32_t vec = data & ZPCI_MSI_VEC_MASK;
@@ -2371,6 +2372,9 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
     route->u.adapter.ind_offset = pbdev->routes.adapter.ind_offset;
     route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id;
     return 0;
+#else
+    return -ENODEV;
+#endif
 }
 
 int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route,
-- 
2.13.0

  parent reply	other threads:[~2017-07-07 12:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-07 12:21 [Qemu-devel] [PATCH RFC 0/7] s390x: zPCI detangling Cornelia Huck
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 1/7] kvm: remove hard dependency on pci Cornelia Huck
2017-07-07 13:11   ` Thomas Huth
2017-07-07 13:15     ` Cornelia Huck
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 2/7] s390x: chsc nt2 events are pci-only Cornelia Huck
2017-07-07 13:01   ` Christian Borntraeger
2017-07-07 13:11     ` Cornelia Huck
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 3/7] s390x/sclp: properly guard pci-specific functions Cornelia Huck
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 4/7] s390x/ccw: create s390 phb conditionally Cornelia Huck
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 5/7] s390x/pci: fence off instructions for non-pci Cornelia Huck
2017-07-07 12:55   ` Christian Borntraeger
2017-07-07 13:04     ` Cornelia Huck
2017-07-10 11:04       ` Cornelia Huck
2017-07-10 12:41         ` Christian Borntraeger
2017-07-10 12:54           ` Cornelia Huck
2017-07-07 13:00   ` Thomas Huth
2017-07-07 13:10     ` Cornelia Huck
2017-07-07 12:21 ` Cornelia Huck [this message]
2017-07-07 12:21 ` [Qemu-devel] [PATCH RFC 7/7] s390x: refine pci dependencies Cornelia Huck

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=20170707122159.24714-7-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=pmorel@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=zyimin@linux.vnet.ibm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).