Commit 09704e6d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* xsetbv fix (x86 targets TCG)
* remove unused functions
* qht segfault and memory leak fixes
* NBD fixes
* Fix for non-power-of-2 discard granularity
* Memory hotplug fixes
* Migration regressions
* IOAPIC fixes and (disabled by default) EOI register support
* Various other small fixes

# gpg: Signature made Wed 03 Aug 2016 18:01:05 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (25 commits)
  util: Fix assertion in iov_copy() upon zero 'bytes' and non-zero 'offset'
  qdev: Fix use after free in qdev_init_nofail error path
  Reorganize help output of '-display' option
  x86: ioapic: add support for explicit EOI
  x86: ioapic: ignore level irq during processing
  apic: fix broken migration for kvm-apic
  fw_cfg: Make base type "fw_cfg" abstract
  block: Cater to iscsi with non-power-of-2 discard
  osdep: Document differences in rounding macros
  nbd: Limit nbdflags to 16 bits
  nbd: Fix bad flag detection on server
  i2c: fix migration regression introduced by broadcast support
  mptsas: really fix migration compatibility
  qdist: return "(empty)" instead of NULL when printing an empty dist
  qdist: use g_renew and g_new instead of g_realloc and g_malloc.
  qdist: fix memory leak during binning
  target-i386: fix typo in xsetbv implementation
  qht: do not segfault when gathering stats from an uninitialized qht
  util: Drop inet_listen()
  util: drop unix_nonblocking_connect()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 29b2517a e911765c

backends/hostmem.c

+14 −4
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static bool host_memory_backend_get_prealloc(Object *obj, Error **errp) 
static void host_memory_backend_set_prealloc(Object *obj, bool value,

                                             Error **errp)

{

    Error *local_err = NULL;

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (backend->force_prealloc) {
@@ -223,7 +224,11 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, 
        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        os_mem_prealloc(fd, ptr, sz);

        os_mem_prealloc(fd, ptr, sz, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }

        backend->prealloc = true;

    }

}
@@ -286,8 +291,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
    if (bc->alloc) {

        bc->alloc(backend, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

            goto out;

        }



        ptr = memory_region_get_ram_ptr(&backend->mr);
@@ -343,10 +347,16 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
         * specified NUMA policy in place.

         */

        if (backend->prealloc) {

            os_mem_prealloc(memory_region_get_fd(&backend->mr), ptr, sz);

            os_mem_prealloc(memory_region_get_fd(&backend->mr), ptr, sz,

                            &local_err);

            if (local_err) {

                goto out;

            }

        }

    }

out:

    error_propagate(errp, local_err);

}



static bool

host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp)

block/io.c

+9 −6
Original line number Diff line number Diff line
@@ -1180,10 +1180,11 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, 
    int alignment = MAX(bs->bl.pwrite_zeroes_alignment,

                        bs->bl.request_alignment);



    assert(is_power_of_2(alignment));

    head = offset & (alignment - 1);

    tail = (offset + count) & (alignment - 1);

    max_write_zeroes &= ~(alignment - 1);

    assert(alignment % bs->bl.request_alignment == 0);

    head = offset % alignment;

    tail = (offset + count) % alignment;

    max_write_zeroes = QEMU_ALIGN_DOWN(max_write_zeroes, alignment);

    assert(max_write_zeroes >= bs->bl.request_alignment);



    while (count > 0 && !ret) {

        int num = count;
@@ -2429,9 +2430,10 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, 


    /* Discard is advisory, so ignore any unaligned head or tail */

    align = MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment);

    assert(is_power_of_2(align));

    head = MIN(count, -offset & (align - 1));

    assert(align % bs->bl.request_alignment == 0);

    head = offset % align;

    if (head) {

        head = MIN(count, align - head);

        count -= head;

        offset += head;

    }
@@ -2449,6 +2451,7 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, 


    max_pdiscard = QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_pdiscard, INT_MAX),

                                   align);

    assert(max_pdiscard);



    while (count > 0) {

        int ret;

block/nbd-client.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
typedef struct NbdClientSession {

    QIOChannelSocket *sioc; /* The master data channel */

    QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) */

    uint32_t nbdflags;

    uint16_t nbdflags;

    off_t size;



    CoMutex send_mutex;

exec.c

+8 −2
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ static void *file_ram_alloc(RAMBlock *block, 
    char *filename;

    char *sanitized_name;

    char *c;

    void *area;

    void *area = MAP_FAILED;

    int fd = -1;

    int64_t page_size;
@@ -1314,13 +1314,19 @@ static void *file_ram_alloc(RAMBlock *block, 
    }



    if (mem_prealloc) {

        os_mem_prealloc(fd, area, memory);

        os_mem_prealloc(fd, area, memory, errp);

        if (errp && *errp) {

            goto error;

        }

    }



    block->fd = fd;

    return area;



error:

    if (area != MAP_FAILED) {

        qemu_ram_munmap(area, memory);

    }

    if (unlink_on_error) {

        unlink(path);

    }

hw/core/qdev.c

+2 −0
Original line number Diff line number Diff line
@@ -354,12 +354,14 @@ void qdev_init_nofail(DeviceState *dev) 


    assert(!dev->realized);



    object_ref(OBJECT(dev));

    object_property_set_bool(OBJECT(dev), true, "realized", &err);

    if (err) {

        error_reportf_err(err, "Initialization of device %s failed: ",

                          object_get_typename(OBJECT(dev)));

        exit(1);

    }

    object_unref(OBJECT(dev));

}



void qdev_machine_creation_done(void)