Commit 1329132d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



vhost: fixes

Misc fixes related to memory region handling.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 25 Sep 2019 15:28:23 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  vhost: Fix memory region section comparison
  memory: Provide an equality function for MemoryRegionSections
  memory: Align MemoryRegionSections fields

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eb13d1cf 3fc4a64c

hw/virtio/vhost.c

+7 −2
Original line number Diff line number Diff line
@@ -451,8 +451,13 @@ static void vhost_commit(MemoryListener *listener) 
        changed = true;

    } else {

        /* Same size, lets check the contents */

        changed = n_old_sections && memcmp(dev->mem_sections, old_sections,

                         n_old_sections * sizeof(old_sections[0])) != 0;

        for (int i = 0; i < n_old_sections; i++) {

            if (!MemoryRegionSection_eq(&old_sections[i],

                                        &dev->mem_sections[i])) {

                changed = true;

                break;

            }

        }

    }



    trace_vhost_commit(dev->started, changed);

include/exec/memory.h

+13 −1
Original line number Diff line number Diff line
@@ -495,15 +495,27 @@ static inline FlatView *address_space_to_flatview(AddressSpace *as) 
 * @nonvolatile: this section is non-volatile

 */

struct MemoryRegionSection {

    Int128 size;

    MemoryRegion *mr;

    FlatView *fv;

    hwaddr offset_within_region;

    Int128 size;

    hwaddr offset_within_address_space;

    bool readonly;

    bool nonvolatile;

};



static inline bool MemoryRegionSection_eq(MemoryRegionSection *a,

                                          MemoryRegionSection *b)

{

    return a->mr == b->mr &&

           a->fv == b->fv &&

           a->offset_within_region == b->offset_within_region &&

           a->offset_within_address_space == b->offset_within_address_space &&

           int128_eq(a->size, b->size) &&

           a->readonly == b->readonly &&

           a->nonvolatile == b->nonvolatile;

}



/**

 * memory_region_init: Initialize a memory region

 *