Commit 23bafd75 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* NBD and chardev conversion to QIONetListener (Daniel)
* MTTCG fixes (David)
* Hyper-V fixes (Roman, Evgeny)
* share-rw option (Fam)
* Mux chardev event bugfix (Marc-André)
* Add systemd unit files in contrib/ (me)
* SCSI and block/iscsi.c bugfixes (me, Peter L.)
* unassigned_mem_ops fixes (Peter M.)
* VEX decoding fix (Peter M.)
* "info pic" and "info irq" improvements (Peter Xu)
* vmport trace events (Philippe)
* Braille chardev bugfix (Samuel)
* Compiler warnings fix (Stefan)
* initial support for TCG smoke test of more boards (Thomas)
* New CPU features (Yang)
* Reduce startup memory usage (Yang)
* QemuThread race fix (linhecheng)

# gpg: Signature made Thu 21 Dec 2017 08:30:49 GMT
# 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: (41 commits)
  chardev: convert the socket server to QIONetListener
  blockdev: convert qemu-nbd server to QIONetListener
  blockdev: convert internal NBD server to QIONetListener
  test: add some chardev mux event tests
  chardev: fix backend events regression with mux chardev
  rcu: reduce more than 7MB heap memory by malloc_trim()
  checkpatch: volatile with a comment or sig_atomic_t is okay
  i8259: move TYPE_INTERRUPT_STATS_PROVIDER upper
  kvm-i8259: support "info pic" and "info irq"
  i8259: generalize statistics into common code
  i8259: use DEBUG_IRQ_COUNT always
  i8259: convert DPRINTFs into trace
  Remove legacy -no-kvm-pit option
  scsi: replace hex constants with #defines
  scsi: provide general-purpose functions to manage sense data
  hw/i386/vmport: replace fprintf() by trace events or LOG_UNIMP
  hw/mips/boston: Remove workaround for writes to ROM aborting
  exec: Don't reuse unassigned_mem_ops for io_mem_rom
  block/iscsi: only report an iSCSI Failure if we don't handle it gracefully
  block/iscsi: dont leave allocmap in an invalid state on UNMAP failure
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c3e72679 194b7f0d

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ T: git git://github.com/jasowang/qemu.git net 


SCSI

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

S: Supported

F: include/hw/scsi/*

F: hw/scsi/*
@@ -1271,6 +1272,7 @@ T: git git://github.com/stefanha/qemu.git block 


Block SCSI subsystem

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: include/scsi/*

accel/tcg/cpu-exec.c

+3 −9
Original line number Diff line number Diff line
@@ -525,19 +525,13 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, 
                                        TranslationBlock **last_tb)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);

    int32_t insns_left;



    /* Clear the interrupt flag now since we're processing

     * cpu->interrupt_request and cpu->exit_request.

     * Ensure zeroing happens before reading cpu->exit_request or

     * cpu->interrupt_request (see also smp_wmb in cpu_exit())

     */

    insns_left = atomic_read(&cpu->icount_decr.u32);

    atomic_set(&cpu->icount_decr.u16.high, 0);

    if (unlikely(insns_left < 0)) {

        /* Ensure the zeroing of icount_decr comes before the next read

         * of cpu->exit_request or cpu->interrupt_request.

         */

        smp_mb();

    }

    atomic_mb_set(&cpu->icount_decr.u16.high, 0);



    if (unlikely(atomic_read(&cpu->interrupt_request))) {

        int interrupt_request;

block/iscsi.c

+36 −15
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * QEMU Block driver for iSCSI images

 *

 * Copyright (c) 2010-2011 Ronnie Sahlberg <ronniesahlberg@gmail.com>

 * Copyright (c) 2012-2016 Peter Lieven <pl@kamp.de>

 * Copyright (c) 2012-2017 Peter Lieven <pl@kamp.de>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal
@@ -104,6 +104,7 @@ typedef struct IscsiTask { 
    IscsiLun *iscsilun;

    QEMUTimer retry_timer;

    int err_code;

    char *err_str;

} IscsiTask;



typedef struct IscsiAIOCB {
@@ -265,7 +266,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 
            }

        }

        iTask->err_code = iscsi_translate_sense(&task->sense);

        error_report("iSCSI Failure: %s", iscsi_get_error(iscsi));

        iTask->err_str = g_strdup(iscsi_get_error(iscsi));

    }



out:
@@ -629,6 +630,8 @@ retry: 


    if (iTask.status != SCSI_STATUS_GOOD) {

        iscsi_allocmap_set_invalid(iscsilun, sector_num, nb_sectors);

        error_report("iSCSI WRITE10/16 failed at lba %" PRIu64 ": %s", lba,

                     iTask.err_str);

        r = iTask.err_code;

        goto out_unlock;

    }
@@ -637,6 +640,7 @@ retry: 


out_unlock:

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

    return r;

}
@@ -651,10 +655,9 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, 
    struct scsi_get_lba_status *lbas = NULL;

    struct scsi_lba_status_descriptor *lbasd = NULL;

    struct IscsiTask iTask;

    uint64_t lba;

    int64_t ret;



    iscsi_co_init_iscsitask(iscsilun, &iTask);



    if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {

        ret = -EINVAL;

        goto out;
@@ -670,11 +673,13 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, 
        goto out;

    }



    lba = sector_qemu2lun(sector_num, iscsilun);



    iscsi_co_init_iscsitask(iscsilun, &iTask);

    qemu_mutex_lock(&iscsilun->mutex);

retry:

    if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,

                                  sector_qemu2lun(sector_num, iscsilun),

                                  8 + 16, iscsi_co_generic_cb,

                                  lba, 8 + 16, iscsi_co_generic_cb,

                                  &iTask) == NULL) {

        ret = -ENOMEM;

        goto out_unlock;
@@ -701,6 +706,8 @@ retry: 
         * because the device is busy or the cmd is not

         * supported) we pretend all blocks are allocated

         * for backwards compatibility */

        error_report("iSCSI GET_LBA_STATUS failed at lba %" PRIu64 ": %s",

                     lba, iTask.err_str);

        goto out_unlock;

    }
@@ -738,6 +745,7 @@ retry: 
    }

out_unlock:

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

out:

    if (iTask.task != NULL) {

        scsi_free_scsi_task(iTask.task);
@@ -756,6 +764,7 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs, 
    struct IscsiTask iTask;

    uint64_t lba;

    uint32_t num_sectors;

    int r = 0;



    if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {

        return -EINVAL;
@@ -853,19 +862,23 @@ retry: 
        iTask.complete = 0;

        goto retry;

    }

    qemu_mutex_unlock(&iscsilun->mutex);



    if (iTask.status != SCSI_STATUS_GOOD) {

        return iTask.err_code;

        error_report("iSCSI READ10/16 failed at lba %" PRIu64 ": %s",

                     lba, iTask.err_str);

        r = iTask.err_code;

    }



    return 0;

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

    return r;

}



static int coroutine_fn iscsi_co_flush(BlockDriverState *bs)

{

    IscsiLun *iscsilun = bs->opaque;

    struct IscsiTask iTask;

    int r = 0;



    iscsi_co_init_iscsitask(iscsilun, &iTask);

    qemu_mutex_lock(&iscsilun->mutex);
@@ -892,13 +905,15 @@ retry: 
        iTask.complete = 0;

        goto retry;

    }

    qemu_mutex_unlock(&iscsilun->mutex);



    if (iTask.status != SCSI_STATUS_GOOD) {

        return iTask.err_code;

        error_report("iSCSI SYNCHRONIZECACHE10 failed: %s", iTask.err_str);

        r = iTask.err_code;

    }



    return 0;

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

    return r;

}



#ifdef __linux__
@@ -1128,6 +1143,9 @@ retry: 
        goto retry;

    }



    iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,

                               bytes >> BDRV_SECTOR_BITS);



    if (iTask.status == SCSI_STATUS_CHECK_CONDITION) {

        /* the target might fail with a check condition if it

           is not happy with the alignment of the UNMAP request
@@ -1136,15 +1154,15 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        error_report("iSCSI UNMAP failed at lba %" PRIu64 ": %s",

                     list.lba, iTask.err_str);

        r = iTask.err_code;

        goto out_unlock;

    }



    iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,

                               bytes >> BDRV_SECTOR_BITS);



out_unlock:

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

    return r;

}
@@ -1241,6 +1259,8 @@ retry: 
    if (iTask.status != SCSI_STATUS_GOOD) {

        iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,

                                   bytes >> BDRV_SECTOR_BITS);

        error_report("iSCSI WRITESAME10/16 failed at lba %" PRIu64 ": %s",

                     lba, iTask.err_str);

        r = iTask.err_code;

        goto out_unlock;

    }
@@ -1255,6 +1275,7 @@ retry: 


out_unlock:

    qemu_mutex_unlock(&iscsilun->mutex);

    g_free(iTask.err_str);

    return r;

}

blockdev-nbd.c

+16 −34
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include "qmp-commands.h"

#include "block/nbd.h"

#include "io/channel-socket.h"

#include "io/net-listener.h"



typedef struct NBDServerData {

    QIOChannelSocket *listen_ioc;

    int watch;

    QIONetListener *listener;

    QCryptoTLSCreds *tlscreds;

} NBDServerData;
@@ -32,27 +32,13 @@ static void nbd_blockdev_client_closed(NBDClient *client, bool ignored) 
    nbd_client_put(client);

}



static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition,

static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,

                       gpointer opaque)

{

    QIOChannelSocket *cioc;



    if (!nbd_server) {

        return FALSE;

    }



    cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),

                                     NULL);

    if (!cioc) {

        return TRUE;

    }



    qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");

    nbd_client_new(NULL, cioc,

                   nbd_server->tlscreds, NULL,

                   nbd_blockdev_client_closed);

    object_unref(OBJECT(cioc));

    return TRUE;

}
@@ -62,10 +48,8 @@ static void nbd_server_free(NBDServerData *server) 
        return;

    }



    if (server->watch != -1) {

        g_source_remove(server->watch);

    }

    object_unref(OBJECT(server->listen_ioc));

    qio_net_listener_disconnect(server->listener);

    object_unref(OBJECT(server->listener));

    if (server->tlscreds) {

        object_unref(OBJECT(server->tlscreds));

    }
@@ -112,12 +96,12 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds, 
    }



    nbd_server = g_new0(NBDServerData, 1);

    nbd_server->watch = -1;

    nbd_server->listen_ioc = qio_channel_socket_new();

    qio_channel_set_name(QIO_CHANNEL(nbd_server->listen_ioc),

    nbd_server->listener = qio_net_listener_new();



    qio_net_listener_set_name(nbd_server->listener,

                              "nbd-listener");

    if (qio_channel_socket_listen_sync(

            nbd_server->listen_ioc, addr, errp) < 0) {



    if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) {

        goto error;

    }
@@ -134,9 +118,7 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds, 
        }

    }



    nbd_server->watch = qio_channel_add_watch(

        QIO_CHANNEL(nbd_server->listen_ioc),

        G_IO_IN,

    qio_net_listener_set_client_func(nbd_server->listener,

                                     nbd_accept,

                                     NULL,

                                     NULL);

chardev/baum.c

+7 −1
Original line number Diff line number Diff line 
/*

 * QEMU Baum Braille Device

 *

 * Copyright (c) 2008, 2010-2011, 2016 Samuel Thibault

 * Copyright (c) 2008, 2010-2011, 2016-2017 Samuel Thibault

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal
@@ -239,6 +239,12 @@ static int baum_deferred_init(BaumChardev *baum) 
        brlapi_perror("baum: brlapi__getDisplaySize");

        return 0;

    }

    if (baum->y > 1) {

        baum->y = 1;

    }

    if (baum->x > 84) {

        baum->x = 84;

    }



    con = qemu_console_lookup_by_index(0);

    if (con && qemu_console_is_graphic(con)) {