Commit 460b6c8e authored by Peter Maydell's avatar Peter Maydell
Browse files

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

* Speed up AddressSpaceDispatch creation (Alexey)
* Fix kvm.c assert (David)
* Memory fixes and further speedup (me)
* Persistent reservation manager infrastructure (me)
* virtio-serial: add enable_backend callback (Pavel)
* chardev GMainContext fixes (Peter)

# gpg: Signature made Fri 22 Sep 2017 20:07:33 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: (32 commits)
  chardev: remove context in chr_update_read_handler
  chardev: use per-dev context for io_add_watch_poll
  chardev: add Chardev.gcontext field
  chardev: new qemu_chr_be_update_read_handlers()
  scsi: add persistent reservation manager using qemu-pr-helper
  scsi: add multipath support to qemu-pr-helper
  scsi: build qemu-pr-helper
  scsi, file-posix: add support for persistent reservation management
  memory: Share special empty FlatView
  memory: seek FlatView sharing candidates among children subregions
  memory: trace FlatView creation and destruction
  memory: Create FlatView directly
  memory: Get rid of address_space_init_shareable
  memory: Rework "info mtree" to print flat views and dispatch trees
  memory: Do not allocate FlatView in address_space_init
  memory: Share FlatView's and dispatch trees between address spaces
  memory: Move address_space_update_ioeventfds
  memory: Alloc dispatch tree where topology is generared
  memory: Store physical root MR in FlatView
  memory: Rename mem_begin/mem_commit/mem_add helpers
  ...

# Conflicts:
#	configure
parents c348b54a bb86d05f

Makefile

+6 −1
Original line number Diff line number Diff line
@@ -372,6 +372,11 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) 
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)

fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap



scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)

ifdef CONFIG_MPATH

scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist

endif



qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
@@ -488,7 +493,7 @@ clean: 
	rm -f *.msi

	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -f fsdev/*.pod

	rm -f fsdev/*.pod scsi/*.pod

	rm -f qemu-img-cmds.h

	rm -f ui/shader/*-vert.h ui/shader/*-frag.h

	@# May not be present in GENERATED_FILES

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ trace-events-subdirs += qapi 
trace-events-subdirs += accel/tcg

trace-events-subdirs += accel/kvm

trace-events-subdirs += nbd

trace-events-subdirs += scsi



trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)

accel/kvm/kvm-all.c

+0 −1
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, 
    mem = kvm_lookup_matching_slot(kml, start_addr, size);

    if (!add) {

        if (!mem) {

            g_assert(!memory_region_is_ram(mr) && !writeable && !mr->romd_mode);

            return;

        }

        if (mem->flags & KVM_MEM_LOG_DIRTY_PAGES) {

block/file-posix.c

+30 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#include "block/raw-aio.h"

#include "qapi/qmp/qstring.h"



#include "scsi/pr-manager.h"

#include "scsi/constants.h"



#if defined(__APPLE__) && (__MACH__)

#include <paths.h>

#include <sys/param.h>
@@ -155,6 +158,8 @@ typedef struct BDRVRawState { 
    bool page_cache_inconsistent:1;

    bool has_fallocate;

    bool needs_alignment;



    PRManager *pr_mgr;

} BDRVRawState;



typedef struct BDRVRawReopenState {
@@ -402,6 +407,11 @@ static QemuOptsList raw_runtime_opts = { 
            .type = QEMU_OPT_STRING,

            .help = "file locking mode (on/off/auto, default: auto)",

        },

        {

            .name = "pr-manager",

            .type = QEMU_OPT_STRING,

            .help = "id of persistent reservation manager object (default: none)",

        },

        { /* end of list */ }

    },

};
@@ -413,6 +423,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename = NULL;

    const char *str;

    BlockdevAioOptions aio, aio_default;

    int fd, ret;

    struct stat st;
@@ -476,6 +487,16 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
        abort();

    }



    str = qemu_opt_get(opts, "pr-manager");

    if (str) {

        s->pr_mgr = pr_manager_lookup(str, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            ret = -EINVAL;

            goto fail;

        }

    }



    s->open_flags = open_flags;

    raw_parse_flags(bdrv_flags, &s->open_flags);
@@ -2597,6 +2618,15 @@ static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs, 
    if (fd_open(bs) < 0)

        return NULL;



    if (req == SG_IO && s->pr_mgr) {

        struct sg_io_hdr *io_hdr = buf;

        if (io_hdr->cmdp[0] == PERSISTENT_RESERVE_OUT ||

            io_hdr->cmdp[0] == PERSISTENT_RESERVE_IN) {

            return pr_manager_execute(s->pr_mgr, bdrv_get_aio_context(bs),

                                      s->fd, io_hdr, cb, opaque);

        }

    }



    acb = g_new(RawPosixAIOData, 1);

    acb->bs = bs;

    acb->aio_type = QEMU_AIO_IOCTL;

chardev/char-fd.c

+2 −3
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ static GSource *fd_chr_add_watch(Chardev *chr, GIOCondition cond) 
    return qio_channel_create_watch(s->ioc_out, cond);

}



static void fd_chr_update_read_handler(Chardev *chr,

                                       GMainContext *context)

static void fd_chr_update_read_handler(Chardev *chr)

{

    FDChardev *s = FD_CHARDEV(chr);
@@ -94,7 +93,7 @@ static void fd_chr_update_read_handler(Chardev *chr, 
        chr->gsource = io_add_watch_poll(chr, s->ioc_in,

                                           fd_chr_read_poll,

                                           fd_chr_read, chr,

                                           context);

                                           chr->gcontext);

    }

}