[Qemu-devel] [PULL 00/10] Trivial patches for December 8 to 18 2012

[Qemu-devel] [PULL 00/10] Trivial patches for December 8 to 18 2012

[Stefan Hajnoczi]

The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:

  exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to 779ab5e3ddb9ad903f9a0ec21e148ed7bfd2d255:

  configure: Earlier pkg-config probe (2012-12-18 17:40:40 +0100)

----------------------------------------------------------------
Cole Robinson (1):
      gitignore: Add virtfs-proxy-helper

John Spencer (2):
      fix build error on ARM due to wrong glibc check
      linux-user/syscall.c: remove wrong forward decl of setgroups()

Laszlo Ersek (1):
      vmmouse_reset(): remove minimal code duplication

Peter Crosthwaite (4):
      pflash_cfi01: qemu_log_mask "unimplemented" msg
      pflash_cfi0x: Send debug messages to stderr
      zynq_slcr: Compile time warning fixes.
      arm_gic: Add cpu nr to Raised IRQ message

Stefan Weil (1):
      configure: Earlier pkg-config probe

Zhi Yong Wu (1):
      net, hub: fix the indent in the comments

 .gitignore           |  1 +
 configure            | 16 ++++++++--------
 hw/arm_gic.c         |  2 +-
 hw/pflash_cfi01.c    | 14 +++++++-------
 hw/pflash_cfi02.c    |  6 +++---
 hw/vmmouse.c         |  1 -
 hw/zynq_slcr.c       |  7 ++++---
 linux-user/syscall.c |  2 +-
 net/hub.c            |  2 +-
 user-exec.c          |  2 +-
 10 files changed, 27 insertions(+), 26 deletions(-)

-- 
1.8.0.2

[Qemu-devel] [PATCH 01/10] net, hub: fix the indent in the comments

[Stefan Hajnoczi]

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

  Remove some redundant blanks in the comments of
net_hub_id_for_client().

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/hub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/hub.c b/net/hub.c
index be41301..3b2d1ff 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -256,7 +256,7 @@ void net_hub_info(Monitor *mon)
 /**
  * Get the hub id that a client is connected to
  *
- * @id              Pointer for hub id output, may be NULL
+ * @id: Pointer for hub id output, may be NULL
  */
 int net_hub_id_for_client(NetClientState *nc, int *id)
 {
-- 
1.8.0.2

[Qemu-devel] [PATCH 02/10] pflash_cfi01: qemu_log_mask "unimplemented" msg

[Stefan Hajnoczi]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

This printf is informing the user of unimplemented functionality. It should be
re-directed to qemu_log(LOG_UNIMP, ...) accordingly.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/pflash_cfi01.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 7d040b5..f9f8e5d 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -438,9 +438,9 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,
     return;
 
  error_flash:
-    printf("%s: Unimplemented flash cmd sequence "
-           "(offset " TARGET_FMT_plx ", wcycle 0x%x cmd 0x%x value 0x%x)\n",
-           __func__, offset, pfl->wcycle, pfl->cmd, value);
+    qemu_log_mask(LOG_UNIMP, "%s: Unimplemented flash cmd sequence "
+                  "(offset " TARGET_FMT_plx ", wcycle 0x%x cmd 0x%x value 0x%x)"
+                  "\n", __func__, offset, pfl->wcycle, pfl->cmd, value);
 
  reset_flash:
     memory_region_rom_device_set_readable(&pfl->mem, true);
-- 
1.8.0.2

[Qemu-devel] [PATCH 03/10] pflash_cfi0x: Send debug messages to stderr

[Stefan Hajnoczi]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

These debug info messages should go to stderr rather than stdout.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/pflash_cfi01.c | 8 ++++----
 hw/pflash_cfi02.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index f9f8e5d..931264f 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -46,15 +46,15 @@
 
 #define PFLASH_BUG(fmt, ...) \
 do { \
-    printf("PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \
+    fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \
     exit(1); \
 } while(0)
 
 /* #define PFLASH_DEBUG */
 #ifdef PFLASH_DEBUG
-#define DPRINTF(fmt, ...)                          \
-do {                                               \
-    printf("PFLASH: " fmt , ## __VA_ARGS__);       \
+#define DPRINTF(fmt, ...)                                   \
+do {                                                        \
+    fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__);       \
 } while (0)
 #else
 #define DPRINTF(fmt, ...) do { } while (0)
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index f918e36..c60ae83 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -45,9 +45,9 @@
 
 //#define PFLASH_DEBUG
 #ifdef PFLASH_DEBUG
-#define DPRINTF(fmt, ...)                          \
-do {                                               \
-    printf("PFLASH: " fmt , ## __VA_ARGS__);       \
+#define DPRINTF(fmt, ...)                                  \
+do {                                                       \
+    fprintf(stderr "PFLASH: " fmt , ## __VA_ARGS__);       \
 } while (0)
 #else
 #define DPRINTF(fmt, ...) do { } while (0)
-- 
1.8.0.2

[Qemu-devel] [PATCH 04/10] zynq_slcr: Compile time warning fixes.

[Stefan Hajnoczi]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Few warnings when compiled with debug printfs enabled. Fixed all.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/zynq_slcr.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index dde4306..f55ab8d 100644
--- a/hw/zynq_slcr.c
+++ b/hw/zynq_slcr.c
@@ -334,7 +334,7 @@ static uint64_t zynq_slcr_read(void *opaque, hwaddr offset,
 {
     uint32_t ret = zynq_slcr_read_imp(opaque, offset);
 
-    DB_PRINT("addr: %08x data: %08x\n", offset, ret);
+    DB_PRINT("addr: %08x data: %08x\n", (unsigned)offset, (unsigned)ret);
     return ret;
 }
 
@@ -343,7 +343,7 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
 {
     ZynqSLCRState *s = (ZynqSLCRState *)opaque;
 
-    DB_PRINT("offset: %08x data: %08x\n", offset, (unsigned)val);
+    DB_PRINT("offset: %08x data: %08x\n", (unsigned)offset, (unsigned)val);
 
     switch (offset) {
     case 0x00: /* SCL */
@@ -476,7 +476,8 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
             break;
         default:
         bad_reg:
-            DB_PRINT("Bad register write %x <= %08x\n", (int)offset, val);
+            DB_PRINT("Bad register write %x <= %08x\n", (int)offset,
+                     (unsigned)val);
         }
     } else {
         DB_PRINT("SCLR registers are locked. Unlock them first\n");
-- 
1.8.0.2

[Qemu-devel] [PATCH 05/10] arm_gic: Add cpu nr to Raised IRQ message

[Stefan Hajnoczi]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Add the relevant CPU nr to this debug message to make IRQ debugging more
informative.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/arm_gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm_gic.c b/hw/arm_gic.c
index 8d769de..b6062c4 100644
--- a/hw/arm_gic.c
+++ b/hw/arm_gic.c
@@ -76,7 +76,7 @@ void gic_update(GICState *s)
         if (best_prio < s->priority_mask[cpu]) {
             s->current_pending[cpu] = best_irq;
             if (best_prio < s->running_priority[cpu]) {
-                DPRINTF("Raised pending IRQ %d\n", best_irq);
+                DPRINTF("Raised pending IRQ %d (cpu %d)\n", best_irq, cpu);
                 level = 1;
             }
         }
-- 
1.8.0.2

[Qemu-devel] [PATCH 06/10] gitignore: Add virtfs-proxy-helper

[Stefan Hajnoczi]

From: Cole Robinson <crobinso@redhat.com>

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bd6ba1c..3ce57cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ test-qmp-output-visitor
 test-string-input-visitor
 test-string-output-visitor
 test-visitor-serialization
+fsdev/virtfs-proxy-helper
 fsdev/virtfs-proxy-helper.1
 fsdev/virtfs-proxy-helper.pod
 .gdbinit
-- 
1.8.0.2

[Qemu-devel] [PATCH 07/10] fix build error on ARM due to wrong glibc check

[Stefan Hajnoczi]

From: John Spencer <maillist-qemu@barfooze.de>

the test for glibc < 2 "succeeds" wrongly for any non-glibc C library,
and breaks the build on musl libc.
we must first test if __GLIBC__ is defined at all, before using it
unconditionally.

Signed-off-by: John Spencer <maillist-qemu@barfooze.de>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 user-exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user-exec.c b/user-exec.c
index 1185cb0..5863b9f 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -436,7 +436,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
     unsigned long pc;
     int is_write;
 
-#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
     pc = uc->uc_mcontext.gregs[R15];
 #else
     pc = uc->uc_mcontext.arm_pc;
-- 
1.8.0.2

[Qemu-devel] [PATCH 08/10] linux-user/syscall.c: remove wrong forward decl of setgroups()

[Stefan Hajnoczi]

From: John Spencer <maillist-qemu@barfooze.de>

this declaration is wrong:
the correct prototype on linux is:
int setgroups(size_t size, const gid_t *list);

since by default musl libc exposes this symbol in unistd.h
additionally to grp.h, the wrong declaration causes a build error.

the proper fix is to simply include the correct header.

Signed-off-by: John Spencer <maillist-qemu@barfooze.de>

Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 linux-user/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 31d5276..275260a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <limits.h>
+#include <grp.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -584,7 +585,6 @@ extern int personality(int);
 extern int flock(int, int);
 extern int setfsuid(int);
 extern int setfsgid(int);
-extern int setgroups(int, gid_t *);
 
 /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
 #ifdef TARGET_ARM
-- 
1.8.0.2

[Qemu-devel] [PATCH 09/10] vmmouse_reset(): remove minimal code duplication

[Stefan Hajnoczi]

From: Laszlo Ersek <lersek@redhat.com>

Commit 069ab0eb added a vmmouse_disable() call to vmmouse_reset().
vmmouse_disable() resets the status already.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/vmmouse.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index 6338efa..578122c 100644
--- a/hw/vmmouse.c
+++ b/hw/vmmouse.c
@@ -252,7 +252,6 @@ static void vmmouse_reset(DeviceState *d)
 {
     VMMouseState *s = container_of(d, VMMouseState, dev.qdev);
 
-    s->status = 0xffff;
     s->queue_size = VMMOUSE_QUEUE_SIZE;
 
     vmmouse_disable(s);
-- 
1.8.0.2

[Qemu-devel] [PATCH 10/10] configure: Earlier pkg-config probe

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

Probe pkg-config before it is used for the first time (libseccomp check).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index ecdb33a..728caca 100755
--- a/configure
+++ b/configure
@@ -1360,6 +1360,14 @@ esac
 fi
 
 ##########################################
+# pkg-config probe
+
+if ! has "$pkg_config_exe"; then
+  echo "Error: pkg-config binary '$pkg_config_exe' not found"
+  exit 1
+fi
+
+##########################################
 # NPTL probe
 
 if test "$nptl" != "no" ; then
@@ -1590,14 +1598,6 @@ if test "$xen_pci_passthrough" != "no"; then
 fi
 
 ##########################################
-# pkg-config probe
-
-if ! has "$pkg_config_exe"; then
-  echo "Error: pkg-config binary '$pkg_config_exe' not found"
-  exit 1
-fi
-
-##########################################
 # libtool probe
 
 if ! has $libtool; then
-- 
1.8.0.2

Re: [Qemu-devel] [PULL 00/10] Trivial patches for December 8 to 18 2012

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
>
>   exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git trivial-patches
>
> for you to fetch changes up to 779ab5e3ddb9ad903f9a0ec21e148ed7bfd2d255:
>
>   configure: Earlier pkg-config probe (2012-12-18 17:40:40 +0100)

Pulled. Thanks.

Regards,

Anthony Liguori

>
> ----------------------------------------------------------------
> Cole Robinson (1):
>       gitignore: Add virtfs-proxy-helper
>
> John Spencer (2):
>       fix build error on ARM due to wrong glibc check
>       linux-user/syscall.c: remove wrong forward decl of setgroups()
>
> Laszlo Ersek (1):
>       vmmouse_reset(): remove minimal code duplication
>
> Peter Crosthwaite (4):
>       pflash_cfi01: qemu_log_mask "unimplemented" msg
>       pflash_cfi0x: Send debug messages to stderr
>       zynq_slcr: Compile time warning fixes.
>       arm_gic: Add cpu nr to Raised IRQ message
>
> Stefan Weil (1):
>       configure: Earlier pkg-config probe
>
> Zhi Yong Wu (1):
>       net, hub: fix the indent in the comments
>
>  .gitignore           |  1 +
>  configure            | 16 ++++++++--------
>  hw/arm_gic.c         |  2 +-
>  hw/pflash_cfi01.c    | 14 +++++++-------
>  hw/pflash_cfi02.c    |  6 +++---
>  hw/vmmouse.c         |  1 -
>  hw/zynq_slcr.c       |  7 ++++---
>  linux-user/syscall.c |  2 +-
>  net/hub.c            |  2 +-
>  user-exec.c          |  2 +-
>  10 files changed, 27 insertions(+), 26 deletions(-)
>
> -- 
> 1.8.0.2