| Message ID | 1305679930-4215-4-git-send-email-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 17 May 2011 19:51:50 -0500 Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > Makefile.objs | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/Makefile.objs b/Makefile.objs > index c49e44c..0803297 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -15,6 +15,7 @@ oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o > > block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o async.o > block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o > +block-obj-y += error.o > block-obj-$(CONFIG_POSIX) += posix-aio-compat.o > block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o This should be squashed in the previous patch, but it won't build as it depends on a change in qerror.c. I got this problem too, but (I hope that I) fixed it properly. I also made two small changes and am working on unit-tests.
diff --git a/Makefile.objs b/Makefile.objs index c49e44c..0803297 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -15,6 +15,7 @@ oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o async.o block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o +block-obj-y += error.o block-obj-$(CONFIG_POSIX) += posix-aio-compat.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- Makefile.objs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)