Commit 82d3d409 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Xen fix (Anthony)
* chardev fixes (Anton, Marc-André)
* small dead code removal (Zhongyi)
* documentation (Dan)
* bugfixes (David)
* decrease migration downtime (Jay)
* improved error output (Laurent)
* RTC tests and bugfix (me)
* Bluetooth clang analyzer fix (me)
* KVM CPU hotplug race (Peng Hao)
* Two other patches from Philippe's clang analyzer series

# gpg: Signature made Tue 01 Aug 2017 16:56:21 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:
  mc146818rtc: implement UIP latching as intended
  mc146818rtc: simplify check_update_timer
  rtc-test: introduce more update tests
  rtc-test: cleanup register_b_set_flag test
  hw/scsi/vmw_pvscsi: Convert to realize
  hw/scsi/vmw_pvscsi: Remove the dead error handling
  migration: optimize the downtime
  qemu-options: document existance of versioned machine types
  bt: stop the sdp memory allocation craziness
  exec: Add lock parameter to qemu_ram_ptr_length
  target-i386: kvm_get/put_vcpu_events don't handle sipi_vector
  docs: document deprecation policy & deprecated features in appendix
  char: don't exit on hmp 'chardev-add help'
  char-fd: remove useless chr pointer
  accel: cleanup error output
  cpu_physical_memory_sync_dirty_bitmap: Fix alignment check
  vl.c/exit: pause cpus before closing block devices

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3b64f272 33f21e4f

accel/accel.c

+10 −10
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "sysemu/qtest.h"

#include "hw/xen/xen.h"

#include "qom/object.h"

#include "qemu/error-report.h"



static const TypeInfo accel_type = {

    .name = TYPE_ACCEL,
@@ -69,19 +70,20 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 


void configure_accelerator(MachineState *ms)

{

    const char *p;

    const char *accel, *p;

    char buf[10];

    int ret;

    bool accel_initialised = false;

    bool init_failed = false;

    AccelClass *acc = NULL;



    p = qemu_opt_get(qemu_get_machine_opts(), "accel");

    if (p == NULL) {

    accel = qemu_opt_get(qemu_get_machine_opts(), "accel");

    if (accel == NULL) {

        /* Use the default "accelerator", tcg */

        p = "tcg";

        accel = "tcg";

    }



    p = accel;

    while (!accel_initialised && *p != '\0') {

        if (*p == ':') {

            p++;
@@ -89,7 +91,6 @@ void configure_accelerator(MachineState *ms) 
        p = get_opt_name(buf, sizeof(buf), p, ':');

        acc = accel_find(buf);

        if (!acc) {

            fprintf(stderr, "\"%s\" accelerator not found.\n", buf);

            continue;

        }

        if (acc->available && !acc->available()) {
@@ -100,9 +101,8 @@ void configure_accelerator(MachineState *ms) 
        ret = accel_init_machine(acc, ms);

        if (ret < 0) {

            init_failed = true;

            fprintf(stderr, "failed to initialize %s: %s\n",

                    acc->name,

                    strerror(-ret));

            error_report("failed to initialize %s: %s",

                         acc->name, strerror(-ret));

        } else {

            accel_initialised = true;

        }
@@ -110,13 +110,13 @@ void configure_accelerator(MachineState *ms) 


    if (!accel_initialised) {

        if (!init_failed) {

            fprintf(stderr, "No accelerator found!\n");

            error_report("-machine accel=%s: No accelerator found", accel);

        }

        exit(1);

    }



    if (init_failed) {

        fprintf(stderr, "Back to %s accelerator.\n", acc->name);

        error_report("Back to %s accelerator", acc->name);

    }

}

chardev/char-fd.c

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ void qemu_chr_open_fd(Chardev *chr, 
    qio_channel_set_name(QIO_CHANNEL(s->ioc_out), name);

    g_free(name);

    qemu_set_nonblock(fd_out);

    s->chr = chr;

}



static void char_fd_class_init(ObjectClass *oc, void *data)

chardev/char.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp) 


        error_report("Available chardev backend types: %s", str->str);

        g_string_free(str, true);

        exit(0);

        return NULL;

    }



    if (id == NULL) {

exec.c

+6 −6
Original line number Diff line number Diff line
@@ -2203,7 +2203,7 @@ void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr) 
 * Called within RCU critical section.

 */

static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,

                                 hwaddr *size)

                                 hwaddr *size, bool lock)

{

    RAMBlock *block = ram_block;

    if (*size == 0) {
@@ -2222,10 +2222,10 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr, 
         * In that case just map the requested area.

         */

        if (block->offset == 0) {

            return xen_map_cache(addr, *size, 1, true);

            return xen_map_cache(addr, *size, lock, lock);

        }



        block->host = xen_map_cache(block->offset, block->max_length, 1, true);

        block->host = xen_map_cache(block->offset, block->max_length, 1, lock);

    }



    return ramblock_ptr(block, addr);
@@ -2947,7 +2947,7 @@ static MemTxResult address_space_write_continue(AddressSpace *as, hwaddr addr, 
            }

        } else {

            /* RAM case */

            ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l);

            ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false);

            memcpy(ptr, buf, l);

            invalidate_and_set_dirty(mr, addr1, l);

        }
@@ -3038,7 +3038,7 @@ MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr, 
            }

        } else {

            /* RAM case */

            ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l);

            ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false);

            memcpy(buf, ptr, l);

        }
@@ -3349,7 +3349,7 @@ void *address_space_map(AddressSpace *as, 


    memory_region_ref(mr);

    *plen = address_space_extend_translation(as, addr, len, mr, xlat, l, is_write);

    ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen);

    ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);

    rcu_read_unlock();



    return ptr;

hw/bt/sdp.c

+13 −4
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static void bt_l2cap_sdp_close_ch(void *opaque) 
    int i;



    for (i = 0; i < sdp->services; i ++) {

        g_free(sdp->service_list[i].attribute_list->pair);

        g_free(sdp->service_list[i].attribute_list[0].pair);

        g_free(sdp->service_list[i].attribute_list);

        g_free(sdp->service_list[i].uuid);

    }
@@ -720,6 +720,8 @@ static void sdp_service_record_build(struct sdp_service_record_s *record, 
        len += sdp_attr_max_size(&def->attributes[record->attributes ++].data,

                        &record->uuids);

    }



    assert(len > 0);

    record->uuids = pow2ceil(record->uuids);

    record->attribute_list =

            g_malloc0(record->attributes * sizeof(*record->attribute_list));
@@ -730,12 +732,14 @@ static void sdp_service_record_build(struct sdp_service_record_s *record, 
    record->attributes = 0;

    uuid = record->uuid;

    while (def->attributes[record->attributes].data.type) {

        int attribute_id = def->attributes[record->attributes].id;

        record->attribute_list[record->attributes].pair = data;

        record->attribute_list[record->attributes].attribute_id = attribute_id;



        len = 0;

        data[len ++] = SDP_DTYPE_UINT | SDP_DSIZE_2;

        data[len ++] = def->attributes[record->attributes].id >> 8;

        data[len ++] = def->attributes[record->attributes].id & 0xff;

        data[len ++] = attribute_id >> 8;

        data[len ++] = attribute_id & 0xff;

        len += sdp_attr_write(data + len,

                        &def->attributes[record->attributes].data, &uuid);
@@ -749,10 +753,15 @@ static void sdp_service_record_build(struct sdp_service_record_s *record, 
        data += len;

    }



    /* Sort the attribute list by the AttributeID */

    /* Sort the attribute list by the AttributeID.  The first must be

     * SDP_ATTR_RECORD_HANDLE so that bt_l2cap_sdp_close_ch can free

     * the buffer.

     */

    qsort(record->attribute_list, record->attributes,

                    sizeof(*record->attribute_list),

                    (void *) sdp_attributeid_compare);

    assert(record->attribute_list[0].pair == data);



    /* Sort the searchable UUIDs list for bisection */

    qsort(record->uuid, record->uuids,

                    sizeof(*record->uuid),