Commit f18793b0 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

compiler: add a sizeof_field() macro 



Determining the size of a field is useful when you don't have a struct
variable handy.  Open-coding this is ugly.

This patch adds the sizeof_field() macro, which is similar to
typeof_field().  Existing instances are updated to use the macro.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20180614164431.29305-1-stefanha@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 00928a42

accel/tcg/translate-all.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct page_collection { 


/* Make sure all possible CPU event bits fit in tb->trace_vcpu_dstate */

QEMU_BUILD_BUG_ON(CPU_TRACE_DSTATE_MAX_EVENTS >

                  sizeof(((TranslationBlock *)0)->trace_vcpu_dstate)

                  sizeof_field(TranslationBlock, trace_vcpu_dstate)

                  * BITS_PER_BYTE);



/*

hw/display/xenfb.c

+2 −2
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim, 
                              int width, int height, int depth,

                              size_t fb_len, int offset, int row_stride)

{

    size_t mfn_sz = sizeof(*((struct xenfb_page *)0)->pd);

    size_t pd_len = sizeof(((struct xenfb_page *)0)->pd) / mfn_sz;

    size_t mfn_sz = sizeof_field(struct xenfb_page, pd[0]);

    size_t pd_len = sizeof_field(struct xenfb_page, pd) / mfn_sz;

    size_t fb_pages = pd_len * XC_PAGE_SIZE / mfn_sz;

    size_t fb_len_max = fb_pages * XC_PAGE_SIZE;

    int max_width, max_height;

hw/net/rocker/rocker_of_dpa.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ typedef struct of_dpa_flow_key { 


/* Width of key which includes field 'f' in u64s, rounded up */

#define FLOW_KEY_WIDTH(f) \

    DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof(((OfDpaFlowKey *)0)->f), \

    DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof_field(OfDpaFlowKey, f), \

    sizeof(uint64_t))



typedef struct of_dpa_flow_action {

hw/net/virtio-net.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 * 'container'.

 */

#define endof(container, field) \

    (offsetof(container, field) + sizeof(((container *)0)->field))

    (offsetof(container, field) + sizeof_field(container, field))



typedef struct VirtIOFeature {

    uint64_t flags;

include/hw/xen/io/ring.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ typedef unsigned int RING_IDX; 
 */

#define __CONST_RING_SIZE(_s, _sz) \

    (__RD32(((_sz) - offsetof(struct _s##_sring, ring)) / \

	    sizeof(((struct _s##_sring *)0)->ring[0])))

            sizeof_field(struct _s##_sring, ring[0])))

/*

 * The same for passing in an actual pointer instead of a name tag.

 */