瀏覽代碼

hw: move fifo.[ch] to libqemuutil

fifo.c is generic code that can be easily unit tested.  So it
belongs in libqemuutil.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 12 年之前
父節點
當前提交
fd7f0d6617
共有 7 個文件被更改,包括 8 次插入5 次删除
  1. 0 1
      hw/Makefile.objs
  2. 1 1
      hw/xilinx_spi.c
  3. 1 1
      hw/xilinx_spips.c
  4. 2 0
      include/migration/vmstate.h
  5. 1 1
      include/qemu/fifo8.h
  6. 1 0
      util/Makefile.objs
  7. 2 1
      util/fifo8.c

+ 0 - 1
hw/Makefile.objs

@@ -44,7 +44,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
 endif
 common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
 common-obj-$(CONFIG_SDHCI) += sdhci.o
-common-obj-y += fifo.o
 common-obj-y += pam.o
 
 # PPC devices

+ 1 - 1
hw/xilinx_spi.c

@@ -27,7 +27,7 @@
 #include "sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
-#include "fifo.h"
+#include "qemu/fifo8.h"
 
 #include "ssi.h"
 

+ 1 - 1
hw/xilinx_spips.c

@@ -26,7 +26,7 @@
 #include "sysemu/sysemu.h"
 #include "ptimer.h"
 #include "qemu/log.h"
-#include "fifo.h"
+#include "qemu/fifo8.h"
 #include "ssi.h"
 #include "qemu/bitops.h"
 

+ 2 - 0
include/migration/vmstate.h

@@ -26,6 +26,8 @@
 #ifndef QEMU_VMSTATE_H
 #define QEMU_VMSTATE_H 1
 
+#include <migration/qemu-file.h>
+
 typedef void SaveStateHandler(QEMUFile *f, void *opaque);
 typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
 

+ 1 - 1
hw/fifo.h → include/qemu/fifo8.h

@@ -1,7 +1,7 @@
 #ifndef FIFO_H
 #define FIFO_H
 
-#include "hw.h"
+#include "migration/vmstate.h"
 
 typedef struct {
     /* All fields are private */

+ 1 - 0
util/Makefile.objs

@@ -3,6 +3,7 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win
 util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
 util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
 util-obj-y += bitmap.o bitops.o hbitmap.o
+util-obj-y += fifo8.o
 util-obj-y += acl.o
 util-obj-y += error.o qemu-error.o
 util-obj-$(CONFIG_POSIX) += compatfd.o

+ 2 - 1
hw/fifo.c → util/fifo8.c

@@ -12,7 +12,8 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fifo.h"
+#include "qemu-common.h"
+#include "qemu/fifo8.h"
 
 void fifo8_create(Fifo8 *fifo, uint32_t capacity)
 {