Commit 783eb67e authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



# By Stefan Weil (9) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  eeprom93xx: fix coding style
  hw/ppc/mac.h: remove unused BIOS_FILENAME definition
  Don't crash on keyboard input with no handler
  libcacard/vcard_emul_nss: Remove unused statement (value stored is never read)
  libcacard/cac: Remove unused statement (value stored is never read)
  virtio-net: fix the indent
  misc: Replace 'struct QEMUTimer' by 'QEMUTimer'
  qobject: Fix compiler warning (missing gnu_printf format attribute)
  acpi-build: Fix compiler warning (missing gnu_printf format attribute)
  .gitignore: Ignore config.status
  gtk: Replace conditional debug messages by trace methods
  console: Replace conditional debug messages by trace methods
  trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies)
  trace: Remove trace.h from console.h (less dependencies)

Message-id: 1385408466-13183-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 7dc65c02 6fedcaa1

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config-all-devices.* 
config-all-disas.*

config-host.*

config-target.*

config.status

trace/generated-tracers.h

trace/generated-tracers.c

trace/generated-tracers-dtrace.h

hw/char/cadence_uart.c

+2 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ typedef struct { 
    uint64_t char_tx_time;

    CharDriverState *chr;

    qemu_irq irq;

    struct QEMUTimer *fifo_trigger_handle;

    struct QEMUTimer *tx_time_handle;

    QEMUTimer *fifo_trigger_handle;

    QEMUTimer *tx_time_handle;

} UartState;



static void uart_update_status(UartState *s)

hw/display/vmware_vga.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include "hw/hw.h"

#include "hw/loader.h"

#include "trace.h"

#include "ui/console.h"

#include "hw/pci/pci.h"

hw/i386/acpi-build.c

+3 −2
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ static inline void build_append_array(GArray *array, GArray *val) 
    g_array_append_vals(array, val->data, val->len);

}



static void build_append_nameseg(GArray *array, const char *format, ...)

static void GCC_FMT_ATTR(2, 3)

build_append_nameseg(GArray *array, const char *format, ...)

{

    /* It would be nicer to use g_string_vprintf but it's only there in 2.22 */

    char s[] = "XXXX";
@@ -630,7 +631,7 @@ build_append_notify(GArray *device, const char *name, 
    GArray *method = build_alloc_array();

    uint8_t op = 0x14; /* MethodOp */



    build_append_nameseg(method, name);

    build_append_nameseg(method, "%s", name);

    build_append_byte(method, 0x02); /* MethodFlags: ArgCount */

    for (i = skip; i < count; i++) {

        GArray *target = build_alloc_array();

hw/nvram/eeprom93xx.c

+31 −31
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ uint16_t eeprom93xx_read(eeprom_t *eeprom) 
{

    /* Return status of pin DO (0 or 1). */

    logout("CS=%u DO=%u\n", eeprom->eecs, eeprom->eedo);

    return (eeprom->eedo);

    return eeprom->eedo;

}



#if 0