KVM Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH -next] emulate:Fix build error
@ 2020-07-31  7:16 Peng Wu
  2020-07-31  7:36 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Peng Wu @ 2020-07-31  7:16 UTC (permalink / raw)
  To: tsbogend
  Cc: chenhc, pbonzini, aleksandar.qemu.devel, colin.king,
	tianjia.zhang, huanglllzu, linux-mips, kvm, linux-kernel

The declaration of function kvm_mips_complete_mmio_load
has only one formal parameter,but two parameters are passed
when called. So, the following error is seen while building
emulate.c

arch/mips/kvm/emulate.c: In function ‘kvm_mips_emulate_load’:
arch/mips/kvm/emulate.c:2130:3: error: too many arguments
to function ‘kvm_mips_complete_mmio_load’
   kvm_mips_complete_mmio_load(vcpu, run);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from linux/include/linux/kvm_host.h:36,
                 from linux/arch/mips/kvm/emulate.c:15:
arch/mips/include/asm/kvm_host.h:1072:30: note: declared here
extern enum emulation_result
	kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu);

Signed-off-by: Peng Wu <wupeng58@huawei.com>
---
 arch/mips/kvm/emulate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 1d41965..7037823 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -2127,7 +2127,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
 			run->mmio.phys_addr, run->mmio.len, run->mmio.data);
 
 	if (!r) {
-		kvm_mips_complete_mmio_load(vcpu, run);
+		kvm_mips_complete_mmio_load(vcpu);
 		vcpu->mmio_needed = 0;
 		return EMULATE_DONE;
 	}
-- 
2.7.4


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

* Re: [PATCH -next] emulate:Fix build error
  2020-07-31  7:16 [PATCH -next] emulate:Fix build error Peng Wu
@ 2020-07-31  7:36 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2020-07-31  7:36 UTC (permalink / raw)
  To: Peng Wu, tsbogend
  Cc: chenhc, aleksandar.qemu.devel, colin.king, tianjia.zhang,
	huanglllzu, linux-mips, kvm, linux-kernel

On 31/07/20 09:16, Peng Wu wrote:
> The declaration of function kvm_mips_complete_mmio_load
> has only one formal parameter,but two parameters are passed
> when called. So, the following error is seen while building
> emulate.c
> 
> arch/mips/kvm/emulate.c: In function ‘kvm_mips_emulate_load’:
> arch/mips/kvm/emulate.c:2130:3: error: too many arguments
> to function ‘kvm_mips_complete_mmio_load’
>    kvm_mips_complete_mmio_load(vcpu, run);
>    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from linux/include/linux/kvm_host.h:36,
>                  from linux/arch/mips/kvm/emulate.c:15:
> arch/mips/include/asm/kvm_host.h:1072:30: note: declared here
> extern enum emulation_result
> 	kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu);
> 
> Signed-off-by: Peng Wu <wupeng58@huawei.com>
> ---
>  arch/mips/kvm/emulate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
> index 1d41965..7037823 100644
> --- a/arch/mips/kvm/emulate.c
> +++ b/arch/mips/kvm/emulate.c
> @@ -2127,7 +2127,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
>  			run->mmio.phys_addr, run->mmio.len, run->mmio.data);
>  
>  	if (!r) {
> -		kvm_mips_complete_mmio_load(vcpu, run);
> +		kvm_mips_complete_mmio_load(vcpu);
>  		vcpu->mmio_needed = 0;
>  		return EMULATE_DONE;
>  	}
> 

This is queued already, I' will push it shortly.  Thanks!

Paolo


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

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-31  7:16 [PATCH -next] emulate:Fix build error Peng Wu
2020-07-31  7:36 ` Paolo Bonzini

KVM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \
		kvm@vger.kernel.org
	public-inbox-index kvm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.kvm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git