Commit 7c9209e7 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Gerd Hoffmann
Browse files

vnc: replace hweight_long() with ctpopl() 



ctpopl() has a better implementation than hweight_long() and ui/vnc.c
being the last user of hweight_long(), we can simply remove it.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1489415605-13105-1-git-send-email-clg@kaod.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 761d0f97

include/qemu/bitops.h

+0 −10
Original line number Diff line number Diff line
@@ -201,16 +201,6 @@ static inline unsigned long find_first_zero_bit(const unsigned long *addr, 
    return find_next_zero_bit(addr, size, 0);

}



static inline unsigned long hweight_long(unsigned long w)

{

    unsigned long count;



    for (count = 0; w; w >>= 1) {

        count += w & 1;

    }

    return count;

}



/**

 * rol8 - rotate an 8-bit value left

 * @word: value to rotate

ui/vnc.c

+3 −3
Original line number Diff line number Diff line
@@ -2061,15 +2061,15 @@ static void set_pixel_format(VncState *vs, int bits_per_pixel, 
    }



    vs->client_pf.rmax = red_max ? red_max : 0xFF;

    vs->client_pf.rbits = hweight_long(red_max);

    vs->client_pf.rbits = ctpopl(red_max);

    vs->client_pf.rshift = red_shift;

    vs->client_pf.rmask = red_max << red_shift;

    vs->client_pf.gmax = green_max ? green_max : 0xFF;

    vs->client_pf.gbits = hweight_long(green_max);

    vs->client_pf.gbits = ctpopl(green_max);

    vs->client_pf.gshift = green_shift;

    vs->client_pf.gmask = green_max << green_shift;

    vs->client_pf.bmax = blue_max ? blue_max : 0xFF;

    vs->client_pf.bbits = hweight_long(blue_max);

    vs->client_pf.bbits = ctpopl(blue_max);

    vs->client_pf.bshift = blue_shift;

    vs->client_pf.bmask = blue_max << blue_shift;

    vs->client_pf.bits_per_pixel = bits_per_pixel;