Commit 06db86c8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



- includes cleanup
- reduce .data footprint
- fix warnings reported by Clang static code analyzer
- fix dp8393x part lost in merge
- update git.orderfile and rules.mak

# gpg: Signature made Mon 09 Mar 2020 15:07:47 GMT
# 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-pull-request: (33 commits)
  monitor/hmp-cmds: Remove redundant statement in hmp_rocker_of_dpa_groups()
  display/exynos4210_fimd: Remove redundant statement in exynos4210_fimd_update()
  display/pxa2xx_lcd: Remove redundant statement in pxa2xx_palette_parse()
  scsi/scsi-disk: Remove redundant statement in scsi_disk_emulate_command()
  dma/xlnx-zdma: Remove redundant statement in zdma_write_dst()
  block/file-posix: Remove redundant statement in raw_handle_perm_lock()
  block/stream: Remove redundant statement in stream_run()
  core/qdev: fix memleak in qdev_get_gpio_out_connector()
  hw/i386/pc: Clean up includes
  hw/pci-host/q35: Remove unused includes
  hw/i386: Include "hw/mem/nvdimm.h"
  hw/acpi: Include "hw/mem/nvdimm.h"
  hw/pci-host/piix: Include "qemu/range.h"
  hw/i2c/smbus_ich9: Include "qemu/range.h"
  hw/pci-host/q35: Include "qemu/range.h"
  hw/timer/hpet: Include "exec/address-spaces.h"
  hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
  hw/hppa/machine: Include "net/net.h"
  hw/alpha/dp264: Include "net/net.h"
  hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dee65a00 916c9250

Makefile

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ UNCHECKED_GOALS := %clean TAGS cscope ctags dist \ 
    help check-help print-% \

    docker docker-% vm-help vm-test vm-build-%



print-%:

	@echo '$*=$($*)'



# All following code might depend on configuration variables

ifneq ($(wildcard config-host.mak),)

# Put the all: rule here so that config-host.mak can contain dependencies.

block/file-posix.c

+0 −1
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@ static int raw_handle_perm_lock(BlockDriverState *bs, 
                              "Is another process using the image [%s]?\n",

                              bs->filename);

        }

        op = RAW_PL_ABORT;

        /* fall through to unlock bytes. */

    case RAW_PL_ABORT:

        raw_apply_lock_bytes(s, s->fd, s->perm, ~s->shared_perm,

block/stream.c

+1 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static int coroutine_fn stream_run(Job *job, Error **errp) 
    int64_t offset = 0;

    uint64_t delay_ns = 0;

    int error = 0;

    int ret = 0;

    int64_t n = 0; /* bytes */



    if (bs == s->bottom) {
@@ -139,6 +138,7 @@ static int coroutine_fn stream_run(Job *job, Error **errp) 


    for ( ; offset < len; offset += n) {

        bool copy;

        int ret;



        /* Note that even when no rate limit is applied we need to yield

         * with no pending I/O here so that bdrv_drain_all() returns.
@@ -183,7 +183,6 @@ static int coroutine_fn stream_run(Job *job, Error **errp) 
                break;

            }

        }

        ret = 0;



        /* Publish progress */

        job_progress_update(&s->common.job, n);

fsdev/virtfs-proxy-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define BTRFS_SUPER_MAGIC 0x9123683E

#endif



static struct option helper_opts[] = {

static const struct option helper_opts[] = {

    {"fd", required_argument, NULL, 'f'},

    {"path", required_argument, NULL, 'p'},

    {"nodaemon", no_argument, NULL, 'n'},

hw/acpi/cpu_hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "qapi/error.h"

#include "hw/core/cpu.h"

#include "hw/i386/pc.h"

#include "hw/pci/pci.h"

#include "qemu/error-report.h"



#define CPU_EJECT_METHOD "CPEJ"