From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757440AbbCPOg0 (ORCPT ); Mon, 16 Mar 2015 10:36:26 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:34644 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbbCPO00 (ORCPT ); Mon, 16 Mar 2015 10:26:26 -0400 Date: Mon, 16 Mar 2015 15:26:20 +0100 From: Ingo Molnar To: Pekka Enberg Cc: linux-kernel@vger.kernel.org, Will Deacon Subject: [PATCH] kvmtool: Adjust to new upstream virtio constants Message-ID: <20150316142620.GA30206@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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,