[Qemu-devel] [PULL 0/7] Trivial patches for June 25 to July 27 2011

[Qemu-devel] [PULL 0/7] Trivial patches for June 25 to July 27 2011

[Stefan Hajnoczi]

The following changes since commit c886edfb851c0c590d4e77f058f2ec8ed95ad1b5:

  Let users select their pythons (2011-07-25 16:50:12 +0000)

are available in the git repository at:
  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Alexandre Raymond (2):
      Makefile: Minor cscope fixups
      Makefile: fix out-of-tree builds

Juan Quintela (1):
      xen_mapcache: remove unused variable

Michael Roth (1):
      Makefile: add missing deps on $(GENERATED_HEADERS)

Stefan Weil (1):
      slirp: Fix unusual "comments" in unused code

Wolfgang Mauerer (1):
      vhost build fix for i386

Zhi Yong Wu (1):
      qmp: fix efect -> effect typo in qmp-commands.hx

 Makefile         |    8 +++++---
 configure        |   23 +++++++++++++++++++++++
 qmp-commands.hx  |    2 +-
 slirp/ip_input.c |    4 ++--
 xen-mapcache.c   |    3 +--
 5 files changed, 32 insertions(+), 8 deletions(-)

-- 
1.7.5.4

[Qemu-devel] [PATCH 1/7] vhost build fix for i386

[Stefan Hajnoczi]

From: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>

vhost.c uses __sync_fetch_and_and(), which is only
available for -march=i486 and above (see
https://bugzilla.redhat.com/show_bug.cgi?id=624279).

Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 38e3724..9bfe917 100755
--- a/configure
+++ b/configure
@@ -2510,6 +2510,29 @@ if test "$trace_backend" = "dtrace"; then
 fi
 
 ##########################################
+# __sync_fetch_and_and requires at least -march=i486. Many toolchains
+# use i686 as default anyway, but for those that don't, an explicit
+# specification is necessary
+if test $vhost_net = "yes" && test $cpu = "i386"; then
+  cat > $TMPC << EOF
+int sfaa(unsigned *ptr)
+{
+  return __sync_fetch_and_and(ptr, 0);
+}
+
+int main(int argc, char **argv)
+{
+  int val = 42;
+  sfaa(&val);
+  return val;
+}
+EOF
+  if ! compile_prog "" "" ; then
+    CFLAGS+="-march=i486"
+  fi
+fi
+
+##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
 
-- 
1.7.5.4

[Qemu-devel] [PATCH 2/7] Makefile: Minor cscope fixups

[Stefan Hajnoczi]

From: Alexandre Raymond <cerbere@gmail.com>

Create cscope symbols for assembly files in addition to .c/.h files.
Create cscope database with full path instead of relative path so cscope
can be used with CSCOPE_DB in any directory.

Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index daa3aa0..eb1c788 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ TAGS:
 
 cscope:
 	rm -f ./cscope.*
-	find . -name "*.[ch]" -print | sed 's,^\./,,' > ./cscope.files
+	find "$(SRC_PATH)" -name "*.[chsS]" -print | sed 's,^\./,,' > ./cscope.files
 	cscope -b
 
 # documentation
-- 
1.7.5.4

[Qemu-devel] [PATCH 3/7] slirp: Fix unusual "comments" in unused code

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

cppcheck detected two rather strange comments which were not
correctly written as C comments.

They did not cause any harm because they were framed by
#ifdef notdef ... #endif, so they were never compiled.

Fix them nevertheless (we could also remove the unused code).

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 slirp/ip_input.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index 5e67631..c7b3eb4 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -511,7 +511,7 @@ typedef uint32_t n_time;
 				 */
 				break;
 			}
-			off--;			/ * 0 origin *  /
+                        off--; /* 0 origin */
 			if (off > optlen - sizeof(struct in_addr)) {
 				/*
 				 * End of source route.  Should be for us.
@@ -554,7 +554,7 @@ typedef uint32_t n_time;
 			/*
 			 * If no space remains, ignore.
 			 */
-			off--;			 * 0 origin *
+                        off--; /* 0 origin */
 			if (off > optlen - sizeof(struct in_addr))
 				break;
 			bcopy((caddr_t)(&ip->ip_dst), (caddr_t)&ipaddr.sin_addr,
-- 
1.7.5.4

[Qemu-devel] [PATCH 4/7] Makefile: fix out-of-tree builds

[Stefan Hajnoczi]

From: Alexandre Raymond <cerbere@gmail.com>

This patch fixes a minor bugs which prevented QEMU from being built
out of tree.

Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index eb1c788..cbd614a 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
 
 -include $(SUBDIR_DEVICES_MAK_DEP)
 
-%/config-devices.mak: default-configs/%.mak
+%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
 	$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
 	@if test -f $@; then \
 	  if cmp -s $@.old $@; then \
-- 
1.7.5.4

Re: [Qemu-devel] [PATCH 4/7] Makefile: fix out-of-tree builds

[Alexandre Raymond]

Hi Stefan,

You may drop this patch, it doesn't do anything after all...

Sorry about that.

Alexandre

On Wed, Jul 27, 2011 at 5:17 AM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> From: Alexandre Raymond <cerbere@gmail.com>
>
> This patch fixes a minor bugs which prevented QEMU from being built
> out of tree.
>
> Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index eb1c788..cbd614a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -46,7 +46,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
>
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>
> -%/config-devices.mak: default-configs/%.mak
> +%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
>        $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
>        @if test -f $@; then \
>          if cmp -s $@.old $@; then \
> --
> 1.7.5.4
>
>

Re: [Qemu-devel] [PATCH 4/7] Makefile: fix out-of-tree builds

[Stefan Hajnoczi]

On Wed, Jul 27, 2011 at 10:17 AM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> From: Alexandre Raymond <cerbere@gmail.com>
>
> This patch fixes a minor bugs which prevented QEMU from being built
> out of tree.
>
> Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index eb1c788..cbd614a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -46,7 +46,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
>
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>
> -%/config-devices.mak: default-configs/%.mak
> +%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
>        $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")

Agreed, we don't need to explicitly use $(SRC_PATH) since VPATH is set
to the source directory and $< expands to the full path name.  I have
dropped it from the git branch.

Stefan

[Qemu-devel] [PATCH 5/7] qmp: fix efect -> effect typo in qmp-commands.hx

[Stefan Hajnoczi]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qmp-commands.hx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 54e313c..03f67da 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -42,7 +42,7 @@ and we're going to establish a deprecation policy for badly defined commands.
 
 If you're planning to adopt QMP, please observe the following:
 
-    1. The deprecation policy will take efect and be documented soon, please
+    1. The deprecation policy will take effect and be documented soon, please
        check the documentation of each used command as soon as a new release of
        QEMU is available
 
-- 
1.7.5.4

[Qemu-devel] [PATCH 6/7] Makefile: add missing deps on $(GENERATED_HEADERS)

[Stefan Hajnoczi]

From: Michael Roth <mdroth@linux.vnet.ibm.com>

This fixes a build issue with make -j6+ due to qapi-generated files
being built before $(GENERATED_HEADERS) have been created.

Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index cbd614a..daae310 100644
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,10 @@ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types
 test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
 
 QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o
+QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c)
 
-qemu-ga.o: $(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
+$(QGALIB_GEN): $(GENERATED_HEADERS)
+$(QGALIB) qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y)
 qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o
 
 QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
-- 
1.7.5.4

[Qemu-devel] [PATCH 7/7] xen_mapcache: remove unused variable

[Stefan Hajnoczi]

From: Juan Quintela <quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 xen-mapcache.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/xen-mapcache.c b/xen-mapcache.c
index 007136a..15d1241 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -237,7 +237,7 @@ uint8_t *xen_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size,
 
 ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
 {
-    MapCacheEntry *entry = NULL, *pentry = NULL;
+    MapCacheEntry *entry = NULL;
     MapCacheRev *reventry;
     target_phys_addr_t paddr_index;
     target_phys_addr_t size;
@@ -263,7 +263,6 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
 
     entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
     while (entry && (entry->paddr_index != paddr_index || entry->size != size)) {
-        pentry = entry;
         entry = entry->next;
     }
     if (!entry) {
-- 
1.7.5.4