Commit 190c93c9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* SCSI scanner support
* fixes to qemu-char and net exit
* FreeBSD fixes
* Other small bugfixes

# gpg: Signature made Wed 13 Jul 2016 12:30:11 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:
  hostmem: detect host backend memory is being used properly
  hostmem: fix QEMU crash by 'info memdev'
  char: do not use atexit cleanup handler
  net: do not use atexit for cleanup
  slirp: use exit notifier for slirp_smb_cleanup
  tap: use an exit notifier to call down_script
  util: Fix MIN_NON_ZERO
  qemu-sockets: use qapi_free_SocketAddress in cleanup
  disas: avoid including everything in headers compiled from C++
  json-streamer: fix double-free on exiting during a parse
  main-loop: check return value before using pointer
  Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD.
  scsi-bus: Use longer sense buffer with scanners
  scsi-bus: Add SCSI scanner support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9358450e 2aece63c

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ qemu-version.h: FORCE 
				printf '""\n'; \

			fi; \

		fi) > $@.tmp)

	$(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@)

	$(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@)



config-host.h: config-host.h-timestamp

config-host.h-timestamp: config-host.mak

backends/hostmem.c

+25 −12
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ out: 
    error_propagate(errp, local_err);

}



static uint16List **host_memory_append_node(uint16List **node,

                                            unsigned long value)

{

     *node = g_malloc0(sizeof(**node));

     (*node)->value = value;

     return &(*node)->next;

}



static void

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)
@@ -74,25 +82,23 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, 
    unsigned long value;



    value = find_first_bit(backend->host_nodes, MAX_NODES);



    node = host_memory_append_node(node, value);



    if (value == MAX_NODES) {

        return;

        goto out;

    }



    *node = g_malloc0(sizeof(**node));

    (*node)->value = value;

    node = &(*node)->next;



    do {

        value = find_next_bit(backend->host_nodes, MAX_NODES, value + 1);

        if (value == MAX_NODES) {

            break;

        }



        *node = g_malloc0(sizeof(**node));

        (*node)->value = value;

        node = &(*node)->next;

        node = host_memory_append_node(node, value);

    } while (true);



out:

    visit_type_uint16List(v, name, &host_nodes, errp);

}
@@ -258,6 +264,16 @@ host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) 
    return memory_region_size(&backend->mr) ? &backend->mr : NULL;

}



void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped)

{

    backend->is_mapped = mapped;

}



bool host_memory_backend_is_mapped(HostMemoryBackend *backend)

{

    return backend->is_mapped;

}



static void

host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)

{
@@ -335,10 +351,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
static bool

host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp)

{

    MemoryRegion *mr;



    mr = host_memory_backend_get_memory(MEMORY_BACKEND(uc), errp);

    if (memory_region_is_mapped(mr)) {

    if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {

        return false;

    } else {

        return true;

hw/mem/pc-dimm.c

+11 −7
Original line number Diff line number Diff line
@@ -369,14 +369,9 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, 
static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name,

                                      Object *val, Error **errp)

{

    MemoryRegion *mr;

    Error *local_err = NULL;



    mr = host_memory_backend_get_memory(MEMORY_BACKEND(val), &local_err);

    if (local_err) {

        goto out;

    }

    if (memory_region_is_mapped(mr)) {

    if (host_memory_backend_is_mapped(MEMORY_BACKEND(val))) {

        char *path = object_get_canonical_path_component(val);

        error_setg(&local_err, "can't use already busy memdev: %s", path);

        g_free(path);
@@ -384,7 +379,6 @@ static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name, 
        qdev_prop_allow_set_link_before_realize(obj, name, val, &local_err);

    }



out:

    error_propagate(errp, local_err);

}
@@ -421,6 +415,15 @@ static void pc_dimm_realize(DeviceState *dev, Error **errp) 
    if (ddc->realize) {

        ddc->realize(dimm, errp);

    }



    host_memory_backend_set_mapped(dimm->hostmem, true);

}



static void pc_dimm_unrealize(DeviceState *dev, Error **errp)

{

    PCDIMMDevice *dimm = PC_DIMM(dev);



    host_memory_backend_set_mapped(dimm->hostmem, false);

}



static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm)
@@ -439,6 +442,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) 
    PCDIMMDeviceClass *ddc = PC_DIMM_CLASS(oc);



    dc->realize = pc_dimm_realize;

    dc->unrealize = pc_dimm_unrealize;

    dc->props = pc_dimm_properties;

    dc->desc = "DIMM memory module";

hw/misc/ivshmem.c

+10 −4
Original line number Diff line number Diff line
@@ -1008,10 +1008,7 @@ static const TypeInfo ivshmem_common_info = { 
static void ivshmem_check_memdev_is_busy(Object *obj, const char *name,

                                         Object *val, Error **errp)

{

    MemoryRegion *mr;



    mr = host_memory_backend_get_memory(MEMORY_BACKEND(val), &error_abort);

    if (memory_region_is_mapped(mr)) {

    if (host_memory_backend_is_mapped(MEMORY_BACKEND(val))) {

        char *path = object_get_canonical_path_component(val);

        error_setg(errp, "can't use already busy memdev: %s", path);

        g_free(path);
@@ -1060,6 +1057,14 @@ static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) 
    }



    ivshmem_common_realize(dev, errp);

    host_memory_backend_set_mapped(s->hostmem, true);

}



static void ivshmem_plain_exit(PCIDevice *pci_dev)

{

    IVShmemState *s = IVSHMEM_COMMON(pci_dev);



    host_memory_backend_set_mapped(s->hostmem, false);

}



static void ivshmem_plain_class_init(ObjectClass *klass, void *data)
@@ -1068,6 +1073,7 @@ static void ivshmem_plain_class_init(ObjectClass *klass, void *data) 
    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->realize = ivshmem_plain_realize;

    k->exit = ivshmem_plain_exit;

    dc->props = ivshmem_plain_properties;

    dc->vmsd = &ivshmem_plain_vmsd;

}

hw/scsi/scsi-bus.c

+40 −1
Original line number Diff line number Diff line
@@ -461,6 +461,14 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) 
    return true;

}



static size_t scsi_sense_len(SCSIRequest *req)

{

    if (req->dev->type == TYPE_SCANNER)

        return SCSI_SENSE_LEN_SCANNER;

    else

        return SCSI_SENSE_LEN;

}



static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf)

{

    SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req);
@@ -477,7 +485,7 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) 
        }

        break;

    case REQUEST_SENSE:

        scsi_target_alloc_buf(&r->req, SCSI_SENSE_LEN);

        scsi_target_alloc_buf(&r->req, scsi_sense_len(req));

        r->len = scsi_device_get_sense(r->req.dev, r->buf,

                                       MIN(req->cmd.xfer, r->buf_len),

                                       (req->cmd.buf[1] & 1) == 0);
@@ -1132,6 +1140,29 @@ static int scsi_req_medium_changer_xfer(SCSICommand *cmd, SCSIDevice *dev, uint8 
    return 0;

}



static int scsi_req_scanner_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)

{

    switch (buf[0]) {

    /* Scanner commands */

    case OBJECT_POSITION:

        cmd->xfer = 0;

        break;

    case SCAN:

        cmd->xfer = buf[4];

        break;

    case READ_10:

    case SEND:

    case GET_WINDOW:

    case SET_WINDOW:

        cmd->xfer = buf[8] | (buf[7] << 8) | (buf[6] << 16);

        break;

    default:

        /* GET_DATA_BUFFER_STATUS xfer handled by scsi_req_xfer */

        return scsi_req_xfer(cmd, dev, buf);

    }



    return 0;

}



static void scsi_cmd_xfer_mode(SCSICommand *cmd)

{
@@ -1178,6 +1209,11 @@ static void scsi_cmd_xfer_mode(SCSICommand *cmd) 
    case SEND_DVD_STRUCTURE:

    case PERSISTENT_RESERVE_OUT:

    case MAINTENANCE_OUT:

    case SET_WINDOW:

    case SCAN:

        /* SCAN conflicts with START_STOP.  START_STOP has cmd->xfer set to 0 for

         * non-scanner devices, so we only get here for SCAN and not for START_STOP.

         */

        cmd->mode = SCSI_XFER_TO_DEV;

        break;

    case ATA_PASSTHROUGH_12:
@@ -1258,6 +1294,9 @@ int scsi_req_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf) 
    case TYPE_MEDIUM_CHANGER:

        rc = scsi_req_medium_changer_xfer(cmd, dev, buf);

        break;

    case TYPE_SCANNER:

        rc = scsi_req_scanner_length(cmd, dev, buf);

        break;

    default:

        rc = scsi_req_xfer(cmd, dev, buf);

        break;