All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011
@ 2011-12-19 11:12 Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 01/17] ide: drop argument to dma_buf_commit Stefan Hajnoczi
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Stefan Hajnoczi

The following changes since commit 5ab97b7f81dccccee03a3f1d03a4d09a27f0eeff:

  phys_page_find_alloc: Use correct initial region_offset. (2011-12-15 10:22:40 -0600)

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

Geoffrey Thomas (1):
      slirp: Fix typo in net_slirp_hostfwd_remove

Julian Pidancet (1):
      Also create piix3 property when Xen is enabled

Michael Ellerman (1):
      kvm: Print something before calling abort() if KVM_RUN fails

Paolo Bonzini (1):
      ide: drop argument to dma_buf_commit

Peter Maydell (2):
      Makefile.target: Remove unnecessary dependency rules
      stellaris: Calculate system clock period on reset

Stefan Weil (11):
      configure: Fix compiler warnings in config.log (always return a value from main)
      configure: Fix compiler warnings in config.log (old-style function definition)
      configure: Fix compiler warning in config.log (integer from pointer)
      configure: Fix compiler warnings in config.log (null arguments)
      configure: Fix compiler warning in config.log (unused variable)
      configure: Fix compiler warning in config.log (macro redefined)
      configure: Fix compiler warnings in config.log (uninitialized variable)
      configure: Fix compiler warning in config.log (undefined NULL)
      configure: Fix compiler warning in config.log (value was never used)
      configure: Fix compiler warnings in config.log (statement without effect)
      configure: Improve Xen autodetection for hosts without Xen

 Makefile.target |    6 ----
 configure       |   71 ++++++++++++++++++++++++++++++++++++++----------------
 hw/ide/core.c   |    6 ++--
 hw/piix_pci.c   |    3 +-
 hw/stellaris.c  |    1 +
 kvm-all.c       |    3 +-
 net/slirp.c     |    2 +-
 7 files changed, 58 insertions(+), 34 deletions(-)

-- 
1.7.7.3

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 01/17] ide: drop argument to dma_buf_commit
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 02/17] Makefile.target: Remove unnecessary dependency rules Stefan Hajnoczi
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Anthony Liguori, Stefan Hajnoczi

From: Paolo Bonzini <pbonzini@redhat.com>

The argument is unused and even wrong when the function is called
by ide_handle_rw_error.  Drop it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/ide/core.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 49847bd..753c442 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -493,7 +493,7 @@ void ide_sector_read(IDEState *s)
     }
 }
 
-static void dma_buf_commit(IDEState *s, int is_write)
+static void dma_buf_commit(IDEState *s)
 {
     qemu_sglist_destroy(&s->sg);
 }
@@ -532,7 +532,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op)
         bdrv_iostatus_set_err(s->bs, error);
     } else {
         if (op & BM_STATUS_DMA_RETRY) {
-            dma_buf_commit(s, 0);
+            dma_buf_commit(s);
             ide_dma_error(s);
         } else {
             ide_rw_error(s);
@@ -566,7 +566,7 @@ handle_rw_error:
     n = s->io_buffer_size >> 9;
     sector_num = ide_get_sector(s);
     if (n > 0) {
-        dma_buf_commit(s, ide_cmd_is_read(s));
+        dma_buf_commit(s);
         sector_num += n;
         ide_set_sector(s, sector_num);
         s->nsector -= n;
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 02/17] Makefile.target: Remove unnecessary dependency rules
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 01/17] ide: drop argument to dma_buf_commit Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 03/17] stellaris: Calculate system clock period on reset Stefan Hajnoczi
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Anthony Liguori, Stefan Hajnoczi

From: Peter Maydell <peter.maydell@linaro.org>

Remove some dependency rules which aren't necessary (the automatically
generated .d files cover all these). These were leftovers from dyngen
days, when the object files also had a dependency on some generated
files.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile.target |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 8be9b9a..3261383 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -92,12 +92,6 @@ tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
 
 $(libobj-y): $(GENERATED_HEADERS)
 
-translate.o: translate.c cpu.h
-
-translate-all.o: translate-all.c cpu.h
-
-tcg/tcg.o: cpu.h
-
 # HELPER_CFLAGS is used for all the code compiled with static register
 # variables
 op_helper.o ldst_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 03/17] stellaris: Calculate system clock period on reset
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 01/17] ide: drop argument to dma_buf_commit Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 02/17] Makefile.target: Remove unnecessary dependency rules Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 04/17] kvm: Print something before calling abort() if KVM_RUN fails Stefan Hajnoczi
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Anthony Liguori, Stefan Hajnoczi

From: Peter Maydell <peter.maydell@linaro.org>

Calculate the system clock period on reset; otherwise it remains
set to the default value of zero and attempting to use it provokes
a hang. This is one of the issues noted in LP:696094.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/stellaris.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/stellaris.c b/hw/stellaris.c
index ce62a98..7a73074 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -621,6 +621,7 @@ static void ssys_reset(void *opaque)
     s->rcgc[0] = 1;
     s->scgc[0] = 1;
     s->dcgc[0] = 1;
+    ssys_calculate_system_clock(s);
 }
 
 static int stellaris_sys_post_load(void *opaque, int version_id)
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 04/17] kvm: Print something before calling abort() if KVM_RUN fails
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (2 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 03/17] stellaris: Calculate system clock period on reset Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 05/17] slirp: Fix typo in net_slirp_hostfwd_remove Stefan Hajnoczi
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Michael Ellerman, Anthony Liguori, Stefan Hajnoczi

From: Michael Ellerman <michael@ellerman.id.au>

It's a little unfriendly to call abort() without printing any sort of
error message. So turn the DPRINTK() into an fprintf(stderr, ...).

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 kvm-all.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index 4c466d6..ac048bc 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -977,7 +977,8 @@ int kvm_cpu_exec(CPUState *env)
                 ret = EXCP_INTERRUPT;
                 break;
             }
-            DPRINTF("kvm run failed %s\n", strerror(-run_ret));
+            fprintf(stderr, "error: kvm run failed %s\n",
+                    strerror(-run_ret));
             abort();
         }
 
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 05/17] slirp: Fix typo in net_slirp_hostfwd_remove
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (3 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 04/17] kvm: Print something before calling abort() if KVM_RUN fails Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 06/17] Also create piix3 property when Xen is enabled Stefan Hajnoczi
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Stefan Hajnoczi, Geoffrey Thomas

From: Geoffrey Thomas <geofft@ldpreload.com>

Report an error when err is nonzero, not when it is zero.

Signed-off-by: Geoffrey Thomas <geofft@ldpreload.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 net/slirp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/slirp.c b/net/slirp.c
index 6646ecb..18e07ba 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -351,7 +351,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
                                host_addr, host_port);
 
     monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
-                   err ? "removed" : "not found");
+                   err ? "not found" : "removed");
     return;
 
  fail_syntax:
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 06/17] Also create piix3 property when Xen is enabled
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (4 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 05/17] slirp: Fix typo in net_slirp_hostfwd_remove Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 07/17] configure: Fix compiler warnings in config.log (always return a value from main) Stefan Hajnoczi
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Stefan Hajnoczi, Julian Pidancet

From: Julian Pidancet <julian.pidancet@gmail.com>

This recently added line in hw/pc_piix.c is causing a SEGV on a Xen
setup because the piix3 property is never created:

qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL),
                            "rtc", (DeviceState *)rtc_state, NULL);

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/piix_pci.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index d785d4b..ea156a9 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -324,9 +324,8 @@ static PCIBus *i440fx_common_init(const char *device_name,
                 pci_create_simple_multifunction(b, -1, true, "PIIX3"));
         pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3,
                 PIIX_NUM_PIRQS);
-
-        qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL);
     }
+    qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL);
     piix3->pic = pic;
 
     (*pi440fx_state)->piix3 = piix3;
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 07/17] configure: Fix compiler warnings in config.log (always return a value from main)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (5 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 06/17] Also create piix3 property when Xen is enabled Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 08/17] configure: Fix compiler warnings in config.log (old-style function definition) Stefan Hajnoczi
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

Fix several "warning: control reaches end of non-void function".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 6fd580e..03b8f35 100755
--- a/configure
+++ b/configure
@@ -1082,7 +1082,7 @@ fi
 
 # check that the C compiler works.
 cat > $TMPC <<EOF
-int main(void) {}
+int main(void) { return 0; }
 EOF
 
 if compile_object ; then
@@ -2651,7 +2651,7 @@ ucontext_coroutine=no
 if test "$darwin" != "yes"; then
   cat > $TMPC << EOF
 #include <ucontext.h>
-int main(void) { makecontext(0, 0, 0); }
+int main(void) { makecontext(0, 0, 0); return 0; }
 EOF
   if compile_prog "" "" ; then
       ucontext_coroutine=yes
@@ -2664,7 +2664,7 @@ fi
 open_by_hande_at=no
 cat > $TMPC << EOF
 #include <fcntl.h>
-int main(void) { struct file_handle fh; open_by_handle_at(0, &fh, 0); }
+int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); }
 EOF
 if compile_prog "" "" ; then
     open_by_handle_at=yes
@@ -2677,6 +2677,7 @@ linux_magic_h=no
 cat > $TMPC << EOF
 #include <linux/magic.h>
 int main(void) {
+  return 0;
 }
 EOF
 if compile_prog "" "" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 08/17] configure: Fix compiler warnings in config.log (old-style function definition)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (6 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 07/17] configure: Fix compiler warnings in config.log (always return a value from main) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 09/17] configure: Fix compiler warning in config.log (integer from pointer) Stefan Hajnoczi
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: function declaration isn’t a prototype
In function ‘foo’:
warning: old-style function definition

The function name was changed, too, to avoid an additional warning.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 03b8f35..93c6cbe 100755
--- a/configure
+++ b/configure
@@ -1274,11 +1274,11 @@ if test "$nptl" != "no" ; then
   cat > $TMPC <<EOF
 #include <sched.h>
 #include <linux/futex.h>
-void foo()
-{
+int main(void) {
 #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
 #error bork
 #endif
+  return 0;
 }
 EOF
 
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 09/17] configure: Fix compiler warning in config.log (integer from pointer)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (7 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 08/17] configure: Fix compiler warnings in config.log (old-style function definition) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 10/17] configure: Fix compiler warnings in config.log (null arguments) Stefan Hajnoczi
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: return makes integer from pointer without a cast

v2: Removed type cast.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 93c6cbe..773df6a 100755
--- a/configure
+++ b/configure
@@ -1841,7 +1841,11 @@ if test "$curses" != "no" ; then
 #ifdef __OpenBSD__
 #define resize_term resizeterm
 #endif
-int main(void) { resize_term(0, 0); return curses_version(); }
+int main(void) {
+  const char *s = curses_version();
+  resize_term(0, 0);
+  return s != 0;
+}
 EOF
   for curses_lib in $curses_list; do
     if compile_prog "" "$curses_lib" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 10/17] configure: Fix compiler warnings in config.log (null arguments)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (8 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 09/17] configure: Fix compiler warning in config.log (integer from pointer) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 11/17] configure: Fix compiler warning in config.log (unused variable) Stefan Hajnoczi
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: null argument where non-null required (argument 1)
warning: null argument where non-null required (argument 3)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 773df6a..4e596e6 100755
--- a/configure
+++ b/configure
@@ -1951,7 +1951,12 @@ PTHREADLIBS_LIST="-pthread -lpthread -lpthreadGC2"
 pthread=no
 cat > $TMPC << EOF
 #include <pthread.h>
-int main(void) { pthread_create(0,0,0,0); return 0; }
+static void *f(void *p) { return NULL; }
+int main(void) {
+  pthread_t thread;
+  pthread_create(&thread, 0, f, 0);
+  return 0;
+}
 EOF
 if compile_prog "" "" ; then
   pthread=yes
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 11/17] configure: Fix compiler warning in config.log (unused variable)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (9 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 10/17] configure: Fix compiler warnings in config.log (null arguments) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 12/17] configure: Fix compiler warning in config.log (macro redefined) Stefan Hajnoczi
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: unused variable ‘iov’

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 4e596e6..f2c2a27 100755
--- a/configure
+++ b/configure
@@ -2060,7 +2060,7 @@ cat > $TMPC <<EOF
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
-int main(void) { struct iovec iov; return 0; }
+int main(void) { return sizeof(struct iovec); }
 EOF
 iovec=no
 if compile_prog "" "" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 12/17] configure: Fix compiler warning in config.log (macro redefined)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (10 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 11/17] configure: Fix compiler warning in config.log (unused variable) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 13/17] configure: Fix compiler warnings in config.log (uninitialized variable) Stefan Hajnoczi
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: "_GNU_SOURCE" redefined

The macro is already defined on the command line.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index f2c2a27..eeec8fa 100755
--- a/configure
+++ b/configure
@@ -2251,7 +2251,6 @@ fi
 # signalfd probe
 signalfd="no"
 cat > $TMPC << EOF
-#define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <signal.h>
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 13/17] configure: Fix compiler warnings in config.log (uninitialized variable)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (11 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 12/17] configure: Fix compiler warning in config.log (macro redefined) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 14/17] configure: Fix compiler warning in config.log (undefined NULL) Stefan Hajnoczi
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

warning: ‘fd’ is used uninitialized in this function
warning: ‘id’ is used uninitialized in this function

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index eeec8fa..e3713af 100755
--- a/configure
+++ b/configure
@@ -2237,7 +2237,7 @@ cat > $TMPC << EOF
 
 int main(void)
 {
-    int len, fd;
+    int len, fd = 0;
     len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK);
     splice(STDIN_FILENO, NULL, fd, NULL, len, SPLICE_F_MOVE);
     return 0;
@@ -2449,7 +2449,7 @@ fi
 cat > $TMPC <<EOF
 #include <signal.h>
 #include <time.h>
-int main(void) { clockid_t id; return clock_gettime(id, NULL); }
+int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
 EOF
 
 if compile_prog "" "" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 14/17] configure: Fix compiler warning in config.log (undefined NULL)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (12 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 13/17] configure: Fix compiler warnings in config.log (uninitialized variable) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 15/17] configure: Fix compiler warning in config.log (value was never used) Stefan Hajnoczi
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

Avoid the warning when probing for xfs.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index e3713af..e9725d4 100755
--- a/configure
+++ b/configure
@@ -1670,6 +1670,7 @@ fi
 # xfsctl() probe, used for raw-posix
 if test "$xfs" != "no" ; then
   cat > $TMPC << EOF
+#include <stddef.h>  /* NULL */
 #include <xfs/xfs.h>
 int main(void)
 {
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 15/17] configure: Fix compiler warning in config.log (value was never used)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (13 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 14/17] configure: Fix compiler warning in config.log (undefined NULL) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 16/17] configure: Fix compiler warnings in config.log (statement without effect) Stefan Hajnoczi
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e9725d4..bd6f10f 100755
--- a/configure
+++ b/configure
@@ -2269,8 +2269,7 @@ cat > $TMPC << EOF
 
 int main(void)
 {
-    int efd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
-    return 0;
+    return eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
 }
 EOF
 if compile_prog "" "" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 16/17] configure: Fix compiler warnings in config.log (statement without effect)
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (14 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 15/17] configure: Fix compiler warning in config.log (value was never used) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 17/17] configure: Improve Xen autodetection for hosts without Xen Stefan Hajnoczi
  2011-12-19 15:44 ` [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Anthony Liguori
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index bd6f10f..36ee849 100755
--- a/configure
+++ b/configure
@@ -2074,7 +2074,7 @@ cat > $TMPC <<EOF
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
-int main(void) { preadv; }
+int main(void) { return preadv == preadv; }
 EOF
 preadv=no
 if compile_prog "" "" ; then
@@ -2107,7 +2107,7 @@ if test "$opengl" != "no" ; then
 #include <X11/Xlib.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
-int main(void) { GL_VERSION; return 0; }
+int main(void) { return GL_VERSION != 0; }
 EOF
   if compile_prog "" "-lGL" ; then
     opengl=yes
@@ -2369,8 +2369,7 @@ int main(void)
      * warning but not an error, and will proceed to fail the
      * qemu compile where we compile with -Werror.)
      */
-    epoll_create1;
-    return 0;
+    return epoll_create1 == epoll_create1;
 }
 EOF
 if compile_prog "$ARCH_CFLAGS" "" ; then
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [Qemu-devel] [PATCH 17/17] configure: Improve Xen autodetection for hosts without Xen
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (15 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 16/17] configure: Fix compiler warnings in config.log (statement without effect) Stefan Hajnoczi
@ 2011-12-19 11:12 ` Stefan Hajnoczi
  2011-12-19 15:44 ` [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Anthony Liguori
  17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2011-12-19 11:12 UTC (permalink / raw)
  To: qemu-devel
  Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi, Stefano Stabellini

From: Stefan Weil <sw@weilnetz.de>

With this patch, it only takes one test (instead of four)
to detect that there is no Xen support at all.

For most build hosts, this will reduce the time configure needs.
It will also reduce noisy output in config.log.

Build hosts with Xen now need up to five (instead of up to four)
tests. They get improved diagnostics when Xen support fails.

Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 36ee849..640e815 100755
--- a/configure
+++ b/configure
@@ -1317,10 +1317,30 @@ fi
 if test "$xen" != "no" ; then
   xen_libs="-lxenstore -lxenctrl -lxenguest"
 
-  # Xen unstable
+  # First we test whether Xen headers and libraries are available.
+  # If no, we are done and there is no Xen support.
+  # If yes, more tests are run to detect the Xen version.
+
+  # Xen (any)
   cat > $TMPC <<EOF
 #include <xenctrl.h>
 #include <xs.h>
+int main(void) {
+  return 0;
+}
+EOF
+  if ! compile_prog "" "$xen_libs" ; then
+    # Xen not found
+    if test "$xen" = "yes" ; then
+      feature_not_found "xen"
+    fi
+    xen=no
+
+  # Xen unstable
+  elif (
+      cat > $TMPC <<EOF
+#include <xenctrl.h>
+#include <xs.h>
 #include <stdint.h>
 #include <xen/hvm/hvm_info_table.h>
 #if !defined(HVM_MAX_VCPUS)
@@ -1336,7 +1356,8 @@ int main(void) {
   return 0;
 }
 EOF
-  if compile_prog "" "$xen_libs" ; then
+      compile_prog "" "$xen_libs"
+    ) ; then
     xen_ctrl_version=410
     xen=yes
 
@@ -1407,10 +1428,10 @@ EOF
     xen_ctrl_version=330
     xen=yes
 
-  # Xen not found or unsupported
+  # Xen version unsupported
   else
     if test "$xen" = "yes" ; then
-      feature_not_found "xen"
+      feature_not_found "xen (unsupported version)"
     fi
     xen=no
   fi
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011
  2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
                   ` (16 preceding siblings ...)
  2011-12-19 11:12 ` [Qemu-devel] [PATCH 17/17] configure: Improve Xen autodetection for hosts without Xen Stefan Hajnoczi
@ 2011-12-19 15:44 ` Anthony Liguori
  17 siblings, 0 replies; 19+ messages in thread
From: Anthony Liguori @ 2011-12-19 15:44 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: qemu-devel

On 12/19/2011 05:12 AM, Stefan Hajnoczi wrote:
> The following changes since commit 5ab97b7f81dccccee03a3f1d03a4d09a27f0eeff:
>
>    phys_page_find_alloc: Use correct initial region_offset. (2011-12-15 10:22:40 -0600)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> are available in the git repository at:
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches
>
> Geoffrey Thomas (1):
>        slirp: Fix typo in net_slirp_hostfwd_remove
>
> Julian Pidancet (1):
>        Also create piix3 property when Xen is enabled
>
> Michael Ellerman (1):
>        kvm: Print something before calling abort() if KVM_RUN fails
>
> Paolo Bonzini (1):
>        ide: drop argument to dma_buf_commit
>
> Peter Maydell (2):
>        Makefile.target: Remove unnecessary dependency rules
>        stellaris: Calculate system clock period on reset
>
> Stefan Weil (11):
>        configure: Fix compiler warnings in config.log (always return a value from main)
>        configure: Fix compiler warnings in config.log (old-style function definition)
>        configure: Fix compiler warning in config.log (integer from pointer)
>        configure: Fix compiler warnings in config.log (null arguments)
>        configure: Fix compiler warning in config.log (unused variable)
>        configure: Fix compiler warning in config.log (macro redefined)
>        configure: Fix compiler warnings in config.log (uninitialized variable)
>        configure: Fix compiler warning in config.log (undefined NULL)
>        configure: Fix compiler warning in config.log (value was never used)
>        configure: Fix compiler warnings in config.log (statement without effect)
>        configure: Improve Xen autodetection for hosts without Xen
>
>   Makefile.target |    6 ----
>   configure       |   71 ++++++++++++++++++++++++++++++++++++++----------------
>   hw/ide/core.c   |    6 ++--
>   hw/piix_pci.c   |    3 +-
>   hw/stellaris.c  |    1 +
>   kvm-all.c       |    3 +-
>   net/slirp.c     |    2 +-
>   7 files changed, 58 insertions(+), 34 deletions(-)
>

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2011-12-19 15:45 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-19 11:12 [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 01/17] ide: drop argument to dma_buf_commit Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 02/17] Makefile.target: Remove unnecessary dependency rules Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 03/17] stellaris: Calculate system clock period on reset Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 04/17] kvm: Print something before calling abort() if KVM_RUN fails Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 05/17] slirp: Fix typo in net_slirp_hostfwd_remove Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 06/17] Also create piix3 property when Xen is enabled Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 07/17] configure: Fix compiler warnings in config.log (always return a value from main) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 08/17] configure: Fix compiler warnings in config.log (old-style function definition) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 09/17] configure: Fix compiler warning in config.log (integer from pointer) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 10/17] configure: Fix compiler warnings in config.log (null arguments) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 11/17] configure: Fix compiler warning in config.log (unused variable) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 12/17] configure: Fix compiler warning in config.log (macro redefined) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 13/17] configure: Fix compiler warnings in config.log (uninitialized variable) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 14/17] configure: Fix compiler warning in config.log (undefined NULL) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 15/17] configure: Fix compiler warning in config.log (value was never used) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 16/17] configure: Fix compiler warnings in config.log (statement without effect) Stefan Hajnoczi
2011-12-19 11:12 ` [Qemu-devel] [PATCH 17/17] configure: Improve Xen autodetection for hosts without Xen Stefan Hajnoczi
2011-12-19 15:44 ` [Qemu-devel] [PULL 00/17] Trivial patches for 7 to 19 December 2011 Anthony Liguori

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.