kvmtool: Adjust to new upstream virtio constants

PATCH New Ingo Molnar 2 participants 3 messages Mar 16, 2015 – May 1, 2015 KVM

lore

Share & tools

lore

Ingo Molnar

author

2015-03-16 14:36 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Ingo Molnar <[email protected]>

---

tools/kvm/virtio/mmio.c +4 -4

index 5174455c6c90..1587d5c8b73a 100644
@@ -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,

tip-bot for Ingo Molnar

merge bot

2015-03-16 14:46 UTC #1 lore raw

kvmtool: Adjust to new upstream virtio constants

Commit-ID:  2643c58e4518973f91e076b493c26dfd8642f14b
Gitweb:     http://git.kernel.org/tip/2643c58e4518973f91e076b493c26dfd8642f14b
Author:     Ingo Molnar <[email protected]>
AuthorDate: Mon, 16 Mar 2015 15:26:20 +0100
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>

Cc Will Deacon <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 tools/kvm/virtio/mmio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

tools/kvm/virtio/mmio.c +4 -4

index 5174455..1587d5c 100644
@@ -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,

tip-bot for Ingo Molnar

merge bot

2015-05-01 14:17 UTC #2 lore raw

In reply to Ingo Molnar

kvmtool: Adjust to new upstream virtio constants

Commit-ID:  4f24511d36c9e41b42a53a6cf5d4b970e013fdfd
Gitweb:     http://git.kernel.org/tip/4f24511d36c9e41b42a53a6cf5d4b970e013fdfd
Author:     Ingo Molnar <[email protected]>
AuthorDate: Mon, 16 Mar 2015 15:26:20 +0100
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>

Cc Will Deacon <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 tools/kvm/virtio/mmio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

tools/kvm/virtio/mmio.c +4 -4

index 5174455..1587d5c 100644
@@ -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,