Commit 914606d2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging 



* stefanha/trivial-patches:
  configure: Earlier pkg-config probe
  vmmouse_reset(): remove minimal code duplication
  linux-user/syscall.c: remove wrong forward decl of setgroups()
  fix build error on ARM due to wrong glibc check
  gitignore: Add virtfs-proxy-helper
  arm_gic: Add cpu nr to Raised IRQ message
  zynq_slcr: Compile time warning fixes.
  pflash_cfi0x: Send debug messages to stderr
  pflash_cfi01: qemu_log_mask "unimplemented" msg
  net, hub: fix the indent in the comments

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 5455a474 779ab5e3

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -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

configure

+8 −8
Original line number Diff line number Diff line
@@ -1359,6 +1359,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
@@ -1589,14 +1597,6 @@ if test "$xen_pci_passthrough" != "no"; then 
  fi

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

hw/arm_gic.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }

        }

hw/pflash_cfi01.c

+7 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


#define PFLASH_BUG(fmt, ...) \

do { \

    printf("PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \

    fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \

    exit(1); \

} while(0)
@@ -54,7 +54,7 @@ do { \ 
#ifdef PFLASH_DEBUG

#define DPRINTF(fmt, ...)                                   \

do {                                                        \

    printf("PFLASH: " fmt , ## __VA_ARGS__);       \

    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);

hw/pflash_cfi02.c

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#ifdef PFLASH_DEBUG

#define DPRINTF(fmt, ...)                                  \

do {                                                       \

    printf("PFLASH: " fmt , ## __VA_ARGS__);       \

    fprintf(stderr "PFLASH: " fmt , ## __VA_ARGS__);       \

} while (0)

#else

#define DPRINTF(fmt, ...) do { } while (0)