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

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



# By Stefan Weil (3) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  m25p80: Remove bogus include of devices.h
  ssh: Remove unnecessary use of strlen function.
  block/ssh: Add missing gcc format attributes
  linux-user: change do_semop to return target errno when unsuccessful
  w64: Fix compiler warnings (wrong format specifier)
  Remove unneeded type casts
  virtio.h: drop unused function prototypes
  bswap: fix compiler warning

Message-id: 1366371241-23430-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 5dff24be ad6b40f4

block/ssh.c

+4 −6
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void ssh_state_free(BDRVSSHState *s) 
/* Wrappers around error_report which make sure to dump as much

 * information from libssh2 as possible.

 */

static void

static void GCC_FMT_ATTR(2, 3)

session_error_report(BDRVSSHState *s, const char *fs, ...)

{

    va_list args;
@@ -132,7 +132,7 @@ session_error_report(BDRVSSHState *s, const char *fs, ...) 
    error_printf("\n");

}



static void

static void GCC_FMT_ATTR(2, 3)

sftp_error_report(BDRVSSHState *s, const char *fs, ...)

{

    va_list args;
@@ -387,15 +387,13 @@ static int check_host_key(BDRVSSHState *s, const char *host, int port, 
    }



    /* host_key_check=md5:xx:yy:zz:... */

    if (strlen(host_key_check) >= 4 &&

        strncmp(host_key_check, "md5:", 4) == 0) {

    if (strncmp(host_key_check, "md5:", 4) == 0) {

        return check_host_key_hash(s, &host_key_check[4],

                                   LIBSSH2_HOSTKEY_HASH_MD5, 16);

    }



    /* host_key_check=sha1:xx:yy:zz:... */

    if (strlen(host_key_check) >= 5 &&

        strncmp(host_key_check, "sha1:", 5) == 0) {

    if (strncmp(host_key_check, "sha1:", 5) == 0) {

        return check_host_key_hash(s, &host_key_check[5],

                                   LIBSSH2_HOSTKEY_HASH_SHA1, 20);

    }

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu) 
        CONTEXT tcgContext;



        if (SuspendThread(cpu->hThread) == (DWORD)-1) {

            fprintf(stderr, "qemu:%s: GetLastError:%d\n", __func__,

            fprintf(stderr, "qemu:%s: GetLastError:%lu\n", __func__,

                    GetLastError());

            exit(1);

        }
@@ -881,7 +881,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu) 
        cpu_signal(0);



        if (ResumeThread(cpu->hThread) == (DWORD)-1) {

            fprintf(stderr, "qemu:%s: GetLastError:%d\n", __func__,

            fprintf(stderr, "qemu:%s: GetLastError:%lu\n", __func__,

                    GetLastError());

            exit(1);

        }

hw/arm/armv7m.c

+6 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static uint32_t bitband_readw(void *opaque, hwaddr offset) 
    addr = bitband_addr(opaque, offset) & ~1;

    mask = (1 << ((offset >> 2) & 15));

    mask = tswap16(mask);

    cpu_physical_memory_read(addr, (uint8_t *)&v, 2);

    cpu_physical_memory_read(addr, &v, 2);

    return (v & mask) != 0;

}
@@ -69,12 +69,12 @@ static void bitband_writew(void *opaque, hwaddr offset, 
    addr = bitband_addr(opaque, offset) & ~1;

    mask = (1 << ((offset >> 2) & 15));

    mask = tswap16(mask);

    cpu_physical_memory_read(addr, (uint8_t *)&v, 2);

    cpu_physical_memory_read(addr, &v, 2);

    if (value & 1)

        v |= mask;

    else

        v &= ~mask;

    cpu_physical_memory_write(addr, (uint8_t *)&v, 2);

    cpu_physical_memory_write(addr, &v, 2);

}



static uint32_t bitband_readl(void *opaque, hwaddr offset)
@@ -85,7 +85,7 @@ static uint32_t bitband_readl(void *opaque, hwaddr offset) 
    addr = bitband_addr(opaque, offset) & ~3;

    mask = (1 << ((offset >> 2) & 31));

    mask = tswap32(mask);

    cpu_physical_memory_read(addr, (uint8_t *)&v, 4);

    cpu_physical_memory_read(addr, &v, 4);

    return (v & mask) != 0;

}
@@ -98,12 +98,12 @@ static void bitband_writel(void *opaque, hwaddr offset, 
    addr = bitband_addr(opaque, offset) & ~3;

    mask = (1 << ((offset >> 2) & 31));

    mask = tswap32(mask);

    cpu_physical_memory_read(addr, (uint8_t *)&v, 4);

    cpu_physical_memory_read(addr, &v, 4);

    if (value & 1)

        v |= mask;

    else

        v &= ~mask;

    cpu_physical_memory_write(addr, (uint8_t *)&v, 4);

    cpu_physical_memory_write(addr, &v, 4);

}



static const MemoryRegionOps bitband_ops = {

hw/arm/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void set_kernel_args(const struct arm_boot_info *info) 
        int cmdline_size;



        cmdline_size = strlen(info->kernel_cmdline);

        cpu_physical_memory_write(p + 8, (void *)info->kernel_cmdline,

        cpu_physical_memory_write(p + 8, info->kernel_cmdline,

                                  cmdline_size + 1);

        cmdline_size = (cmdline_size >> 2) + 1;

        WRITE_WORD(p, cmdline_size + 2);
@@ -219,7 +219,7 @@ static void set_kernel_args_old(const struct arm_boot_info *info) 
    }

    s = info->kernel_cmdline;

    if (s) {

        cpu_physical_memory_write(p, (void *)s, strlen(s) + 1);

        cpu_physical_memory_write(p, s, strlen(s) + 1);

    } else {

        WRITE_WORD(p, 0);

    }

hw/arm/musicpal.c

+4 −4
Original line number Diff line number Diff line
@@ -170,12 +170,12 @@ static void eth_rx_desc_put(uint32_t addr, mv88w8618_rx_desc *desc) 
    cpu_to_le16s(&desc->buffer_size);

    cpu_to_le32s(&desc->buffer);

    cpu_to_le32s(&desc->next);

    cpu_physical_memory_write(addr, (void *)desc, sizeof(*desc));

    cpu_physical_memory_write(addr, desc, sizeof(*desc));

}



static void eth_rx_desc_get(uint32_t addr, mv88w8618_rx_desc *desc)

{

    cpu_physical_memory_read(addr, (void *)desc, sizeof(*desc));

    cpu_physical_memory_read(addr, desc, sizeof(*desc));

    le32_to_cpus(&desc->cmdstat);

    le16_to_cpus(&desc->bytes);

    le16_to_cpus(&desc->buffer_size);
@@ -229,12 +229,12 @@ static void eth_tx_desc_put(uint32_t addr, mv88w8618_tx_desc *desc) 
    cpu_to_le16s(&desc->bytes);

    cpu_to_le32s(&desc->buffer);

    cpu_to_le32s(&desc->next);

    cpu_physical_memory_write(addr, (void *)desc, sizeof(*desc));

    cpu_physical_memory_write(addr, desc, sizeof(*desc));

}



static void eth_tx_desc_get(uint32_t addr, mv88w8618_tx_desc *desc)

{

    cpu_physical_memory_read(addr, (void *)desc, sizeof(*desc));

    cpu_physical_memory_read(addr, desc, sizeof(*desc));

    le32_to_cpus(&desc->cmdstat);

    le16_to_cpus(&desc->res);

    le16_to_cpus(&desc->bytes);