From: tip-bot for Ingo Molnar <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, penberg@iki.fi, tglx@linutronix.de,
will.deacon@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com
Subject: [tip:tools/kvm] kvmtool: Adjust to new upstream virtio constants
Date: Mon, 16 Mar 2015 07:46:00 -0700 [thread overview]
Message-ID: <tip-2643c58e4518973f91e076b493c26dfd8642f14b@git.kernel.org> (raw)
In-Reply-To: <20150316142620.GA30206@gmail.com>
Commit-ID: 2643c58e4518973f91e076b493c26dfd8642f14b
Gitweb: http://git.kernel.org/tip/2643c58e4518973f91e076b493c26dfd8642f14b
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Mon, 16 Mar 2015 15:26:20 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 16 Mar 2015 15:27:59 +0100
kvmtool: Adjust to new upstream virtio constants
tools/kvm won't build on newer kernels, due to the rename in:
1862ee22ce2e ("virtio-mmio: Update the device to OASIS spec version")
adjust the code to the new names.
Cc: Pekka Enberg <penberg@iki.fi>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/20150316142620.GA30206@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/kvm/virtio/mmio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/kvm/virtio/mmio.c b/tools/kvm/virtio/mmio.c
index 5174455..1587d5c 100644
--- a/tools/kvm/virtio/mmio.c
+++ b/tools/kvm/virtio/mmio.c
@@ -122,7 +122,7 @@ static void virtio_mmio_config_in(struct kvm_cpu *vcpu,
case VIRTIO_MMIO_INTERRUPT_STATUS:
ioport__write32(data, *(u32 *)(((void *)&vmmio->hdr) + addr));
break;
- case VIRTIO_MMIO_HOST_FEATURES:
+ case VIRTIO_MMIO_DEVICE_FEATURES:
if (vmmio->hdr.host_features_sel == 0)
val = vdev->ops->get_host_features(vmmio->kvm,
vmmio->dev);
@@ -152,8 +152,8 @@ static void virtio_mmio_config_out(struct kvm_cpu *vcpu,
u32 val = 0;
switch (addr) {
- case VIRTIO_MMIO_HOST_FEATURES_SEL:
- case VIRTIO_MMIO_GUEST_FEATURES_SEL:
+ case VIRTIO_MMIO_DEVICE_FEATURES_SEL:
+ case VIRTIO_MMIO_DRIVER_FEATURES_SEL:
case VIRTIO_MMIO_QUEUE_SEL:
val = ioport__read32(data);
*(u32 *)(((void *)&vmmio->hdr) + addr) = val;
@@ -165,7 +165,7 @@ static void virtio_mmio_config_out(struct kvm_cpu *vcpu,
if (vdev->ops->notify_status)
vdev->ops->notify_status(kvm, vmmio->dev, vmmio->hdr.status);
break;
- case VIRTIO_MMIO_GUEST_FEATURES:
+ case VIRTIO_MMIO_DRIVER_FEATURES:
if (vmmio->hdr.guest_features_sel == 0) {
val = ioport__read32(data);
vdev->ops->set_guest_features(vmmio->kvm,
next prev parent reply other threads:[~2015-03-16 14:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 14:26 [PATCH] kvmtool: Adjust to new upstream virtio constants Ingo Molnar
2015-03-16 14:46 ` tip-bot for Ingo Molnar [this message]
2015-05-01 14:17 ` [tip:tools/kvm] " tip-bot for Ingo Molnar
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=tip-2643c58e4518973f91e076b493c26dfd8642f14b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=penberg@iki.fi \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.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