qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] hw/s390x: Fix the function arguments in the pci stub file
@ 2019-01-31 17:47 Thomas Huth
  2019-01-31 17:56 ` Cornelia Huck
  0 siblings, 1 reply; 12+ messages in thread
From: Thomas Huth @ 2019-01-31 17:47 UTC (permalink / raw)
  To: Collin Walling, Cornelia Huck, qemu-devel; +Cc: qemu-s390x, Paolo Bonzini

The arguments of the stub functions to not match the real implementation
(and the prototypes in the header) anymore, so if you try to compile s390x
without CONFIG_PCI, the build currently fails.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/s390x/s390-pci-stub.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c
index ad4c5a7..145759e 100644
--- a/hw/s390x/s390-pci-stub.c
+++ b/hw/s390x/s390-pci-stub.c
@@ -29,38 +29,40 @@ void s390_pci_sclp_deconfigure(SCCB *sccb)
 }
 
 /* target/s390x/kvm.c */
-int clp_service_call(S390CPU *cpu, uint8_t r2)
+int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
 {
     return -1;
 }
 
-int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)
+int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
 {
     return -1;
 }
 
-int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)
+int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
 {
     return -1;
 }
 
-int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)
+int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
+                         uintptr_t ra)
 {
     return -1;
 }
 
-int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)
+int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
 {
     return -1;
 }
 
 int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,
-                        uint8_t ar)
+                        uint8_t ar, uintptr_t ra)
 {
     return -1;
 }
 
-int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)
+int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
+                        uintptr_t ra)
 {
     return -1;
 }
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2019-02-11 11:21 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-31 17:47 [Qemu-devel] [PATCH] hw/s390x: Fix the function arguments in the pci stub file Thomas Huth
2019-01-31 17:56 ` Cornelia Huck
2019-01-31 18:00   ` Thomas Huth
2019-01-31 18:08     ` Paolo Bonzini
2019-02-01  6:14       ` Thomas Huth
2019-02-01  6:46         ` Thomas Huth
2019-02-01  8:23           ` Cornelia Huck
2019-02-11 10:48             ` Cornelia Huck
2019-02-11 10:54               ` Thomas Huth
2019-02-11 11:04                 ` Cornelia Huck
2019-02-11 11:17                   ` Thomas Huth
2019-02-11 11:20                     ` Cornelia Huck

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).