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

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



* TCG 8-byte atomic accesses bugfix (Andrew)
* Report disk rotation rate (Daniel)
* Report invalid scsi-disk block size configuration (Mark)
* KVM and memory API MemoryListener fixes (David, Maxime, Peter Xu)
* x86 CPU hotplug crash fix (Igor)
* Load/store API documentation (Peter Maydell)
* Small fixes by myself and Thomas
* qdev DEVICE_DELETED deferral (Michael)

# gpg: Signature made Wed 18 Oct 2017 10:56:24 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: (29 commits)
  scsi: reject configurations with logical block size > physical block size
  qdev: defer DEVICE_DEL event until instance_finalize()
  Revert "qdev: Free QemuOpts when the QOM path goes away"
  qdev: store DeviceState's canonical path to use when unparenting
  qemu-pr-helper: use new libmultipath API
  watch_mem_write: implement 8-byte accesses
  notdirty_mem_write: implement 8-byte accesses
  memory: reuse section_from_flat_range()
  kvm: simplify kvm_align_section()
  kvm: region_add and region_del is not called on updates
  kvm: fix error message when failing to unregister slot
  kvm: tolerate non-existing slot for log_start/log_stop/log_sync
  kvm: fix alignment of ram address
  memory: call log_start after region_add
  target/i386: trap on instructions longer than >15 bytes
  target/i386: introduce x86_ld*_code
  tco: add trace events
  docs/devel/loads-stores.rst: Document our various load and store APIs
  nios2: define tcg_env
  build: remove CONFIG_LIBDECNUMBER
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f2a48d69 3da023b5

Makefile.target

+0 −6
Original line number Diff line number Diff line
@@ -102,12 +102,6 @@ obj-y += target/$(TARGET_BASE_ARCH)/ 
obj-y += disas.o

obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o



obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal32.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal64.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal128.o



#########################################################

# Linux user emulator target

accel/kvm/kvm-all.c

+14 −25
Original line number Diff line number Diff line
@@ -197,26 +197,20 @@ static hwaddr kvm_align_section(MemoryRegionSection *section, 
                                hwaddr *start)

{

    hwaddr size = int128_get64(section->size);

    hwaddr delta;



    *start = section->offset_within_address_space;

    hwaddr delta, aligned;



    /* kvm works in page size chunks, but the function may be called

       with sub-page size and unaligned start address. Pad the start

       address to next and truncate size to previous page boundary. */

    delta = qemu_real_host_page_size - (*start & ~qemu_real_host_page_mask);

    delta &= ~qemu_real_host_page_mask;

    *start += delta;

    aligned = ROUND_UP(section->offset_within_address_space,

                       qemu_real_host_page_size);

    delta = aligned - section->offset_within_address_space;

    *start = aligned;

    if (delta > size) {

        return 0;

    }

    size -= delta;

    size &= qemu_real_host_page_mask;

    if (*start & ~qemu_real_host_page_mask) {

        return 0;

    }



    return size;

    return (size - delta) & qemu_real_host_page_mask;

}



int kvm_physical_memory_addr_from_host(KVMState *s, void *ram,
@@ -394,8 +388,8 @@ static int kvm_section_update_flags(KVMMemoryListener *kml, 


    mem = kvm_lookup_matching_slot(kml, start_addr, size);

    if (!mem) {

        fprintf(stderr, "%s: error finding slot\n", __func__);

        abort();

        /* We don't have a slot if we want to trap every access. */

        return 0;

    }



    return kvm_slot_update_flags(kml, mem, section->mr);
@@ -470,8 +464,8 @@ static int kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml, 
    if (size) {

        mem = kvm_lookup_matching_slot(kml, start_addr, size);

        if (!mem) {

            fprintf(stderr, "%s: error finding slot\n", __func__);

            abort();

            /* We don't have a slot if we want to trap every access. */

            return 0;

        }



        /* XXX bad kernel interface alert
@@ -717,11 +711,12 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, 
        return;

    }



    /* use aligned delta to align the ram address */

    ram = memory_region_get_ram_ptr(mr) + section->offset_within_region +

          (section->offset_within_address_space - start_addr);

          (start_addr - section->offset_within_address_space);



    mem = kvm_lookup_matching_slot(kml, start_addr, size);

    if (!add) {

        mem = kvm_lookup_matching_slot(kml, start_addr, size);

        if (!mem) {

            return;

        }
@@ -733,19 +728,13 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, 
        mem->memory_size = 0;

        err = kvm_set_user_memory_region(kml, mem);

        if (err) {

            fprintf(stderr, "%s: error unregistering overlapping slot: %s\n",

            fprintf(stderr, "%s: error unregistering slot: %s\n",

                    __func__, strerror(-err));

            abort();

        }

        return;

    }



    if (mem) {

        /* update the slot */

        kvm_slot_update_flags(kml, mem, mr);

        return;

    }



    /* register the new slot */

    mem = kvm_alloc_slot(kml);

    mem->memory_size = size;

chardev/char-socket.c

+9 −10
Original line number Diff line number Diff line
@@ -332,10 +332,6 @@ static void tcp_chr_free_connection(Chardev *chr) 
    SocketChardev *s = SOCKET_CHARDEV(chr);

    int i;



    if (!s->connected) {

        return;

    }



    if (s->read_msgfds_num) {

        for (i = 0; i < s->read_msgfds_num; i++) {

            close(s->read_msgfds[i]);
@@ -394,22 +390,25 @@ static void update_disconnected_filename(SocketChardev *s) 
                                         s->is_listen, s->is_telnet);

}



/* NB may be called even if tcp_chr_connect has not been

 * reached, due to TLS or telnet initialization failure,

 * so can *not* assume s->connected == true

 */

static void tcp_chr_disconnect(Chardev *chr)

{

    SocketChardev *s = SOCKET_CHARDEV(chr);



    if (!s->connected) {

        return;

    }

    bool emit_close = s->connected;



    tcp_chr_free_connection(chr);



    if (s->listen_ioc) {

    if (s->listen_ioc && s->listen_tag == 0) {

        s->listen_tag = qio_channel_add_watch(

            QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);

    }

    update_disconnected_filename(s);

    if (emit_close) {

        qemu_chr_be_event(chr, CHR_EVENT_CLOSED);

    }

    if (s->reconnect_time) {

        qemu_chr_socket_restart_timer(chr);

    }

configure

+10 −2
Original line number Diff line number Diff line
@@ -3335,9 +3335,17 @@ if test "$mpath" != "no" ; then 
#include <mpath_persist.h>

unsigned mpath_mx_alloc_len = 1024;

int logsink;

static struct config *multipath_conf;

extern struct udev *udev;

extern struct config *get_multipath_config(void);

extern void put_multipath_config(struct config *conf);

struct udev *udev;

struct config *get_multipath_config(void) { return multipath_conf; }

void put_multipath_config(struct config *conf) { }



int main(void) {

    struct udev *udev = udev_new();

    mpath_lib_init(udev);

    udev = udev_new();

    multipath_conf = mpath_lib_init();

    return 0;

}

EOF

default-configs/ppc-linux-user.mak

+0 −1
Original line number Diff line number Diff line 
# Default configuration for ppc-linux-user
 
CONFIG_LIBDECNUMBER=y