diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | hw/arm_gic.c | 2 | ||||
| -rw-r--r-- | hw/pflash_cfi01.c | 14 | ||||
| -rw-r--r-- | hw/pflash_cfi02.c | 6 | ||||
| -rw-r--r-- | hw/vmmouse.c | 1 | ||||
| -rw-r--r-- | hw/zynq_slcr.c | 7 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 | ||||
| -rw-r--r-- | net/hub.c | 2 | ||||
| -rw-r--r-- | user-exec.c | 2 |
10 files changed, 27 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index bd6ba1c71e..3ce57ccd58 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 @@ -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 diff --git a/hw/arm_gic.c b/hw/arm_gic.c index 8d769de4f5..b6062c4241 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; } } diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 7d040b508a..931264ff8c 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) @@ -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); diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index f918e36580..c60ae831b4 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) diff --git a/hw/vmmouse.c b/hw/vmmouse.c index 6338efa1c3..578122c9f5 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); diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c index dde4306195..f55ab8d8a9 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"); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 31d5276465..275260a6ff 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 @@ -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) { diff --git a/user-exec.c b/user-exec.c index 1185cb03c8..5863b9f362 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; |