* [PATCH] kvmtool: Adjust to new upstream virtio constants
@ 2015-03-16 14:26 Ingo Molnar
2015-03-16 14:46 ` [tip:tools/kvm] " tip-bot for Ingo Molnar
2015-05-01 14:17 ` tip-bot for Ingo Molnar
0 siblings, 2 replies; 3+ messages in thread
From: Ingo Molnar @ 2015-03-16 14:26 UTC (permalink / raw)
To: Pekka Enberg; +Cc: linux-kernel, Will Deacon
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.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
diff --git a/tools/kvm/virtio/mmio.c b/tools/kvm/virtio/mmio.c
index 5174455c6c90..1587d5c8b73a 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,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:tools/kvm] kvmtool: Adjust to new upstream virtio constants
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
2015-05-01 14:17 ` tip-bot for Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Ingo Molnar @ 2015-03-16 14:46 UTC (permalink / raw)
To: linux-tip-commits; +Cc: mingo, penberg, tglx, will.deacon, linux-kernel, hpa
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,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:tools/kvm] kvmtool: Adjust to new upstream virtio constants
2015-03-16 14:26 [PATCH] kvmtool: Adjust to new upstream virtio constants Ingo Molnar
2015-03-16 14:46 ` [tip:tools/kvm] " tip-bot for Ingo Molnar
@ 2015-05-01 14:17 ` tip-bot for Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Ingo Molnar @ 2015-05-01 14:17 UTC (permalink / raw)
To: linux-tip-commits; +Cc: will.deacon, linux-kernel, hpa, mingo, penberg, tglx
Commit-ID: 4f24511d36c9e41b42a53a6cf5d4b970e013fdfd
Gitweb: http://git.kernel.org/tip/4f24511d36c9e41b42a53a6cf5d4b970e013fdfd
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Mon, 16 Mar 2015 15:26:20 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 1 May 2015 16:11:58 +0200
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,
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-01 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-16 14:26 [PATCH] kvmtool: Adjust to new upstream virtio constants Ingo Molnar
2015-03-16 14:46 ` [tip:tools/kvm] " tip-bot for Ingo Molnar
2015-05-01 14:17 ` tip-bot for Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox