From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754037AbbEAORm (ORCPT ); Fri, 1 May 2015 10:17:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56954 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753782AbbEAORl (ORCPT ); Fri, 1 May 2015 10:17:41 -0400 Date: Fri, 1 May 2015 07:17:22 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: will.deacon@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, penberg@iki.fi, tglx@linutronix.de Reply-To: tglx@linutronix.de, penberg@iki.fi, hpa@zytor.com, mingo@kernel.org, will.deacon@arm.com, linux-kernel@vger.kernel.org In-Reply-To: <20150316142620.GA30206@gmail.com> References: <20150316142620.GA30206@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:tools/kvm] kvmtool: Adjust to new upstream virtio constants Git-Commit-ID: 4f24511d36c9e41b42a53a6cf5d4b970e013fdfd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4f24511d36c9e41b42a53a6cf5d4b970e013fdfd Gitweb: http://git.kernel.org/tip/4f24511d36c9e41b42a53a6cf5d4b970e013fdfd Author: Ingo Molnar AuthorDate: Mon, 16 Mar 2015 15:26:20 +0100 Committer: Ingo Molnar 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 Cc: Will Deacon Link: http://lkml.kernel.org/r/20150316142620.GA30206@gmail.com Signed-off-by: Ingo Molnar --- 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,