Commit aa3c40f6 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

vhost: Move log_dirty check 



Move the log_dirty check into vhost_section.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 938eeb64

hw/virtio/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
vhost_commit(bool started, bool changed) "Started: %d Changed: %d"

vhost_region_add_section(const char *name, uint64_t gpa, uint64_t size, uint64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64

vhost_region_add_section_abut(const char *name, uint64_t new_size) "%s: 0x%"PRIx64

vhost_section(const char *name, int r) "%s:%d"



# hw/virtio/virtio.c

virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"

hw/virtio/vhost.c

+13 −7
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/virtio/virtio-access.h"

#include "migration/blocker.h"

#include "sysemu/dma.h"

#include "trace.h"



/* enabled until disconnected backend stabilizes */

#define _VHOST_DEBUG 1
@@ -379,8 +380,19 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev, 


static bool vhost_section(MemoryRegionSection *section)

{

    return memory_region_is_ram(section->mr) &&

    bool result;

    bool log_dirty = memory_region_get_dirty_log_mask(section->mr) &

                     ~(1 << DIRTY_MEMORY_MIGRATION);

    result = memory_region_is_ram(section->mr) &&

        !memory_region_is_rom(section->mr);



    /* Vhost doesn't handle any block which is doing dirty-tracking other

     * than migration; this typically fires on VGA areas.

     */

    result &= !log_dirty;



    trace_vhost_section(section->mr->name, result);

    return result;

}



static void vhost_begin(MemoryListener *listener)
@@ -510,12 +522,6 @@ static void vhost_region_add_section(struct vhost_dev *dev, 
    trace_vhost_region_add_section(section->mr->name, mrs_gpa, mrs_size,

                                   mrs_host);



    bool log_dirty = memory_region_get_dirty_log_mask(section->mr) &

                        ~(1 << DIRTY_MEMORY_MIGRATION);

    if (log_dirty) {

        return;

    }



    if (dev->n_tmp_sections) {

        /* Since we already have at least one section, lets see if

         * this extends it; since we're scanning in order, we only