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

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging

trivial patches (20200504)

Silent static analyzer warning
Remove dead assignments
Support -chardev serial on macOS
Update MAINTAINERS
Some cosmetic changes

# gpg: Signature made Mon 04 May 2020 16:45:18 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-5.1-pull-request:
  hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning
  hw/timer/stm32f2xx_timer: Remove dead assignment
  hw/gpio/aspeed_gpio: Remove dead assignment
  hw/isa/i82378: Remove dead assignment
  hw/ide/sii3112: Remove dead assignment
  hw/input/adb-kbd: Remove dead assignment
  hw/i2c/pm_smbus: Remove dead assignment
  blockdev: Remove dead assignment
  block: Avoid dead assignment
  Compress lines for immediate return
  chardev: Add macOS to list of OSes that support -chardev serial
  MAINTAINERS: Update Keith Busch's email address
  elf_ops: Don't try to g_mapped_file_unref(NULL)
  hw/mem/pc-dimm: Fix line over 80 characters warning
  hw/mem/pc-dimm: Print slot number on error at pc_dimm_pre_plug()
  MAINTAINERS: Mark the LatticeMico32 target as orphan
  timer/exynos4210_mct: Remove redundant statement in exynos4210_mct_write()
  display/blizzard: use extract16() for fix clang analyzer warning in blizzard_draw_line16_32()
  scsi/esp-pci: add g_assert() for fix clang analyzer warning in esp_pci_io_write()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5c7c46fe e702fba8

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ F: hw/net/*i82596* 
F: include/hw/net/lasi_82596.h



LM32 TCG CPUs

M: Michael Walle <michael@walle.cc>

S: Maintained

R: Michael Walle <michael@walle.cc>

S: Orphan

F: target/lm32/

F: disas/lm32.c

F: hw/lm32/
@@ -977,13 +977,13 @@ F: pc-bios/hppa-firmware.img 
LM32 Machines

-------------

EVR32 and uclinux BSP

M: Michael Walle <michael@walle.cc>

S: Maintained

R: Michael Walle <michael@walle.cc>

S: Orphan

F: hw/lm32/lm32_boards.c



milkymist

M: Michael Walle <michael@walle.cc>

S: Maintained

R: Michael Walle <michael@walle.cc>

S: Orphan

F: hw/lm32/milkymist.c



M68K Machines
@@ -1735,7 +1735,7 @@ F: hw/virtio/virtio-crypto-pci.c 
F: include/hw/virtio/virtio-crypto.h



nvme

M: Keith Busch <keith.busch@intel.com>

M: Keith Busch <kbusch@kernel.org>

L: qemu-block@nongnu.org

S: Supported

F: hw/block/nvme*

block.c

+1 −1
Original line number Diff line number Diff line
@@ -3165,7 +3165,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
    }



    ret = bdrv_fill_options(&options, filename, &flags, &local_err);

    if (local_err) {

    if (ret < 0) {

        goto fail;

    }

block/file-posix.c

+3 −5
Original line number Diff line number Diff line
@@ -1617,12 +1617,11 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) 
{

    RawPosixAIOData *aiocb = opaque;

    BDRVRawState *s G_GNUC_UNUSED = aiocb->bs->opaque;

    int ret;



    /* First try to write zeros and unmap at the same time */



#ifdef CONFIG_FALLOCATE_PUNCH_HOLE

    ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

    int ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

                           aiocb->aio_offset, aiocb->aio_nbytes);

    if (ret != -ENOTSUP) {

        return ret;
@@ -1631,8 +1630,7 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) 


    /* If we couldn't manage to unmap while guaranteed that the area reads as

     * all-zero afterwards, just write zeroes without unmapping */

    ret = handle_aiocb_write_zeroes(aiocb);

    return ret;

    return handle_aiocb_write_zeroes(aiocb);

}



#ifndef HAVE_COPY_FILE_RANGE

block/nfs.c

+1 −2
Original line number Diff line number Diff line
@@ -620,8 +620,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    bs->total_sectors = ret;

    ret = 0;

    return ret;

    return 0;

}



static QemuOptsList nfs_create_opts = {

block/nvme.c

+1 −3
Original line number Diff line number Diff line
@@ -575,11 +575,9 @@ static bool nvme_poll_cb(void *opaque) 
{

    EventNotifier *e = opaque;

    BDRVNVMeState *s = container_of(e, BDRVNVMeState, irq_notifier);

    bool progress = false;



    trace_nvme_poll_cb(s);

    progress = nvme_poll_queues(s);

    return progress;

    return nvme_poll_queues(s);

}



static int nvme_init(BlockDriverState *bs, const char *device, int namespace,