Re-organize util lib

xiaoqjwt · Nov 23, 2018 · ad32cd9 · ad32cd9
1 parent c8d454a
commit ad32cd9
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 121 deletions.
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
@@ -13,7 +13,7 @@ obj-$(CONFIG_FEMU_PCI) += femu/nvme-core.o
 obj-$(CONFIG_FEMU_PCI) += femu/femu.o
 obj-$(CONFIG_FEMU_PCI) += femu/ocssd/
 obj-$(CONFIG_FEMU_PCI) += femu/ssd/
-obj-$(CONFIG_FEMU_PCI) += femu/ring/
+obj-$(CONFIG_FEMU_PCI) += femu/lib/
 obj-$(CONFIG_FEMU_PCI) += femu/mem-backend.o
 
 obj-$(CONFIG_SH4) += tc58128.o

diff --git a/hw/block/femu/femu.c b/hw/block/femu/femu.c
@@ -5,7 +5,7 @@
 #include "hw/pci/msi.h"
 #include "qapi/visitor.h"
 #include "qapi/error.h"
-#include "ring/rte_ring.h"
+#include "include/rte_ring.h"
 
 #include <immintrin.h>
 #include "nvme.h"

diff --git a/hw/block/femu/ring/rte_atomic_x86.h → hw/block/femu/include/rte_atomic_x86.h b/hw/block/femu/ring/rte_atomic_x86.h → hw/block/femu/include/rte_atomic_x86.h
diff --git a/hw/block/femu/ring/rte_branch_prediction.h → ...lock/femu/include/rte_branch_prediction.h b/hw/block/femu/ring/rte_branch_prediction.h → ...lock/femu/include/rte_branch_prediction.h
diff --git a/hw/block/femu/ring/rte_ring.h → hw/block/femu/include/rte_ring.h b/hw/block/femu/ring/rte_ring.h → hw/block/femu/include/rte_ring.h
diff --git a/hw/block/femu/ring/rte_ring_generic.h → hw/block/femu/include/rte_ring_generic.h b/hw/block/femu/ring/rte_ring_generic.h → hw/block/femu/include/rte_ring_generic.h
diff --git a/hw/block/femu/ring/Makefile.objs → hw/block/femu/lib/Makefile.objs b/hw/block/femu/ring/Makefile.objs → hw/block/femu/lib/Makefile.objs
diff --git a/hw/block/femu/ring/rte_ring.c → hw/block/femu/lib/rte_ring.c b/hw/block/femu/ring/rte_ring.c → hw/block/femu/lib/rte_ring.c
@@ -78,7 +78,7 @@
 #include <errno.h>
 #include <sys/queue.h>
 
-#include "rte_ring.h"
+#include "../include/rte_ring.h"
 
 /* true if x is a power of 2 */
 #define POWEROF2(x) ((((x)-1) & (x)) == 0)

diff --git a/hw/block/femu/ring/Makefile b/hw/block/femu/ring/Makefile
diff --git a/hw/block/femu/ring/ring-test.c b/hw/block/femu/ring/ring-test.c