From 88b8ce8362f6873c5f9c4dee6e4a4eba3a947eb3 Mon Sep 17 00:00:00 2001 From: Mingqiang Chi Date: Wed, 23 May 2018 10:25:00 +0800 Subject: [PATCH] hv: move structure(intr_ctx) to irq.h move intr_ctx to irq.h, delete intr_ctx.h Signed-off-by: Mingqiang Chi Reviewed-by: Jason Chen CJ Acked-by: Eddie Dong --- hypervisor/include/arch/x86/hv_arch.h | 1 - hypervisor/include/arch/x86/intr_ctx.h | 64 -------------------------- hypervisor/include/arch/x86/irq.h | 30 ++++++++++++ 3 files changed, 30 insertions(+), 65 deletions(-) delete mode 100644 hypervisor/include/arch/x86/intr_ctx.h diff --git a/hypervisor/include/arch/x86/hv_arch.h b/hypervisor/include/arch/x86/hv_arch.h index a29f8ce8c..16f9eb303 100644 --- a/hypervisor/include/arch/x86/hv_arch.h +++ b/hypervisor/include/arch/x86/hv_arch.h @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/hypervisor/include/arch/x86/intr_ctx.h b/hypervisor/include/arch/x86/intr_ctx.h deleted file mode 100644 index 76edeba2a..000000000 --- a/hypervisor/include/arch/x86/intr_ctx.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2018 Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef INTR_CTX_H -#define INTR_CTX_H - -/* - * Definition of the stack frame layout - */ -struct intr_ctx { - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - uint64_t rbx; - uint64_t rbp; - - uint64_t rax; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t r8; - uint64_t r9; - uint64_t r10; - uint64_t r11; - - uint64_t vector; - uint64_t error_code; - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t rsp; - uint64_t ss; -}; - -#endif /* INTR_CTX_H */ diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/irq.h index 79e6d3bb8..77ff27b39 100644 --- a/hypervisor/include/arch/x86/irq.h +++ b/hypervisor/include/arch/x86/irq.h @@ -91,6 +91,36 @@ struct irq_routing_entry { int intx; /* PCI cfg offset 0x3D: 0-3 = INTA,INTB,INTC,INTD*/ }; +/* + * Definition of the stack frame layout + */ +struct intr_ctx { + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t rbx; + uint64_t rbp; + + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + + uint64_t vector; + uint64_t error_code; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t rsp; + uint64_t ss; +}; + int irq_mark_used(int irq); int irq_alloc(void);