Commit 80dfc873 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



# By Stefan Weil (5) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  migration: Fix compiler warning ('caps' may be used uninitialized)
  util/path: Fix type which is longer than 8 bit for MinGW
  hw/9pfs: Fix errno value for xattr functions
  vl: Clean up unnecessary boot_order complications
  qemu-char: Fix potential out of bounds access to local arrays
  pci-ohci: Add missing 'break' in ohci_service_td
  sh4: Fix serial line access for Linux kernels later than 3.2
  hw/alpha: Fix compiler warning (integer constant is too large)
  target-i386: Fix compiler warning (integer constant is too large)
  block: Remove unused assignment (fixes warning from clang)
  exec: cleanup DEBUG_SUBPAGE
  tests: Fix schema parser test for in-tree build
  tests: Update .gitignore for test-int128 and test-bitops
  .gitignore: ignore tests/qemu-iotests/socket_scm_helper

Message-id: 1381051979-25742-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 576e81be 387eedeb

blockdev.c

+0 −1
Original line number Diff line number Diff line
@@ -1926,7 +1926,6 @@ void qmp_drive_mirror(const char *device, const char *target, 
    } else {

        switch (mode) {

        case NEW_IMAGE_MODE_EXISTING:

            ret = 0;

            break;

        case NEW_IMAGE_MODE_ABSOLUTE_PATHS:

            /* create new image with backing file */

exec.c

+9 −9
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ static uint64_t subpage_read(void *opaque, hwaddr addr, 
    uint8_t buf[4];



#if defined(DEBUG_SUBPAGE)

    printf("%s: subpage %p len %d addr " TARGET_FMT_plx "\n", __func__,

    printf("%s: subpage %p len %u addr " TARGET_FMT_plx "\n", __func__,

           subpage, len, addr);

#endif

    address_space_read(subpage->as, addr + subpage->base, buf, len);
@@ -1596,7 +1596,7 @@ static void subpage_write(void *opaque, hwaddr addr, 
    uint8_t buf[4];



#if defined(DEBUG_SUBPAGE)

    printf("%s: subpage %p len %d addr " TARGET_FMT_plx

    printf("%s: subpage %p len %u addr " TARGET_FMT_plx

           " value %"PRIx64"\n",

           __func__, subpage, len, addr, value);

#endif
@@ -1617,16 +1617,16 @@ static void subpage_write(void *opaque, hwaddr addr, 
}



static bool subpage_accepts(void *opaque, hwaddr addr,

                            unsigned size, bool is_write)

                            unsigned len, bool is_write)

{

    subpage_t *subpage = opaque;

#if defined(DEBUG_SUBPAGE)

    printf("%s: subpage %p %c len %d addr " TARGET_FMT_plx "\n",

    printf("%s: subpage %p %c len %u addr " TARGET_FMT_plx "\n",

           __func__, subpage, is_write ? 'w' : 'r', len, addr);

#endif



    return address_space_access_valid(subpage->as, addr + subpage->base,

                                      size, is_write);

                                      len, is_write);

}



static const MemoryRegionOps subpage_ops = {
@@ -1646,8 +1646,8 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, 
    idx = SUBPAGE_IDX(start);

    eidx = SUBPAGE_IDX(end);

#if defined(DEBUG_SUBPAGE)

    printf("%s: %p start %08x end %08x idx %08x eidx %08x mem %ld\n", __func__,

           mmio, start, end, idx, eidx, memory);

    printf("%s: %p start %08x end %08x idx %08x eidx %08x section %d\n",

           __func__, mmio, start, end, idx, eidx, section);

#endif

    for (; idx <= eidx; idx++) {

        mmio->sub_section[idx] = section;
@@ -1668,8 +1668,8 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base) 
                          "subpage", TARGET_PAGE_SIZE);

    mmio->iomem.subpage = true;

#if defined(DEBUG_SUBPAGE)

    printf("%s: %p base " TARGET_FMT_plx " len %08x %d\n", __func__,

           mmio, base, TARGET_PAGE_SIZE, subpage_memory);

    printf("%s: %p base " TARGET_FMT_plx " len %08x\n", __func__,

           mmio, base, TARGET_PAGE_SIZE);

#endif

    subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, PHYS_SECTION_UNASSIGNED);

hw/9pfs/virtio-9p-xattr.c

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ ssize_t v9fs_get_xattr(FsContext *ctx, const char *path, 
    if (xops) {

        return xops->getxattr(ctx, path, name, value, size);

    }

    errno = -EOPNOTSUPP;

    errno = EOPNOTSUPP;

    return -1;

}
@@ -123,7 +123,7 @@ int v9fs_set_xattr(FsContext *ctx, const char *path, const char *name, 
    if (xops) {

        return xops->setxattr(ctx, path, name, value, size, flags);

    }

    errno = -EOPNOTSUPP;

    errno = EOPNOTSUPP;

    return -1;



}
@@ -135,7 +135,7 @@ int v9fs_remove_xattr(FsContext *ctx, 
    if (xops) {

        return xops->removexattr(ctx, path, name);

    }

    errno = -EOPNOTSUPP;

    errno = EOPNOTSUPP;

    return -1;



}

hw/alpha/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static IOMMUTLBEntry typhoon_translate_iommu(MemoryRegion *iommu, hwaddr addr) 
            }

        }



        if (addr >= 0x80000000000 && addr <= 0xfffffffffff) {

        if (addr >= 0x80000000000ull && addr <= 0xfffffffffffull) {

            /* Check the fourth window for DAC enable and window enable.  */

            if ((pchip->win[3].wba & 0x80000000001ull) == 0x80000000001ull) {

                uint64_t pte_addr;

hw/char/sh_serial.c

+0 −2
Original line number Diff line number Diff line
@@ -248,11 +248,9 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs, 
                    s->flags &= ~SH_SERIAL_FLAG_RDF;

            }

            break;

#if 0

        case 0x18:

            ret = s->fcr;

            break;

#endif

        case 0x1c:

            ret = s->rx_cnt;

            break;