| Message ID | 1408704863-12343-2-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Aug 22, 2014 at 8:54 PM, Fam Zheng <famz@redhat.com> wrote: > Since it has a dependency on vmstate and is only used by device > emulation, moving out from util will make the archive more independent. > > Signed-off-by: Fam Zheng <famz@redhat.com> We probably also want to move the corresponding header at some stage too. but Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > --- > hw/misc/Makefile.objs | 1 + > {util => hw/misc}/fifo8.c | 0 > util/Makefile.objs | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename {util => hw/misc}/fifo8.c (100%) > > diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs > index 979e532..a4a5ad7 100644 > --- a/hw/misc/Makefile.objs > +++ b/hw/misc/Makefile.objs > @@ -41,3 +41,4 @@ obj-$(CONFIG_SLAVIO) += slavio_misc.o > obj-$(CONFIG_ZYNQ) += zynq_slcr.o > > obj-$(CONFIG_PVPANIC) += pvpanic.o > +obj-y += fifo8.o > diff --git a/util/fifo8.c b/hw/misc/fifo8.c > similarity index 100% > rename from util/fifo8.c > rename to hw/misc/fifo8.c > diff --git a/util/Makefile.objs b/util/Makefile.objs > index 6b3c83b..65a36f6 100644 > --- a/util/Makefile.objs > +++ b/util/Makefile.objs > @@ -3,7 +3,6 @@ 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 qemu-openpty.o > util-obj-y += envlist.o path.o host-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.0.3 > >
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 979e532..a4a5ad7 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -41,3 +41,4 @@ obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o obj-$(CONFIG_PVPANIC) += pvpanic.o +obj-y += fifo8.o diff --git a/util/fifo8.c b/hw/misc/fifo8.c similarity index 100% rename from util/fifo8.c rename to hw/misc/fifo8.c diff --git a/util/Makefile.objs b/util/Makefile.objs index 6b3c83b..65a36f6 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -3,7 +3,6 @@ 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 qemu-openpty.o util-obj-y += envlist.o path.o host-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
Since it has a dependency on vmstate and is only used by device emulation, moving out from util will make the archive more independent. Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/misc/Makefile.objs | 1 + {util => hw/misc}/fifo8.c | 0 util/Makefile.objs | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename {util => hw/misc}/fifo8.c (100%)