From patchwork Thu Jan 7 14:17:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7977711 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45F07BEEE5 for ; Thu, 7 Jan 2016 14:18:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7712720117 for ; Thu, 7 Jan 2016 14:18:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EE6220149 for ; Thu, 7 Jan 2016 14:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752701AbcAGORV (ORCPT ); Thu, 7 Jan 2016 09:17:21 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:32817 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752493AbcAGORT (ORCPT ); Thu, 7 Jan 2016 09:17:19 -0500 Received: by mail-wm0-f43.google.com with SMTP id f206so99511053wmf.0; Thu, 07 Jan 2016 06:17:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NV5xMHY0sokpv+EiInr+tk9Z/LciQpUrkqhkyQUfnqE=; b=bmLNlfHnEstcx4fQcTk4xy9zLuMlzCIleyVgUQNoR5UZIN+X5wLE+9DRS5Nj0BYl+X I5CYo53wsOqMt5DjX0+R0qVsvM+rK6ff3NQ1DCyxSccx4F07ImudRwJFSvWrBUmskiuC xu4TyF5hSUrRPZ6dH1HjZRZwJbbw/hWPOIzqDcxyvBsnT8TIAhz6vuj3NySYpY5qf13Y lBo6NnmAaDxLO5ddtUYZv2Pd31pSMj34G3u1RHBjah0YHxRhPqd1Gl7oflJR7JFmPDau 7pxagE8ZShKbhbwATAkZsvs5fdlmiSlGkyfOfPKkEPeoauPELJ+mxJOqoAueB6qgHMYT UyRA== X-Received: by 10.28.0.79 with SMTP id 76mr18176675wma.27.1452176238479; Thu, 07 Jan 2016 06:17:18 -0800 (PST) Received: from 640k.lan (94-39-185-77.adsl-ull.clienti.tiscali.it. [94.39.185.77]) by smtp.gmail.com with ESMTPSA id g3sm101031671wjw.31.2016.01.07.06.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2016 06:17:17 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Takuya Yoshikawa , Christian Borntraeger , Paul Mackerras Subject: [PATCH 3/4] KVM: renumber architecture-dependent requests Date: Thu, 7 Jan 2016 15:17:07 +0100 Message-Id: <1452176228-8484-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1452176228-8484-1-git-send-email-pbonzini@redhat.com> References: <1452176228-8484-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Leave room for 4 more arch-independent requests. Signed-off-by: Paolo Bonzini --- include/linux/kvm_host.h | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 48abf6792286..b0ec0f778192 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -114,43 +114,42 @@ static inline bool is_error_page(struct page *page) * vcpu->requests bit members */ #define KVM_REQ_TLB_FLUSH 0 -#define KVM_REQ_MMU_RELOAD 3 -#define KVM_REQ_PENDING_TIMER 5 -#define KVM_REQ_UNHALT 6 +#define KVM_REQ_MMU_RELOAD 1 +#define KVM_REQ_PENDING_TIMER 2 +#define KVM_REQ_UNHALT 3 /* x86-specific requests */ -#define KVM_REQ_MIGRATE_TIMER 1 -#define KVM_REQ_REPORT_TPR_ACCESS 2 -#define KVM_REQ_TRIPLE_FAULT 4 -#define KVM_REQ_MMU_SYNC 7 -#define KVM_REQ_CLOCK_UPDATE 8 -/* 9 is unused */ -#define KVM_REQ_DEACTIVATE_FPU 10 -#define KVM_REQ_EVENT 11 -#define KVM_REQ_APF_HALT 12 -#define KVM_REQ_STEAL_UPDATE 13 -#define KVM_REQ_NMI 14 -#define KVM_REQ_PMU 15 -#define KVM_REQ_PMI 16 -#define KVM_REQ_MASTERCLOCK_UPDATE 18 -#define KVM_REQ_MCLOCK_INPROGRESS 19 -#define KVM_REQ_SCAN_IOAPIC 21 -#define KVM_REQ_GLOBAL_CLOCK_UPDATE 22 +#define KVM_REQ_MIGRATE_TIMER 8 +#define KVM_REQ_REPORT_TPR_ACCESS 9 +#define KVM_REQ_TRIPLE_FAULT 10 +#define KVM_REQ_MMU_SYNC 11 +#define KVM_REQ_CLOCK_UPDATE 12 +#define KVM_REQ_DEACTIVATE_FPU 13 +#define KVM_REQ_EVENT 14 +#define KVM_REQ_APF_HALT 15 +#define KVM_REQ_STEAL_UPDATE 16 +#define KVM_REQ_NMI 17 +#define KVM_REQ_PMU 18 +#define KVM_REQ_PMI 19 +#define KVM_REQ_SMI 20 +#define KVM_REQ_MASTERCLOCK_UPDATE 21 +#define KVM_REQ_MCLOCK_INPROGRESS 22 +#define KVM_REQ_SCAN_IOAPIC 23 +#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24 #define KVM_REQ_APIC_PAGE_RELOAD 25 -#define KVM_REQ_SMI 26 -#define KVM_REQ_HV_CRASH 27 -#define KVM_REQ_IOAPIC_EOI_EXIT 28 -#define KVM_REQ_HV_RESET 29 -#define KVM_REQ_HV_EXIT 30 -#define KVM_REQ_HV_STIMER 31 +#define KVM_REQ_HV_CRASH 26 +#define KVM_REQ_IOAPIC_EOI_EXIT 27 +#define KVM_REQ_HV_RESET 28 +#define KVM_REQ_HV_EXIT 29 +#define KVM_REQ_HV_STIMER 30 /* PPC-specific requests */ -#define KVM_REQ_WATCHDOG 17 -#define KVM_REQ_EPR_EXIT 20 +#define KVM_REQ_WATCHDOG 8 +#define KVM_REQ_EPR_EXIT 9 /* s390-specific requests */ -#define KVM_REQ_ENABLE_IBS 23 -#define KVM_REQ_DISABLE_IBS 24 +#define KVM_REQ_ENABLE_IBS 8 +#define KVM_REQ_DISABLE_IBS 9 #define KVM_USERSPACE_IRQ_SOURCE_ID 0 #define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1