Commit 4ae046b8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200227' into staging 



Xen queue 2020-02-27

* fix for xen-block
* fix in exec.c for migration of xen guest
* one cleanup patch

# gpg: Signature made Thu 27 Feb 2020 11:57:12 GMT
# gpg:                using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg:                issuer "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
# gpg:                 aka "Anthony PERARD <anthony.perard@citrix.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
#      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF

* remotes/aperard/tags/pull-xen-20200227:
  Memory: Only call ramblock_ptr when needed in qemu_ram_writeback
  xen-bus/block: explicitly assign event channels to an AioContext
  hw/xen/xen_pt_load_rom: Remove unused includes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 430f63e2 5d4c9549

exec.c

+2 −2
Original line number Diff line number Diff line
@@ -2116,14 +2116,13 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp) 
 */

void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length)

{

    void *addr = ramblock_ptr(block, start);



    /* The requested range should fit in within the block range */

    g_assert((start + length) <= block->used_length);



#ifdef CONFIG_LIBPMEM

    /* The lack of support for pmem should not block the sync */

    if (ramblock_is_pmem(block)) {

        void *addr = ramblock_ptr(block, start);

        pmem_persist(addr, length);

        return;

    }
@@ -2134,6 +2133,7 @@ void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length) 
         * specified as persistent (or is not one) - use the msync.

         * Less optimal but still achieves the same goal

         */

        void *addr = ramblock_ptr(block, start);

        if (qemu_msync(addr, length, block->fd)) {

            warn_report("%s: failed to sync memory range: start: "

                    RAM_ADDR_FMT " length: " RAM_ADDR_FMT,

hw/block/dataplane/xen-block.c

+18 −2
Original line number Diff line number Diff line
@@ -685,12 +685,24 @@ void xen_block_dataplane_stop(XenBlockDataPlane *dataplane) 
        return;

    }



    xendev = dataplane->xendev;



    aio_context_acquire(dataplane->ctx);

    if (dataplane->event_channel) {

        /* Only reason for failure is a NULL channel */

        xen_device_set_event_channel_context(xendev, dataplane->event_channel,

                                             qemu_get_aio_context(),

                                             &error_abort);

    }

    /* Xen doesn't have multiple users for nodes, so this can't fail */

    blk_set_aio_context(dataplane->blk, qemu_get_aio_context(), &error_abort);

    aio_context_release(dataplane->ctx);



    xendev = dataplane->xendev;

    /*

     * Now that the context has been moved onto the main thread, cancel

     * further processing.

     */

    qemu_bh_cancel(dataplane->bh);



    if (dataplane->event_channel) {

        Error *local_err = NULL;
@@ -807,7 +819,7 @@ void xen_block_dataplane_start(XenBlockDataPlane *dataplane, 
    }



    dataplane->event_channel =

        xen_device_bind_event_channel(xendev, dataplane->ctx, event_channel,

        xen_device_bind_event_channel(xendev, event_channel,

                                      xen_block_dataplane_event, dataplane,

                                      &local_err);

    if (local_err) {
@@ -818,7 +830,11 @@ void xen_block_dataplane_start(XenBlockDataPlane *dataplane, 
    aio_context_acquire(dataplane->ctx);

    /* If other users keep the BlockBackend in the iothread, that's ok */

    blk_set_aio_context(dataplane->blk, dataplane->ctx, NULL);

    /* Only reason for failure is a NULL channel */

    xen_device_set_event_channel_context(xendev, dataplane->event_channel,

                                         dataplane->ctx, &error_abort);

    aio_context_release(dataplane->ctx);



    return;



stop:

hw/xen/xen-bus.c

+23 −4
Original line number Diff line number Diff line
@@ -1089,8 +1089,26 @@ static void xen_device_event(void *opaque) 
    }

}



XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev,

void xen_device_set_event_channel_context(XenDevice *xendev,

                                          XenEventChannel *channel,

                                          AioContext *ctx,

                                          Error **errp)

{

    if (!channel) {

        error_setg(errp, "bad channel");

        return;

    }



    if (channel->ctx)

        aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true,

                           NULL, NULL, NULL, NULL);



    channel->ctx = ctx;

    aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true,

                       xen_device_event, NULL, xen_device_poll, channel);

}



XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev,

                                               unsigned int port,

                                               XenEventHandler handler,

                                               void *opaque, Error **errp)
@@ -1116,9 +1134,10 @@ XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, 
    channel->handler = handler;

    channel->opaque = opaque;



    channel->ctx = ctx;

    aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true,

                       xen_device_event, NULL, xen_device_poll, channel);

    /* Only reason for failure is a NULL channel */

    xen_device_set_event_channel_context(xendev, channel,

                                         qemu_get_aio_context(),

                                         &error_abort);



    QLIST_INSERT_HEAD(&xendev->event_channels, channel, list);

hw/xen/xen_pt_load_rom.c

+0 −4
Original line number Diff line number Diff line
@@ -3,12 +3,8 @@ 
 */

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/i386/pc.h"

#include "qemu/error-report.h"

#include "ui/console.h"

#include "hw/loader.h"

#include "monitor/monitor.h"

#include "qemu/range.h"

#include "hw/pci/pci.h"

#include "xen_pt.h"

include/hw/xen/xen-bus.h

+4 −1
Original line number Diff line number Diff line
@@ -128,10 +128,13 @@ void xen_device_copy_grant_refs(XenDevice *xendev, bool to_domain, 
typedef bool (*XenEventHandler)(void *opaque);



XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev,

                                               AioContext *ctx,

                                               unsigned int port,

                                               XenEventHandler handler,

                                               void *opaque, Error **errp);

void xen_device_set_event_channel_context(XenDevice *xendev,

                                          XenEventChannel *channel,

                                          AioContext *ctx,

                                          Error **errp);

void xen_device_notify_event_channel(XenDevice *xendev,

                                     XenEventChannel *channel,

                                     Error **errp);