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

Merge remote-tracking branch 'remotes/bonzini/memory' into staging 



* remotes/bonzini/memory:
  qdev: correctly send DEVICE_DELETED for recursively-deleted devices
  memory: do not give a name to the internal exec.c regions
  memory: MemoryRegion: Add size property
  memory: MemoryRegion: Add may-overlap and priority props
  memory: MemoryRegion: Add container and addr props
  memory: MemoryRegion: replace owner field with QOM parent
  memory: MemoryRegion: QOMify
  memory: MemoryRegion: use /machine as default owner
  libqtest: escape strings in QMP commands, fix leak
  qom: object: Ignore refs/unrefs of NULL
  qom: object: remove parent pointer when unparenting
  mc146818rtc: add "rtc-time" link to "/machine/rtc"
  qom: allow creating an alias of a child<> property
  qom: add a generic mechanism to resolve paths
  qom: add object_property_add_alias()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3959efd 352e8da7

exec.c

+6 −6
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static void phys_section_destroy(MemoryRegion *mr) 


    if (mr->subpage) {

        subpage_t *subpage = container_of(mr, subpage_t, iomem);

        memory_region_destroy(&subpage->iomem);

        object_unref(OBJECT(&subpage->iomem));

        g_free(subpage);

    }

}
@@ -1768,7 +1768,7 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base) 
    mmio->as = as;

    mmio->base = base;

    memory_region_init_io(&mmio->iomem, NULL, &subpage_ops, mmio,

                          "subpage", TARGET_PAGE_SIZE);

                          NULL, TARGET_PAGE_SIZE);

    mmio->iomem.subpage = true;

#if defined(DEBUG_SUBPAGE)

    printf("%s: %p base " TARGET_FMT_plx " len %08x\n", __func__,
@@ -1801,13 +1801,13 @@ MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index) 


static void io_mem_init(void)

{

    memory_region_init_io(&io_mem_rom, NULL, &unassigned_mem_ops, NULL, "rom", UINT64_MAX);

    memory_region_init_io(&io_mem_rom, NULL, &unassigned_mem_ops, NULL, NULL, UINT64_MAX);

    memory_region_init_io(&io_mem_unassigned, NULL, &unassigned_mem_ops, NULL,

                          "unassigned", UINT64_MAX);

                          NULL, UINT64_MAX);

    memory_region_init_io(&io_mem_notdirty, NULL, &notdirty_mem_ops, NULL,

                          "notdirty", UINT64_MAX);

                          NULL, UINT64_MAX);

    memory_region_init_io(&io_mem_watch, NULL, &watch_mem_ops, NULL,

                          "watch", UINT64_MAX);

                          NULL, UINT64_MAX);

}



static void mem_begin(MemoryListener *listener)

hw/core/qdev.c

+3 −2
Original line number Diff line number Diff line
@@ -848,6 +848,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 
        if (dev->hotplugged && local_err == NULL) {

            device_reset(dev);

        }

        dev->pending_deleted_event = false;

    } else if (!value && dev->realized) {

        QLIST_FOREACH(bus, &dev->child_bus, sibling) {

            object_property_set_bool(OBJECT(bus), false, "realized",
@@ -862,6 +863,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 
        if (dc->unrealize && local_err == NULL) {

            dc->unrealize(dev, &local_err);

        }

        dev->pending_deleted_event = true;

    }



    if (local_err != NULL) {
@@ -972,7 +974,6 @@ static void device_unparent(Object *obj) 
{

    DeviceState *dev = DEVICE(obj);

    BusState *bus;

    bool have_realized = dev->realized;



    if (dev->realized) {

        object_property_set_bool(obj, false, "realized", NULL);
@@ -988,7 +989,7 @@ static void device_unparent(Object *obj) 
    }



    /* Only send event if the device had been completely realized */

    if (have_realized) {

    if (dev->pending_deleted_event) {

        gchar *path = object_get_canonical_path(OBJECT(dev));



        qapi_event_send_device_deleted(!!dev->id, dev->id, path, &error_abort);

hw/timer/mc146818rtc.c

+9 −0
Original line number Diff line number Diff line
@@ -909,6 +909,9 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) 


    object_property_add(OBJECT(s), "date", "struct tm",

                        rtc_get_date, NULL, NULL, s, NULL);



    object_property_add_alias(qdev_get_machine(), "rtc-time",

                              OBJECT(s), "date", NULL);

}



ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
@@ -950,11 +953,17 @@ static void rtc_class_initfn(ObjectClass *klass, void *data) 
    dc->cannot_instantiate_with_device_add_yet = true;

}



static void rtc_finalize(Object *obj)

{

    object_property_del(qdev_get_machine(), "rtc", NULL);

}



static const TypeInfo mc146818rtc_info = {

    .name          = TYPE_MC146818_RTC,

    .parent        = TYPE_ISA_DEVICE,

    .instance_size = sizeof(RTCState),

    .class_init    = rtc_class_initfn,

    .instance_finalize = rtc_finalize,

};



static void mc146818rtc_register_types(void)

include/exec/memory.h

+7 −2
Original line number Diff line number Diff line
@@ -32,10 +32,15 @@ 
#include "qemu/int128.h"

#include "qemu/notify.h"

#include "qapi/error.h"

#include "qom/object.h"



#define MAX_PHYS_ADDR_SPACE_BITS 62

#define MAX_PHYS_ADDR            (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)



#define TYPE_MEMORY_REGION "qemu:memory-region"

#define MEMORY_REGION(obj) \

        OBJECT_CHECK(MemoryRegion, (obj), TYPE_MEMORY_REGION)



typedef struct MemoryRegionOps MemoryRegionOps;

typedef struct MemoryRegionMmio MemoryRegionMmio;
@@ -131,11 +136,11 @@ typedef struct CoalescedMemoryRange CoalescedMemoryRange; 
typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd;



struct MemoryRegion {

    Object parent_obj;

    /* All fields are private - violators will be prosecuted */

    const MemoryRegionOps *ops;

    const MemoryRegionIOMMUOps *iommu_ops;

    void *opaque;

    struct Object *owner;

    MemoryRegion *container;

    Int128 size;

    hwaddr addr;
@@ -152,7 +157,7 @@ struct MemoryRegion { 
    bool flush_coalesced_mmio;

    MemoryRegion *alias;

    hwaddr alias_offset;

    int priority;

    int32_t priority;

    bool may_overlap;

    QTAILQ_HEAD(subregions, MemoryRegion) subregions;

    QTAILQ_ENTRY(MemoryRegion) subregions_link;

include/hw/qdev-core.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct DeviceState { 


    const char *id;

    bool realized;

    bool pending_deleted_event;

    QemuOpts *opts;

    int hotplugged;

    BusState *parent_bus;