From: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: David Daney <ddaney.cavm@gmail.com>, <kvm@vger.kernel.org>,
<linux-mips@linux-mips.org>, James Hogan <james.hogan@imgtec.com>
Subject: [PATCH] kvm tools, mips: Adapt signature of kvm_cpu__emulate_io
Date: Mon, 16 Jun 2014 13:47:29 +0200 [thread overview]
Message-ID: <20140616114729.GB17831@alberich> (raw)
Use struct kvm_cpu instead of struct kvm.
This change is req'd due to commit
8d770c4096cdf73e1b79e7395ef3a86aa2887077
(kvmtool: virtio: pass trapped vcpu to IO accessors).
Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
---
tools/kvm/mips/include/kvm/kvm-cpu-arch.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Hi Pekka,
When submitting v3 patch set for mips support
(http://marc.info/?i=1401307735-16195-1-git-send-email-andreas.herrmann@caviumnetworks.com)
that was based on v3.13-rc1-1436-g1fc83c5 of your tree.
Thus I missed commit 8d770c4096cdf73e1b79e7395ef3a86aa2887077
(kvmtool: virtio: pass trapped vcpu to IO accessors)
This patch provides the req'd change for above commit to fix
compilation for mips.
Please apply.
Thanks,
Andreas
diff --git a/tools/kvm/mips/include/kvm/kvm-cpu-arch.h b/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
index fc286b1..3db7f2b 100644
--- a/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
+++ b/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
@@ -29,9 +29,9 @@ struct kvm_cpu {
* As these are such simple wrappers, let's have them in the header so they'll
* be cheaper to call:
*/
-static inline bool kvm_cpu__emulate_io(struct kvm *kvm, u16 port, void *data, int direction, int size, u32 count)
+static inline bool kvm_cpu__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction, int size, u32 count)
{
- return kvm__emulate_io(kvm, port, data, direction, size, count);
+ return kvm__emulate_io(vcpu, port, data, direction, size, count);
}
static inline bool kvm_cpu__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, u8 *data, u32 len, u8 is_write)
--
1.7.9.5
reply other threads:[~2014-06-16 11:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140616114729.GB17831@alberich \
--to=andreas.herrmann@caviumnetworks.com \
--cc=ddaney.cavm@gmail.com \
--cc=james.hogan@imgtec.com \
--cc=kvm@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=penberg@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox