Commit 993b1f4b authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

msix: trace control bit write op 



Meanwhile, abstract a function to detect msix masked bit.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1494309644-18743-3-git-send-email-peterx@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9ba35d0b

hw/pci/msix.c

+9 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "hw/xen/xen.h"

#include "qemu/range.h"

#include "qapi/error.h"

#include "trace.h"



#define MSIX_CAP_LENGTH 12
@@ -130,10 +131,14 @@ static void msix_handle_mask_update(PCIDevice *dev, int vector, bool was_masked) 
    }

}



static bool msix_masked(PCIDevice *dev)

{

    return dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] & MSIX_MASKALL_MASK;

}



static void msix_update_function_masked(PCIDevice *dev)

{

    dev->msix_function_masked = !msix_enabled(dev) ||

        (dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] & MSIX_MASKALL_MASK);

    dev->msix_function_masked = !msix_enabled(dev) || msix_masked(dev);

}



/* Handle MSI-X capability config write. */
@@ -148,6 +153,8 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, 
        return;

    }



    trace_msix_write_config(dev->name, msix_enabled(dev), msix_masked(dev));



    was_masked = dev->msix_function_masked;

    msix_update_function_masked(dev);

hw/pci/trace-events

+3 −0
Original line number Diff line number Diff line
@@ -7,3 +7,6 @@ pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func, int 
# hw/pci/pci_host.c

pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x"

pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x <- 0x%x"



# hw/pci/msix.c

msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d"