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

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



* KVM run_on_cpu fix (Alex)
* atomic usage fixes (Emilio, me)
* hugetlbfs alignment fix (Haozhong)
* CharBackend refactoring (Marc-André)
* test-i386 fixes (me)
* MemoryListener optimizations (me)
* Miscellaneous bugfixes (me)
* iSER support (Roy)
* --version formatting (Thomas)

# gpg: Signature made Mon 24 Oct 2016 14:46:19 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: (50 commits)
  exec.c: workaround regression caused by alignment change in d2f39add
  char: remove explicit_be_open from CharDriverState
  char: use common error path in qmp_chardev_add
  char: replace avail_connections
  char: remove unused qemu_chr_fe_event
  char: use an enum for CHR_EVENT
  char: remove unused CHR_EVENT_FOCUS
  char: move fe_open in CharBackend
  char: remove explicit_fe_open, use a set_handlers argument
  char: rename chr_close/chr_free
  char: move front end handlers in CharBackend
  tests: start chardev unit tests
  char: make some qemu_chr_fe skip if no driver
  char: replace qemu_chr_claim/release with qemu_chr_fe_init/deinit
  vhost-user: only initialize queue 0 CharBackend
  char: fold qemu_chr_set_handlers in qemu_chr_fe_set_handlers
  char: use qemu_chr_fe* functions with CharBackend argument
  colo: claim in find_and_check_chardev
  char: rename some frontend functions
  char: remaining switch to CharBackend in frontend
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4387f567 8360668e

backends/baum.c

+3 −2
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static void baum_chr_read(void *opaque) 
    }

}



static void baum_close(struct CharDriverState *chr)

static void baum_free(struct CharDriverState *chr)

{

    BaumDriverState *baum = chr->opaque;
@@ -566,6 +566,7 @@ static void baum_close(struct CharDriverState *chr) 
static CharDriverState *chr_baum_init(const char *id,

                                      ChardevBackend *backend,

                                      ChardevReturn *ret,

                                      bool *be_opened,

                                      Error **errp)

{

    ChardevCommon *common = backend->u.braille.data;
@@ -589,7 +590,7 @@ static CharDriverState *chr_baum_init(const char *id, 
    chr->opaque = baum;

    chr->chr_write = baum_write;

    chr->chr_accept_input = baum_accept_input;

    chr->chr_close = baum_close;

    chr->chr_free = baum_free;



    handle = g_malloc0(brlapi_getHandleSize());

    baum->brlapi = handle;

backends/msmouse.c

+4 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int 
    return len;

}



static void msmouse_chr_close (struct CharDriverState *chr)

static void msmouse_chr_free(struct CharDriverState *chr)

{

    MouseState *mouse = chr->opaque;
@@ -151,6 +151,7 @@ static QemuInputHandler msmouse_handler = { 
static CharDriverState *qemu_chr_open_msmouse(const char *id,

                                              ChardevBackend *backend,

                                              ChardevReturn *ret,

                                              bool *be_opened,

                                              Error **errp)

{

    ChardevCommon *common = backend->u.msmouse.data;
@@ -162,9 +163,9 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, 
        return NULL;

    }

    chr->chr_write = msmouse_chr_write;

    chr->chr_close = msmouse_chr_close;

    chr->chr_free = msmouse_chr_free;

    chr->chr_accept_input = msmouse_chr_accept_input;

    chr->explicit_be_open = true;

    *be_opened = false;



    mouse = g_new0(MouseState, 1);

    mouse->hs = qemu_input_handler_register((DeviceState *)mouse,

backends/rng-egd.c

+12 −17
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "sysemu/char.h"

#include "qapi/error.h"

#include "qapi/qmp/qerror.h"

#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */



#define TYPE_RNG_EGD "rng-egd"

#define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD)
@@ -24,7 +23,7 @@ typedef struct RngEgd 
{

    RngBackend parent;



    CharDriverState *chr;

    CharBackend chr;

    char *chr_name;

} RngEgd;
@@ -43,7 +42,7 @@ static void rng_egd_request_entropy(RngBackend *b, RngRequest *req) 


        /* XXX this blocks entire thread. Rewrite to use

         * qemu_chr_fe_write and background I/O callbacks */

        qemu_chr_fe_write_all(s->chr, header, sizeof(header));

        qemu_chr_fe_write_all(&s->chr, header, sizeof(header));



        size -= len;

    }
@@ -87,6 +86,7 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) 
static void rng_egd_opened(RngBackend *b, Error **errp)

{

    RngEgd *s = RNG_EGD(b);

    CharDriverState *chr;



    if (s->chr_name == NULL) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
@@ -94,21 +94,19 @@ static void rng_egd_opened(RngBackend *b, Error **errp) 
        return;

    }



    s->chr = qemu_chr_find(s->chr_name);

    if (s->chr == NULL) {

    chr = qemu_chr_find(s->chr_name);

    if (chr == NULL) {

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", s->chr_name);

        return;

    }



    if (qemu_chr_fe_claim(s->chr) != 0) {

        error_setg(errp, QERR_DEVICE_IN_USE, s->chr_name);

    if (!qemu_chr_fe_init(&s->chr, chr, errp)) {

        return;

    }



    /* FIXME we should resubmit pending requests when the CDS reconnects. */

    qemu_chr_add_handlers(s->chr, rng_egd_chr_can_read, rng_egd_chr_read,

                          NULL, s);

    qemu_chr_fe_set_handlers(&s->chr, rng_egd_chr_can_read,

                             rng_egd_chr_read, NULL, s, NULL, true);

}



static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)
@@ -127,9 +125,10 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp) 
static char *rng_egd_get_chardev(Object *obj, Error **errp)

{

    RngEgd *s = RNG_EGD(obj);

    CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr);



    if (s->chr && s->chr->label) {

        return g_strdup(s->chr->label);

    if (chr && chr->label) {

        return g_strdup(chr->label);

    }



    return NULL;
@@ -146,11 +145,7 @@ static void rng_egd_finalize(Object *obj) 
{

    RngEgd *s = RNG_EGD(obj);



    if (s->chr) {

        qemu_chr_add_handlers(s->chr, NULL, NULL, NULL, NULL);

        qemu_chr_fe_release(s->chr);

    }



    qemu_chr_fe_deinit(&s->chr);

    g_free(s->chr_name);

}

backends/testdev.c

+3 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int testdev_write(CharDriverState *chr, const uint8_t *buf, int len) 
    return orig_len;

}



static void testdev_close(struct CharDriverState *chr)

static void testdev_free(struct CharDriverState *chr)

{

    TestdevCharState *testdev = chr->opaque;
@@ -112,6 +112,7 @@ static void testdev_close(struct CharDriverState *chr) 
static CharDriverState *chr_testdev_init(const char *id,

                                         ChardevBackend *backend,

                                         ChardevReturn *ret,

                                         bool *be_opened,

                                         Error **errp)

{

    TestdevCharState *testdev;
@@ -122,7 +123,7 @@ static CharDriverState *chr_testdev_init(const char *id, 


    chr->opaque = testdev;

    chr->chr_write = testdev_write;

    chr->chr_close = testdev_close;

    chr->chr_free = testdev_free;



    return chr;

}

block/iscsi.c

+86 −3
Original line number Diff line number Diff line
@@ -202,6 +202,10 @@ static inline unsigned exp_random(double mean) 
#define SCSI_SENSE_ASCQ_PARAMETER_LIST_LENGTH_ERROR        0x1a00

#endif



#ifndef LIBISCSI_API_VERSION

#define LIBISCSI_API_VERSION 20130701

#endif



static int iscsi_translate_sense(struct scsi_sense *sense)

{

    int ret;
@@ -592,6 +596,20 @@ iscsi_co_writev_flags(BlockDriverState *bs, int64_t sector_num, int nb_sectors, 
    iscsi_co_init_iscsitask(iscsilun, &iTask);

retry:

    if (iscsilun->use_16_for_rw) {

#if LIBISCSI_API_VERSION >= (20160603)

        iTask.task = iscsi_write16_iov_task(iscsilun->iscsi, iscsilun->lun, lba,

                                            NULL, num_sectors * iscsilun->block_size,

                                            iscsilun->block_size, 0, 0, fua, 0, 0,

                                            iscsi_co_generic_cb, &iTask,

                                            (struct scsi_iovec *)iov->iov, iov->niov);

    } else {

        iTask.task = iscsi_write10_iov_task(iscsilun->iscsi, iscsilun->lun, lba,

                                            NULL, num_sectors * iscsilun->block_size,

                                            iscsilun->block_size, 0, 0, fua, 0, 0,

                                            iscsi_co_generic_cb, &iTask,

                                            (struct scsi_iovec *)iov->iov, iov->niov);

    }

#else

        iTask.task = iscsi_write16_task(iscsilun->iscsi, iscsilun->lun, lba,

                                        NULL, num_sectors * iscsilun->block_size,

                                        iscsilun->block_size, 0, 0, fua, 0, 0,
@@ -602,11 +620,14 @@ retry: 
                                        iscsilun->block_size, 0, 0, fua, 0, 0,

                                        iscsi_co_generic_cb, &iTask);

    }

#endif

    if (iTask.task == NULL) {

        return -ENOMEM;

    }

#if LIBISCSI_API_VERSION < (20160603)

    scsi_task_set_iov_out(iTask.task, (struct scsi_iovec *) iov->iov,

                          iov->niov);

#endif

    while (!iTask.complete) {

        iscsi_set_events(iscsilun);

        qemu_coroutine_yield();
@@ -789,6 +810,21 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs, 
    iscsi_co_init_iscsitask(iscsilun, &iTask);

retry:

    if (iscsilun->use_16_for_rw) {

#if LIBISCSI_API_VERSION >= (20160603)

        iTask.task = iscsi_read16_iov_task(iscsilun->iscsi, iscsilun->lun, lba,

                                           num_sectors * iscsilun->block_size,

                                           iscsilun->block_size, 0, 0, 0, 0, 0,

                                           iscsi_co_generic_cb, &iTask,

                                           (struct scsi_iovec *)iov->iov, iov->niov);

    } else {

        iTask.task = iscsi_read10_iov_task(iscsilun->iscsi, iscsilun->lun, lba,

                                           num_sectors * iscsilun->block_size,

                                           iscsilun->block_size,

                                           0, 0, 0, 0, 0,

                                           iscsi_co_generic_cb, &iTask,

                                           (struct scsi_iovec *)iov->iov, iov->niov);

    }

#else

        iTask.task = iscsi_read16_task(iscsilun->iscsi, iscsilun->lun, lba,

                                       num_sectors * iscsilun->block_size,

                                       iscsilun->block_size, 0, 0, 0, 0, 0,
@@ -800,11 +836,13 @@ retry: 
                                       0, 0, 0, 0, 0,

                                       iscsi_co_generic_cb, &iTask);

    }

#endif

    if (iTask.task == NULL) {

        return -ENOMEM;

    }

#if LIBISCSI_API_VERSION < (20160603)

    scsi_task_set_iov_in(iTask.task, (struct scsi_iovec *) iov->iov, iov->niov);



#endif

    while (!iTask.complete) {

        iscsi_set_events(iscsilun);

        qemu_coroutine_yield();
@@ -1606,7 +1644,13 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
        ret = -ENOMEM;

        goto out;

    }



#if LIBISCSI_API_VERSION >= (20160603)

    if (iscsi_init_transport(iscsi, iscsi_url->transport)) {

        error_setg(errp, ("Error initializing transport."));

        ret = -EINVAL;

        goto out;

    }

#endif

    if (iscsi_set_targetname(iscsi, iscsi_url->target)) {

        error_setg(errp, "iSCSI: Failed to set target name.");

        ret = -EINVAL;
@@ -1649,7 +1693,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 


    /* timeout handling is broken in libiscsi before 1.15.0 */

    timeout = parse_timeout(iscsi_url->target);

#if defined(LIBISCSI_API_VERSION) && LIBISCSI_API_VERSION >= 20150621

#if LIBISCSI_API_VERSION >= 20150621

    iscsi_set_timeout(iscsi, timeout);

#else

    if (timeout) {
@@ -2010,9 +2054,48 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_attach_aio_context = iscsi_attach_aio_context,

};



#if LIBISCSI_API_VERSION >= (20160603)

static BlockDriver bdrv_iser = {

    .format_name     = "iser",

    .protocol_name   = "iser",



    .instance_size   = sizeof(IscsiLun),

    .bdrv_needs_filename = true,

    .bdrv_file_open  = iscsi_open,

    .bdrv_close      = iscsi_close,

    .bdrv_create     = iscsi_create,

    .create_opts     = &iscsi_create_opts,

    .bdrv_reopen_prepare   = iscsi_reopen_prepare,

    .bdrv_reopen_commit    = iscsi_reopen_commit,

    .bdrv_invalidate_cache = iscsi_invalidate_cache,



    .bdrv_getlength  = iscsi_getlength,

    .bdrv_get_info   = iscsi_get_info,

    .bdrv_truncate   = iscsi_truncate,

    .bdrv_refresh_limits = iscsi_refresh_limits,



    .bdrv_co_get_block_status = iscsi_co_get_block_status,

    .bdrv_co_pdiscard      = iscsi_co_pdiscard,

    .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,

    .bdrv_co_readv         = iscsi_co_readv,

    .bdrv_co_writev_flags  = iscsi_co_writev_flags,

    .bdrv_co_flush_to_disk = iscsi_co_flush,



#ifdef __linux__

    .bdrv_aio_ioctl   = iscsi_aio_ioctl,

#endif



    .bdrv_detach_aio_context = iscsi_detach_aio_context,

    .bdrv_attach_aio_context = iscsi_attach_aio_context,

};

#endif



static void iscsi_block_init(void)

{

    bdrv_register(&bdrv_iscsi);

#if LIBISCSI_API_VERSION >= (20160603)

    bdrv_register(&bdrv_iser);

#endif

}



block_init(iscsi_block_init);