Commit 7cd37925 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging 



Machine queue for 2.10

# gpg: Signature made Thu 20 Apr 2017 19:44:27 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-pull-request:
  qdev: Constify local variable returned by blk_bs
  qdev: Constify value passed to qdev_prop_set_macaddr
  hostmem: use host_memory_backend_mr_inited() where proper
  hostmem: introduce host_memory_backend_mr_inited()
  hw/core/null-machine: Print error message when using the -kernel parameter
  qdev: Make "hotplugged" property read-only
  intel_iommu: enable remote IOTLB
  intel_iommu: allow dynamic switch of IOMMU region
  intel_iommu: provide its own replay() callback
  intel_iommu: use the correct memory region for device IOTLB notification
  memory: add MemoryRegionIOMMUOps.replay() callback
  memory: introduce memory_region_notify_one()
  memory: provide iommu_replay_all()
  memory: provide IOMMU_NOTIFIER_FOREACH macro
  memory: add section range info for IOMMU notifier

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fa54abb8 be9721f4

backends/hostmem-file.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
#ifndef CONFIG_LINUX

    error_setg(errp, "-mem-path not supported on this host");

#else

    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        gchar *path;

        backend->force_prealloc = mem_prealloc;

        path = object_get_canonical_path(OBJECT(backend));
@@ -76,7 +76,7 @@ static void set_mem_path(Object *o, const char *str, Error **errp) 
    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(errp, "cannot change property value");

        return;

    }
@@ -96,7 +96,7 @@ static void file_memory_backend_set_share(Object *o, bool value, Error **errp) 
    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(errp, "cannot change property value");

        return;

    }

backends/hostmem.c

+14 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const char *name, 
    Error *local_err = NULL;

    uint64_t value;



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(&local_err, "cannot change property value");

        goto out;

    }
@@ -146,7 +146,7 @@ static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp) 
{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->merge = value;

        return;

    }
@@ -172,7 +172,7 @@ static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp) 
{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->dump = value;

        return;

    }
@@ -208,7 +208,7 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, 
        }

    }



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->prealloc = value;

        return;

    }
@@ -237,10 +237,19 @@ static void host_memory_backend_init(Object *obj) 
    backend->prealloc = mem_prealloc;

}



bool host_memory_backend_mr_inited(HostMemoryBackend *backend)

{

    /*

     * NOTE: We forbid zero-length memory backend, so here zero means

     * "we haven't inited the backend memory region yet".

     */

    return memory_region_size(&backend->mr) != 0;

}



MemoryRegion *

host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)

{

    return memory_region_size(&backend->mr) ? &backend->mr : NULL;

    return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL;

}



void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped)

hw/core/null-machine.c

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ static void machine_none_init(MachineState *mch) 
        memory_region_allocate_system_memory(ram, NULL, "ram", mch->ram_size);

        memory_region_add_subregion(get_system_memory(), 0, ram);

    }



    if (mch->kernel_filename) {

        error_report("The -kernel parameter is not supported "

                     "(use the generic 'loader' device instead).");

        exit(1);

    }

}



static void machine_none_machine_init(MachineClass *mc)

hw/core/qdev-properties-system.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ void qdev_prop_set_drive(DeviceState *dev, const char *name, 
    if (value) {

        ref = blk_name(value);

        if (!*ref) {

            BlockDriverState *bs = blk_bs(value);

            const BlockDriverState *bs = blk_bs(value);

            if (bs) {

                ref = bdrv_get_node_name(bs);

            }

hw/core/qdev-properties.c

+2 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,8 @@ void qdev_prop_set_string(DeviceState *dev, const char *name, const char *value) 
    object_property_set_str(OBJECT(dev), value, name, &error_abort);

}



void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value)

void qdev_prop_set_macaddr(DeviceState *dev, const char *name,

                           const uint8_t *value)

{

    char str[2 * 6 + 5 + 1];

    snprintf(str, sizeof(str), "%02x:%02x:%02x:%02x:%02x:%02x",