[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/19] hw: move fifo.[ch] to libqemuutil
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 02/19] hw: move fifo.[ch] to libqemuutil |
Date: |
Mon, 4 Feb 2013 18:29:47 +0100 |
fifo.c is generic code that can be easily unit tested. So it
belongs in libqemuutil.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/Makefile.objs | 1 -
hw/xilinx_spi.c | 2 +-
hw/xilinx_spips.c | 2 +-
include/migration/vmstate.h | 2 ++
hw/fifo.h => include/qemu/fifo8.h | 2 +-
util/Makefile.objs | 1 +
hw/fifo.c => util/fifo8.c | 3 ++-
7 files changed, 8 insertions(+), 5 deletions(-)
rename hw/fifo.h => include/qemu/fifo8.h (98%)
rename hw/fifo.c => util/fifo8.c (97%)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 8fb0712..6aad5de 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -41,7 +41,6 @@ common-obj-$(CONFIG_APPLESMC) += applesmc.o
common-obj-y += ccid-card-passthru.o
common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
-common-obj-y += fifo.o
common-obj-y += pam.o
# PPC devices
diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c
index be581c2..e73c9bd 100644
--- a/hw/xilinx_spi.c
+++ b/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"
diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c
index 42e019d..915eb96 100644
--- a/hw/xilinx_spips.c
+++ b/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"
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f27276c..94a409b 100644
--- a/include/migration/vmstate.h
+++ b/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);
diff --git a/hw/fifo.h b/include/qemu/fifo8.h
similarity index 98%
rename from hw/fifo.h
rename to include/qemu/fifo8.h
index f23890a..d318f71 100644
--- a/hw/fifo.h
+++ b/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 */
diff --git a/util/Makefile.objs b/util/Makefile.objs
index 495a178..cad5ce8 100644
--- a/util/Makefile.objs
+++ b/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
diff --git a/hw/fifo.c b/util/fifo8.c
similarity index 97%
rename from hw/fifo.c
rename to util/fifo8.c
index 68a955a..013e903 100644
--- a/hw/fifo.c
+++ b/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)
{
--
1.7.4.1
- [Qemu-devel] [PATCH 00/19] hw/ directory restructuring, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 01/19] hw: move char backends to backends/, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 02/19] hw: move fifo.[ch] to libqemuutil,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 04/19] hw: move device-hotplug.o to toplevel, compile it once, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 06/19] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 05/19] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 07/19] vt82c686: vt82c686 is not a PCI host bridge, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 03/19] hw: move qdev-monitor.o to toplevel directory, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 08/19] ppc: do not use ../ in include files, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 11/19] hw: make subdirectories for devices, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 12/19] hw: move target-independent files to subdirectories, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 19/19] hw: compile most devices once, Paolo Bonzini, 2013/02/04
- [Qemu-devel] [PATCH 18/19] hw: remove CPU dependencies, Paolo Bonzini, 2013/02/04