Commit b780bf8e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-10' into staging 



trivial patches for 2014-06-10

# gpg: Signature made Tue 10 Jun 2014 17:07:19 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-06-10: (25 commits)
  virtio.c: fix error message
  hw: vmware_vga: don't return cursorx when the driver asks for cursory register
  migration: Plug memory leak in migrate-set-cache-size command
  libcacard: Clean up dead stores before g_free()
  libcacard: Drop superfluous conditionals around g_free()
  cpu/x86: correctly set errors in x86_cpu_parse_featurestr
  smbios: use g_free directly on NULL pointers
  vdi: remove double conversion
  apb: Fix compiler warnings (large constants)
  hw/net/ne2000-isa: Register vmstate struct
  target-microblaze: Delete unused sign_extend() function
  hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem()
  target-i386/translate.c: Remove unused tcg_gen_lshift()
  hw/isa/pc87312: Remove unused function is_parallel_epp()
  hw/intc/openpic: Remove unused function IRQ_testbit()
  hw/dma/xilinx_axidma: Remove unused stream_halted() function
  util/qemu-sockets.c: Avoid unused variable warnings
  hw/sd/sd.c: Drop unused sd_acmd_type[] array
  hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables
  slirp: Remove unused zero_ethaddr[] variable
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3334e929 1a285899

arch_init.c

+0 −1
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ static void migration_end(void) 
    XBZRLE_cache_lock();

    if (XBZRLE.cache) {

        cache_fini(XBZRLE.cache);

        g_free(XBZRLE.cache);

        g_free(XBZRLE.encoded_buf);

        g_free(XBZRLE.current_buf);

        XBZRLE.cache = NULL;

block/vdi.c

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static void vdi_header_to_le(VdiHeader *header) 
    cpu_to_le32s(&header->block_extra);

    cpu_to_le32s(&header->blocks_in_image);

    cpu_to_le32s(&header->blocks_allocated);

    cpu_to_le32s(&header->blocks_allocated);

    uuid_convert(header->uuid_image);

    uuid_convert(header->uuid_last_snap);

    uuid_convert(header->uuid_link);

hw/display/vmware_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) 
        break;



    case SVGA_REG_CURSOR_Y:

        ret = s->cursor.x;

        ret = s->cursor.y;

        break;



    case SVGA_REG_CURSOR_ON:

hw/dma/xilinx_axidma.c

+0 −5
Original line number Diff line number Diff line
@@ -157,11 +157,6 @@ static inline int stream_running(struct Stream *s) 
    return s->regs[R_DMACR] & DMACR_RUNSTOP;

}



static inline int stream_halted(struct Stream *s)

{

    return s->regs[R_DMASR] & DMASR_HALTED;

}



static inline int stream_idle(struct Stream *s)

{

    return !!(s->regs[R_DMASR] & DMASR_IDLE);

hw/i386/pc.c

+0 −3
Original line number Diff line number Diff line
@@ -922,9 +922,6 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 
                                              0x280, 0x380 };

static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };



static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };

static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };



void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)

{

    static int nb_ne2k = 0;