Patchwork [1/6] Make the necessary changes in Makefile and configure file.

login
register
mail settings
Submitter Arun Bharadwaj
Date Nov. 18, 2010, 6:06 p.m.
Message ID <20101118180647.4434.76290.stgit@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/72124/
State New
Headers show

Comments

Arun Bharadwaj - Nov. 18, 2010, 6:06 p.m.
Signed-off-by: Arun R Bharadwaj <arun@linux.vnet.ibm.com>
---
 Makefile.objs |    2 +-
 configure     |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Nov. 19, 2010, 9:55 a.m.
The commit message "Make the necessary changes in Makefile and
configure file" provides no information, especially outside the
context of your patch series.  Please choose something more specific
about what the patch is doing.

CONFIG_POSIX=y excludes mingw32.  Does this commit break Windows
builds?  I suspect vnc_thread and io_thread may not be available on
Windows anyway.

Should we actually add qemu-thread.o where threadlets.o gets added
instead of putting it next to posix-aio-compat.o?

Stefan

Patch

diff --git a/Makefile.objs b/Makefile.objs
index cd5a24b..3b7ec27 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -9,6 +9,7 @@  qobject-obj-y += qerror.o
 
 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
 block-obj-y += nbd.o block.o aio.o aes.o osdep.o qemu-config.o
+block-obj-$(CONFIG_POSIX) += qemu-thread.o
 block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
 
@@ -124,7 +125,6 @@  endif
 common-obj-y += $(addprefix ui/, $(ui-obj-y))
 
 common-obj-y += iov.o acl.o
-common-obj-$(CONFIG_THREAD) += qemu-thread.o
 common-obj-y += notify.o event_notifier.o
 common-obj-y += qemu-timer.o
 
diff --git a/configure b/configure
index a079a49..addf733 100755
--- a/configure
+++ b/configure
@@ -2456,7 +2456,6 @@  if test "$vnc_png" != "no" ; then
 fi
 if test "$vnc_thread" != "no" ; then
   echo "CONFIG_VNC_THREAD=y" >> $config_host_mak
-  echo "CONFIG_THREAD=y" >> $config_host_mak
 fi
 if test "$fnmatch" = "yes" ; then
   echo "CONFIG_FNMATCH=y" >> $config_host_mak
@@ -2534,7 +2533,6 @@  if test "$xen" = "yes" ; then
 fi
 if test "$io_thread" = "yes" ; then
   echo "CONFIG_IOTHREAD=y" >> $config_host_mak
-  echo "CONFIG_THREAD=y" >> $config_host_mak
 fi
 if test "$linux_aio" = "yes" ; then
   echo "CONFIG_LINUX_AIO=y" >> $config_host_mak