Commit 3988475b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* stefanha/trivial-patches:
  w32: Always use standard instead of native format strings
  net/socket: Fix compiler warning (regression for MinGW)
  linux-user: Remove redundant null check and replace free by g_free
  qemu-timer: simplify qemu_run_timers
  TextConsole: saturate escape parameter in TTY_STATE_CSI
  curses: don't initialize curses when qemu is daemonized
  dtrace backend: add function to reserved words
  pflash_cfi01: Fix warning caused by unreachable code
  ioh3420: Remove unreachable code
  lm4549: Fix buffer overflow
  cadence_uart: Fix buffer overflow
  qemu-sockets: Fix potential memory leak
  qemu-ga: Remove unreachable code after g_error
  target-i386: Allow tsc-frequency to be larger then 2.147G
parents 97fe81d3 95df51a4

compiler.h

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ 
   /* Use gnu_printf when supported (qemu uses standard format strings). */

#  define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2)))

#  define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))

#  if defined(_WIN32)

    /* Map __printf__ to __gnu_printf__ because we want standard format strings

     * even when MinGW or GLib include files use __printf__. */

#   define __printf__ __gnu_printf__

#  endif

# endif

#if defined(_WIN32)

#define GCC_WEAK __attribute__((weak))

console.c

+5 −2
Original line number Diff line number Diff line
@@ -938,8 +938,11 @@ static void console_putchar(TextConsole *s, int ch) 
    case TTY_STATE_CSI: /* handle escape sequence parameters */

        if (ch >= '0' && ch <= '9') {

            if (s->nb_esc_params < MAX_ESC_PARAMS) {

                s->esc_params[s->nb_esc_params] =

                    s->esc_params[s->nb_esc_params] * 10 + ch - '0';

                int *param = &s->esc_params[s->nb_esc_params];

                int digit = (ch - '0');



                *param = (*param <= (INT_MAX - digit) / 10) ?

                         *param * 10 + digit : INT_MAX;

            }

        } else {

            if (s->nb_esc_params < MAX_ESC_PARAMS)

hw/cadence_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static uint64_t uart_read(void *opaque, target_phys_addr_t offset, 
    uint32_t c = 0;



    offset >>= 2;

    if (offset > R_MAX) {

    if (offset >= R_MAX) {

        return 0;

    } else if (offset == R_TX_RX) {

        uart_read_rx_fifo(s, &c);

hw/ioh3420.c

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static int ioh3420_initfn(PCIDevice *d) 
    rc = pcie_chassis_add_slot(s);

    if (rc < 0) {

        goto err_pcie_cap;

        return rc;

    }

    pcie_cap_root_init(d);

    rc = pcie_aer_init(d, IOH_EP_AER_OFFSET);

hw/lm4549.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ uint32_t lm4549_write_samples(lm4549_state *s, uint32_t left, uint32_t right) 
       This model supports 16-bit playback.

    */



    if (s->buffer_level >= LM4549_BUFFER_SIZE) {

    if (s->buffer_level > LM4549_BUFFER_SIZE - 2) {

        DPRINTF("write_sample Buffer full\n");

        return 0;

    }