Commit 7106a87d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

 * Gracefully handle Linux AIO init failure

# gpg: Signature made Wed 27 Jun 2018 15:48:28 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  linux-aio: properly bubble up errors from initialization
  compiler: add a sizeof_field() macro

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4a83bf2f ed6e2161

accel/tcg/translate-all.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct page_collection { 


/* Make sure all possible CPU event bits fit in tb->trace_vcpu_dstate */

QEMU_BUILD_BUG_ON(CPU_TRACE_DSTATE_MAX_EVENTS >

                  sizeof(((TranslationBlock *)0)->trace_vcpu_dstate)

                  sizeof_field(TranslationBlock, trace_vcpu_dstate)

                  * BITS_PER_BYTE);



/*

block/file-posix.c

+28 −5
Original line number Diff line number Diff line
@@ -545,12 +545,18 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 


#ifdef CONFIG_LINUX_AIO

     /* Currently Linux does AIO only for files opened with O_DIRECT */

    if (s->use_linux_aio && !(s->open_flags & O_DIRECT)) {

    if (s->use_linux_aio) {

        if (!(s->open_flags & O_DIRECT)) {

            error_setg(errp, "aio=native was specified, but it requires "

                             "cache.direct=on, which was not specified.");

            ret = -EINVAL;

            goto fail;

        }

        if (!aio_setup_linux_aio(bdrv_get_aio_context(bs), errp)) {

            error_prepend(errp, "Unable to use native AIO: ");

            goto fail;

        }

    }

#else

    if (s->use_linux_aio) {

        error_setg(errp, "aio=native was specified, but is not supported "
@@ -1723,6 +1729,22 @@ static BlockAIOCB *raw_aio_flush(BlockDriverState *bs, 
    return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH);

}



static void raw_aio_attach_aio_context(BlockDriverState *bs,

                                       AioContext *new_context)

{

#ifdef CONFIG_LINUX_AIO

    BDRVRawState *s = bs->opaque;

    if (s->use_linux_aio) {

        Error *local_err;

        if (!aio_setup_linux_aio(new_context, &local_err)) {

            error_reportf_err(local_err, "Unable to use native AIO, "

                                         "falling back to thread pool: ");

            s->use_linux_aio = false;

        }

    }

#endif

}



static void raw_close(BlockDriverState *bs)

{

    BDRVRawState *s = bs->opaque;
@@ -2601,6 +2623,7 @@ BlockDriver bdrv_file = { 
    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,

    .bdrv_attach_aio_context = raw_aio_attach_aio_context,



    .bdrv_truncate = raw_truncate,

    .bdrv_getlength = raw_getlength,

block/linux-aio.c

+9 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "block/raw-aio.h"

#include "qemu/event_notifier.h"

#include "qemu/coroutine.h"

#include "qapi/error.h"



#include <libaio.h>
@@ -470,16 +471,21 @@ void laio_attach_aio_context(LinuxAioState *s, AioContext *new_context) 
                           qemu_laio_poll_cb);

}



LinuxAioState *laio_init(void)

LinuxAioState *laio_init(Error **errp)

{

    int rc;

    LinuxAioState *s;



    s = g_malloc0(sizeof(*s));

    if (event_notifier_init(&s->e, false) < 0) {

    rc = event_notifier_init(&s->e, false);

    if (rc < 0) {

        error_setg_errno(errp, -rc, "failed to to initialize event notifier");

        goto out_free_state;

    }



    if (io_setup(MAX_EVENTS, &s->ctx) != 0) {

    rc = io_setup(MAX_EVENTS, &s->ctx);

    if (rc < 0) {

        error_setg_errno(errp, -rc, "failed to create linux AIO context");

        goto out_close_efd;

    }

hw/display/xenfb.c

+2 −2
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim, 
                              int width, int height, int depth,

                              size_t fb_len, int offset, int row_stride)

{

    size_t mfn_sz = sizeof(*((struct xenfb_page *)0)->pd);

    size_t pd_len = sizeof(((struct xenfb_page *)0)->pd) / mfn_sz;

    size_t mfn_sz = sizeof_field(struct xenfb_page, pd[0]);

    size_t pd_len = sizeof_field(struct xenfb_page, pd) / mfn_sz;

    size_t fb_pages = pd_len * XC_PAGE_SIZE / mfn_sz;

    size_t fb_len_max = fb_pages * XC_PAGE_SIZE;

    int max_width, max_height;

hw/net/rocker/rocker_of_dpa.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ typedef struct of_dpa_flow_key { 


/* Width of key which includes field 'f' in u64s, rounded up */

#define FLOW_KEY_WIDTH(f) \

    DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof(((OfDpaFlowKey *)0)->f), \

    DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof_field(OfDpaFlowKey, f), \

    sizeof(uint64_t))



typedef struct of_dpa_flow_action {