From patchwork Thu Jun 23 17:07:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamas K Lengyel X-Patchwork-Id: 9195619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E7E66075F for ; Thu, 23 Jun 2016 17:10:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67AF827C26 for ; Thu, 23 Jun 2016 17:10:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A71D28465; Thu, 23 Jun 2016 17:10:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 285E427C26 for ; Thu, 23 Jun 2016 17:10:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bG86M-0005GA-Mu; Thu, 23 Jun 2016 17:07:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bG86L-0005Fm-I4 for xen-devel@lists.xenproject.org; Thu, 23 Jun 2016 17:07:37 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D6/94-08132-8571C675; Thu, 23 Jun 2016 17:07:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRWlGSWpSXmKPExsVyMfT+Id0I8Zx wg33X+Sy+b5nM5MDocfjDFZYAxijWzLyk/IoE1owHv38yF+xSrDj79T1TA+M86S5GLg4hgZmM EpPmvmUDcSQE+lklJhx/y9rFyAnkxEi0T1zDCGFXSSx9OJkFxBYS0JC4fbORHaK7n0li9Zx5z CAJNgFtibbXu8CaRQSUJO6tmswEUsQs0MwocWHSdnaQhLCAm8SdLz/AJrEIqEpcbN4B1swr4C xxfNcUNohtchKXpz8AszkFXCS2zT7DBLHZWeLMnX9sExj5FzAyrGLUKE4tKkst0jU01Usqykz PKMlNzMzRNTQ00ctNLS5OTE/NSUwq1kvOz93ECAyiegYGxh2Mf097HmKU5GBSEuU1EssJF+JL yk+pzEgszogvKs1JLT7EKMPBoSTB+0wUKCdYlJqeWpGWmQMMZ5i0BAePkgivAEgrb3FBYm5xZ jpE6hSjMceW39fWMnFsm3pvLZMQS15+XqqUOC87SKkASGlGaR7cIFicXWKUlRLmZWRgYBDiKU gtys0sQZV/xSjOwagkzPsO5B6ezLwSuH2vgE5hAjrlbn82yCkliQgpqQZG5m2iU3fnRv4JfWc yfemkbFY/zouvln1nm39B8/XWuBOmGjMjtondvi2iPWnPhl23jhtPujEt7sv/VGXNZflNITv0 Un8L3vqvGlE8s/tFntz7dW8XM/CdCfspse762X1pnTevser/0ZtQXP21503J0kvGV1he6izzb vfZ+yMibpPI2azOOaZ1a5VYijMSDbWYi4oTASlw9IOuAgAA X-Env-Sender: tamas.k.lengyel@gmail.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1466701654!49611072!1 X-Originating-IP: [209.85.223.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44565 invoked from network); 23 Jun 2016 17:07:35 -0000 Received: from mail-io0-f194.google.com (HELO mail-io0-f194.google.com) (209.85.223.194) by server-10.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 23 Jun 2016 17:07:35 -0000 Received: by mail-io0-f194.google.com with SMTP id u25so12082372iou.2 for ; Thu, 23 Jun 2016 10:07:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aucJym5DD2lGSmcQWqMO8Ic6AMHEhaOLQl8MKcqfygc=; b=EfYQh8FIoTiH2i7F7xdI0+LTO9Y0Ss7yZB8OMFq9wviHqxZfenVHyZnrJwhJqmEe6g oxNkPD7wB+FJ1lFciruxp2jykWdUUKkU9BeSPl/E4UdWLmAjwAhJFS/zdqRGaStBzYcy hZy5mlTgS/VwhkvN9PXTPgUbuRTZkMQkEC529NFGjvlR7VPpoyzxXcTlD721i+BZXIj/ zaV4DZmLSN3ufjIF1sXmeucbVEx4qU4AYSXuXwQkLuUGbolOWKszsth++Kpp8cO5B7d5 OYtwJVpwdGN/Ld1pEzwH1ojNqYTW8Yv/2otGUj21g52fwBBxFcNAvH0C2STNF1mLi0b2 EFAg== X-Gm-Message-State: ALyK8tLaP1L2WpIvFQXCzXtsyIzgmyAplFKxnEQJlzve8/LtT56uoetHI+6hiYTk87QPcA== X-Received: by 10.107.161.71 with SMTP id k68mr2039846ioe.103.1466701654050; Thu, 23 Jun 2016 10:07:34 -0700 (PDT) Received: from l1.lan (c-73-14-35-59.hsd1.co.comcast.net. [73.14.35.59]) by smtp.gmail.com with ESMTPSA id e91sm725356itd.8.2016.06.23.10.07.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 10:07:32 -0700 (PDT) From: Tamas K Lengyel To: xen-devel@lists.xenproject.org Date: Thu, 23 Jun 2016 11:07:24 -0600 Message-Id: <1466701647-21733-2-git-send-email-tamas@tklengyel.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466701647-21733-1-git-send-email-tamas@tklengyel.com> References: <1466701647-21733-1-git-send-email-tamas@tklengyel.com> Cc: Andrew Cooper , Tamas K Lengyel , Stefano Stabellini Subject: [Xen-devel] [PATCH v6 2/5] monitor: Rename vm_event_monitor_guest_request X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Mechanical renaming and relocation to the monitor subsystem. Signed-off-by: Tamas K Lengyel Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Julien Grall --- Cc: Stefano Stabellini Cc: Andrew Cooper --- xen/arch/arm/hvm.c | 4 ++-- xen/arch/x86/hvm/hvm.c | 3 ++- xen/common/monitor.c | 17 +++++++++++++++++ xen/common/vm_event.c | 16 ---------------- xen/include/xen/monitor.h | 1 + xen/include/xen/vm_event.h | 2 -- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c index c01123a..d999bde 100644 --- a/xen/arch/arm/hvm.c +++ b/xen/arch/arm/hvm.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include @@ -75,7 +75,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) case HVMOP_guest_request_vm_event: if ( guest_handle_is_null(arg) ) - vm_event_monitor_guest_request(); + monitor_guest_request(); else rc = -EINVAL; break; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ffc3395..337a119 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -5753,7 +5754,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) case HVMOP_guest_request_vm_event: if ( guest_handle_is_null(arg) ) - vm_event_monitor_guest_request(); + monitor_guest_request(); else rc = -EINVAL; break; diff --git a/xen/common/monitor.c b/xen/common/monitor.c index 7c3d1c8..436214a 100644 --- a/xen/common/monitor.c +++ b/xen/common/monitor.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -84,6 +85,22 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) return 0; } +void monitor_guest_request(void) +{ + struct vcpu *curr = current; + struct domain *d = curr->domain; + + if ( d->monitor.guest_request_enabled ) + { + vm_event_request_t req = { + .reason = VM_EVENT_REASON_GUEST_REQUEST, + .vcpu_id = curr->vcpu_id, + }; + + vm_event_monitor_traps(curr, d->monitor.guest_request_sync, &req); + } +} + /* * Local variables: * mode: C diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 1ba12cb..ca1eced 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -829,22 +829,6 @@ int vm_event_monitor_traps(struct vcpu *v, uint8_t sync, return 1; } -void vm_event_monitor_guest_request(void) -{ - struct vcpu *curr = current; - struct domain *d = curr->domain; - - if ( d->monitor.guest_request_enabled ) - { - vm_event_request_t req = { - .reason = VM_EVENT_REASON_GUEST_REQUEST, - .vcpu_id = curr->vcpu_id, - }; - - vm_event_monitor_traps(curr, d->monitor.guest_request_sync, &req); - } -} - /* * Local variables: * mode: C diff --git a/xen/include/xen/monitor.h b/xen/include/xen/monitor.h index 7015e6d..204d5cc 100644 --- a/xen/include/xen/monitor.h +++ b/xen/include/xen/monitor.h @@ -26,5 +26,6 @@ struct domain; struct xen_domctl_monitor_op; int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op); +void monitor_guest_request(void); #endif /* __XEN_MONITOR_H__ */ diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h index beda9fe..89e6243 100644 --- a/xen/include/xen/vm_event.h +++ b/xen/include/xen/vm_event.h @@ -81,8 +81,6 @@ void vm_event_vcpu_unpause(struct vcpu *v); int vm_event_monitor_traps(struct vcpu *v, uint8_t sync, vm_event_request_t *req); -void vm_event_monitor_guest_request(void); - #endif /* __VM_EVENT_H__ */