Commit b85a4ec8 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* stefanha/trivial-patches:
  qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()
  ioapic: fix build with DEBUG_IOAPIC
  .gitignore: add qemu-bridge-helper and option rom build products
  cleanup obsolete typedef
  monitor: Remove unused bool field 'qapi' in mon_cmd_t struct
  ds1338: Add missing break statement
  vnc: Fix packed boolean struct members
  Remove type field in ModuleEntry as it's not used
parents dfebfcf0 b71706d1

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ qemu-img-cmds.texi 
qemu-img-cmds.h

qemu-io

qemu-ga

qemu-bridge-helper

qemu-monitor.texi

QMP/qmp-commands.txt

test-coroutine
@@ -75,9 +76,14 @@ patches 
pc-bios/bios-pq/status

pc-bios/vgabios-pq/status

pc-bios/optionrom/linuxboot.bin

pc-bios/optionrom/linuxboot.raw

pc-bios/optionrom/linuxboot.img

pc-bios/optionrom/multiboot.bin

pc-bios/optionrom/multiboot.raw

pc-bios/optionrom/multiboot.img

pc-bios/optionrom/kvmvapic.bin

pc-bios/optionrom/kvmvapic.raw

pc-bios/optionrom/kvmvapic.img

.stgit-*

cscope.*

tags

hw/ds1338.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) 
            break;

        case 5:

            s->now.tm_mon = from_bcd(data & 0x1f) - 1;

            break;

        case 6:

            s->now.tm_year = from_bcd(data) + 100;

            break;

hw/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ ioapic_mem_write(void *opaque, target_phys_addr_t addr, uint64_t val, 
        if (size != 4) {

            break;

        }

        DPRINTF("write: %08x = %08x\n", s->ioregsel, val);

        DPRINTF("write: %08x = %08" PRIx64 "\n", s->ioregsel, val);

        switch (s->ioregsel) {

        case IOAPIC_REG_ID:

            s->id = (val >> IOAPIC_ID_SHIFT) & IOAPIC_ID_MASK;

module.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


typedef struct ModuleEntry

{

    module_init_type type;

    void (*init)(void);

    QTAILQ_ENTRY(ModuleEntry) node;

} ModuleEntry;

monitor.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ typedef struct mon_cmd_t { 
        int  (*cmd_async)(Monitor *mon, const QDict *params,

                          MonitorCompletion *cb, void *opaque);

    } mhandler;

    bool qapi;

    int flags;

} mon_cmd_t;