[Crash-utility] [PATCH v2 2/4] Move QEMUCPU* structs from netdump.h to defs.h
They are going to be used by diskdump too.
---
defs.h | 23 +++++++++++++++++++++++
netdump.h | 23 -----------------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/defs.h b/defs.h
index 18b41d0..2ba058a 100644
--- a/defs.h
+++ b/defs.h
@@ -2773,6 +2773,29 @@ struct load_module {
#define NR_SECTION_ROOTS() (DIV_ROUND_UP(NR_MEM_SECTIONS(), SECTIONS_PER_ROOT()))
#define SECTION_ROOT_MASK() (SECTIONS_PER_ROOT() - 1)
+struct QEMUCPUSegment {
+ uint32_t selector;
+ uint32_t limit;
+ uint32_t flags;
+ uint32_t pad;
+ uint64_t base;
+};
+
+typedef struct QEMUCPUSegment QEMUCPUSegment;
+
+struct QEMUCPUState {
+ uint32_t version;
+ uint32_t size;
+ uint64_t rax, rbx, rcx, rdx, rsi, rdi, rsp, rbp;
+ uint64_t r8, r9, r10, r11, r12, r13, r14, r15;
+ uint64_t rip, rflags;
+ QEMUCPUSegment cs, ds, es, fs, gs, ss;
+ QEMUCPUSegment ldt, tr, gdt, idt;
+ uint64_t cr[5];
+};
+
+typedef struct QEMUCPUState QEMUCPUState;
+
/*
* Machine specific stuff
*/
diff --git a/netdump.h b/netdump.h
index dbb054a..87d51ca 100644
--- a/netdump.h
+++ b/netdump.h
@@ -142,26 +142,3 @@ struct proc_kcore_data {
Elf32_Ehdr *elf32;
Elf32_Phdr *load32;
};
-
-struct QEMUCPUSegment {
- uint32_t selector;
- uint32_t limit;
- uint32_t flags;
- uint32_t pad;
- uint64_t base;
-};
-
-typedef struct QEMUCPUSegment QEMUCPUSegment;
-
-struct QEMUCPUState {
- uint32_t version;
- uint32_t size;
- uint64_t rax, rbx, rcx, rdx, rsi, rdi, rsp, rbp;
- uint64_t r8, r9, r10, r11, r12, r13, r14, r15;
- uint64_t rip, rflags;
- QEMUCPUSegment cs, ds, es, fs, gs, ss;
- QEMUCPUSegment ldt, tr, gdt, idt;
- uint64_t cr[5];
-};
-
-typedef struct QEMUCPUState QEMUCPUState;
--
2.14.3